From 482717b2c7f4fabd800b51bf4b19aeee8b307545 Mon Sep 17 00:00:00 2001
From: Mathias Fussenegger <f.mathias@zignar.net>
Date: Thu, 30 Apr 2015 10:20:55 +0200
Subject: [PATCH 001/123] prevent over allocation for multicast ping request

very tiny optimization but the BytesStreamOutput ctor by
default allocates 16KB which is way too much for a ping
request.

The actual size of the request depends on the clusterName so
150 isn't accurate either but should be enough.
---
 .../discovery/zen/ping/multicast/MulticastZenPing.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java b/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java
index 0d5ca7260b4..85eb221a73e 100644
--- a/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java
+++ b/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.discovery.zen.ping.multicast;
 
 import org.apache.lucene.util.Constants;
-import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.ClusterName;
@@ -29,7 +28,10 @@ import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
-import org.elasticsearch.common.io.stream.*;
+import org.elasticsearch.common.io.stream.BytesStreamInput;
+import org.elasticsearch.common.io.stream.BytesStreamOutput;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.network.MulticastChannel;
 import org.elasticsearch.common.network.NetworkService;
 import org.elasticsearch.common.settings.Settings;
@@ -64,6 +66,8 @@ public class MulticastZenPing extends AbstractLifecycleComponent<ZenPing> implem
 
     private static final byte[] INTERNAL_HEADER = new byte[]{1, 9, 8, 4};
 
+    private static final int PING_SIZE_ESTIMATE = 150;
+
     private final String address;
     private final int port;
     private final String group;
@@ -248,7 +252,7 @@ public class MulticastZenPing extends AbstractLifecycleComponent<ZenPing> implem
 
     private void sendPingRequest(int id) {
         try {
-            BytesStreamOutput out = new BytesStreamOutput();
+            BytesStreamOutput out = new BytesStreamOutput(PING_SIZE_ESTIMATE);
             out.writeBytes(INTERNAL_HEADER);
             // TODO: change to min_required version!
             Version.writeVersion(version, out);

From defe2c305cdc54b051d197e2204d9a160084d0ab Mon Sep 17 00:00:00 2001
From: aleph-zero <andrew@elastic.co>
Date: Thu, 30 Apr 2015 13:47:24 -0700
Subject: [PATCH 002/123] Read configuration file with .yaml suffix

Fixes a bug whereby we failed to read an elasticsearch config file with
the .yaml extension. This commit allows elasticsearch config files to
be suffixed with: .yml, .yaml, .json, .properties.

Closes #9706
---
 .../internal/InternalSettingsPreparer.java    | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/elasticsearch/node/internal/InternalSettingsPreparer.java b/src/main/java/org/elasticsearch/node/internal/InternalSettingsPreparer.java
index fcb6f3919c6..f940c15c042 100644
--- a/src/main/java/org/elasticsearch/node/internal/InternalSettingsPreparer.java
+++ b/src/main/java/org/elasticsearch/node/internal/InternalSettingsPreparer.java
@@ -19,6 +19,7 @@
 
 package org.elasticsearch.node.internal;
 
+import com.google.common.collect.ImmutableList;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.common.Names;
 import org.elasticsearch.common.Strings;
@@ -28,6 +29,7 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.env.FailedToResolveConfigException;
 
+import java.util.List;
 import java.util.Map;
 
 import static org.elasticsearch.common.Strings.cleanPath;
@@ -38,6 +40,8 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde
  */
 public class InternalSettingsPreparer {
 
+    static final List<String> ALLOWED_SUFFIXES = ImmutableList.of(".yml", ".yaml", ".json", ".properties");
+
     public static Tuple<Settings, Environment> prepareSettings(Settings pSettings, boolean loadConfigSettings) {
         // ignore this prefixes when getting properties from es. and elasticsearch.
         String[] ignorePrefixes = new String[]{"es.default.", "elasticsearch.default."};
@@ -73,22 +77,12 @@ public class InternalSettingsPreparer {
                 }
             }
             if (loadFromEnv) {
-                try {
-                    settingsBuilder.loadFromUrl(environment.resolveConfig("elasticsearch.yml"));
-                } catch (FailedToResolveConfigException e) {
-                    // ignore
-                } catch (NoClassDefFoundError e) {
-                    // ignore, no yaml
-                }
-                try {
-                    settingsBuilder.loadFromUrl(environment.resolveConfig("elasticsearch.json"));
-                } catch (FailedToResolveConfigException e) {
-                    // ignore
-                }
-                try {
-                    settingsBuilder.loadFromUrl(environment.resolveConfig("elasticsearch.properties"));
-                } catch (FailedToResolveConfigException e) {
-                    // ignore
+                for (String allowedSuffix : ALLOWED_SUFFIXES) {
+                    try {
+                        settingsBuilder.loadFromUrl(environment.resolveConfig("elasticsearch" + allowedSuffix));
+                    } catch (FailedToResolveConfigException e) {
+                        // ignore
+                    }
                 }
             }
         }

From 4a13a56058465e9b9cff0e9d435b24f1a37d5826 Mon Sep 17 00:00:00 2001
From: aleph-zero <andrew@elastic.co>
Date: Thu, 7 May 2015 13:26:42 -0700
Subject: [PATCH 003/123] Test for reading alternate suffixes

---
 .../node/internal/InternalSettingsPreparerTests.java | 12 ++++++++++++
 src/test/resources/config/elasticsearch.json         |  3 +++
 src/test/resources/config/elasticsearch.properties   |  2 ++
 src/test/resources/config/elasticsearch.yaml         |  3 +++
 4 files changed, 20 insertions(+)
 create mode 100644 src/test/resources/config/elasticsearch.json
 create mode 100644 src/test/resources/config/elasticsearch.properties
 create mode 100644 src/test/resources/config/elasticsearch.yaml

diff --git a/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java b/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java
index 8db6fd4e5c0..d78644e5fb5 100644
--- a/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java
+++ b/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java
@@ -52,4 +52,16 @@ public class InternalSettingsPreparerTests extends ElasticsearchTestCase {
         // Should use setting from the system property
         assertThat(tuple.v1().get("node.zone"), equalTo("bar"));
     }
+
+    @Test
+    public void testAlternateConfigFileSuffixes() {
+        // test that we can read config files with .yaml, .json, and .properties suffixes
+        Tuple<Settings, Environment> tuple = InternalSettingsPreparer.prepareSettings(settingsBuilder()
+                .put("config.ignore_system_properties", true)
+                .build(), true);
+
+        assertThat(tuple.v1().get("yaml.config.exists"), equalTo("true"));
+        assertThat(tuple.v1().get("json.config.exists"), equalTo("true"));
+        assertThat(tuple.v1().get("properties.config.exists"), equalTo("true"));
+    }
 }
diff --git a/src/test/resources/config/elasticsearch.json b/src/test/resources/config/elasticsearch.json
new file mode 100644
index 00000000000..16433a2c88d
--- /dev/null
+++ b/src/test/resources/config/elasticsearch.json
@@ -0,0 +1,3 @@
+{
+  "json.config.exists" : "true"
+}
diff --git a/src/test/resources/config/elasticsearch.properties b/src/test/resources/config/elasticsearch.properties
new file mode 100644
index 00000000000..d3f822cafb5
--- /dev/null
+++ b/src/test/resources/config/elasticsearch.properties
@@ -0,0 +1,2 @@
+
+properties.config.exists: true
diff --git a/src/test/resources/config/elasticsearch.yaml b/src/test/resources/config/elasticsearch.yaml
new file mode 100644
index 00000000000..b6ebc6bd105
--- /dev/null
+++ b/src/test/resources/config/elasticsearch.yaml
@@ -0,0 +1,3 @@
+
+yaml.config.exists: true
+

From aa98ae5240cf8c2d18abb50ab310ff414d3df9a2 Mon Sep 17 00:00:00 2001
From: Adrien Grand <jpountz@gmail.com>
Date: Fri, 22 May 2015 19:28:49 +0200
Subject: [PATCH 004/123] Search: Do not specialize TermQuery vs. TermsQuery.

We had some code that created a TermQuery instead of a TermsQuery when there
was a single term, which is not useful anymore now that TermsQuery rewrites to
a disjunction when there are few terms:
  https://issues.apache.org/jira/browse/LUCENE-6360
---
 .../mapper/core/AbstractFieldMapper.java      | 20 ++++---------------
 .../index/mapper/internal/IdFieldMapper.java  |  6 +-----
 .../string/SimpleStringMappingTests.java      | 14 -------------
 3 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java
index 5c26e0c14b4..b1d1d3395e4 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java
@@ -479,23 +479,11 @@ public abstract class AbstractFieldMapper implements FieldMapper {
 
     @Override
     public Query termsQuery(List values, @Nullable QueryParseContext context) {
-        switch (values.size()) {
-        case 0:
-            return Queries.newMatchNoDocsQuery();
-        case 1:
-            // When there is a single term, it's important to return a term filter so that
-            // it can return a DocIdSet that is directly backed by a postings list, instead
-            // of loading everything into a bit set and returning an iterator based on the
-            // bit set
-            return termQuery(values.get(0), context);
-        default:
-            BytesRef[] bytesRefs = new BytesRef[values.size()];
-            for (int i = 0; i < bytesRefs.length; i++) {
-                bytesRefs[i] = indexedValueForSearch(values.get(i));
-            }
-            return new TermsQuery(names.indexName(), bytesRefs);
-            
+        BytesRef[] bytesRefs = new BytesRef[values.size()];
+        for (int i = 0; i < bytesRefs.length; i++) {
+            bytesRefs[i] = indexedValueForSearch(values.get(i));
         }
+        return new TermsQuery(names.indexName(), bytesRefs);
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java
index cd59591b6bb..b7438540c40 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java
@@ -188,11 +188,7 @@ public class IdFieldMapper extends AbstractFieldMapper implements RootMapper {
             return super.termQuery(value, context);
         }
         final BytesRef[] uids = Uid.createUidsForTypesAndId(context.queryTypes(), value);
-        if (uids.length == 1) {
-            return new TermQuery(new Term(UidFieldMapper.NAME, uids[0]));
-        } else {
-            return new TermsQuery(UidFieldMapper.NAME, uids);
-        }
+        return new TermsQuery(UidFieldMapper.NAME, uids);
     }
 
     @Override
diff --git a/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java
index 9baa2ca6afc..3363518b8e4 100644
--- a/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java
@@ -519,18 +519,4 @@ public class SimpleStringMappingTests extends ElasticsearchSingleNodeTest {
         assertTrue(mergeResult.buildConflicts()[0].contains("cannot enable norms"));
     }
 
-    public void testTermsQuery() throws Exception {
-        String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
-                .startObject("properties").startObject("field").field("type", "string").field("index", "not_analyzed").endObject().endObject()
-                .endObject().endObject().string();
-
-        DocumentMapper defaultMapper = parser.parse(mapping);
-        FieldMapper mapper = defaultMapper.mappers().getMapper("field");
-        assertNotNull(mapper);
-        assertTrue(mapper instanceof StringFieldMapper);
-        assertEquals(Queries.newMatchNoDocsQuery(), mapper.termsQuery(Collections.emptyList(), null));
-        assertEquals(new TermQuery(new Term("field", "value")), mapper.termsQuery(Collections.singletonList("value"), null));
-        assertEquals(new TermsQuery(new Term("field", "value1"), new Term("field", "value2")), mapper.termsQuery(Arrays.asList("value1", "value2"), null));
-    }
-
 }

From b376a3fbfb3a5830db194476b7a08aad7633650f Mon Sep 17 00:00:00 2001
From: Boaz Leskes <b.leskes@gmail.com>
Date: Sat, 23 May 2015 17:18:21 +0300
Subject: [PATCH 005/123] Move index sealing terminology to synced flush

#10032 introduced the notion of sealing an index by marking it with a special read only marker, allowing for a couple of optimization to happen. The most important one was to speed up recoveries of shards where we know nothing has changed since they were online by skipping the file based sync phase. During the implementation we came up with a light notion which achieves the same recovery benefits but without the read only aspects which we dubbed synced flush. The fact that it was light weight and didn't put the index in read only mode, allowed us to do it automatically in the background which has great advantage. However we also felt the need to allow users to manually trigger this operation.

 The implementation at #11179 added the sync flush internal logic and the manual (rest) rest API. The name of the API was modeled after the sealing terminology which may end up being confusing. This commit changes the API name to match the internal synced flush naming, namely `{index}/_flush/synced'.

  On top of that it contains a couple other changes:
   - Remove all java client API. This feature is not supposed to be called programtically by applications but rather by admins.
   - Improve rest responses making structure similar to other (flush) API
   - Change IndexShard#getOperationsCount to exclude the internal +1 on open shard . it's confusing to get 1 while there are actually no ongoing operations
   - Some minor other clean ups
---
 docs/reference/indices.asciidoc               |   1 -
 docs/reference/indices/flush.asciidoc         | 152 ++++++++++-
 docs/reference/indices/seal.asciidoc          |  91 -------
 docs/reference/setup/upgrade.asciidoc         |  56 +++--
 rest-api-spec/api/indices.flush_synced.json   |  39 +++
 rest-api-spec/api/indices.seal.json           |  17 --
 .../10_basic.yaml                             |   7 +-
 .../elasticsearch/action/ActionModule.java    |   3 -
 .../admin/indices/seal/SealIndicesAction.java |  45 ----
 .../indices/seal/SealIndicesRequest.java      |  49 ----
 .../seal/SealIndicesRequestBuilder.java       |  38 ---
 .../indices/seal/SealIndicesResponse.java     | 171 -------------
 .../seal/TransportSealIndicesAction.java      | 100 --------
 .../client/IndicesAdminClient.java            |  25 --
 .../client/support/AbstractClient.java        |  19 --
 .../elasticsearch/index/shard/IndexShard.java |   4 +-
 .../elasticsearch/indices/IndicesModule.java  |   1 +
 .../flush/IndicesSyncedFlushResult.java       | 148 +++++++++++
 .../flush/ShardsSyncedFlushResult.java        | 164 ++++++++++++
 .../{ => flush}/SyncedFlushService.java       | 237 +++++++-----------
 .../recovery/RecoverySourceHandler.java       |   3 +-
 .../TransportNodesListShardStoreMetaData.java |   9 +-
 .../rest/action/RestActionModule.java         |   8 +-
 .../RestSyncedFlushAction.java}               |  35 +--
 .../admin/indices/seal/SealIndicesTests.java  | 116 ---------
 .../gateway/RecoveryFromGatewayTests.java     |  10 +-
 .../index/shard/IndexShardTests.java          |   9 +-
 .../org/elasticsearch/indices/SealTests.java  |  49 ----
 .../indices/{ => flush}/FlushTest.java        |  82 +++---
 .../SyncedFlushSingleNodeTest.java}           |  53 ++--
 .../indices/flush/SyncedFlushUnitTests.java   | 134 ++++++++++
 .../indices/{ => flush}/SyncedFlushUtil.java  |  30 ++-
 .../test/ElasticsearchIntegrationTest.java    | 144 +++++------
 .../test/InternalTestCluster.java             |  10 +-
 34 files changed, 948 insertions(+), 1111 deletions(-)
 delete mode 100644 docs/reference/indices/seal.asciidoc
 create mode 100644 rest-api-spec/api/indices.flush_synced.json
 delete mode 100644 rest-api-spec/api/indices.seal.json
 rename rest-api-spec/test/{indices.seal => indices.flush}/10_basic.yaml (74%)
 delete mode 100644 src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesAction.java
 delete mode 100644 src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesRequest.java
 delete mode 100644 src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesRequestBuilder.java
 delete mode 100644 src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesResponse.java
 delete mode 100644 src/main/java/org/elasticsearch/action/admin/indices/seal/TransportSealIndicesAction.java
 create mode 100644 src/main/java/org/elasticsearch/indices/flush/IndicesSyncedFlushResult.java
 create mode 100644 src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java
 rename src/main/java/org/elasticsearch/indices/{ => flush}/SyncedFlushService.java (80%)
 rename src/main/java/org/elasticsearch/rest/action/admin/indices/{seal/RestSealIndicesAction.java => flush/RestSyncedFlushAction.java} (55%)
 delete mode 100644 src/test/java/org/elasticsearch/action/admin/indices/seal/SealIndicesTests.java
 delete mode 100644 src/test/java/org/elasticsearch/indices/SealTests.java
 rename src/test/java/org/elasticsearch/indices/{ => flush}/FlushTest.java (73%)
 rename src/test/java/org/elasticsearch/indices/{SycnedFlushSingleNodeTest.java => flush/SyncedFlushSingleNodeTest.java} (83%)
 create mode 100644 src/test/java/org/elasticsearch/indices/flush/SyncedFlushUnitTests.java
 rename src/test/java/org/elasticsearch/indices/{ => flush}/SyncedFlushUtil.java (70%)

diff --git a/docs/reference/indices.asciidoc b/docs/reference/indices.asciidoc
index fe1b20b05e9..06a24821440 100644
--- a/docs/reference/indices.asciidoc
+++ b/docs/reference/indices.asciidoc
@@ -59,7 +59,6 @@ and warmers.
 * <<indices-refresh>>
 * <<indices-flush>>
 * <<indices-optimize>>
-* <<indices-seal>>
 * <<indices-upgrade>>
 
 --
diff --git a/docs/reference/indices/flush.asciidoc b/docs/reference/indices/flush.asciidoc
index b2b67474623..99aa589d866 100644
--- a/docs/reference/indices/flush.asciidoc
+++ b/docs/reference/indices/flush.asciidoc
@@ -10,8 +10,9 @@ trigger flush operations as required in order to clear memory.
 
 [source,js]
 --------------------------------------------------
-$ curl -XPOST 'http://localhost:9200/twitter/_flush'
+POST /twitter/_flush
 --------------------------------------------------
+// AUTOSENSE
 
 [float]
 [[flush-parameters]]
@@ -39,7 +40,152 @@ or even on `_all` the indices.
 
 [source,js]
 --------------------------------------------------
-$ curl -XPOST 'http://localhost:9200/kimchy,elasticsearch/_flush'
+POST /kimchy,elasticsearch/_flush
 
-$ curl -XPOST 'http://localhost:9200/_flush'
+POST /_flush
 --------------------------------------------------
+// AUTOSENSE
+
+[[indices-synced-flush]]
+=== Synced Flush
+
+Elasticsearch tracks the indexing activity of each shards. Shards that have not
+received any indexing operations for, by default, 30m are automatically marked as inactive. This presents
+an opportunity for Elasticsearch to reduce shard resources and also perform
+a special kind of flush, called `synced flush`. A synced flush performs normal
+flushing and adds a special uniquely generated marker (`sync_id`) to all shards.
+
+Since the sync id marker was added when there were no ongoing indexing operations, it can
+be used as a quick way to check if two shards indices are identical. This quick sync id
+comparison (if present) is used during recovery or restarts to skip the first and
+most costly phase of the process. In that case, no segment files need to be copied and
+the transaction log replay phase of the recovery can start immediately. Note that since the sync id
+marker was applied together with a flush, it is highly likely that the transaction log will be empty,
+speeding up recoveries even more.
+
+This is particularly useful for use cases having lots of indices which are
+never or very rarely updated, such as time based data. This use case typically generates lots of indices whose
+recovery without the synced flush marker would take a long time.
+
+To check whether a shard has a marker or not, one can use the `commit` section of shard stats returned by
+the <<indices-stats,indices stats>> API:
+
+[source,bash]
+--------------------------------------------------
+GET /twitter/_stats/commit?level=shards
+--------------------------------------------------
+// AUTOSENSE
+
+[float]
+=== Synced Flush API
+
+The Synced Flush API allows an administrator to initiate a synced flush manually. This can particularly useful for
+a planned (rolling) cluster restart where one can stop indexing and doesn't want to wait for the default 30m to pass
+when the synced flush will be performed automatically.
+
+While handy, there are a couple of caveats for this API:
+
+1. Synced flush is a best effort operation. Any ongoing indexing operations will cause
+the synced flush to fail. This means that some shards may be synced flushed while others aren't. See below for more.
+2. The `sync_id` marker is removed as soon as the shard is flushed again. Uncommitted
+operations in the transaction log do not remove the marker. That is because the marker is store as part
+of a low level lucene commit, representing a point in time snapshot of the segments. In practice, one should consider
+any indexing operation on an index  as removing the marker.
+
+
+[source,bash]
+--------------------------------------------------
+POST /twitter/_flush/synced
+--------------------------------------------------
+// AUTOSENSE
+
+The response contains details about how many shards were successfully synced-flushed and information about any failure.
+
+Here is what it looks like when all shards of a two shards and one replica index successfully
+sync-flushed:
+
+[source,js]
+--------------------------------------------------
+{
+   "_shards": {
+      "total": 4,
+      "successful": 4,
+      "failed": 0
+   },
+   "twitter": {
+      "total": 4,
+      "successful": 4,
+      "failed": 0
+   }
+}
+--------------------------------------------------
+
+
+Here is what it looks like when one shard group failed due to pending operations:
+
+[source,js]
+--------------------------------------------------
+{
+   "_shards": {
+      "total": 4,
+      "successful": 2,
+      "failed": 2
+   },
+   "twitter": {
+      "total": 4,
+      "successful": 2,
+      "failed": 2,
+      "failures": [
+         {
+            "shard": 1,
+            "reason": "[2] ongoing operations on primary"
+         }
+      ]
+   }
+}
+--------------------------------------------------
+
+
+Sometimes the failures are specific to a shard copy, in which case they will be reported as follows:
+
+[source,js]
+--------------------------------------------------
+{
+   "_shards": {
+      "total": 4,
+      "successful": 1,
+      "failed": 1
+   },
+   "twitter": {
+      "total": 4,
+      "successful": 3,
+      "failed": 1,
+      "failures": [
+         {
+            "shard": 1,
+            "reason": "unexpected error",
+            "routing": {
+               "state": "STARTED",
+               "primary": false,
+               "node": "SZNr2J_ORxKTLUCydGX4zA",
+               "relocating_node": null,
+               "shard": 1,
+               "index": "twitter"
+            }
+         }
+      ]
+   }
+}
+--------------------------------------------------
+
+
+The synced flush API can be applied to more than one index with a single call,
+or even on `_all` the indices.
+
+[source,js]
+--------------------------------------------------
+POST /kimchy,elasticsearch/_flush/synced
+
+POST /_flush/synced
+--------------------------------------------------
+// AUTOSENSE
\ No newline at end of file
diff --git a/docs/reference/indices/seal.asciidoc b/docs/reference/indices/seal.asciidoc
deleted file mode 100644
index 86ad42a40da..00000000000
--- a/docs/reference/indices/seal.asciidoc
+++ /dev/null
@@ -1,91 +0,0 @@
-[[indices-seal]]
-== Seal
-
-The seal API flushes and adds a "seal" marker to the shards of one or more
-indices. The seal is used during recovery or restarts to skip the first and
-most costly phase of the process if all copies of the shard have the same seal.
-No segment files need to be copied and the transaction log replay phase of the
-recovery can start immediately which makes recovery much faster.
-
-There are two important points about seals:
-1. They are best effort in that if there are any outstanding write operations
-while the seal operation is being performed then the shards which those writes
-target won't be sealed but all others will be. See below for more.
-2. The seal breaks as soon as the shard issues a new lucene commit. Uncommitted
-operations in the transaction log do not break the seal. That is because a seal
-marks a point in time snapshot of the segments, a low level lucene commit.
-Practically that means that every write operation on the index will remove the
-seal.
-
-[source,bash]
---------------------------------------------------
-$ curl -XPOST 'http://localhost:9200/twitter/_seal'
---------------------------------------------------
-
-The response contains details about which shards wrote the seal and the reason
-in case they failed to write the seal.
-
-Here is what it looks like when all copies single shard index successfully
-wrote the seal:
-
-[source,js]
---------------------------------------------------
-{
-   "twitter": [
-      {
-         "shard_id": 0,
-         "responses": {
-            "5wjOIntuRqy9F_7JRrrLwA": "success",
-            "M2iCBe-nS5yaInE8volfSg": "success"
-         },
-         "message": "success"
-      }
-}
---------------------------------------------------
-
-
-Here is what it looks like when one copy fails:
-
-[source,js]
---------------------------------------------------
-{
-   "twitter": [
-      {
-         "shard_id": 0,
-         "responses": {
-            "M2iCBe-nS5yaInE8volfSg": "pending operations",
-            "5wjOIntuRqy9F_7JRrrLwA": "success"
-         },
-         "message": "failed on some copies"
-      }
-}
---------------------------------------------------
-
-
-Sometimes the failures can be shard wide and they'll look like this:
-
-[source,js]
---------------------------------------------------
-{
-   "twitter": [
-      {
-         "shard_id": 0,
-         "message": "operation counter on primary is non zero [2]"
-      }
-}
---------------------------------------------------
-
-
-[float]
-[[seal-multi-index]]
-=== Multi Index
-
-The seal API can be applied to more than one index with a single call,
-or even on `_all` the indices.
-
-[source,js]
---------------------------------------------------
-curl -XPOST 'http://localhost:9200/kimchy,elasticsearch/_seal'
-
-curl -XPOST 'http://localhost:9200/_seal'
---------------------------------------------------
diff --git a/docs/reference/setup/upgrade.asciidoc b/docs/reference/setup/upgrade.asciidoc
index c477f5ec9c7..61708755006 100644
--- a/docs/reference/setup/upgrade.asciidoc
+++ b/docs/reference/setup/upgrade.asciidoc
@@ -85,13 +85,27 @@ This syntax applies to Elasticsearch 1.0 and later:
 
 [source,sh]
 --------------------------------------------------
-        curl -XPUT localhost:9200/_cluster/settings -d '{
-                "transient" : {
-                    "cluster.routing.allocation.enable" : "none"
-                }
-        }'
+curl -XPUT localhost:9200/_cluster/settings -d '{
+        "transient" : {
+            "cluster.routing.allocation.enable" : "none"
+        }
+}'
 --------------------------------------------------
 
+* There is no problem to continue indexing while doing the upgrade. However, you can speed the process considerably
+by stopping indexing temporarily to non-essential indices and issuing a manual <<indices-synced-flush, synced flush>>.
+A synced flush is special kind of flush which can seriously speed up recovery of shards. Elasticsearch automatically
+uses it when an index has been inactive for a while (default is `30m`) but you can manually trigger it using the following command:
+
+[source,sh]
+--------------------------------------------------
+curl -XPOST localhost:9200/_all/_flush/synced
+--------------------------------------------------
+
+Note that a synced flush call is a best effort operation. It will fail there are any pending indexing operations. It is safe to issue
+it multiple times if needed.
+
+
 * Shut down a single node within the cluster.
 
 * Confirm that all shards are correctly reallocated to the remaining running nodes.
@@ -110,11 +124,11 @@ This syntax applies to Elasticsearch 1.0 and later:
 
 [source,sh]
 --------------------------------------------------
-        curl -XPUT localhost:9200/_cluster/settings -d '{
-                "transient" : {
-                    "cluster.routing.allocation.enable" : "all"
-                }
-        }'
+curl -XPUT localhost:9200/_cluster/settings -d '{
+        "transient" : {
+            "cluster.routing.allocation.enable" : "all"
+        }
+}'
 --------------------------------------------------
 
 * Observe that all shards are properly allocated on all nodes.  Balancing may take some time.
@@ -150,11 +164,11 @@ This syntax is from versions prior to 1.0:
 
 [source,sh]
 --------------------------------------------------
-	curl -XPUT localhost:9200/_cluster/settings -d '{
-		"persistent" : {
-		"cluster.routing.allocation.disable_allocation" : true
-		}
-	}'
+curl -XPUT localhost:9200/_cluster/settings -d '{
+    "persistent" : {
+    "cluster.routing.allocation.disable_allocation" : true
+    }
+}'
 --------------------------------------------------
 
 * Stop all Elasticsearch services on all nodes in the cluster.
@@ -169,12 +183,12 @@ This syntax is from versions prior to 1.0:
 This syntax is from release 1.0 and later:
 [source,sh]
 ------------------------------------------------------
-	curl -XPUT localhost:9200/_cluster/settings -d '{
-     		"persistent" : {
-		"cluster.routing.allocation.disable_allocation": false,
-         	"cluster.routing.allocation.enable" : "all"
-     		}
- 	}'
+curl -XPUT localhost:9200/_cluster/settings -d '{
+        "persistent" : {
+    "cluster.routing.allocation.disable_allocation": false,
+        "cluster.routing.allocation.enable" : "all"
+        }
+}'
 ------------------------------------------------------
 
 The cluster upgrade can be streamlined by installing the software before stopping cluster services.  If this is done, testing must be performed to ensure that no production data or configuration files are overwritten prior to restart.
diff --git a/rest-api-spec/api/indices.flush_synced.json b/rest-api-spec/api/indices.flush_synced.json
new file mode 100644
index 00000000000..28cad291e6a
--- /dev/null
+++ b/rest-api-spec/api/indices.flush_synced.json
@@ -0,0 +1,39 @@
+{
+  "indices.flush.synced": {
+    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-flush.html",
+    "methods": ["POST", "GET"],
+    "url": {
+      "path": "/_flush/synced",
+      "paths": [
+        "/_flush/synced",
+        "/{index}/_flush/synced"
+      ],
+      "parts": {
+        "index": {
+          "type" : "list",
+          "description" : "A comma-separated list of index names; use `_all` or empty string for all indices"
+        },
+        "ignore_unavailable": {
+          "type": "boolean",
+          "description": "Whether specified concrete indices should be ignored when unavailable (missing or closed)"
+        },
+        "allow_no_indices": {
+          "type": "boolean",
+          "description": "Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)"
+        },
+        "expand_wildcards": {
+          "type": "enum",
+          "options": [
+            "open",
+            "closed",
+            "none",
+            "all"
+          ],
+          "default": "open",
+          "description": "Whether to expand wildcard expression to concrete indices that are open, closed or both."
+        }
+      }
+    },
+    "body": null
+  }
+}
diff --git a/rest-api-spec/api/indices.seal.json b/rest-api-spec/api/indices.seal.json
deleted file mode 100644
index 3377d6e88a1..00000000000
--- a/rest-api-spec/api/indices.seal.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "indices.seal": {
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-seal.html",
-    "methods": ["POST", "GET"],
-    "url": {
-      "path": "/_seal",
-      "paths": ["/_seal", "/{index}/_seal"],
-      "parts": {
-        "index": {
-          "type" : "list",
-          "description" : "A comma-separated list of index names; use `_all` or empty string for all indices"
-        }
-      }
-    },
-    "body": null
-  }
-}
diff --git a/rest-api-spec/test/indices.seal/10_basic.yaml b/rest-api-spec/test/indices.flush/10_basic.yaml
similarity index 74%
rename from rest-api-spec/test/indices.seal/10_basic.yaml
rename to rest-api-spec/test/indices.flush/10_basic.yaml
index 5277adc528d..f85458da69e 100644
--- a/rest-api-spec/test/indices.seal/10_basic.yaml
+++ b/rest-api-spec/test/indices.flush/10_basic.yaml
@@ -1,5 +1,5 @@
 ---
-"Index seal rest test":
+"Index synced flush rest test":
     - do:
        indices.create:
           index: testing
@@ -8,8 +8,11 @@
        cluster.health:
           wait_for_status: yellow
     - do:
-       indices.seal:
+       indices.flush.synced:
           index: testing
+
+    - is_false: _shards.failed
+
     - do:
        indices.stats: {level: shards}
 
diff --git a/src/main/java/org/elasticsearch/action/ActionModule.java b/src/main/java/org/elasticsearch/action/ActionModule.java
index 1c273f67b5b..c529a3e876f 100644
--- a/src/main/java/org/elasticsearch/action/ActionModule.java
+++ b/src/main/java/org/elasticsearch/action/ActionModule.java
@@ -103,8 +103,6 @@ import org.elasticsearch.action.admin.indices.settings.put.TransportUpdateSettin
 import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsAction;
 import org.elasticsearch.action.admin.indices.stats.IndicesStatsAction;
 import org.elasticsearch.action.admin.indices.stats.TransportIndicesStatsAction;
-import org.elasticsearch.action.admin.indices.seal.SealIndicesAction;
-import org.elasticsearch.action.admin.indices.seal.TransportSealIndicesAction;
 import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateAction;
 import org.elasticsearch.action.admin.indices.template.delete.TransportDeleteIndexTemplateAction;
 import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesAction;
@@ -256,7 +254,6 @@ public class ActionModule extends AbstractModule {
         registerAction(ValidateQueryAction.INSTANCE, TransportValidateQueryAction.class);
         registerAction(RefreshAction.INSTANCE, TransportRefreshAction.class);
         registerAction(FlushAction.INSTANCE, TransportFlushAction.class);
-        registerAction(SealIndicesAction.INSTANCE, TransportSealIndicesAction.class);
         registerAction(OptimizeAction.INSTANCE, TransportOptimizeAction.class);
         registerAction(ClearIndicesCacheAction.INSTANCE, TransportClearIndicesCacheAction.class);
         registerAction(PutWarmerAction.INSTANCE, TransportPutWarmerAction.class);
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesAction.java b/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesAction.java
deleted file mode 100644
index fbb01b05abe..00000000000
--- a/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesAction.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.action.admin.indices.seal;
-
-import org.elasticsearch.action.Action;
-import org.elasticsearch.client.ElasticsearchClient;
-
-/**
- */
-public class SealIndicesAction extends Action<SealIndicesRequest, SealIndicesResponse, SealIndicesRequestBuilder> {
-
-    public static final SealIndicesAction INSTANCE = new SealIndicesAction();
-    public static final String NAME = "indices:admin/seal";
-
-    private SealIndicesAction() {
-        super(NAME);
-    }
-
-    @Override
-    public SealIndicesResponse newResponse() {
-        return new SealIndicesResponse();
-    }
-
-    @Override
-    public SealIndicesRequestBuilder newRequestBuilder(ElasticsearchClient client) {
-        return new SealIndicesRequestBuilder(client, this);
-    }
-}
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesRequest.java
deleted file mode 100644
index 42cdc51ed32..00000000000
--- a/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesRequest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.action.admin.indices.seal;
-
-import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
-
-import java.util.Arrays;
-
-/**
- * A request to seal one or more indices.
- */
-public class SealIndicesRequest extends BroadcastOperationRequest {
-
-    SealIndicesRequest() {
-    }
-
-    /**
-     * Constructs a seal request against one or more indices. If nothing is provided, all indices will
-     * be sealed.
-     */
-    public SealIndicesRequest(String... indices) {
-        super(indices);
-    }
-
-    @Override
-    public String toString() {
-        return "SealIndicesRequest{" +
-                "indices=" + Arrays.toString(indices) +
-                ", indicesOptions=" + indicesOptions() +
-                '}';
-    }
-}
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesRequestBuilder.java
deleted file mode 100644
index a424ab3fc3b..00000000000
--- a/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesRequestBuilder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.action.admin.indices.seal;
-
-import org.elasticsearch.action.ActionRequestBuilder;
-import org.elasticsearch.client.ElasticsearchClient;
-
-/**
- *
- */
-public class SealIndicesRequestBuilder extends ActionRequestBuilder<SealIndicesRequest, SealIndicesResponse, SealIndicesRequestBuilder> {
-
-    public SealIndicesRequestBuilder(ElasticsearchClient client, SealIndicesAction action) {
-        super(client, action, new SealIndicesRequest());
-    }
-
-    public SealIndicesRequestBuilder indices(String ... indices) {
-        request.indices(indices);
-        return this;
-    }
-}
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesResponse.java
deleted file mode 100644
index 1dfd47795a5..00000000000
--- a/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesResponse.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.action.admin.indices.seal;
-
-import org.elasticsearch.action.ActionResponse;
-import org.elasticsearch.cluster.routing.ShardRouting;
-import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.xcontent.ToXContent;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.indices.SyncedFlushService;
-import org.elasticsearch.rest.RestStatus;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * A response to a seal action on several indices.
- */
-public class SealIndicesResponse extends ActionResponse implements ToXContent {
-
-    final private Set<SyncedFlushService.SyncedFlushResult> results;
-
-    private RestStatus restStatus;
-
-    SealIndicesResponse() {
-        results = new HashSet<>();
-    }
-
-    SealIndicesResponse(Set<SyncedFlushService.SyncedFlushResult> results) {
-        this.results = results;
-        if (allShardsFailed()) {
-            restStatus = RestStatus.CONFLICT;
-        } else if (someShardsFailed()) {
-            restStatus = RestStatus.PARTIAL_CONTENT;
-        } else {
-            restStatus = RestStatus.OK;
-        }
-    }
-
-    public RestStatus status() {
-        return restStatus;
-    }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        super.readFrom(in);
-        int size = in.readVInt();
-        results.clear();
-        for (int i = 0; i < size; i++) {
-            SyncedFlushService.SyncedFlushResult syncedFlushResult = new SyncedFlushService.SyncedFlushResult();
-            syncedFlushResult.readFrom(in);
-            results.add(syncedFlushResult);
-        }
-        restStatus = RestStatus.readFrom(in);
-    }
-
-    @Override
-    public void writeTo(StreamOutput out) throws IOException {
-        super.writeTo(out);
-        out.writeVInt(results.size());
-        for (SyncedFlushService.SyncedFlushResult syncedFlushResult : results) {
-            syncedFlushResult.writeTo(out);
-        }
-        RestStatus.writeTo(out, restStatus);
-    }
-
-    public Set<SyncedFlushService.SyncedFlushResult> results() {
-        return results;
-    }
-
-    @Override
-    public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-        Map<String, Map<Integer, Object>> allResults = new HashMap<>();
-
-        // first, sort everything by index and shard id
-        for (SyncedFlushService.SyncedFlushResult result : results) {
-            String indexName = result.getShardId().index().name();
-            int shardId = result.getShardId().getId();
-
-            if (allResults.get(indexName) == null) {
-                // no results yet for this index
-                allResults.put(indexName, new TreeMap<Integer, Object>());
-            }
-            if (result.shardResponses().size() > 0) {
-                Map<ShardRouting, SyncedFlushService.SyncedFlushResponse> shardResponses = new HashMap<>();
-                for (Map.Entry<ShardRouting, SyncedFlushService.SyncedFlushResponse> shardResponse : result.shardResponses().entrySet()) {
-                    shardResponses.put(shardResponse.getKey(), shardResponse.getValue());
-                }
-                allResults.get(indexName).put(shardId, shardResponses);
-            } else {
-                allResults.get(indexName).put(shardId, result.failureReason());
-            }
-        }
-        for (Map.Entry<String, Map<Integer, Object>> result : allResults.entrySet()) {
-            builder.startArray(result.getKey());
-            for (Map.Entry<Integer, Object> shardResponse : result.getValue().entrySet()) {
-                builder.startObject();
-                builder.field("shard_id", shardResponse.getKey());
-                if (shardResponse.getValue() instanceof Map) {
-                    builder.startObject("responses");
-                    Map<ShardRouting, SyncedFlushService.SyncedFlushResponse> results = (Map<ShardRouting, SyncedFlushService.SyncedFlushResponse>) shardResponse.getValue();
-                    boolean success = true;
-                    for (Map.Entry<ShardRouting, SyncedFlushService.SyncedFlushResponse> shardCopy : results.entrySet()) {
-                        builder.field(shardCopy.getKey().currentNodeId(), shardCopy.getValue().success() ? "success" : shardCopy.getValue().failureReason());
-                        if (shardCopy.getValue().success() == false) {
-                            success = false;
-                        }
-                    }
-                    builder.endObject();
-                    builder.field("message", success ? "success" : "failed on some copies");
-
-                } else {
-                    builder.field("message", shardResponse.getValue()); // must be a string
-                }
-                builder.endObject();
-            }
-            builder.endArray();
-        }
-        return builder;
-    }
-
-    public boolean allShardsFailed() {
-        for (SyncedFlushService.SyncedFlushResult result : results) {
-            if (result.success()) {
-                return false;
-            }
-            if (result.shardResponses().size() > 0) {
-                for (Map.Entry<ShardRouting, SyncedFlushService.SyncedFlushResponse> shardResponse : result.shardResponses().entrySet()) {
-                    if (shardResponse.getValue().success()) {
-                        return false;
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-    public boolean someShardsFailed() {
-        for (SyncedFlushService.SyncedFlushResult result : results) {
-            if (result.success() == false) {
-                return true;
-            }
-            if (result.shardResponses().size() > 0) {
-                for (Map.Entry<ShardRouting, SyncedFlushService.SyncedFlushResponse> shardResponse : result.shardResponses().entrySet()) {
-                    if (shardResponse.getValue().success() == false) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-}
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/seal/TransportSealIndicesAction.java b/src/main/java/org/elasticsearch/action/admin/indices/seal/TransportSealIndicesAction.java
deleted file mode 100644
index 61d5e53c32f..00000000000
--- a/src/main/java/org/elasticsearch/action/admin/indices/seal/TransportSealIndicesAction.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.action.admin.indices.seal;
-
-import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.HandledTransportAction;
-import org.elasticsearch.cluster.ClusterService;
-import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.node.DiscoveryNode;
-import org.elasticsearch.cluster.routing.GroupShardsIterator;
-import org.elasticsearch.cluster.routing.ShardIterator;
-import org.elasticsearch.common.inject.Inject;
-import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
-import org.elasticsearch.common.util.concurrent.CountDown;
-import org.elasticsearch.index.shard.ShardId;
-import org.elasticsearch.indices.IndicesLifecycle;
-import org.elasticsearch.indices.SyncedFlushService;
-import org.elasticsearch.threadpool.ThreadPool;
-import org.elasticsearch.transport.*;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- */
-public class TransportSealIndicesAction extends HandledTransportAction<SealIndicesRequest, SealIndicesResponse> {
-
-
-    final private SyncedFlushService syncedFlushService;
-    final private ClusterService clusterService;
-
-    @Inject
-    public TransportSealIndicesAction(Settings settings, ThreadPool threadPool, TransportService transportService, ActionFilters actionFilters, SyncedFlushService syncedFlushService, ClusterService clusterService) {
-        super(settings, SealIndicesAction.NAME, threadPool, transportService, actionFilters, SealIndicesRequest.class);
-        this.syncedFlushService = syncedFlushService;
-        this.clusterService = clusterService;
-    }
-
-    @Override
-    protected void doExecute(final SealIndicesRequest request, final ActionListener<SealIndicesResponse> listener) {
-        ClusterState state = clusterService.state();
-        String[] concreteIndices = state.metaData().concreteIndices(request.indicesOptions(), request.indices());
-        GroupShardsIterator primaries = state.routingTable().activePrimaryShardsGrouped(concreteIndices, true);
-        final Set<SyncedFlushService.SyncedFlushResult> results = ConcurrentCollections.newConcurrentSet();
-
-        final CountDown countDown = new CountDown(primaries.size());
-
-        for (final ShardIterator shard : primaries) {
-            if (shard.size() == 0) {
-                results.add(new SyncedFlushService.SyncedFlushResult(shard.shardId(), "no active primary available"));
-                if (countDown.countDown()) {
-                    listener.onResponse(new SealIndicesResponse(results));
-                }
-            } else {
-                final ShardId shardId = shard.shardId();
-                syncedFlushService.attemptSyncedFlush(shardId, new ActionListener<SyncedFlushService.SyncedFlushResult>() {
-                    @Override
-                    public void onResponse(SyncedFlushService.SyncedFlushResult syncedFlushResult) {
-                        results.add(syncedFlushResult);
-                        if (countDown.countDown()) {
-                            listener.onResponse(new SealIndicesResponse(results));
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(Throwable e) {
-                        logger.debug("{} unexpected error while executing synced flush", shardId);
-                        results.add(new SyncedFlushService.SyncedFlushResult(shardId, e.getMessage()));
-                        if (countDown.countDown()) {
-                            listener.onResponse(new SealIndicesResponse(results));
-                        }
-                    }
-                });
-            }
-        }
-
-    }
-}
diff --git a/src/main/java/org/elasticsearch/client/IndicesAdminClient.java b/src/main/java/org/elasticsearch/client/IndicesAdminClient.java
index c54aaece7f4..6f69fd42ac7 100644
--- a/src/main/java/org/elasticsearch/client/IndicesAdminClient.java
+++ b/src/main/java/org/elasticsearch/client/IndicesAdminClient.java
@@ -84,9 +84,6 @@ import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsRespons
 import org.elasticsearch.action.admin.indices.stats.IndicesStatsRequest;
 import org.elasticsearch.action.admin.indices.stats.IndicesStatsRequestBuilder;
 import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse;
-import org.elasticsearch.action.admin.indices.seal.SealIndicesRequest;
-import org.elasticsearch.action.admin.indices.seal.SealIndicesRequestBuilder;
-import org.elasticsearch.action.admin.indices.seal.SealIndicesResponse;
 import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest;
 import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequestBuilder;
 import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateResponse;
@@ -117,7 +114,6 @@ import org.elasticsearch.common.Nullable;
  */
 public interface IndicesAdminClient extends ElasticsearchClient {
 
-
     /**
      * Indices Exists.
      *
@@ -362,27 +358,6 @@ public interface IndicesAdminClient extends ElasticsearchClient {
      */
     FlushRequestBuilder prepareFlush(String... indices);
 
-    /**
-     * Explicitly sync flush one or more indices
-     *
-     * @param request The seal indices request
-     * @return A result future
-     */
-    ActionFuture<SealIndicesResponse> sealIndices(SealIndicesRequest request);
-
-    /**
-     * Explicitly sync flush one or more indices
-     *
-     * @param request  The seal indices request
-     * @param listener A listener to be notified with a result
-     */
-    void sealIndices(SealIndicesRequest request, ActionListener<SealIndicesResponse> listener);
-
-    /**
-     * Explicitly seal one or more indices
-     */
-    SealIndicesRequestBuilder prepareSealIndices(String... indices);
-
     /**
      * Explicitly optimize one or more indices into a the number of segments.
      *
diff --git a/src/main/java/org/elasticsearch/client/support/AbstractClient.java b/src/main/java/org/elasticsearch/client/support/AbstractClient.java
index 18b0a377ac0..703b03f0dc5 100644
--- a/src/main/java/org/elasticsearch/client/support/AbstractClient.java
+++ b/src/main/java/org/elasticsearch/client/support/AbstractClient.java
@@ -180,10 +180,6 @@ import org.elasticsearch.action.admin.indices.stats.IndicesStatsAction;
 import org.elasticsearch.action.admin.indices.stats.IndicesStatsRequest;
 import org.elasticsearch.action.admin.indices.stats.IndicesStatsRequestBuilder;
 import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse;
-import org.elasticsearch.action.admin.indices.seal.SealIndicesAction;
-import org.elasticsearch.action.admin.indices.seal.SealIndicesRequest;
-import org.elasticsearch.action.admin.indices.seal.SealIndicesRequestBuilder;
-import org.elasticsearch.action.admin.indices.seal.SealIndicesResponse;
 import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateAction;
 import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequest;
 import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateRequestBuilder;
@@ -1327,21 +1323,6 @@ public abstract class AbstractClient extends AbstractComponent implements Client
             return new FlushRequestBuilder(this, FlushAction.INSTANCE).setIndices(indices);
         }
 
-        @Override
-        public ActionFuture<SealIndicesResponse> sealIndices(SealIndicesRequest request) {
-            return execute(SealIndicesAction.INSTANCE, request);
-        }
-
-        @Override
-        public void sealIndices(SealIndicesRequest request, ActionListener<SealIndicesResponse> listener) {
-            execute(SealIndicesAction.INSTANCE, request, listener);
-        }
-
-        @Override
-        public SealIndicesRequestBuilder prepareSealIndices(String... indices) {
-            return new SealIndicesRequestBuilder(this, SealIndicesAction.INSTANCE).indices(indices);
-        }
-
         @Override
         public void getMappings(GetMappingsRequest request, ActionListener<GetMappingsResponse> listener) {
             execute(GetMappingsAction.INSTANCE, request, listener);
diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/src/main/java/org/elasticsearch/index/shard/IndexShard.java
index 71c0bc1347d..a5a9835b21f 100644
--- a/src/main/java/org/elasticsearch/index/shard/IndexShard.java
+++ b/src/main/java/org/elasticsearch/index/shard/IndexShard.java
@@ -21,7 +21,6 @@ package org.elasticsearch.index.shard;
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
-
 import org.apache.lucene.codecs.PostingsFormat;
 import org.apache.lucene.index.CheckIndex;
 import org.apache.lucene.search.Query;
@@ -79,7 +78,6 @@ import org.elasticsearch.index.get.ShardGetService;
 import org.elasticsearch.index.indexing.IndexingStats;
 import org.elasticsearch.index.indexing.ShardIndexingService;
 import org.elasticsearch.index.mapper.*;
-import org.elasticsearch.index.mapper.internal.ParentFieldMapper;
 import org.elasticsearch.index.merge.MergeStats;
 import org.elasticsearch.index.merge.policy.MergePolicyProvider;
 import org.elasticsearch.index.merge.scheduler.MergeSchedulerProvider;
@@ -1367,7 +1365,7 @@ public class IndexShard extends AbstractIndexShardComponent {
     }
 
     public int getOperationsCount() {
-        return indexShardOperationCounter.refCount();
+        return Math.max(0, indexShardOperationCounter.refCount() - 1); // refCount is incremented on creation and decremented on close
     }
 
     /**
diff --git a/src/main/java/org/elasticsearch/indices/IndicesModule.java b/src/main/java/org/elasticsearch/indices/IndicesModule.java
index 4cfb9980e87..50bbfa61858 100644
--- a/src/main/java/org/elasticsearch/indices/IndicesModule.java
+++ b/src/main/java/org/elasticsearch/indices/IndicesModule.java
@@ -32,6 +32,7 @@ import org.elasticsearch.indices.cache.query.IndicesQueryCache;
 import org.elasticsearch.indices.cluster.IndicesClusterStateService;
 import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache;
 import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCacheListener;
+import org.elasticsearch.indices.flush.SyncedFlushService;
 import org.elasticsearch.indices.memory.IndexingMemoryController;
 import org.elasticsearch.indices.query.IndicesQueriesModule;
 import org.elasticsearch.indices.recovery.RecoverySettings;
diff --git a/src/main/java/org/elasticsearch/indices/flush/IndicesSyncedFlushResult.java b/src/main/java/org/elasticsearch/indices/flush/IndicesSyncedFlushResult.java
new file mode 100644
index 00000000000..7c0a680b383
--- /dev/null
+++ b/src/main/java/org/elasticsearch/indices/flush/IndicesSyncedFlushResult.java
@@ -0,0 +1,148 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.elasticsearch.indices.flush;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import org.elasticsearch.cluster.routing.ShardRouting;
+import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentBuilderString;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * The result of performing a sync flush operation on all shards of multiple indices
+ */
+public class IndicesSyncedFlushResult implements ToXContent {
+
+    final Map<String, List<ShardsSyncedFlushResult>> shardsResultPerIndex;
+    final ShardCounts shardCounts;
+
+
+    public IndicesSyncedFlushResult(Map<String, List<ShardsSyncedFlushResult>> shardsResultPerIndex) {
+        this.shardsResultPerIndex = ImmutableMap.copyOf(shardsResultPerIndex);
+        this.shardCounts = calculateShardCounts(Iterables.concat(shardsResultPerIndex.values()));
+    }
+
+    /** total number shards, including replicas, both assigned and unassigned */
+    public int totalShards() {
+        return shardCounts.total;
+    }
+
+    /** total number of shards for which the operation failed */
+    public int failedShards() {
+        return shardCounts.failed;
+    }
+
+    /** total number of shards which were successfully sync-flushed */
+    public int successfulShards() {
+        return shardCounts.successful;
+    }
+
+    public Map<String, List<ShardsSyncedFlushResult>> getShardsResultPerIndex() {
+        return shardsResultPerIndex;
+    }
+
+    @Override
+    public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+        builder.startObject(Fields._SHARDS);
+        shardCounts.toXContent(builder, params);
+        builder.endObject();
+        for (Map.Entry<String, List<ShardsSyncedFlushResult>> indexEntry : shardsResultPerIndex.entrySet()) {
+            List<ShardsSyncedFlushResult> indexResult = indexEntry.getValue();
+            builder.startObject(indexEntry.getKey());
+            ShardCounts indexShardCounts = calculateShardCounts(indexResult);
+            indexShardCounts.toXContent(builder, params);
+            if (indexShardCounts.failed > 0) {
+                builder.startArray(Fields.FAILURES);
+                for (ShardsSyncedFlushResult shardResults : indexResult) {
+                    if (shardResults.failed()) {
+                        builder.startObject();
+                        builder.field(Fields.SHARD, shardResults.shardId().id());
+                        builder.field(Fields.REASON, shardResults.failureReason());
+                        builder.endObject();
+                        continue;
+                    }
+                    Map<ShardRouting, SyncedFlushService.SyncedFlushResponse> failedShards = shardResults.failedShards();
+                    for (Map.Entry<ShardRouting, SyncedFlushService.SyncedFlushResponse> shardEntry : failedShards.entrySet()) {
+                        builder.startObject();
+                        builder.field(Fields.SHARD, shardResults.shardId().id());
+                        builder.field(Fields.REASON, shardEntry.getValue().failureReason());
+                        builder.field(Fields.ROUTING, shardEntry.getKey());
+                        builder.endObject();
+                    }
+                }
+                builder.endArray();
+            }
+            builder.endObject();
+        }
+        return builder;
+    }
+
+    static ShardCounts calculateShardCounts(Iterable<ShardsSyncedFlushResult> results) {
+        int total = 0, successful = 0, failed = 0;
+        for (ShardsSyncedFlushResult result : results) {
+            total += result.totalShards();
+            successful += result.successfulShards();
+            if (result.failed()) {
+                // treat all shard copies as failed
+                failed += result.totalShards();
+            } else {
+                // some shards may have failed during the sync phase
+                failed += result.failedShards().size();
+            }
+        }
+        return new ShardCounts(total, successful, failed);
+    }
+
+    static final class ShardCounts implements ToXContent {
+
+        public final int total;
+        public final int successful;
+        public final int failed;
+
+        ShardCounts(int total, int successful, int failed) {
+            this.total = total;
+            this.successful = successful;
+            this.failed = failed;
+        }
+
+        @Override
+        public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+            builder.field(Fields.TOTAL, total);
+            builder.field(Fields.SUCCESSFUL, successful);
+            builder.field(Fields.FAILED, failed);
+            return builder;
+        }
+    }
+
+    static final class Fields {
+        static final XContentBuilderString _SHARDS = new XContentBuilderString("_shards");
+        static final XContentBuilderString TOTAL = new XContentBuilderString("total");
+        static final XContentBuilderString SUCCESSFUL = new XContentBuilderString("successful");
+        static final XContentBuilderString FAILED = new XContentBuilderString("failed");
+        static final XContentBuilderString FAILURES = new XContentBuilderString("failures");
+        static final XContentBuilderString SHARD = new XContentBuilderString("shard");
+        static final XContentBuilderString ROUTING = new XContentBuilderString("routing");
+        static final XContentBuilderString REASON = new XContentBuilderString("reason");
+    }
+}
diff --git a/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java b/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java
new file mode 100644
index 00000000000..cdf8a2495d8
--- /dev/null
+++ b/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java
@@ -0,0 +1,164 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.elasticsearch.indices.flush;
+
+import com.google.common.collect.ImmutableMap;
+import org.elasticsearch.cluster.routing.ShardRouting;
+import org.elasticsearch.index.shard.ShardId;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Result for all copies of a shard
+ */
+public class ShardsSyncedFlushResult {
+    private String failureReason;
+    private Map<ShardRouting, SyncedFlushService.SyncedFlushResponse> shardResponses;
+    private String syncId;
+    private ShardId shardId;
+    // some shards may be unassigned, so we need this as state
+    private int totalShards;
+
+    public ShardsSyncedFlushResult() {
+    }
+
+    public ShardId getShardId() {
+        return shardId;
+    }
+
+    /**
+     * failure constructor
+     */
+    public ShardsSyncedFlushResult(ShardId shardId, int totalShards, String failureReason) {
+        this.syncId = null;
+        this.failureReason = failureReason;
+        this.shardResponses = ImmutableMap.of();
+        this.shardId = shardId;
+        this.totalShards = totalShards;
+    }
+
+    /**
+     * success constructor
+     */
+    public ShardsSyncedFlushResult(ShardId shardId, String syncId, int totalShards, Map<ShardRouting, SyncedFlushService.SyncedFlushResponse> shardResponses) {
+        this.failureReason = null;
+        ImmutableMap.Builder<ShardRouting, SyncedFlushService.SyncedFlushResponse> builder = ImmutableMap.builder();
+        this.shardResponses = builder.putAll(shardResponses).build();
+        this.syncId = syncId;
+        this.totalShards = totalShards;
+        this.shardId = shardId;
+    }
+
+    /**
+     * @return true if the operation failed before reaching step three of synced flush. {@link #failureReason()} can be used for
+     * more details
+     */
+    public boolean failed() {
+        return failureReason != null;
+    }
+
+    /**
+     * @return the reason for the failure if synced flush failed before step three of synced flush
+     */
+    public String failureReason() {
+        return failureReason;
+    }
+
+    public String syncId() {
+        return syncId;
+    }
+
+    /**
+     * @return total number of shards for which a sync attempt was made
+     */
+    public int totalShards() {
+        return totalShards;
+    }
+
+    /**
+     * @return total number of successful shards
+     */
+    public int successfulShards() {
+        int i = 0;
+        for (SyncedFlushService.SyncedFlushResponse result : shardResponses.values()) {
+            if (result.success()) {
+                i++;
+            }
+        }
+        return i;
+    }
+
+    /**
+     * @return an array of shard failures
+     */
+    public Map<ShardRouting, SyncedFlushService.SyncedFlushResponse> failedShards() {
+        Map<ShardRouting, SyncedFlushService.SyncedFlushResponse> failures = new HashMap<>();
+        for (Map.Entry<ShardRouting, SyncedFlushService.SyncedFlushResponse> result : shardResponses.entrySet()) {
+            if (result.getValue().success() == false) {
+                failures.put(result.getKey(), result.getValue());
+            }
+        }
+        return failures;
+    }
+
+    /**
+     * @return Individual responses for each shard copy with a detailed failure message if the copy failed to perform the synced flush.
+     * Empty if synced flush failed before step three.
+     */
+    public Map<ShardRouting, SyncedFlushService.SyncedFlushResponse> shardResponses() {
+        return shardResponses;
+    }
+
+//    @Override
+//    public void writeTo(StreamOutput out) throws IOException {
+//        super.writeTo(out);
+//        out.writeOptionalString(failureReason);
+//        out.writeOptionalString(syncId);
+//        out.writeVInt(totalShards);
+//        out.writeVInt(shardResponses.size());
+//        for (Map.Entry<ShardRouting, SyncedFlushService.SyncedFlushResponse> result : shardResponses.entrySet()) {
+//            result.getKey().writeTo(out);
+//            result.getValue().writeTo(out);
+//        }
+//        shardId.writeTo(out);
+//    }
+
+//    @Override
+//    public void readFrom(StreamInput in) throws IOException {
+//        super.readFrom(in);
+//        failureReason = in.readOptionalString();
+//        syncId = in.readOptionalString();
+//        totalShards = in.readVInt();
+//        int size = in.readVInt();
+//        ImmutableMap.Builder<ShardRouting, SyncedFlushService.SyncedFlushResponse> builder = ImmutableMap.builder();
+//        for (int i = 0; i < size; i++) {
+//            ImmutableShardRouting shardRouting = ImmutableShardRouting.readShardRoutingEntry(in);
+//            SyncedFlushService.SyncedFlushResponse syncedFlushRsponse = new SyncedFlushService.SyncedFlushResponse();
+//            syncedFlushRsponse.readFrom(in);
+//            builder.put(shardRouting, syncedFlushRsponse);
+//        }
+//        shardResponses = builder.build();
+//        shardId = ShardId.readShardId(in);
+//    }
+
+    public ShardId shardId() {
+        return shardId;
+    }
+}
diff --git a/src/main/java/org/elasticsearch/indices/SyncedFlushService.java b/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java
similarity index 80%
rename from src/main/java/org/elasticsearch/indices/SyncedFlushService.java
rename to src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java
index c4c3fbaa84c..b9447ed01f6 100644
--- a/src/main/java/org/elasticsearch/indices/SyncedFlushService.java
+++ b/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java
@@ -16,17 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.indices;
+package org.elasticsearch.indices.flush;
 
-import com.google.common.collect.ImmutableMap;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.flush.FlushRequest;
+import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.node.DiscoveryNode;
-import org.elasticsearch.cluster.routing.ImmutableShardRouting;
 import org.elasticsearch.cluster.routing.IndexRoutingTable;
 import org.elasticsearch.cluster.routing.IndexShardRoutingTable;
 import org.elasticsearch.cluster.routing.ShardRouting;
@@ -36,26 +35,27 @@ import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
 import org.elasticsearch.common.util.concurrent.CountDown;
 import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.IndexShardMissingException;
 import org.elasticsearch.index.engine.Engine;
-import org.elasticsearch.index.shard.IllegalIndexShardStateException;
 import org.elasticsearch.index.shard.IndexShard;
 import org.elasticsearch.index.shard.IndexShardException;
 import org.elasticsearch.index.shard.ShardId;
+import org.elasticsearch.indices.IndexClosedException;
+import org.elasticsearch.indices.IndexMissingException;
+import org.elasticsearch.indices.IndicesLifecycle;
+import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.*;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 
 public class SyncedFlushService extends AbstractComponent {
 
@@ -82,10 +82,10 @@ public class SyncedFlushService extends AbstractComponent {
             public void onShardInactive(final IndexShard indexShard) {
                 // we only want to call sync flush once, so only trigger it when we are on a primary
                 if (indexShard.routingEntry().primary()) {
-                    attemptSyncedFlush(indexShard.shardId(), new ActionListener<SyncedFlushResult>() {
+                    attemptSyncedFlush(indexShard.shardId(), new ActionListener<ShardsSyncedFlushResult>() {
                         @Override
-                        public void onResponse(SyncedFlushResult syncedFlushResult) {
-                            logger.debug("{} sync flush on inactive shard returned successfully for sync_id: {}", syncedFlushResult.getShardId(), syncedFlushResult.syncId());
+                        public void onResponse(ShardsSyncedFlushResult syncedFlushResult) {
+                            logger.trace("{} sync flush on inactive shard returned successfully for sync_id: {}", syncedFlushResult.getShardId(), syncedFlushResult.syncId());
                         }
 
                         @Override
@@ -98,6 +98,48 @@ public class SyncedFlushService extends AbstractComponent {
         });
     }
 
+    public void attemptSyncedFlush(final String[] aliasesOrIndices, IndicesOptions indicesOptions, final ActionListener<IndicesSyncedFlushResult> listener) {
+        final ClusterState state = clusterService.state();
+        final String[] concreteIndices = state.metaData().concreteIndices(indicesOptions, aliasesOrIndices);
+        final Map<String, List<ShardsSyncedFlushResult>> results = ConcurrentCollections.newConcurrentMap();
+        int totalNumberOfShards = 0;
+        int numberOfShards = 0;
+        for (String index : concreteIndices) {
+            final IndexMetaData indexMetaData = state.metaData().index(index);
+            totalNumberOfShards += indexMetaData.totalNumberOfShards();
+            numberOfShards += indexMetaData.getNumberOfShards();
+            results.put(index, Collections.synchronizedList(new ArrayList<ShardsSyncedFlushResult>()));
+
+        }
+        final int finalTotalNumberOfShards = totalNumberOfShards;
+        final CountDown countDown = new CountDown(numberOfShards);
+
+        for (final String index : concreteIndices) {
+            final int indexNumberOfShards = state.metaData().index(index).getNumberOfShards();
+            for (int shard = 0; shard < indexNumberOfShards; shard++) {
+                final ShardId shardId = new ShardId(index, shard);
+                attemptSyncedFlush(shardId, new ActionListener<ShardsSyncedFlushResult>() {
+                    @Override
+                    public void onResponse(ShardsSyncedFlushResult syncedFlushResult) {
+                        results.get(index).add(syncedFlushResult);
+                        if (countDown.countDown()) {
+                            listener.onResponse(new IndicesSyncedFlushResult(results));
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(Throwable e) {
+                        logger.debug("{} unexpected error while executing synced flush", shardId);
+                        results.get(index).add(new ShardsSyncedFlushResult(shardId, finalTotalNumberOfShards, e.getMessage()));
+                        if (countDown.countDown()) {
+                            listener.onResponse(new IndicesSyncedFlushResult(results));
+                        }
+                    }
+                });
+            }
+        }
+    }
+
     /*
     * Tries to flush all copies of a shard and write a sync id to it.
     * After a synced flush two shard copies may only contain the same sync id if they contain the same documents.
@@ -124,28 +166,36 @@ public class SyncedFlushService extends AbstractComponent {
     *
     * Synced flush is a best effort operation. The sync id may be written on all, some or none of the copies. 
     **/
-    public void attemptSyncedFlush(final ShardId shardId, final ActionListener<SyncedFlushResult> actionListener) {
+    public void attemptSyncedFlush(final ShardId shardId, final ActionListener<ShardsSyncedFlushResult> actionListener) {
         try {
             final ClusterState state = clusterService.state();
-            final IndexShardRoutingTable shardRoutingTable = getActiveShardRoutings(shardId, state);
+            final IndexShardRoutingTable shardRoutingTable = getShardRoutingTable(shardId, state);
             final List<ShardRouting> activeShards = shardRoutingTable.activeShards();
+            final int totalShards = shardRoutingTable.getSize();
+
+            if (activeShards.size() == 0) {
+                actionListener.onResponse(new ShardsSyncedFlushResult(shardId, totalShards, "no active shards"));
+                return;
+            }
+
             final ActionListener<Map<String, Engine.CommitId>> commitIdsListener = new ActionListener<Map<String, Engine.CommitId>>() {
                 @Override
                 public void onResponse(final Map<String, Engine.CommitId> commitIds) {
                     if (commitIds.isEmpty()) {
-                        actionListener.onResponse(new SyncedFlushResult(shardId, "all shards failed to commit on pre-sync"));
+                        actionListener.onResponse(new ShardsSyncedFlushResult(shardId, totalShards, "all shards failed to commit on pre-sync"));
+                        return;
                     }
                     final ActionListener<InFlightOpsResponse> inflightOpsListener = new ActionListener<InFlightOpsResponse>() {
                         @Override
                         public void onResponse(InFlightOpsResponse response) {
                             final int inflight = response.opCount();
-                            assert inflight >= -1;
-                            if (inflight != 1) { // 1 means that there are no write operations are in flight (>1) and the shard is not closed (0).
-                                actionListener.onResponse(new SyncedFlushResult(shardId, "operation counter on primary is non zero [" + inflight + "]"));
+                            assert inflight >= 0;
+                            if (inflight != 0) {
+                                actionListener.onResponse(new ShardsSyncedFlushResult(shardId, totalShards, "[" + inflight + "] ongoing operations on primary"));
                             } else {
                                 // 3. now send the sync request to all the shards
                                 String syncId = Strings.base64UUID();
-                                sendSyncRequests(syncId, activeShards, state, commitIds, shardId, actionListener);
+                                sendSyncRequests(syncId, activeShards, state, commitIds, shardId, totalShards, actionListener);
                             }
                         }
 
@@ -171,7 +221,7 @@ public class SyncedFlushService extends AbstractComponent {
         }
     }
 
-    final IndexShardRoutingTable getActiveShardRoutings(ShardId shardId, ClusterState state) {
+    final IndexShardRoutingTable getShardRoutingTable(ShardId shardId, ClusterState state) {
         final IndexRoutingTable indexRoutingTable = state.routingTable().index(shardId.index().name());
         if (indexRoutingTable == null) {
             IndexMetaData index = state.getMetaData().index(shardId.index().getName());
@@ -188,7 +238,7 @@ public class SyncedFlushService extends AbstractComponent {
     }
 
     /**
-     * returns the number of inflight operations on primary. -1 upon error.
+     * returns the number of in flight operations on primary. -1 upon error.
      */
     protected void getInflightOpsCount(final ShardId shardId, ClusterState state, IndexShardRoutingTable shardRoutingTable, final ActionListener<InFlightOpsResponse> listener) {
         try {
@@ -214,7 +264,7 @@ public class SyncedFlushService extends AbstractComponent {
 
                         @Override
                         public void handleException(TransportException exp) {
-                            logger.debug("{} unexpected error while retrieving inflight op count", shardId);
+                            logger.debug("{} unexpected error while retrieving in flight op count", shardId);
                             listener.onFailure(exp);
                         }
 
@@ -229,7 +279,8 @@ public class SyncedFlushService extends AbstractComponent {
     }
 
 
-    void sendSyncRequests(final String syncId, final List<ShardRouting> shards, ClusterState state, Map<String, Engine.CommitId> expectedCommitIds, final ShardId shardId, final ActionListener<SyncedFlushResult> listener) {
+    void sendSyncRequests(final String syncId, final List<ShardRouting> shards, ClusterState state, Map<String, Engine.CommitId> expectedCommitIds,
+                          final ShardId shardId, final int totalShards, final ActionListener<ShardsSyncedFlushResult> listener) {
         final CountDown countDown = new CountDown(shards.size());
         final Map<ShardRouting, SyncedFlushResponse> results = ConcurrentCollections.newConcurrentMap();
         for (final ShardRouting shard : shards) {
@@ -237,14 +288,14 @@ public class SyncedFlushService extends AbstractComponent {
             if (node == null) {
                 logger.trace("{} is assigned to an unknown node. skipping for sync id [{}]. shard routing {}", shardId, syncId, shard);
                 results.put(shard, new SyncedFlushResponse("unknown node"));
-                contDownAndSendResponseIfDone(syncId, shards, shardId, listener, countDown, results);
+                contDownAndSendResponseIfDone(syncId, shards, shardId, totalShards, listener, countDown, results);
                 continue;
             }
             final Engine.CommitId expectedCommitId = expectedCommitIds.get(shard.currentNodeId());
             if (expectedCommitId == null) {
                 logger.trace("{} can't resolve expected commit id for {}, skipping for sync id [{}]. shard routing {}", shardId, syncId, shard);
                 results.put(shard, new SyncedFlushResponse("no commit id from pre-sync flush"));
-                contDownAndSendResponseIfDone(syncId, shards, shardId, listener, countDown, results);
+                contDownAndSendResponseIfDone(syncId, shards, shardId, totalShards, listener, countDown, results);
                 continue;
             }
             logger.trace("{} sending synced flush request to {}. sync id [{}].", shardId, shard, syncId);
@@ -260,14 +311,14 @@ public class SyncedFlushService extends AbstractComponent {
                             SyncedFlushResponse existing = results.put(shard, response);
                             assert existing == null : "got two answers for node [" + node + "]";
                             // count after the assert so we won't decrement twice in handleException
-                            contDownAndSendResponseIfDone(syncId, shards, shardId, listener, countDown, results);
+                            contDownAndSendResponseIfDone(syncId, shards, shardId, totalShards, listener, countDown, results);
                         }
 
                         @Override
                         public void handleException(TransportException exp) {
                             logger.trace("{} error while performing synced flush on [{}], skipping", exp, shardId, shard);
                             results.put(shard, new SyncedFlushResponse(exp.getMessage()));
-                            contDownAndSendResponseIfDone(syncId, shards, shardId, listener, countDown, results);
+                            contDownAndSendResponseIfDone(syncId, shards, shardId, totalShards, listener, countDown, results);
                         }
 
                         @Override
@@ -279,10 +330,12 @@ public class SyncedFlushService extends AbstractComponent {
 
     }
 
-    private void contDownAndSendResponseIfDone(String syncId, List<ShardRouting> shards, ShardId shardId, ActionListener<SyncedFlushResult> listener, CountDown countDown, Map<ShardRouting, SyncedFlushResponse> results) {
+    private void contDownAndSendResponseIfDone(String syncId, List<ShardRouting> shards, ShardId shardId, int totalShards,
+                                               ActionListener<ShardsSyncedFlushResult> listener, CountDown countDown, Map<ShardRouting,
+            SyncedFlushResponse> results) {
         if (countDown.countDown()) {
             assert results.size() == shards.size();
-            listener.onResponse(new SyncedFlushResult(shardId, syncId, results));
+            listener.onResponse(new ShardsSyncedFlushResult(shardId, syncId, totalShards, results));
         }
     }
 
@@ -297,8 +350,8 @@ public class SyncedFlushService extends AbstractComponent {
             final DiscoveryNode node = state.nodes().get(shard.currentNodeId());
             if (node == null) {
                 logger.trace("{} shard routing {} refers to an unknown node. skipping.", shardId, shard);
-                if(countDown.countDown()) {
-                   listener.onResponse(commitIds);
+                if (countDown.countDown()) {
+                    listener.onResponse(commitIds);
                 }
                 continue;
             }
@@ -313,7 +366,7 @@ public class SyncedFlushService extends AbstractComponent {
                     Engine.CommitId existing = commitIds.putIfAbsent(node.id(), response.commitId());
                     assert existing == null : "got two answers for node [" + node + "]";
                     // count after the assert so we won't decrement twice in handleException
-                    if(countDown.countDown()) {
+                    if (countDown.countDown()) {
                         listener.onResponse(commitIds);
                     }
                 }
@@ -321,7 +374,7 @@ public class SyncedFlushService extends AbstractComponent {
                 @Override
                 public void handleException(TransportException exp) {
                     logger.trace("{} error while performing pre synced flush on [{}], skipping", shardId, exp, shard);
-                    if(countDown.countDown()) {
+                    if (countDown.countDown()) {
                         listener.onResponse(commitIds);
                     }
                 }
@@ -348,7 +401,7 @@ public class SyncedFlushService extends AbstractComponent {
         IndexShard indexShard = indexService.shardSafe(request.shardId().id());
         logger.trace("{} performing sync flush. sync id [{}], expected commit id {}", request.shardId(), request.syncId(), request.expectedCommitId());
         Engine.SyncedFlushResult result = indexShard.syncFlush(request.syncId(), request.expectedCommitId());
-        logger.trace("{} sync flush done. sync id [{}], result  [{}]", request.shardId(), request.syncId(), result);
+        logger.trace("{} sync flush done. sync id [{}], result [{}]", request.shardId(), request.syncId(), result);
         switch (result) {
             case SUCCESS:
                 return new SyncedFlushResponse();
@@ -372,124 +425,6 @@ public class SyncedFlushService extends AbstractComponent {
         return new InFlightOpsResponse(opCount);
     }
 
-    /**
-     * Result for all copies of a shard
-     */
-    public static class SyncedFlushResult extends TransportResponse {
-        private String failureReason;
-        private Map<ShardRouting, SyncedFlushResponse> shardResponses;
-        private String syncId;
-        private ShardId shardId;
-
-        public SyncedFlushResult() {
-        }
-
-        public ShardId getShardId() {
-            return shardId;
-        }
-
-        /**
-         * failure constructor
-         */
-        public SyncedFlushResult(ShardId shardId, String failureReason) {
-            this.syncId = null;
-            this.failureReason = failureReason;
-            this.shardResponses = ImmutableMap.of();
-            this.shardId = shardId;
-        }
-
-        /**
-         * success constructor
-         */
-        public SyncedFlushResult(ShardId shardId, String syncId, Map<ShardRouting, SyncedFlushResponse> shardResponses) {
-            this.failureReason = null;
-            ImmutableMap.Builder<ShardRouting, SyncedFlushResponse> builder = ImmutableMap.builder();
-            this.shardResponses = builder.putAll(shardResponses).build();
-            this.syncId = syncId;
-            this.shardId = shardId;
-        }
-
-        /**
-         * @return true if one or more shard copies was successful, false if all failed before step three of synced flush
-         */
-        public boolean success() {
-            return syncId != null;
-        }
-
-        /**
-         * @return the reason for the failure if synced flush failed before step three of synced flush
-         */
-        public String failureReason() {
-            return failureReason;
-        }
-
-        public String syncId() {
-            return syncId;
-        }
-
-        /**
-         * @return total number of shards for which a sync attempt was made
-         */
-        public int totalShards() {
-            return shardResponses.size();
-        }
-
-        /**
-         * @return total number of successful shards
-         */
-        public int successfulShards() {
-            int i = 0;
-            for (SyncedFlushResponse result : shardResponses.values()) {
-                if (result.success()) {
-                    i++;
-                }
-            }
-            return i;
-        }
-
-        /**
-         * @return Individual responses for each shard copy with a detailed failure message if the copy failed to perform the synced flush.
-         * Empty if synced flush failed before step three.
-         */
-        public Map<ShardRouting, SyncedFlushResponse> shardResponses() {
-            return shardResponses;
-        }
-
-        @Override
-        public void writeTo(StreamOutput out) throws IOException {
-            super.writeTo(out);
-            out.writeOptionalString(failureReason);
-            out.writeOptionalString(syncId);
-            out.writeVInt(shardResponses.size());
-            for (Map.Entry<ShardRouting, SyncedFlushResponse> result : shardResponses.entrySet()) {
-                result.getKey().writeTo(out);
-                result.getValue().writeTo(out);
-            }
-            shardId.writeTo(out);
-        }
-
-        @Override
-        public void readFrom(StreamInput in) throws IOException {
-            super.readFrom(in);
-            failureReason = in.readOptionalString();
-            syncId = in.readOptionalString();
-            int size = in.readVInt();
-            ImmutableMap.Builder<ShardRouting, SyncedFlushResponse> builder = ImmutableMap.builder();
-            for (int i = 0; i < size; i++) {
-                ImmutableShardRouting shardRouting = ImmutableShardRouting.readShardRoutingEntry(in);
-                SyncedFlushResponse syncedFlushRsponse = new SyncedFlushResponse();
-                syncedFlushRsponse.readFrom(in);
-                builder.put(shardRouting, syncedFlushRsponse);
-            }
-            shardResponses = builder.build();
-            shardId = ShardId.readShardId(in);
-        }
-
-        public ShardId shardId() {
-            return shardId;
-        }
-    }
-
     final static class PreSyncedFlushRequest extends TransportRequest {
         private ShardId shardId;
 
diff --git a/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java b/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java
index 2e2497fe7cb..572b784093e 100644
--- a/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java
+++ b/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java
@@ -21,7 +21,6 @@ package org.elasticsearch.indices.recovery;
 
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-
 import org.apache.lucene.index.CorruptIndexException;
 import org.apache.lucene.index.IndexFormatTooNewException;
 import org.apache.lucene.index.IndexFormatTooOldException;
@@ -199,6 +198,8 @@ public class RecoverySourceHandler {
                 }
                 // we shortcut recovery here because we have nothing to copy. but we must still start the engine on the target.
                 // so we don't return here
+                logger.trace("[{}][{}] skipping [phase1] to {} - identical sync id [{}] found on both source and target", indexName, shardId,
+                        request.targetNode(), recoverySourceSyncId);
             } else {
                 final Store.RecoveryDiff diff = recoverySourceMetadata.recoveryDiff(request.metadataSnapshot());
                 for (StoreFileMetaData md : diff.identical) {
diff --git a/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java b/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java
index c1766a30f51..2611c7b5791 100644
--- a/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java
+++ b/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java
@@ -19,11 +19,8 @@
 
 package org.elasticsearch.indices.store;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.action.ActionFuture;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.FailedNodeException;
 import org.elasticsearch.action.support.ActionFilters;
@@ -32,7 +29,6 @@ import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.node.DiscoveryNode;
-import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -42,7 +38,6 @@ import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.env.NodeEnvironment;
 import org.elasticsearch.gateway.AsyncShardFetch;
 import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.shard.IndexShard;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.index.shard.ShardPath;
@@ -56,7 +51,6 @@ import org.elasticsearch.transport.TransportService;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReferenceArray;
@@ -241,6 +235,9 @@ public class TransportNodesListShardStoreMetaData extends TransportNodesOperatio
             metadataSnapshot.writeTo(out);
         }
 
+        /**
+         * @return commit sync id if exists, else null
+         */
         public String syncId() {
             return metadataSnapshot.getSyncId();
         }
diff --git a/src/main/java/org/elasticsearch/rest/action/RestActionModule.java b/src/main/java/org/elasticsearch/rest/action/RestActionModule.java
index a3864d5886e..a2d09f4f80e 100644
--- a/src/main/java/org/elasticsearch/rest/action/RestActionModule.java
+++ b/src/main/java/org/elasticsearch/rest/action/RestActionModule.java
@@ -23,9 +23,6 @@ import com.google.common.collect.Lists;
 import org.elasticsearch.common.inject.AbstractModule;
 import org.elasticsearch.common.inject.multibindings.Multibinder;
 import org.elasticsearch.rest.BaseRestHandler;
-import org.elasticsearch.rest.action.admin.indices.seal.RestSealIndicesAction;
-import org.elasticsearch.rest.action.admin.indices.upgrade.RestUpgradeAction;
-import org.elasticsearch.rest.action.admin.cluster.repositories.verify.RestVerifyRepositoryAction;
 import org.elasticsearch.rest.action.admin.cluster.health.RestClusterHealthAction;
 import org.elasticsearch.rest.action.admin.cluster.node.hotthreads.RestNodesHotThreadsAction;
 import org.elasticsearch.rest.action.admin.cluster.node.info.RestNodesInfoAction;
@@ -33,6 +30,7 @@ import org.elasticsearch.rest.action.admin.cluster.node.stats.RestNodesStatsActi
 import org.elasticsearch.rest.action.admin.cluster.repositories.delete.RestDeleteRepositoryAction;
 import org.elasticsearch.rest.action.admin.cluster.repositories.get.RestGetRepositoriesAction;
 import org.elasticsearch.rest.action.admin.cluster.repositories.put.RestPutRepositoryAction;
+import org.elasticsearch.rest.action.admin.cluster.repositories.verify.RestVerifyRepositoryAction;
 import org.elasticsearch.rest.action.admin.cluster.reroute.RestClusterRerouteAction;
 import org.elasticsearch.rest.action.admin.cluster.settings.RestClusterGetSettingsAction;
 import org.elasticsearch.rest.action.admin.cluster.settings.RestClusterUpdateSettingsAction;
@@ -59,6 +57,7 @@ import org.elasticsearch.rest.action.admin.indices.delete.RestDeleteIndexAction;
 import org.elasticsearch.rest.action.admin.indices.exists.indices.RestIndicesExistsAction;
 import org.elasticsearch.rest.action.admin.indices.exists.types.RestTypesExistsAction;
 import org.elasticsearch.rest.action.admin.indices.flush.RestFlushAction;
+import org.elasticsearch.rest.action.admin.indices.flush.RestSyncedFlushAction;
 import org.elasticsearch.rest.action.admin.indices.get.RestGetIndicesAction;
 import org.elasticsearch.rest.action.admin.indices.mapping.get.RestGetFieldMappingAction;
 import org.elasticsearch.rest.action.admin.indices.mapping.get.RestGetMappingAction;
@@ -75,6 +74,7 @@ import org.elasticsearch.rest.action.admin.indices.template.delete.RestDeleteInd
 import org.elasticsearch.rest.action.admin.indices.template.get.RestGetIndexTemplateAction;
 import org.elasticsearch.rest.action.admin.indices.template.head.RestHeadIndexTemplateAction;
 import org.elasticsearch.rest.action.admin.indices.template.put.RestPutIndexTemplateAction;
+import org.elasticsearch.rest.action.admin.indices.upgrade.RestUpgradeAction;
 import org.elasticsearch.rest.action.admin.indices.validate.query.RestValidateQueryAction;
 import org.elasticsearch.rest.action.admin.indices.warmer.delete.RestDeleteWarmerAction;
 import org.elasticsearch.rest.action.admin.indices.warmer.get.RestGetWarmerAction;
@@ -183,7 +183,7 @@ public class RestActionModule extends AbstractModule {
 
         bind(RestRefreshAction.class).asEagerSingleton();
         bind(RestFlushAction.class).asEagerSingleton();
-        bind(RestSealIndicesAction.class).asEagerSingleton();
+        bind(RestSyncedFlushAction.class).asEagerSingleton();
         bind(RestOptimizeAction.class).asEagerSingleton();
         bind(RestUpgradeAction.class).asEagerSingleton();
         bind(RestClearIndicesCacheAction.class).asEagerSingleton();
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/seal/RestSealIndicesAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestSyncedFlushAction.java
similarity index 55%
rename from src/main/java/org/elasticsearch/rest/action/admin/indices/seal/RestSealIndicesAction.java
rename to src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestSyncedFlushAction.java
index a2007ca703d..82a1d5f8fd3 100644
--- a/src/main/java/org/elasticsearch/rest/action/admin/indices/seal/RestSealIndicesAction.java
+++ b/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestSyncedFlushAction.java
@@ -17,17 +17,16 @@
  * under the License.
  */
 
-package org.elasticsearch.rest.action.admin.indices.seal;
+package org.elasticsearch.rest.action.admin.indices.flush;
 
-import org.elasticsearch.action.admin.indices.seal.SealIndicesAction;
-import org.elasticsearch.action.admin.indices.seal.SealIndicesRequest;
-import org.elasticsearch.action.admin.indices.seal.SealIndicesResponse;
+import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.indices.flush.IndicesSyncedFlushResult;
+import org.elasticsearch.indices.flush.SyncedFlushService;
 import org.elasticsearch.rest.*;
 import org.elasticsearch.rest.action.support.RestBuilderListener;
 
@@ -37,29 +36,33 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
 /**
  *
  */
-public class RestSealIndicesAction extends BaseRestHandler {
+public class RestSyncedFlushAction extends BaseRestHandler {
+
+    private final SyncedFlushService syncedFlushService;
 
     @Inject
-    public RestSealIndicesAction(Settings settings, RestController controller, Client client) {
+    public RestSyncedFlushAction(Settings settings, RestController controller, Client client, SyncedFlushService syncedFlushService) {
         super(settings, controller, client);
-        controller.registerHandler(POST, "/_seal", this);
-        controller.registerHandler(POST, "/{index}/_seal", this);
+        this.syncedFlushService = syncedFlushService;
+        controller.registerHandler(POST, "/_flush/synced", this);
+        controller.registerHandler(POST, "/{index}/_flush/synced", this);
 
-        controller.registerHandler(GET, "/_seal", this);
-        controller.registerHandler(GET, "/{index}/_seal", this);
+        controller.registerHandler(GET, "/_flush/synced", this);
+        controller.registerHandler(GET, "/{index}/_flush/synced", this);
     }
 
     @Override
     public void handleRequest(final RestRequest request, final RestChannel channel, final Client client) {
         String[] indices = Strings.splitStringByCommaToArray(request.param("index"));
-        SealIndicesRequest sealIndicesRequest = new SealIndicesRequest(indices);
-        client.admin().indices().execute(SealIndicesAction.INSTANCE, sealIndicesRequest, new RestBuilderListener<SealIndicesResponse>(channel) {
+        IndicesOptions indicesOptions = IndicesOptions.fromRequest(request, IndicesOptions.lenientExpandOpen());
+
+        syncedFlushService.attemptSyncedFlush(indices, indicesOptions, new RestBuilderListener<IndicesSyncedFlushResult>(channel) {
             @Override
-            public RestResponse buildResponse(SealIndicesResponse response, XContentBuilder builder) throws Exception {
+            public RestResponse buildResponse(IndicesSyncedFlushResult results, XContentBuilder builder) throws Exception {
                 builder.startObject();
-                builder = response.toXContent(builder, ToXContent.EMPTY_PARAMS);
+                results.toXContent(builder, request);
                 builder.endObject();
-                return new BytesRestResponse(response.status(), builder);
+                return new BytesRestResponse(RestStatus.OK, builder);
             }
         });
     }
diff --git a/src/test/java/org/elasticsearch/action/admin/indices/seal/SealIndicesTests.java b/src/test/java/org/elasticsearch/action/admin/indices/seal/SealIndicesTests.java
deleted file mode 100644
index 13c376eb250..00000000000
--- a/src/test/java/org/elasticsearch/action/admin/indices/seal/SealIndicesTests.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.action.admin.indices.seal;
-
-import org.elasticsearch.cluster.routing.ImmutableShardRouting;
-import org.elasticsearch.cluster.routing.ShardRouting;
-import org.elasticsearch.cluster.routing.ShardRoutingState;
-import org.elasticsearch.common.io.stream.BytesStreamOutput;
-import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.index.shard.ShardId;
-import org.elasticsearch.indices.SyncedFlushService;
-import org.elasticsearch.test.ElasticsearchTestCase;
-
-import java.io.IOException;
-import java.util.*;
-
-import static org.elasticsearch.test.XContentTestUtils.convertToMap;
-import static org.hamcrest.Matchers.equalTo;
-
-public class SealIndicesTests extends ElasticsearchTestCase {
-
-    public void testSealIndicesResponseStreaming() throws IOException {
-
-        Set<SyncedFlushService.SyncedFlushResult> shardResults = new HashSet<>();
-        // add one result where one shard failed and one succeeded
-        SyncedFlushService.SyncedFlushResult syncedFlushResult = createSyncedFlushResult(0, "test");
-        shardResults.add(syncedFlushResult);
-        // add one result where all failed
-        syncedFlushResult = new SyncedFlushService.SyncedFlushResult(new ShardId("test", 1), "all failed :(");
-        shardResults.add(syncedFlushResult);
-        SealIndicesResponse sealIndicesResponse = new SealIndicesResponse(shardResults);
-        BytesStreamOutput out = new BytesStreamOutput();
-        sealIndicesResponse.writeTo(out);
-        out.close();
-        StreamInput in = StreamInput.wrap(out.bytes());
-        SealIndicesResponse readResponse = new SealIndicesResponse();
-        readResponse.readFrom(in);
-        Map<String, Object> asMap = convertToMap(readResponse);
-        assertResponse(asMap);
-    }
-
-    public void testXContentResponse() throws IOException {
-
-        Set<SyncedFlushService.SyncedFlushResult> shardResults = new HashSet<>();
-        // add one result where one shard failed and one succeeded
-        SyncedFlushService.SyncedFlushResult syncedFlushResult = createSyncedFlushResult(0, "test");
-        shardResults.add(syncedFlushResult);
-        // add one result where all failed
-        syncedFlushResult = new SyncedFlushService.SyncedFlushResult(new ShardId("test", 1), "all failed :(");
-        shardResults.add(syncedFlushResult);
-        SealIndicesResponse sealIndicesResponse = new SealIndicesResponse(shardResults);
-        Map<String, Object> asMap = convertToMap(sealIndicesResponse);
-        assertResponse(asMap);
-    }
-
-    protected void assertResponse(Map<String, Object> asMap) {
-        assertNotNull(asMap.get("test"));
-        assertThat((Integer) (((HashMap) ((ArrayList) asMap.get("test")).get(0)).get("shard_id")), equalTo(0));
-        assertThat((String) (((HashMap) ((ArrayList) asMap.get("test")).get(0)).get("message")), equalTo("failed on some copies"));
-        HashMap<String, String> shardResponses = (HashMap<String, String>) ((HashMap) ((ArrayList) asMap.get("test")).get(0)).get("responses");
-        assertThat(shardResponses.get("node_1"), equalTo("failed for some reason"));
-        assertThat(shardResponses.get("node_2"), equalTo("success"));
-        HashMap<String, Object> failedShard = (HashMap<String, Object>) (((ArrayList) asMap.get("test")).get(1));
-        assertThat((Integer) (failedShard.get("shard_id")), equalTo(1));
-        assertThat((String) (failedShard.get("message")), equalTo("all failed :("));
-    }
-
-    public void testXContentResponseSortsShards() throws IOException {
-        Set<SyncedFlushService.SyncedFlushResult> shardResults = new HashSet<>();
-        // add one result where one shard failed and one succeeded
-        SyncedFlushService.SyncedFlushResult syncedFlushResult;
-        for (int i = 100000; i >= 0; i--) {
-            if (randomBoolean()) {
-                syncedFlushResult = createSyncedFlushResult(i, "test");
-                shardResults.add(syncedFlushResult);
-            } else {
-                syncedFlushResult = new SyncedFlushService.SyncedFlushResult(new ShardId("test", i), "all failed :(");
-                shardResults.add(syncedFlushResult);
-            }
-        }
-        SealIndicesResponse sealIndicesResponse = new SealIndicesResponse(shardResults);
-        Map<String, Object> asMap = convertToMap(sealIndicesResponse);
-        assertNotNull(asMap.get("test"));
-        for (int i = 0; i < 100000; i++) {
-            assertThat((Integer) (((HashMap) ((ArrayList) asMap.get("test")).get(i)).get("shard_id")), equalTo(i));
-        }
-    }
-
-    protected SyncedFlushService.SyncedFlushResult createSyncedFlushResult(int shardId, String index) {
-        Map<ShardRouting, SyncedFlushService.SyncedFlushResponse> responses = new HashMap<>();
-        ImmutableShardRouting shardRouting = new ImmutableShardRouting(index, shardId, "node_1", false, ShardRoutingState.RELOCATING, 2);
-        SyncedFlushService.SyncedFlushResponse syncedFlushResponse = new SyncedFlushService.SyncedFlushResponse("failed for some reason");
-        responses.put(shardRouting, syncedFlushResponse);
-        shardRouting = new ImmutableShardRouting(index, shardId, "node_2", false, ShardRoutingState.RELOCATING, 2);
-        syncedFlushResponse = new SyncedFlushService.SyncedFlushResponse();
-        responses.put(shardRouting, syncedFlushResponse);
-        return new SyncedFlushService.SyncedFlushResult(new ShardId(index, shardId), "some_sync_id", responses);
-    }
-}
diff --git a/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayTests.java b/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayTests.java
index 93ead8ac862..7bdedbabe5d 100644
--- a/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayTests.java
+++ b/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayTests.java
@@ -33,13 +33,11 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.shard.ShardId;
-import org.elasticsearch.indices.SyncedFlushService;
+import org.elasticsearch.indices.flush.SyncedFlushUtil;
 import org.elasticsearch.indices.recovery.RecoveryState;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
 import org.elasticsearch.test.InternalTestCluster.RestartCallback;
-import org.elasticsearch.indices.SyncedFlushUtil;
 import org.elasticsearch.test.junit.annotations.TestLogging;
 import org.elasticsearch.test.store.MockFSDirectoryService;
 import org.junit.Test;
@@ -398,11 +396,7 @@ public class RecoveryFromGatewayTests extends ElasticsearchIntegrationTest {
             ensureGreen();
         } else {
             logger.info("--> trying to sync flush");
-            int numShards = Integer.parseInt(client().admin().indices().prepareGetSettings("test").get().getSetting("test", "index.number_of_shards"));
-            SyncedFlushService syncedFlushService = internalCluster().getInstance(SyncedFlushService.class);
-            for (int i = 0; i < numShards; i++) {
-                assertTrue(SyncedFlushUtil.attemptSyncedFlush(syncedFlushService, new ShardId("test", i)).success());
-            }
+            assertEquals(SyncedFlushUtil.attemptSyncedFlush(internalCluster(), "test").failedShards(), 0);
             assertSyncIdsNotNull();
         }
 
diff --git a/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
index 0ecc99d923b..c1c8a69d2d6 100644
--- a/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
+++ b/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
@@ -18,8 +18,8 @@
  */
 package org.elasticsearch.index.shard;
 
-import org.elasticsearch.action.admin.indices.stats.IndexStats;
 import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.action.admin.indices.stats.IndexStats;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.routing.MutableShardRouting;
 import org.elasticsearch.cluster.routing.ShardRouting;
@@ -254,13 +254,14 @@ public class IndexShardTests extends ElasticsearchSingleNodeTest {
         IndicesService indicesService = getInstanceFromNode(IndicesService.class);
         IndexService indexService = indicesService.indexServiceSafe("test");
         IndexShard indexShard = indexService.shard(0);
+        assertEquals(0, indexShard.getOperationsCount());
+        indexShard.incrementOperationCounter();
+        assertEquals(1, indexShard.getOperationsCount());
         indexShard.incrementOperationCounter();
         assertEquals(2, indexShard.getOperationsCount());
-        indexShard.incrementOperationCounter();
-        assertEquals(3, indexShard.getOperationsCount());
         indexShard.decrementOperationCounter();
         indexShard.decrementOperationCounter();
-        assertEquals(1, indexShard.getOperationsCount());
+        assertEquals(0, indexShard.getOperationsCount());
     }
 
     @Test
diff --git a/src/test/java/org/elasticsearch/indices/SealTests.java b/src/test/java/org/elasticsearch/indices/SealTests.java
deleted file mode 100644
index 723f699d8cd..00000000000
--- a/src/test/java/org/elasticsearch/indices/SealTests.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.elasticsearch.indices;
-
-import org.elasticsearch.action.admin.indices.seal.SealIndicesResponse;
-import org.elasticsearch.cluster.metadata.IndexMetaData;
-import org.elasticsearch.common.settings.ImmutableSettings;
-import org.elasticsearch.test.ElasticsearchIntegrationTest;
-import org.junit.Test;
-
-import static java.lang.Thread.sleep;
-import static org.hamcrest.Matchers.equalTo;
-
-@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0)
-public class SealTests extends ElasticsearchIntegrationTest {
-
-    @Test
-    public void testUnallocatedShardsDoesNotHang() throws InterruptedException {
-        ImmutableSettings.Builder settingsBuilder = ImmutableSettings.builder()
-                .put("node.data", false)
-                .put("node.master", true)
-                .put("path.data", createTempDir().toString());
-        internalCluster().startNode(settingsBuilder.build());
-        //  create an index but because no data nodes are available no shards will be allocated
-        createIndex("test");
-        // this should not hang but instead immediately return with empty result set
-        SealIndicesResponse sealIndicesResponse = client().admin().indices().prepareSealIndices("test").get();
-        // just to make sure the test actually tests the right thing
-        int numShards = client().admin().indices().prepareGetSettings("test").get().getIndexToSettings().get("test").getAsInt(IndexMetaData.SETTING_NUMBER_OF_SHARDS, -1);
-        assertThat(sealIndicesResponse.results().size(), equalTo(numShards));
-        assertThat(sealIndicesResponse.results().iterator().next().failureReason(), equalTo("no active primary available"));
-    }
-}
diff --git a/src/test/java/org/elasticsearch/indices/FlushTest.java b/src/test/java/org/elasticsearch/indices/flush/FlushTest.java
similarity index 73%
rename from src/test/java/org/elasticsearch/indices/FlushTest.java
rename to src/test/java/org/elasticsearch/indices/flush/FlushTest.java
index 65fb2f6816b..0307f705f38 100644
--- a/src/test/java/org/elasticsearch/indices/FlushTest.java
+++ b/src/test/java/org/elasticsearch/indices/flush/FlushTest.java
@@ -16,13 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.indices;
+package org.elasticsearch.indices.flush;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.flush.FlushResponse;
 import org.elasticsearch.action.admin.indices.stats.IndexStats;
 import org.elasticsearch.action.admin.indices.stats.ShardStats;
-import org.elasticsearch.action.admin.indices.seal.SealIndicesResponse;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.routing.ShardRouting;
@@ -36,6 +35,7 @@ import org.junit.Test;
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
@@ -43,7 +43,6 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static java.lang.Thread.sleep;
 import static org.hamcrest.Matchers.emptyIterable;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -97,8 +96,16 @@ public class FlushTest extends ElasticsearchIntegrationTest {
             assertNull(shardStats.getCommitStats().getUserData().get(Engine.SYNC_COMMIT_ID));
         }
 
-        SyncedFlushService.SyncedFlushResult result = SyncedFlushUtil.attemptSyncedFlush(internalCluster().getInstance(SyncedFlushService.class), new ShardId("test", 0));
-        assertTrue(result.success());
+        ShardsSyncedFlushResult result;
+        if (randomBoolean()) {
+            logger.info("--> sync flushing shard 0");
+            result = SyncedFlushUtil.attemptSyncedFlush(internalCluster(), new ShardId("test", 0));
+        } else {
+            logger.info("--> sync flushing index [test]");
+            IndicesSyncedFlushResult indicesResult = SyncedFlushUtil.attemptSyncedFlush(internalCluster(), "test");
+            result = indicesResult.getShardsResultPerIndex().get("test").get(0);
+        }
+        assertFalse(result.failed());
         assertThat(result.totalShards(), equalTo(indexStats.getShards().length));
         assertThat(result.successfulShards(), equalTo(indexStats.getShards().length));
 
@@ -140,26 +147,7 @@ public class FlushTest extends ElasticsearchIntegrationTest {
     }
 
     @TestLogging("indices:TRACE")
-    public void testSyncedFlushWithApi() throws ExecutionException, InterruptedException, IOException {
-
-        createIndex("test");
-        ensureGreen();
-
-        IndexStats indexStats = client().admin().indices().prepareStats("test").get().getIndex("test");
-        for (ShardStats shardStats : indexStats.getShards()) {
-            assertNull(shardStats.getCommitStats().getUserData().get(Engine.SYNC_COMMIT_ID));
-        }
-        logger.info("--> trying sync flush");
-        SealIndicesResponse sealIndicesResponse = client().admin().indices().prepareSealIndices("test").get();
-        logger.info("--> sync flush done");
-        indexStats = client().admin().indices().prepareStats("test").get().getIndex("test");
-        for (ShardStats shardStats : indexStats.getShards()) {
-            assertNotNull(shardStats.getCommitStats().getUserData().get(Engine.SYNC_COMMIT_ID));
-        }
-    }
-
-    @TestLogging("indices:TRACE")
-    public void testSyncedFlushWithApiAndConcurrentIndexing() throws Exception {
+    public void testSyncedFlushWithConcurrentIndexing() throws Exception {
 
         internalCluster().ensureAtLeastNumDataNodes(3);
         createIndex("test");
@@ -186,14 +174,12 @@ public class FlushTest extends ElasticsearchIntegrationTest {
             assertNull(shardStats.getCommitStats().getUserData().get(Engine.SYNC_COMMIT_ID));
         }
         logger.info("--> trying sync flush");
-        SealIndicesResponse sealIndicesResponse = client().admin().indices().prepareSealIndices("test").get();
+        IndicesSyncedFlushResult syncedFlushResult = SyncedFlushUtil.attemptSyncedFlush(internalCluster(), "test");
         logger.info("--> sync flush done");
         stop.set(true);
         indexingThread.join();
         indexStats = client().admin().indices().prepareStats("test").get().getIndex("test");
-        for (ShardStats shardStats : indexStats.getShards()) {
-            assertFlushResponseEqualsShardStats(shardStats, sealIndicesResponse);
-        }
+        assertFlushResponseEqualsShardStats(indexStats.getShards(), syncedFlushResult.getShardsResultPerIndex().get("test"));
         refresh();
         assertThat(client().prepareCount().get().getCount(), equalTo((long) numDocs.get()));
         logger.info("indexed {} docs", client().prepareCount().get().getCount());
@@ -203,22 +189,38 @@ public class FlushTest extends ElasticsearchIntegrationTest {
         assertThat(client().prepareCount().get().getCount(), equalTo((long) numDocs.get()));
     }
 
-    private void assertFlushResponseEqualsShardStats(ShardStats shardStats, SealIndicesResponse sealIndicesResponse) {
+    private void assertFlushResponseEqualsShardStats(ShardStats[] shardsStats, List<ShardsSyncedFlushResult> syncedFlushResults) {
 
-        for (SyncedFlushService.SyncedFlushResult shardResult : sealIndicesResponse.results()) {
-            if (shardStats.getShardRouting().getId() == shardResult.shardId().getId()) {
-                for (Map.Entry<ShardRouting, SyncedFlushService.SyncedFlushResponse> singleResponse : shardResult.shardResponses().entrySet()) {
-                    if (singleResponse.getKey().currentNodeId().equals(shardStats.getShardRouting().currentNodeId())) {
-                        if (singleResponse.getValue().success()) {
-                            assertNotNull(shardStats.getCommitStats().getUserData().get(Engine.SYNC_COMMIT_ID));
-                            logger.info("sync flushed {} on node {}", singleResponse.getKey().shardId(), singleResponse.getKey().currentNodeId());
-                        } else {
-                            assertNull(shardStats.getCommitStats().getUserData().get(Engine.SYNC_COMMIT_ID));
-                            logger.info("sync flush failed for {} on node {}", singleResponse.getKey().shardId(), singleResponse.getKey().currentNodeId());
+        for (final ShardStats shardStats : shardsStats) {
+            for (final ShardsSyncedFlushResult shardResult : syncedFlushResults) {
+                if (shardStats.getShardRouting().getId() == shardResult.shardId().getId()) {
+                    for (Map.Entry<ShardRouting, SyncedFlushService.SyncedFlushResponse> singleResponse : shardResult.shardResponses().entrySet()) {
+                        if (singleResponse.getKey().currentNodeId().equals(shardStats.getShardRouting().currentNodeId())) {
+                            if (singleResponse.getValue().success()) {
+                                logger.info("{} sync flushed on node {}", singleResponse.getKey().shardId(), singleResponse.getKey().currentNodeId());
+                                assertNotNull(shardStats.getCommitStats().getUserData().get(Engine.SYNC_COMMIT_ID));
+                            } else {
+                                logger.info("{} sync flush failed for on node {}", singleResponse.getKey().shardId(), singleResponse.getKey().currentNodeId());
+                                assertNull(shardStats.getCommitStats().getUserData().get(Engine.SYNC_COMMIT_ID));
+                            }
                         }
                     }
                 }
             }
         }
     }
+
+    @Test
+    public void testUnallocatedShardsDoesNotHang() throws InterruptedException {
+        //  create an index but disallow allocation
+        prepareCreate("test").setSettings(ImmutableSettings.builder().put("index.routing.allocation.include._name", "nonexistent")).get();
+
+        // this should not hang but instead immediately return with empty result set
+        List<ShardsSyncedFlushResult> shardsResult = SyncedFlushUtil.attemptSyncedFlush(internalCluster(), "test").getShardsResultPerIndex().get("test");
+        // just to make sure the test actually tests the right thing
+        int numShards = client().admin().indices().prepareGetSettings("test").get().getIndexToSettings().get("test").getAsInt(IndexMetaData.SETTING_NUMBER_OF_SHARDS, -1);
+        assertThat(shardsResult.size(), equalTo(numShards));
+        assertThat(shardsResult.get(0).failureReason(), equalTo("no active shards"));
+    }
+
 }
diff --git a/src/test/java/org/elasticsearch/indices/SycnedFlushSingleNodeTest.java b/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTest.java
similarity index 83%
rename from src/test/java/org/elasticsearch/indices/SycnedFlushSingleNodeTest.java
rename to src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTest.java
index 348c5753c83..5d65c1acb7d 100644
--- a/src/test/java/org/elasticsearch/indices/SycnedFlushSingleNodeTest.java
+++ b/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.indices;
+package org.elasticsearch.indices.flush;
 
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
@@ -27,17 +27,17 @@ import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.shard.IndexShard;
 import org.elasticsearch.index.shard.ShardId;
+import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.test.ElasticsearchSingleNodeTest;
-import org.elasticsearch.test.hamcrest.ElasticsearchAssertions;
 
 import java.util.List;
 import java.util.Map;
 
 /**
  */
-public class SycnedFlushSingleNodeTest extends ElasticsearchSingleNodeTest {
+public class SyncedFlushSingleNodeTest extends ElasticsearchSingleNodeTest {
 
-    public void testModificationPreventsSealing() throws InterruptedException {
+    public void testModificationPreventsFlushing() throws InterruptedException {
         createIndex("test");
         client().prepareIndex("test", "test", "1").setSource("{}").get();
         IndexService test = getInstanceFromNode(IndicesService.class).indexService("test");
@@ -46,18 +46,18 @@ public class SycnedFlushSingleNodeTest extends ElasticsearchSingleNodeTest {
         SyncedFlushService flushService = getInstanceFromNode(SyncedFlushService.class);
         final ShardId shardId = shard.shardId();
         final ClusterState state = getInstanceFromNode(ClusterService.class).state();
-        final IndexShardRoutingTable shardRoutingTable = flushService.getActiveShardRoutings(shardId, state);
+        final IndexShardRoutingTable shardRoutingTable = flushService.getShardRoutingTable(shardId, state);
         final List<ShardRouting> activeShards = shardRoutingTable.activeShards();
         assertEquals("exactly one active shard", 1, activeShards.size());
         Map<String, Engine.CommitId> commitIds = SyncedFlushUtil.sendPreSyncRequests(flushService, activeShards, state, shardId);
         assertEquals("exactly one commit id", 1, commitIds.size());
         client().prepareIndex("test", "test", "2").setSource("{}").get();
         String syncId = Strings.base64UUID();
-        SyncedFlushUtil.LatchedListener<SyncedFlushService.SyncedFlushResult> listener = new SyncedFlushUtil.LatchedListener();
-        flushService.sendSyncRequests(syncId, activeShards, state, commitIds, shardId,listener);
+        SyncedFlushUtil.LatchedListener<ShardsSyncedFlushResult> listener = new SyncedFlushUtil.LatchedListener<>();
+        flushService.sendSyncRequests(syncId, activeShards, state, commitIds, shardId, shardRoutingTable.size(), listener);
         listener.latch.await();
         assertNull(listener.error);
-        SyncedFlushService.SyncedFlushResult syncedFlushResult = listener.result;
+        ShardsSyncedFlushResult syncedFlushResult = listener.result;
         assertNotNull(syncedFlushResult);
         assertEquals(0, syncedFlushResult.successfulShards());
         assertEquals(1, syncedFlushResult.totalShards());
@@ -66,9 +66,9 @@ public class SycnedFlushSingleNodeTest extends ElasticsearchSingleNodeTest {
         assertFalse(syncedFlushResult.shardResponses().get(activeShards.get(0)).success());
         assertEquals("pending operations", syncedFlushResult.shardResponses().get(activeShards.get(0)).failureReason());
 
-        SyncedFlushUtil.sendPreSyncRequests(flushService, activeShards, state, shardId); // pull another commit and make sure we can't seal with the old one
+        SyncedFlushUtil.sendPreSyncRequests(flushService, activeShards, state, shardId); // pull another commit and make sure we can't sync-flush with the old one
         listener = new SyncedFlushUtil.LatchedListener();
-        flushService.sendSyncRequests(syncId, activeShards, state, commitIds, shardId,listener);
+        flushService.sendSyncRequests(syncId, activeShards, state, commitIds, shardId, shardRoutingTable.size(), listener);
         listener.latch.await();
         assertNull(listener.error);
         syncedFlushResult = listener.result;
@@ -79,7 +79,6 @@ public class SycnedFlushSingleNodeTest extends ElasticsearchSingleNodeTest {
         assertNotNull(syncedFlushResult.shardResponses().get(activeShards.get(0)));
         assertFalse(syncedFlushResult.shardResponses().get(activeShards.get(0)).success());
         assertEquals("commit has changed", syncedFlushResult.shardResponses().get(activeShards.get(0)).failureReason());
-        ElasticsearchAssertions.assertVersionSerializable(syncedFlushResult);
     }
 
     public void testSingleShardSuccess() throws InterruptedException {
@@ -90,17 +89,16 @@ public class SycnedFlushSingleNodeTest extends ElasticsearchSingleNodeTest {
 
         SyncedFlushService flushService = getInstanceFromNode(SyncedFlushService.class);
         final ShardId shardId = shard.shardId();
-        SyncedFlushUtil.LatchedListener<SyncedFlushService.SyncedFlushResult> listener = new SyncedFlushUtil.LatchedListener();
+        SyncedFlushUtil.LatchedListener<ShardsSyncedFlushResult> listener = new SyncedFlushUtil.LatchedListener();
         flushService.attemptSyncedFlush(shardId, listener);
         listener.latch.await();
         assertNull(listener.error);
-        SyncedFlushService.SyncedFlushResult syncedFlushResult = listener.result;
+        ShardsSyncedFlushResult syncedFlushResult = listener.result;
         assertNotNull(syncedFlushResult);
         assertEquals(1, syncedFlushResult.successfulShards());
         assertEquals(1, syncedFlushResult.totalShards());
         SyncedFlushService.SyncedFlushResponse response = syncedFlushResult.shardResponses().values().iterator().next();
         assertTrue(response.success());
-        ElasticsearchAssertions.assertVersionSerializable(syncedFlushResult);
     }
 
     public void testSyncFailsIfOperationIsInFlight() throws InterruptedException {
@@ -113,16 +111,15 @@ public class SycnedFlushSingleNodeTest extends ElasticsearchSingleNodeTest {
         final ShardId shardId = shard.shardId();
         shard.incrementOperationCounter();
         try {
-            SyncedFlushUtil.LatchedListener<SyncedFlushService.SyncedFlushResult> listener = new SyncedFlushUtil.LatchedListener();
+            SyncedFlushUtil.LatchedListener<ShardsSyncedFlushResult> listener = new SyncedFlushUtil.LatchedListener<>();
             flushService.attemptSyncedFlush(shardId, listener);
             listener.latch.await();
             assertNull(listener.error);
-            SyncedFlushService.SyncedFlushResult syncedFlushResult = listener.result;
+            ShardsSyncedFlushResult syncedFlushResult = listener.result;
             assertNotNull(syncedFlushResult);
             assertEquals(0, syncedFlushResult.successfulShards());
-            assertEquals(0, syncedFlushResult.totalShards());
-            assertEquals("operation counter on primary is non zero [2]", syncedFlushResult.failureReason());
-            ElasticsearchAssertions.assertVersionSerializable(syncedFlushResult);
+            assertNotEquals(0, syncedFlushResult.totalShards());
+            assertEquals("[1] ongoing operations on primary", syncedFlushResult.failureReason());
         } finally {
             shard.decrementOperationCounter();
         }
@@ -168,7 +165,7 @@ public class SycnedFlushSingleNodeTest extends ElasticsearchSingleNodeTest {
         SyncedFlushService flushService = getInstanceFromNode(SyncedFlushService.class);
         final ShardId shardId = shard.shardId();
         final ClusterState state = getInstanceFromNode(ClusterService.class).state();
-        final IndexShardRoutingTable shardRoutingTable = flushService.getActiveShardRoutings(shardId, state);
+        final IndexShardRoutingTable shardRoutingTable = flushService.getShardRoutingTable(shardId, state);
         final List<ShardRouting> activeShards = shardRoutingTable.activeShards();
         assertEquals("exactly one active shard", 1, activeShards.size());
         Map<String, Engine.CommitId> commitIds = SyncedFlushUtil.sendPreSyncRequests(flushService, activeShards, state, shardId);
@@ -178,11 +175,11 @@ public class SycnedFlushSingleNodeTest extends ElasticsearchSingleNodeTest {
         }
         client().admin().indices().prepareFlush("test").setForce(true).get();
         String syncId = Strings.base64UUID();
-        final SyncedFlushUtil.LatchedListener<SyncedFlushService.SyncedFlushResult> listener = new SyncedFlushUtil.LatchedListener();
-        flushService.sendSyncRequests(syncId, activeShards, state, commitIds, shardId, listener);
+        final SyncedFlushUtil.LatchedListener<ShardsSyncedFlushResult> listener = new SyncedFlushUtil.LatchedListener();
+        flushService.sendSyncRequests(syncId, activeShards, state, commitIds, shardId, shardRoutingTable.size(), listener);
         listener.latch.await();
         assertNull(listener.error);
-        SyncedFlushService.SyncedFlushResult syncedFlushResult = listener.result;
+        ShardsSyncedFlushResult syncedFlushResult = listener.result;
         assertNotNull(syncedFlushResult);
         assertEquals(0, syncedFlushResult.successfulShards());
         assertEquals(1, syncedFlushResult.totalShards());
@@ -190,7 +187,6 @@ public class SycnedFlushSingleNodeTest extends ElasticsearchSingleNodeTest {
         assertNotNull(syncedFlushResult.shardResponses().get(activeShards.get(0)));
         assertFalse(syncedFlushResult.shardResponses().get(activeShards.get(0)).success());
         assertEquals("commit has changed", syncedFlushResult.shardResponses().get(activeShards.get(0)).failureReason());
-        ElasticsearchAssertions.assertVersionSerializable(syncedFlushResult);
     }
 
     public void testFailWhenCommitIsMissing() throws InterruptedException {
@@ -202,18 +198,18 @@ public class SycnedFlushSingleNodeTest extends ElasticsearchSingleNodeTest {
         SyncedFlushService flushService = getInstanceFromNode(SyncedFlushService.class);
         final ShardId shardId = shard.shardId();
         final ClusterState state = getInstanceFromNode(ClusterService.class).state();
-        final IndexShardRoutingTable shardRoutingTable = flushService.getActiveShardRoutings(shardId, state);
+        final IndexShardRoutingTable shardRoutingTable = flushService.getShardRoutingTable(shardId, state);
         final List<ShardRouting> activeShards = shardRoutingTable.activeShards();
         assertEquals("exactly one active shard", 1, activeShards.size());
         Map<String, Engine.CommitId> commitIds =  SyncedFlushUtil.sendPreSyncRequests(flushService, activeShards, state, shardId);
         assertEquals("exactly one commit id", 1, commitIds.size());
         commitIds.clear(); // wipe it...
         String syncId = Strings.base64UUID();
-        SyncedFlushUtil.LatchedListener<SyncedFlushService.SyncedFlushResult> listener = new SyncedFlushUtil.LatchedListener();
-        flushService.sendSyncRequests(syncId, activeShards, state, commitIds, shardId, listener);
+        SyncedFlushUtil.LatchedListener<ShardsSyncedFlushResult> listener = new SyncedFlushUtil.LatchedListener();
+        flushService.sendSyncRequests(syncId, activeShards, state, commitIds, shardId, shardRoutingTable.size(), listener);
         listener.latch.await();
         assertNull(listener.error);
-        SyncedFlushService.SyncedFlushResult syncedFlushResult = listener.result;
+        ShardsSyncedFlushResult syncedFlushResult = listener.result;
         assertNotNull(syncedFlushResult);
         assertEquals(0, syncedFlushResult.successfulShards());
         assertEquals(1, syncedFlushResult.totalShards());
@@ -221,7 +217,6 @@ public class SycnedFlushSingleNodeTest extends ElasticsearchSingleNodeTest {
         assertNotNull(syncedFlushResult.shardResponses().get(activeShards.get(0)));
         assertFalse(syncedFlushResult.shardResponses().get(activeShards.get(0)).success());
         assertEquals("no commit id from pre-sync flush", syncedFlushResult.shardResponses().get(activeShards.get(0)).failureReason());
-        ElasticsearchAssertions.assertVersionSerializable(syncedFlushResult);
     }
 
 
diff --git a/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUnitTests.java b/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUnitTests.java
new file mode 100644
index 00000000000..fcf80c19d67
--- /dev/null
+++ b/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUnitTests.java
@@ -0,0 +1,134 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.indices.flush;
+
+import com.carrotsearch.hppc.ObjectIntHashMap;
+import com.carrotsearch.hppc.ObjectIntMap;
+import org.elasticsearch.cluster.routing.ImmutableShardRouting;
+import org.elasticsearch.cluster.routing.ShardRouting;
+import org.elasticsearch.cluster.routing.ShardRoutingState;
+import org.elasticsearch.index.shard.ShardId;
+import org.elasticsearch.indices.flush.IndicesSyncedFlushResult.ShardCounts;
+import org.elasticsearch.indices.flush.SyncedFlushService.SyncedFlushResponse;
+import org.elasticsearch.test.ElasticsearchTestCase;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.elasticsearch.test.XContentTestUtils.convertToMap;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+
+public class SyncedFlushUnitTests extends ElasticsearchTestCase {
+
+
+    private static class TestPlan {
+        public ShardCounts totalCounts;
+        public Map<String, ShardCounts> countsPerIndex = new HashMap<>();
+        public ObjectIntMap<String> expectedFailuresPerIndex = new ObjectIntHashMap<>();
+
+        public IndicesSyncedFlushResult result;
+
+    }
+
+    public void testIndicesSyncedFlushResult() throws IOException {
+        final TestPlan testPlan = createTestPlan();
+        assertThat(testPlan.result.totalShards(), equalTo(testPlan.totalCounts.total));
+        assertThat(testPlan.result.successfulShards(), equalTo(testPlan.totalCounts.successful));
+        assertThat(testPlan.result.failedShards(), equalTo(testPlan.totalCounts.failed));
+        Map<String, Object> asMap = convertToMap(testPlan.result);
+        assertShardCount("_shards header", (Map<String, Object>) asMap.get("_shards"), testPlan.totalCounts);
+
+        assertThat("unexpected number of indices", asMap.size(), equalTo(1 + testPlan.countsPerIndex.size())); // +1 for the shards header
+        for (String index : testPlan.countsPerIndex.keySet()) {
+            Map<String, Object> indexMap = (Map<String, Object>) asMap.get(index);
+            assertShardCount(index, indexMap, testPlan.countsPerIndex.get(index));
+            List<Map<String, Object>> failureList = (List<Map<String, Object>>) indexMap.get("failures");
+            final int expectedFailures = testPlan.expectedFailuresPerIndex.get(index);
+            if (expectedFailures == 0) {
+                assertNull(index + " has unexpected failures", failureList);
+            } else {
+                assertNotNull(index + " should have failures", failureList);
+                assertThat(failureList, hasSize(expectedFailures));
+            }
+        }
+    }
+
+    private void assertShardCount(String name, Map<String, Object> header, ShardCounts expectedCounts) {
+        assertThat(name + " has unexpected total count", (Integer) header.get("total"), equalTo(expectedCounts.total));
+        assertThat(name + " has unexpected successful count", (Integer) header.get("successful"), equalTo(expectedCounts.successful));
+        assertThat(name + " has unexpected failed count", (Integer) header.get("failed"), equalTo(expectedCounts.failed));
+    }
+
+    protected TestPlan createTestPlan() {
+        final TestPlan testPlan = new TestPlan();
+        final Map<String, List<ShardsSyncedFlushResult>> indicesResults = new HashMap<>();
+        final int indexCount = randomIntBetween(1, 10);
+        int totalShards = 0;
+        int totalSuccesful = 0;
+        int totalFailed = 0;
+        for (int i = 0; i < indexCount; i++) {
+            final String index = "index_" + i;
+            int shards = randomIntBetween(1, 4);
+            int replicas = randomIntBetween(0, 2);
+            int successful = 0;
+            int failed = 0;
+            int failures = 0;
+            List<ShardsSyncedFlushResult> shardsResults = new ArrayList<>();
+            for (int shard = 0; shard < shards; shard++) {
+                final ShardId shardId = new ShardId(index, shard);
+                if (randomInt(5) < 2) {
+                    // total shard failure
+                    failed += replicas + 1;
+                    failures++;
+                    shardsResults.add(new ShardsSyncedFlushResult(shardId, replicas + 1, "simulated total failure"));
+                } else {
+                    Map<ShardRouting, SyncedFlushResponse> shardResponses = new HashMap<>();
+                    for (int copy = 0; copy < replicas + 1; copy++) {
+                        final ShardRouting shardRouting = new ImmutableShardRouting(index, shard, "node_" + shardId + "_" + copy, null,
+                                copy == 0, ShardRoutingState.STARTED, 0);
+                        if (randomInt(5) < 2) {
+                            // shard copy failure
+                            failed++;
+                            failures++;
+                            shardResponses.put(shardRouting, new SyncedFlushResponse("copy failure " + shardId));
+                        } else {
+                            successful++;
+                            shardResponses.put(shardRouting, new SyncedFlushResponse());
+                        }
+                    }
+                    shardsResults.add(new ShardsSyncedFlushResult(shardId, "_sync_id_" + shard, replicas + 1, shardResponses));
+                }
+            }
+            indicesResults.put(index, shardsResults);
+            testPlan.countsPerIndex.put(index, new ShardCounts(shards * (replicas + 1), successful, failed));
+            testPlan.expectedFailuresPerIndex.put(index, failures);
+            totalFailed += failed;
+            totalShards += shards * (replicas + 1);
+            totalSuccesful += successful;
+        }
+        testPlan.result = new IndicesSyncedFlushResult(indicesResults);
+        testPlan.totalCounts = new ShardCounts(totalShards, totalSuccesful, totalFailed);
+        return testPlan;
+    }
+}
diff --git a/src/test/java/org/elasticsearch/indices/SyncedFlushUtil.java b/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java
similarity index 70%
rename from src/test/java/org/elasticsearch/indices/SyncedFlushUtil.java
rename to src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java
index e16c85b4b7e..fef6c23231e 100644
--- a/src/test/java/org/elasticsearch/indices/SyncedFlushUtil.java
+++ b/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.indices;
+package org.elasticsearch.indices.flush;
 
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.LatchedActionListener;
+import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.shard.ShardId;
-import org.elasticsearch.indices.SyncedFlushService;
+import org.elasticsearch.test.InternalTestCluster;
 
 import java.util.List;
 import java.util.Map;
@@ -38,11 +38,31 @@ public class SyncedFlushUtil {
 
     }
 
+    /**
+     * Blocking single index version of {@link SyncedFlushService#attemptSyncedFlush(String[], IndicesOptions, ActionListener)}
+     */
+    public static IndicesSyncedFlushResult attemptSyncedFlush(InternalTestCluster cluster, String index) {
+        SyncedFlushService service = cluster.getInstance(SyncedFlushService.class);
+        LatchedListener<IndicesSyncedFlushResult> listener = new LatchedListener();
+        service.attemptSyncedFlush(new String[]{index}, IndicesOptions.lenientExpandOpen(), listener);
+        try {
+            listener.latch.await();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+        if (listener.error != null) {
+            throw ExceptionsHelper.convertToElastic(listener.error);
+        }
+        return listener.result;
+    }
+
+
     /**
      * Blocking version of {@link SyncedFlushService#attemptSyncedFlush(ShardId, ActionListener)}
      */
-    public static SyncedFlushService.SyncedFlushResult attemptSyncedFlush(SyncedFlushService service, ShardId shardId) {
-        LatchedListener<SyncedFlushService.SyncedFlushResult> listener = new LatchedListener();
+    public static ShardsSyncedFlushResult attemptSyncedFlush(InternalTestCluster cluster, ShardId shardId) {
+        SyncedFlushService service = cluster.getInstance(SyncedFlushService.class);
+        LatchedListener<ShardsSyncedFlushResult> listener = new LatchedListener();
         service.attemptSyncedFlush(shardId, listener);
         try {
             listener.latch.await();
diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
index df786df3d6a..bf0a504e140 100644
--- a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
+++ b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
@@ -18,14 +18,15 @@
  */
 package org.elasticsearch.test;
 
-import com.carrotsearch.randomizedtesting.*;
+import com.carrotsearch.randomizedtesting.RandomizedContext;
+import com.carrotsearch.randomizedtesting.RandomizedTest;
+import com.carrotsearch.randomizedtesting.Randomness;
 import com.carrotsearch.randomizedtesting.annotations.TestGroup;
 import com.carrotsearch.randomizedtesting.generators.RandomInts;
 import com.carrotsearch.randomizedtesting.generators.RandomPicks;
 import com.google.common.base.Joiner;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.lucene.store.StoreRateLimiting;
@@ -49,7 +50,6 @@ import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
 import org.elasticsearch.action.admin.indices.optimize.OptimizeResponse;
 import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
 import org.elasticsearch.action.admin.indices.segments.IndicesSegmentResponse;
-import org.elasticsearch.action.admin.indices.seal.SealIndicesResponse;
 import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequestBuilder;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.bulk.BulkResponse;
@@ -102,21 +102,18 @@ import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.FieldMapper.Loading;
 import org.elasticsearch.index.mapper.internal.SizeFieldMapper;
 import org.elasticsearch.index.mapper.internal.TimestampFieldMapper;
-import org.elasticsearch.index.merge.policy.AbstractMergePolicyProvider;
-import org.elasticsearch.index.merge.policy.LogByteSizeMergePolicyProvider;
-import org.elasticsearch.index.merge.policy.LogDocMergePolicyProvider;
-import org.elasticsearch.index.merge.policy.MergePolicyModule;
-import org.elasticsearch.index.merge.policy.MergePolicyProvider;
-import org.elasticsearch.index.merge.policy.TieredMergePolicyProvider;
+import org.elasticsearch.index.merge.policy.*;
 import org.elasticsearch.index.merge.scheduler.ConcurrentMergeSchedulerProvider;
 import org.elasticsearch.index.merge.scheduler.MergeSchedulerModule;
+import org.elasticsearch.index.translog.Translog;
 import org.elasticsearch.index.translog.TranslogConfig;
 import org.elasticsearch.index.translog.TranslogService;
-import org.elasticsearch.index.translog.Translog;
 import org.elasticsearch.index.translog.TranslogWriter;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.indices.cache.query.IndicesQueryCache;
 import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache;
+import org.elasticsearch.indices.flush.IndicesSyncedFlushResult;
+import org.elasticsearch.indices.flush.SyncedFlushService;
 import org.elasticsearch.indices.recovery.RecoverySettings;
 import org.elasticsearch.indices.store.IndicesStore;
 import org.elasticsearch.node.Node;
@@ -129,53 +126,28 @@ import org.elasticsearch.test.rest.client.http.HttpRequestBuilder;
 import org.elasticsearch.transport.netty.NettyTransport;
 import org.hamcrest.Matchers;
 import org.joda.time.DateTimeZone;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
+import org.junit.*;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 import java.net.InetSocketAddress;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
+import java.util.*;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
 import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_REPLICAS;
 import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
 import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
+import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
 import static org.elasticsearch.test.XContentTestUtils.convertToMap;
 import static org.elasticsearch.test.XContentTestUtils.mapsEqualIgnoringArrayOrder;
-import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoTimeout;
-import static org.hamcrest.Matchers.emptyIterable;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
+import static org.hamcrest.Matchers.*;
 
 /**
  * {@link ElasticsearchIntegrationTest} is an abstract base class to run integration
@@ -253,7 +225,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
 
     /**
      * Annotation for third-party integration tests.
-     * <p>
+     * <p/>
      * These are tests the require a third-party service in order to run. They
      * may require the user to manually configure an external process (such as rabbitmq),
      * or may additionally require some external configuration (e.g. AWS credentials)
@@ -417,56 +389,56 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
                 }
                 mappings.startArray("dynamic_templates")
                         .startObject()
-                    .startObject("template-strings")
-                    .field("match_mapping_type", "string")
+                        .startObject("template-strings")
+                        .field("match_mapping_type", "string")
                         .startObject("mapping")
-                    .startObject("fielddata")
-                    .field(FieldDataType.FORMAT_KEY, randomFrom("paged_bytes", "fst"))
-                    .field(Loading.KEY, randomLoadingValues())
+                        .startObject("fielddata")
+                        .field(FieldDataType.FORMAT_KEY, randomFrom("paged_bytes", "fst"))
+                        .field(Loading.KEY, randomLoadingValues())
                         .endObject()
                         .endObject()
                         .endObject()
                         .endObject()
                         .startObject()
-                    .startObject("template-longs")
-                    .field("match_mapping_type", "long")
-                    .startObject("mapping")
-                    .field("doc_values", randomBoolean())
-                    .startObject("fielddata")
-                    .field(Loading.KEY, randomFrom(Loading.LAZY, Loading.EAGER))
+                        .startObject("template-longs")
+                        .field("match_mapping_type", "long")
+                        .startObject("mapping")
+                        .field("doc_values", randomBoolean())
+                        .startObject("fielddata")
+                        .field(Loading.KEY, randomFrom(Loading.LAZY, Loading.EAGER))
                         .endObject()
                         .endObject()
                         .endObject()
                         .endObject()
                         .startObject()
-                    .startObject("template-doubles")
-                    .field("match_mapping_type", "double")
-                    .startObject("mapping")
-                    .field("doc_values", randomBoolean())
-                    .startObject("fielddata")
-                    .field(Loading.KEY, randomFrom(Loading.LAZY, Loading.EAGER))
+                        .startObject("template-doubles")
+                        .field("match_mapping_type", "double")
+                        .startObject("mapping")
+                        .field("doc_values", randomBoolean())
+                        .startObject("fielddata")
+                        .field(Loading.KEY, randomFrom(Loading.LAZY, Loading.EAGER))
                         .endObject()
                         .endObject()
                         .endObject()
                         .endObject()
                         .startObject()
-                    .startObject("template-geo_points")
-                    .field("match_mapping_type", "geo_point")
-                    .startObject("mapping")
-                    .field("doc_values", randomBoolean())
-                    .startObject("fielddata")
-                    .field(Loading.KEY, randomFrom(Loading.LAZY, Loading.EAGER))
+                        .startObject("template-geo_points")
+                        .field("match_mapping_type", "geo_point")
+                        .startObject("mapping")
+                        .field("doc_values", randomBoolean())
+                        .startObject("fielddata")
+                        .field(Loading.KEY, randomFrom(Loading.LAZY, Loading.EAGER))
                         .endObject()
                         .endObject()
                         .endObject()
                         .endObject()
                         .startObject()
-                    .startObject("template-booleans")
-                    .field("match_mapping_type", "boolean")
-                    .startObject("mapping")
-                    .startObject("fielddata")
-                    .field(FieldDataType.FORMAT_KEY, randomFrom("array", "doc_values"))
-                    .field(Loading.KEY, randomFrom(Loading.LAZY, Loading.EAGER))
+                        .startObject("template-booleans")
+                        .field("match_mapping_type", "boolean")
+                        .startObject("mapping")
+                        .startObject("fielddata")
+                        .field(FieldDataType.FORMAT_KEY, randomFrom("array", "doc_values"))
+                        .field(Loading.KEY, randomFrom(Loading.LAZY, Loading.EAGER))
                         .endObject()
                         .endObject()
                         .endObject()
@@ -521,7 +493,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
         }
 
         if (random.nextBoolean()) {
-             builder.put(TranslogConfig.INDEX_TRANSLOG_FS_TYPE, RandomPicks.randomFrom(random, TranslogWriter.Type.values()).name());
+            builder.put(TranslogConfig.INDEX_TRANSLOG_FS_TYPE, RandomPicks.randomFrom(random, TranslogWriter.Type.values()).name());
         }
 
         if (random.nextBoolean()) {
@@ -661,9 +633,9 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
                     if (currentClusterScope != Scope.TEST) {
                         MetaData metaData = client().admin().cluster().prepareState().execute().actionGet().getState().getMetaData();
                         assertThat("test leaves persistent cluster metadata behind: " + metaData.persistentSettings().getAsMap(), metaData
-                            .persistentSettings().getAsMap().size(), equalTo(0));
+                                .persistentSettings().getAsMap().size(), equalTo(0));
                         assertThat("test leaves transient cluster metadata behind: " + metaData.transientSettings().getAsMap(), metaData
-                            .transientSettings().getAsMap().size(), equalTo(0));
+                                .transientSettings().getAsMap().size(), equalTo(0));
                     }
                     ensureClusterSizeConsistency();
                     ensureClusterStateConsistency();
@@ -879,11 +851,11 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
             public void run() {
                 for (Client client : clients()) {
                     ClusterHealthResponse clusterHealth = client.admin().cluster().prepareHealth().setLocal(true).get();
-                    assertThat("client " + client  + " still has in flight fetch", clusterHealth.getNumberOfInFlightFetch(), equalTo(0));
+                    assertThat("client " + client + " still has in flight fetch", clusterHealth.getNumberOfInFlightFetch(), equalTo(0));
                     PendingClusterTasksResponse pendingTasks = client.admin().cluster().preparePendingClusterTasks().setLocal(true).get();
                     assertThat("client " + client + " still has pending tasks " + pendingTasks.prettyPrint(), pendingTasks, Matchers.emptyIterable());
                     clusterHealth = client.admin().cluster().prepareHealth().setLocal(true).get();
-                    assertThat("client " + client  + " still has in flight fetch", clusterHealth.getNumberOfInFlightFetch(), equalTo(0));
+                    assertThat("client " + client + " still has in flight fetch", clusterHealth.getNumberOfInFlightFetch(), equalTo(0));
                 }
             }
         });
@@ -970,7 +942,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
      * It is useful to ensure that all action on the cluster have finished and all shards that were currently relocating
      * are now allocated and started.
      */
-    public ClusterHealthStatus  ensureGreen(String... indices) {
+    public ClusterHealthStatus ensureGreen(String... indices) {
         return ensureGreen(TimeValue.timeValueSeconds(30), indices);
     }
 
@@ -1252,11 +1224,11 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
 
     /**
      * Syntactic sugar for:
-     *
+     * <p/>
      * <pre>
      *   return client().prepareIndex(index, type, id).setSource(source).execute().actionGet();
      * </pre>
-     *
+     * <p/>
      * where source is a String.
      */
     protected final IndexResponse index(String index, String type, String id, String source) {
@@ -1379,7 +1351,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
      * @param forceRefresh   if <tt>true</tt> all involved indices are refreshed once the documents are indexed.
      * @param dummyDocuments if <tt>true</tt> some empty dummy documents may be randomly inserted into the document list and deleted once
      *                       all documents are indexed. This is useful to produce deleted documents on the server side.
-     * @param maybeFlush if <tt>true</tt> this method may randomly execute full flushes after index operations.
+     * @param maybeFlush     if <tt>true</tt> this method may randomly execute full flushes after index operations.
      * @param builders       the documents to index.
      */
     public void indexRandom(boolean forceRefresh, boolean dummyDocuments, boolean maybeFlush, List<IndexRequestBuilder> builders) throws InterruptedException, ExecutionException {
@@ -1513,8 +1485,8 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
                     client().admin().indices().prepareFlush(indices).setIndicesOptions(IndicesOptions.lenientExpandOpen()).execute(
                             new LatchedActionListener<FlushResponse>(newLatch(inFlightAsyncOperations)));
                 } else {
-                    client().admin().indices().prepareSealIndices(indices).execute(
-                            new LatchedActionListener<SealIndicesResponse>(newLatch(inFlightAsyncOperations)));
+                    internalCluster().getInstance(SyncedFlushService.class).attemptSyncedFlush(indices, IndicesOptions.lenientExpandOpen(),
+                            new LatchedActionListener<IndicesSyncedFlushResult>(newLatch(inFlightAsyncOperations)));
                 }
             } else if (rarely()) {
                 client().admin().indices().prepareOptimize(indices).setIndicesOptions(IndicesOptions.lenientExpandOpen()).setMaxNumSegments(between(1, 10)).setFlush(maybeFlush && randomBoolean()).execute(
@@ -1673,7 +1645,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
 
     private int getMinNumDataNodes() {
         ClusterScope annotation = getAnnotation(this.getClass());
-        return annotation == null || annotation.minNumDataNodes() == -1 ? InternalTestCluster.DEFAULT_MIN_NUM_DATA_NODES  : annotation.minNumDataNodes();
+        return annotation == null || annotation.minNumDataNodes() == -1 ? InternalTestCluster.DEFAULT_MIN_NUM_DATA_NODES : annotation.minNumDataNodes();
     }
 
     private int getMaxNumDataNodes() {
@@ -1706,7 +1678,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
                 .put(DiskThresholdDecider.CLUSTER_ROUTING_ALLOCATION_HIGH_DISK_WATERMARK, "1b")
                 .put("script.indexed", "on")
                 .put("script.inline", "on")
-                // wait short time for other active shards before actually deleting, default 30s not needed in tests
+                        // wait short time for other active shards before actually deleting, default 30s not needed in tests
                 .put(IndicesStore.INDICES_STORE_DELETE_SHARD_TIMEOUT, new TimeValue(1, TimeUnit.SECONDS))
                 .build();
     }
@@ -1885,7 +1857,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
         for (IndexRoutingTable indexRoutingTable : clusterState.routingTable()) {
             for (IndexShardRoutingTable indexShardRoutingTable : indexRoutingTable) {
                 for (ShardRouting shardRouting : indexShardRoutingTable) {
-                    if (shardRouting.currentNodeId() != null &&  index.equals(shardRouting.getIndex())) {
+                    if (shardRouting.currentNodeId() != null && index.equals(shardRouting.getIndex())) {
                         String name = clusterState.nodes().get(shardRouting.currentNodeId()).name();
                         nodes.add(name);
                         assertThat("Allocated on new node: " + name, Regex.simpleMatch(pattern, name), is(true));
diff --git a/src/test/java/org/elasticsearch/test/InternalTestCluster.java b/src/test/java/org/elasticsearch/test/InternalTestCluster.java
index 0ca7ae60ff6..fd179fd8201 100644
--- a/src/test/java/org/elasticsearch/test/InternalTestCluster.java
+++ b/src/test/java/org/elasticsearch/test/InternalTestCluster.java
@@ -79,10 +79,8 @@ import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.engine.EngineClosedException;
 import org.elasticsearch.index.shard.IndexShard;
 import org.elasticsearch.index.shard.IndexShardModule;
-import org.elasticsearch.index.shard.IndexShardState;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.index.store.IndexStoreModule;
-import org.elasticsearch.index.translog.Translog;
 import org.elasticsearch.index.translog.TranslogConfig;
 import org.elasticsearch.index.translog.TranslogWriter;
 import org.elasticsearch.indices.IndicesService;
@@ -90,7 +88,6 @@ import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService;
 import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache;
 import org.elasticsearch.indices.recovery.RecoverySettings;
-import org.elasticsearch.monitor.sigar.SigarService;
 import org.elasticsearch.node.Node;
 import org.elasticsearch.node.service.NodeService;
 import org.elasticsearch.plugins.PluginsService;
@@ -978,7 +975,7 @@ public final class InternalTestCluster extends TestCluster {
 
     @Override
     public void beforeIndexDeletion() {
-        // Check that the operations counter on index shard has reached 1.
+        // Check that the operations counter on index shard has reached 0.
         // The assumption here is that after a test there are no ongoing write operations.
         // test that have ongoing write operations after the test (for example because ttl is used
         // and not all docs have been purged after the test) and inherit from
@@ -1021,10 +1018,7 @@ public final class InternalTestCluster extends TestCluster {
             IndicesService indexServices = getInstance(IndicesService.class, nodeAndClient.name);
             for (IndexService indexService : indexServices) {
                 for (IndexShard indexShard : indexService) {
-                    assertThat(indexShard.getOperationsCount(), anyOf(equalTo(1), equalTo(0)));
-                    if (indexShard.getOperationsCount() == 0) {
-                        assertThat(indexShard.state(), equalTo(IndexShardState.CLOSED));
-                    }
+                    assertThat(indexShard.getOperationsCount(), equalTo(0));
                 }
             }
         }

From 8958096754f1a75cd86bf8c1e9da1ea9e371e523 Mon Sep 17 00:00:00 2001
From: Michael McCandless <mail@mikemccandless.com>
Date: Tue, 26 May 2015 04:06:21 -0400
Subject: [PATCH 006/123] don't truncate TopDocs after rescoring

---
 .../search/rescore/RescorePhase.java          |  5 ----
 .../search/rescore/QueryRescorerTests.java    | 24 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java b/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java
index 88d2b0aae60..48d8407facd 100644
--- a/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java
+++ b/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java
@@ -60,11 +60,6 @@ public class RescorePhase extends AbstractComponent implements SearchPhase {
             for (RescoreSearchContext ctx : context.rescore()) {
                 topDocs = ctx.rescorer().rescore(topDocs, context, ctx);
             }
-            if (context.size() < topDocs.scoreDocs.length) {
-                ScoreDoc[] hits = new ScoreDoc[context.size()];
-                System.arraycopy(topDocs.scoreDocs, 0, hits, 0, hits.length);
-                topDocs = new TopDocs(topDocs.totalHits, hits, topDocs.getMaxScore());
-            }
             context.queryResult().topDocs(topDocs);
         } catch (IOException e) {
             throw new ElasticsearchException("Rescore Phase Failed", e);
diff --git a/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java b/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java
index afeb93f9be4..d1cbdc86525 100644
--- a/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java
+++ b/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java
@@ -45,6 +45,7 @@ import java.util.Arrays;
 import java.util.Comparator;
 
 import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
+import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_REPLICAS;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
 import static org.hamcrest.Matchers.*;
@@ -206,7 +207,7 @@ public class QueryRescorerTests extends ElasticsearchIntegrationTest {
                         RescoreBuilder.queryRescorer(QueryBuilders.matchPhraseQuery("field1", "lexington avenue massachusetts").slop(3))
                                 .setQueryWeight(0.6f).setRescoreQueryWeight(2.0f)).setRescoreWindow(20).execute().actionGet();
 
-        assertThat(searchResponse.getHits().hits().length, equalTo(3));
+        assertThat(searchResponse.getHits().hits().length, equalTo(5));
         assertHitCount(searchResponse, 9);
         assertFirstHit(searchResponse, hasId("3"));
     }
@@ -719,4 +720,25 @@ public class QueryRescorerTests extends ElasticsearchIntegrationTest {
         ensureGreen();
         return numDocs;
     }
+
+    // #11277
+    public void testFromSize() throws Exception {
+        Builder settings = Settings.builder();
+        settings.put(SETTING_NUMBER_OF_SHARDS, 1);
+        settings.put(SETTING_NUMBER_OF_REPLICAS, 0);
+        assertAcked(prepareCreate("test").setSettings(settings));
+        for(int i=0;i<5;i++) {
+            client().prepareIndex("test", "type", ""+i).setSource("text", "hello world").get();
+        }
+        refresh();
+
+        SearchRequestBuilder request = client().prepareSearch();
+        request.setQuery(QueryBuilders.termQuery("text", "hello"));
+        request.setFrom(1);
+        request.setSize(4);
+        request.addRescorer(RescoreBuilder.queryRescorer(QueryBuilders.matchAllQuery()));
+        request.setRescoreWindow(50);
+
+        assertEquals(4, request.get().getHits().hits().length);
+    }
 }

From 37782c17453e00c9bacea096c18f98840942f7bb Mon Sep 17 00:00:00 2001
From: Britta Weber <britta.weber@elasticsearch.com>
Date: Fri, 22 May 2015 16:59:56 +0200
Subject: [PATCH 007/123] analyzers: custom analyzers names and aliases must
 not start with _

closes #9596
---
 .../analyzers/custom-analyzer.asciidoc        |  1 +
 .../index/analysis/AnalysisService.java       |  5 +++
 .../index/analysis/AnalysisModuleTests.java   | 35 ++++++++++++++++++-
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/docs/reference/analysis/analyzers/custom-analyzer.asciidoc b/docs/reference/analysis/analyzers/custom-analyzer.asciidoc
index a7cf7136a83..012045153b3 100644
--- a/docs/reference/analysis/analyzers/custom-analyzer.asciidoc
+++ b/docs/reference/analysis/analyzers/custom-analyzer.asciidoc
@@ -5,6 +5,7 @@ An analyzer of type `custom` that allows to combine a `Tokenizer` with
 zero or more `Token Filters`, and zero or more `Char Filters`. The
 custom analyzer accepts a logical/registered name of the tokenizer to
 use, and a list of logical/registered names of token filters.
+The name of the custom analyzer must not start mit "_".
 
 The following are settings that can be set for a `custom` analyzer type:
 
diff --git a/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java b/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java
index e1c23ceb2f8..53cdbfde4ae 100644
--- a/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java
+++ b/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java
@@ -251,6 +251,11 @@ public class AnalysisService extends AbstractIndexComponent implements Closeable
         defaultSearchAnalyzer = analyzers.containsKey("default_search") ? analyzers.get("default_search") : analyzers.get("default");
         defaultSearchQuoteAnalyzer = analyzers.containsKey("default_search_quote") ? analyzers.get("default_search_quote") : defaultSearchAnalyzer;
 
+        for (Map.Entry<String, NamedAnalyzer> analyzer : analyzers.entrySet()) {
+            if (analyzer.getKey().startsWith("_")) {
+                throw new IllegalArgumentException("analyzer name must not start with _. got \"" + analyzer.getKey() + "\"");
+            }
+        }
         this.analyzers = ImmutableMap.copyOf(analyzers);
     }
 
diff --git a/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java b/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java
index a1db68ab039..886c3b289a6 100644
--- a/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java
+++ b/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java
@@ -31,6 +31,7 @@ import org.elasticsearch.Version;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.inject.Injector;
 import org.elasticsearch.common.inject.ModulesBuilder;
+import org.elasticsearch.common.inject.ProvisionException;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsModule;
 import org.elasticsearch.env.Environment;
@@ -94,7 +95,7 @@ public class AnalysisModuleTests extends ElasticsearchTestCase {
         Settings settings = loadFromClasspath("org/elasticsearch/index/analysis/test1.yml");
         testSimpleConfiguration(settings);
     }
-    
+
     @Test
     public void testDefaultFactoryTokenFilters() throws IOException {
         assertTokenFilter("keyword_repeat", KeywordRepeatFilter.class);
@@ -238,4 +239,36 @@ public class AnalysisModuleTests extends ElasticsearchTestCase {
         return wordListFile;
     }
 
+    @Test
+    public void testUnderscoreInAnalyzerName() {
+        Settings settings = Settings.builder()
+                .put("index.analysis.analyzer._invalid_name.tokenizer", "keyword")
+                .put("path.home", createTempDir().toString())
+                .put(IndexMetaData.SETTING_VERSION_CREATED, "1")
+                .build();
+        try {
+            getAnalysisService(settings);
+            fail("This should fail with IllegalArgumentException because the analyzers name starts with _");
+        } catch (ProvisionException e) {
+            assertTrue(e.getCause() instanceof IllegalArgumentException);
+            assertThat(e.getCause().getMessage(), equalTo("analyzer name must not start with _. got \"_invalid_name\""));
+        }
+    }
+
+    @Test
+    public void testUnderscoreInAnalyzerNameAlias() {
+        Settings settings = Settings.builder()
+                .put("index.analysis.analyzer.valid_name.tokenizer", "keyword")
+                .put("index.analysis.analyzer.valid_name.alias", "_invalid_name")
+                .put("path.home", createTempDir().toString())
+                .put(IndexMetaData.SETTING_VERSION_CREATED, "1")
+                .build();
+        try {
+            getAnalysisService(settings);
+            fail("This should fail with IllegalArgumentException because the analyzers alias starts with _");
+        } catch (ProvisionException e) {
+            assertTrue(e.getCause() instanceof IllegalArgumentException);
+            assertThat(e.getCause().getMessage(), equalTo("analyzer name must not start with _. got \"_invalid_name\""));
+        }
+    }
 }

From 60519911b4e50bcc958c924a768dca2ae618101b Mon Sep 17 00:00:00 2001
From: David Pilato <david@pilato.fr>
Date: Sat, 23 May 2015 18:51:22 +0200
Subject: [PATCH 008/123] [maven] fix paths for final artifact

We need to define an absolute path (based on `${project.basedir}`) instead of using related paths.
---
 pom.xml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8a5b11f1bee..f644ff91bbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <name>elasticsearch</name>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch</artifactId>
     <version>2.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
+    <name>Elasticsearch core</name>
     <description>Elasticsearch - Open Source, Distributed, RESTful Search Engine</description>
     <inceptionYear>2009</inceptionYear>
     <licenses>
@@ -291,7 +291,7 @@
             <groupId>sigar</groupId>
             <artifactId>sigar</artifactId>
             <scope>system</scope>
-            <systemPath>${basedir}/lib/sigar/sigar-1.6.4.jar</systemPath>
+            <systemPath>${project.basedir}/lib/sigar/sigar-1.6.4.jar</systemPath>
             <optional>true</optional>
         </dependency>
         -->
@@ -302,19 +302,19 @@
         <!-- This file contains all the common properties used to build
             the different packages (tar.gz, deb, rpm) using Maven resources plugin -->
         <filters>
-            <filter>src/packaging/common/packaging.properties</filter>
+            <filter>${project.basedir}/src/packaging/common/packaging.properties</filter>
         </filters>
 
         <resources>
             <resource>
-                <directory>${basedir}/src/main/java</directory>
+                <directory>${project.basedir}/src/main/java</directory>
                 <includes>
                     <include>**/*.json</include>
                     <include>**/*.yml</include>
                 </includes>
             </resource>
             <resource>
-                <directory>${basedir}/src/main/resources</directory>
+                <directory>${project.basedir}/src/main/resources</directory>
                 <includes>
                     <include>**/*.*</include>
                 </includes>
@@ -324,7 +324,7 @@
 
         <testResources>
             <testResource>
-                <directory>${basedir}/src/test/java</directory>
+                <directory>${project.basedir}/src/test/java</directory>
                 <includes>
                     <include>**/*.json</include>
                     <include>**/*.yml</include>
@@ -334,19 +334,19 @@
                 <filtering>true</filtering>
             </testResource>
             <testResource>
-                <directory>${basedir}/src/test/java</directory>
+                <directory>${project.basedir}/src/test/java</directory>
                 <includes>
                     <include>**/*.gz</include>
                 </includes>
             </testResource>
             <testResource>
-                <directory>${basedir}/src/test/resources</directory>
+                <directory>${project.basedir}/src/test/resources</directory>
                 <includes>
                     <include>**/*.*</include>
                 </includes>
             </testResource>
             <testResource>
-                <directory>${basedir}/rest-api-spec</directory>
+                <directory>${project.basedir}/rest-api-spec</directory>
                 <targetPath>rest-api-spec</targetPath>
                 <includes>
                     <include>api/*.json</include>
@@ -543,14 +543,14 @@
                             <outputDirectory>${project.build.directory}/bin</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>${basedir}/bin</directory>
+                                    <directory>${project.basedir}/bin</directory>
                                     <filtering>true</filtering>
                                     <excludes>
                                         <exclude>*.exe</exclude>
                                     </excludes>
                                 </resource>
                                 <resource>
-                                    <directory>${basedir}/bin</directory>
+                                    <directory>${project.basedir}/bin</directory>
                                     <filtering>false</filtering>
                                     <includes>
                                         <include>*.exe</include>
@@ -569,12 +569,12 @@
                         <configuration>
                             <outputDirectory>${project.build.directory}/generated-packaging/deb/</outputDirectory>
                             <filters>
-                                <filter>src/packaging/common/packaging.properties</filter>
-                                <filter>src/packaging/deb/packaging.properties</filter>
+                                <filter>${project.basedir}/src/packaging/common/packaging.properties</filter>
+                                <filter>${project.basedir}/src/packaging/deb/packaging.properties</filter>
                             </filters>
                             <resources>
                                 <resource>
-                                    <directory>src/packaging/common/</directory>
+                                    <directory>${project.basedir}/src/packaging/common/</directory>
                                     <filtering>true</filtering>
                                     <includes>
                                         <include>**/*</include>
@@ -584,7 +584,7 @@
                                     </excludes>
                                 </resource>
                                 <resource>
-                                    <directory>src/packaging/deb/</directory>
+                                    <directory>${project.basedir}/src/packaging/deb/</directory>
                                     <filtering>true</filtering>
                                     <includes>
                                         <include>**/*</include>
@@ -615,8 +615,8 @@
                         <configuration>
                             <outputDirectory>${project.build.directory}/generated-packaging/rpm/</outputDirectory>
                             <filters>
-                                <filter>src/packaging/common/packaging.properties</filter>
-                                <filter>src/packaging/rpm/packaging.properties</filter>
+                                <filter>${project.basedir}/src/packaging/common/packaging.properties</filter>
+                                <filter>${project.basedir}/src/packaging/rpm/packaging.properties</filter>
                             </filters>
                             <resources>
                                 <resource>
@@ -660,8 +660,8 @@
                     <appendAssemblyId>false</appendAssemblyId>
                     <outputDirectory>${project.build.directory}/releases/</outputDirectory>
                     <descriptors>
-                        <descriptor>${basedir}/src/main/assemblies/targz-bin.xml</descriptor>
-                        <descriptor>${basedir}/src/main/assemblies/zip-bin.xml</descriptor>
+                        <descriptor>${project.basedir}/src/main/assemblies/targz-bin.xml</descriptor>
+                        <descriptor>${project.basedir}/src/main/assemblies/zip-bin.xml</descriptor>
                     </descriptors>
                 </configuration>
                 <executions>

From eeeb29f9006790460270f4d32a928e7645c0ea21 Mon Sep 17 00:00:00 2001
From: Britta Weber <britta.weber@elasticsearch.com>
Date: Tue, 26 May 2015 11:40:19 +0200
Subject: [PATCH 009/123] spell correct and add single quotes

---
 docs/reference/analysis/analyzers/custom-analyzer.asciidoc      | 2 +-
 .../java/org/elasticsearch/index/analysis/AnalysisService.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/reference/analysis/analyzers/custom-analyzer.asciidoc b/docs/reference/analysis/analyzers/custom-analyzer.asciidoc
index 012045153b3..bdc03a0998b 100644
--- a/docs/reference/analysis/analyzers/custom-analyzer.asciidoc
+++ b/docs/reference/analysis/analyzers/custom-analyzer.asciidoc
@@ -5,7 +5,7 @@ An analyzer of type `custom` that allows to combine a `Tokenizer` with
 zero or more `Token Filters`, and zero or more `Char Filters`. The
 custom analyzer accepts a logical/registered name of the tokenizer to
 use, and a list of logical/registered names of token filters.
-The name of the custom analyzer must not start mit "_".
+The name of the custom analyzer must not start with "_".
 
 The following are settings that can be set for a `custom` analyzer type:
 
diff --git a/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java b/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java
index 53cdbfde4ae..1cc37b8cda8 100644
--- a/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java
+++ b/src/main/java/org/elasticsearch/index/analysis/AnalysisService.java
@@ -253,7 +253,7 @@ public class AnalysisService extends AbstractIndexComponent implements Closeable
 
         for (Map.Entry<String, NamedAnalyzer> analyzer : analyzers.entrySet()) {
             if (analyzer.getKey().startsWith("_")) {
-                throw new IllegalArgumentException("analyzer name must not start with _. got \"" + analyzer.getKey() + "\"");
+                throw new IllegalArgumentException("analyzer name must not start with '_'. got \"" + analyzer.getKey() + "\"");
             }
         }
         this.analyzers = ImmutableMap.copyOf(analyzers);

From 802b7b88fa55e94975f9c9bb451eb6642861d1cc Mon Sep 17 00:00:00 2001
From: Britta Weber <britta.weber@elasticsearch.com>
Date: Tue, 26 May 2015 11:49:33 +0200
Subject: [PATCH 010/123] [TEST] fix epected error message

---
 .../org/elasticsearch/index/analysis/AnalysisModuleTests.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java b/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java
index 886c3b289a6..c1d260392ff 100644
--- a/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java
+++ b/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java
@@ -251,7 +251,7 @@ public class AnalysisModuleTests extends ElasticsearchTestCase {
             fail("This should fail with IllegalArgumentException because the analyzers name starts with _");
         } catch (ProvisionException e) {
             assertTrue(e.getCause() instanceof IllegalArgumentException);
-            assertThat(e.getCause().getMessage(), equalTo("analyzer name must not start with _. got \"_invalid_name\""));
+            assertThat(e.getCause().getMessage(), equalTo("analyzer name must not start with '_'. got \"_invalid_name\""));
         }
     }
 
@@ -268,7 +268,7 @@ public class AnalysisModuleTests extends ElasticsearchTestCase {
             fail("This should fail with IllegalArgumentException because the analyzers alias starts with _");
         } catch (ProvisionException e) {
             assertTrue(e.getCause() instanceof IllegalArgumentException);
-            assertThat(e.getCause().getMessage(), equalTo("analyzer name must not start with _. got \"_invalid_name\""));
+            assertThat(e.getCause().getMessage(), equalTo("analyzer name must not start with '_'. got \"_invalid_name\""));
         }
     }
 }

From 543f572d80b0494c4f620eb2e6ad3fb8d1fdd89b Mon Sep 17 00:00:00 2001
From: javanna <cavannaluca@gmail.com>
Date: Sat, 23 May 2015 11:15:27 +0200
Subject: [PATCH 011/123] Highlighting: keep track of the original query only
 in HighlighterContext

We used to keep track of the rewritten query in the highlighter context to support custom rewriting done by our own postings highlighter fork. Now that we rely on lucene implementation, no rewrite happens, we can simply keep track of the original query and simplify code around it.

Closes #11317
---
 .../highlight/FastVectorHighlighter.java      |  4 +--
 .../search/highlight/HighlightPhase.java      |  8 ++---
 .../search/highlight/HighlighterContext.java  | 29 ++-----------------
 .../search/highlight/PlainHighlighter.java    |  4 +--
 .../search/highlight/PostingsHighlighter.java |  2 +-
 5 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java b/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java
index a61fabb0034..715dacae39d 100644
--- a/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java
+++ b/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java
@@ -79,13 +79,13 @@ public class FastVectorHighlighter implements Highlighter {
             if (field.fieldOptions().requireFieldMatch()) {
                 if (cache.fieldMatchFieldQuery == null) {
                     // we use top level reader to rewrite the query against all readers, with use caching it across hits (and across readers...)
-                    cache.fieldMatchFieldQuery = new CustomFieldQuery(highlighterContext.query.originalQuery(), hitContext.topLevelReader(), true, field.fieldOptions().requireFieldMatch());
+                    cache.fieldMatchFieldQuery = new CustomFieldQuery(highlighterContext.query, hitContext.topLevelReader(), true, field.fieldOptions().requireFieldMatch());
                 }
                 fieldQuery = cache.fieldMatchFieldQuery;
             } else {
                 if (cache.noFieldMatchFieldQuery == null) {
                     // we use top level reader to rewrite the query against all readers, with use caching it across hits (and across readers...)
-                    cache.noFieldMatchFieldQuery = new CustomFieldQuery(highlighterContext.query.originalQuery(), hitContext.topLevelReader(), true, field.fieldOptions().requireFieldMatch());
+                    cache.noFieldMatchFieldQuery = new CustomFieldQuery(highlighterContext.query, hitContext.topLevelReader(), true, field.fieldOptions().requireFieldMatch());
                 }
                 fieldQuery = cache.noFieldMatchFieldQuery;
             }
diff --git a/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java b/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java
index a730b6612d0..10afac729ba 100644
--- a/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java
+++ b/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java
@@ -22,6 +22,7 @@ package org.elasticsearch.search.highlight;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import org.apache.lucene.index.IndexOptions;
+import org.apache.lucene.search.Query;
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.regex.Regex;
@@ -113,12 +114,7 @@ public class HighlightPhase extends AbstractComponent implements FetchSubPhase {
                     throw new IllegalArgumentException("unknown highlighter type [" + highlighterType + "] for the field [" + fieldName + "]");
                 }
 
-                HighlighterContext.HighlightQuery highlightQuery;
-                if (field.fieldOptions().highlightQuery() == null) {
-                    highlightQuery = new HighlighterContext.HighlightQuery(context.parsedQuery().query(), context.query(), context.queryRewritten());
-                } else {
-                    highlightQuery = new HighlighterContext.HighlightQuery(field.fieldOptions().highlightQuery(), field.fieldOptions().highlightQuery(), false);
-                }
+                Query highlightQuery = field.fieldOptions().highlightQuery() == null ? context.parsedQuery().query() : field.fieldOptions().highlightQuery();
                 HighlighterContext highlighterContext = new HighlighterContext(fieldName, field, fieldMapper, context, hitContext, highlightQuery);
                 HighlightField highlightField = highlighter.highlight(highlighterContext);
                 if (highlightField != null) {
diff --git a/src/main/java/org/elasticsearch/search/highlight/HighlighterContext.java b/src/main/java/org/elasticsearch/search/highlight/HighlighterContext.java
index f3dd9ff1ba8..e791aad4310 100644
--- a/src/main/java/org/elasticsearch/search/highlight/HighlighterContext.java
+++ b/src/main/java/org/elasticsearch/search/highlight/HighlighterContext.java
@@ -18,7 +18,6 @@
  */
 package org.elasticsearch.search.highlight;
 
-import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.search.Query;
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.search.fetch.FetchSubPhase;
@@ -34,10 +33,10 @@ public class HighlighterContext {
     public final FieldMapper mapper;
     public final SearchContext context;
     public final FetchSubPhase.HitContext hitContext;
-    public final HighlightQuery query;
+    public final Query query;
 
     public HighlighterContext(String fieldName, SearchContextHighlight.Field field, FieldMapper mapper, SearchContext context,
-            FetchSubPhase.HitContext hitContext, HighlightQuery query) {
+            FetchSubPhase.HitContext hitContext, Query query) {
         this.fieldName = fieldName;
         this.field = field;
         this.mapper = mapper;
@@ -45,28 +44,4 @@ public class HighlighterContext {
         this.hitContext = hitContext;
         this.query = query;
     }
-
-    public static class HighlightQuery {
-        private final Query originalQuery;
-        private final Query query;
-        private final boolean queryRewritten;
-
-        protected HighlightQuery(Query originalQuery, Query query, boolean queryRewritten) {
-            this.originalQuery = originalQuery;
-            this.query = query;
-            this.queryRewritten = queryRewritten;
-        }
-
-        public boolean queryRewritten() {
-            return queryRewritten;
-        }
-
-        public Query originalQuery() {
-            return originalQuery;
-        }
-
-        public Query query() {
-            return query;
-        }
-    }
 }
diff --git a/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java b/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java
index 3e0eca6c468..12d7d08fa8f 100644
--- a/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java
+++ b/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java
@@ -23,7 +23,6 @@ import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
-import org.apache.lucene.search.Query;
 import org.apache.lucene.search.highlight.*;
 import org.apache.lucene.util.CollectionUtil;
 import org.elasticsearch.common.text.StringText;
@@ -69,8 +68,7 @@ public class PlainHighlighter implements Highlighter {
 
         org.apache.lucene.search.highlight.Highlighter entry = cache.get(mapper);
         if (entry == null) {
-            Query query = highlighterContext.query.originalQuery();
-            QueryScorer queryScorer = new CustomQueryScorer(query, field.fieldOptions().requireFieldMatch() ? mapper.names().indexName() : null);
+            QueryScorer queryScorer = new CustomQueryScorer(highlighterContext.query, field.fieldOptions().requireFieldMatch() ? mapper.names().indexName() : null);
             queryScorer.setExpandMultiTermQuery(true);
             Fragmenter fragmenter;
             if (field.fieldOptions().numberOfFragments() == 0) {
diff --git a/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java b/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java
index 1614f294ff2..0375ff204f7 100644
--- a/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java
+++ b/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java
@@ -91,7 +91,7 @@ public class PostingsHighlighter implements Highlighter {
             }
 
             IndexSearcher searcher = new IndexSearcher(hitContext.reader());
-            Snippet[] fieldSnippets = highlighter.highlightField(fieldMapper.names().indexName(), highlighterContext.query.originalQuery(), searcher, hitContext.docId(), numberOfFragments);
+            Snippet[] fieldSnippets = highlighter.highlightField(fieldMapper.names().indexName(), highlighterContext.query, searcher, hitContext.docId(), numberOfFragments);
             for (Snippet fieldSnippet : fieldSnippets) {
                 if (Strings.hasText(fieldSnippet.getText())) {
                     snippets.add(fieldSnippet);

From ce63590bd67f3fa419b388f7d3d13eaee1089b29 Mon Sep 17 00:00:00 2001
From: Tanguy Leroux <tlrx.dev@gmail.com>
Date: Tue, 5 May 2015 14:11:05 +0200
Subject: [PATCH 012/123] API: Add response filtering with filter_path
 parameter

This change adds a new "filter_path" parameter that can be used to filter and reduce the responses returned by the REST API of elasticsearch.

For example, returning only the shards that failed to be optimized:
```
curl -XPOST 'localhost:9200/beer/_optimize?filter_path=_shards.failed'
{"_shards":{"failed":0}}%
```

It supports multiple filters (separated by a comma):
```
curl -XGET 'localhost:9200/_mapping?pretty&filter_path=*.mappings.*.properties.name,*.mappings.*.properties.title'
```

It also supports the YAML response format. Here it returns only the `_id` field of a newly indexed document:
```
curl -XPOST 'localhost:9200/library/book?filter_path=_id' -d '---hello:\n  world: 1\n'
---
_id: "AU0j64-b-stVfkvus5-A"
```

It also supports wildcards. Here it returns only the host name of every nodes in the cluster:
```
curl -XGET 'http://localhost:9200/_nodes/stats?filter_path=nodes.*.host*'
{"nodes":{"lvJHed8uQQu4brS-SXKsNA":{"host":"portable"}}}
```

And "**" can be used to include sub fields without knowing the exact path. Here it returns only the Lucene version of every segment:
```
curl 'http://localhost:9200/_segments?pretty&filter_path=indices.**.version'
{
  "indices" : {
    "beer" : {
      "shards" : {
        "0" : [ {
          "segments" : {
            "_0" : {
              "version" : "5.2.0"
            },
            "_1" : {
              "version" : "5.2.0"
            }
          }
        } ]
      }
    }
  }
}
```

Note that elasticsearch sometimes returns directly the raw value of a field, like the _source field. If you want to filter _source fields, you should consider combining the already existing _source parameter (see Get API for more details) with the filter_path parameter like this:

```
curl -XGET 'localhost:9200/_search?pretty&filter_path=hits.hits._source&_source=title'
{
  "hits" : {
    "hits" : [ {
      "_source":{"title":"Book #2"}
    }, {
      "_source":{"title":"Book #1"}
    }, {
      "_source":{"title":"Book #3"}
    } ]
  }
}
```
---
 docs/reference/api-conventions.asciidoc       | 107 ++++
 rest-api-spec/api/nodes.stats.json            |   4 +
 rest-api-spec/api/search.json                 |   4 +
 .../nodes.stats/20_response_filtering.yaml    | 154 +++++
 .../test/search/70_response_filtering.yaml    |  87 +++
 .../common/xcontent/XContent.java             |   5 +
 .../common/xcontent/XContentBuilder.java      |  15 +-
 .../common/xcontent/cbor/CborXContent.java    |  21 +-
 .../xcontent/cbor/CborXContentGenerator.java  |   4 +-
 .../xcontent/json/BaseJsonGenerator.java      |  80 +++
 .../common/xcontent/json/JsonXContent.java    |  19 +-
 .../xcontent/json/JsonXContentGenerator.java  |  53 +-
 .../common/xcontent/smile/SmileXContent.java  |  23 +-
 .../smile/SmileXContentGenerator.java         |   4 +-
 .../support/filtering/FilterContext.java      | 225 ++++++++
 .../filtering/FilteringJsonGenerator.java     | 423 ++++++++++++++
 .../common/xcontent/yaml/YamlXContent.java    |  21 +-
 .../xcontent/yaml/YamlXContentGenerator.java  |   4 +-
 .../elasticsearch/rest/BytesRestResponse.java |   2 +-
 .../org/elasticsearch/rest/RestChannel.java   |  13 +-
 .../elasticsearch/rest/RestController.java    |   2 +-
 .../rest/action/get/RestGetSourceAction.java  |   2 +-
 .../rest/action/index/RestIndexAction.java    |   2 +-
 .../script/RestPutIndexedScriptAction.java    |   2 +-
 .../AbstractFilteringJsonGeneratorTests.java  | 524 ++++++++++++++++++
 .../CborFilteringGeneratorTests.java          |  36 ++
 .../FilteringJsonGeneratorBenchmark.java      |  99 ++++
 .../JsonFilteringGeneratorTests.java          |  36 ++
 .../SmileFilteringGeneratorTests.java         |  36 ++
 .../YamlFilteringGeneratorTests.java          |  36 ++
 .../rest/RestFilterChainTests.java            |   9 +-
 31 files changed, 1986 insertions(+), 66 deletions(-)
 create mode 100644 rest-api-spec/test/nodes.stats/20_response_filtering.yaml
 create mode 100644 rest-api-spec/test/search/70_response_filtering.yaml
 create mode 100644 src/main/java/org/elasticsearch/common/xcontent/json/BaseJsonGenerator.java
 create mode 100644 src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterContext.java
 create mode 100644 src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilteringJsonGenerator.java
 create mode 100644 src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractFilteringJsonGeneratorTests.java
 create mode 100644 src/test/java/org/elasticsearch/common/xcontent/support/filtering/CborFilteringGeneratorTests.java
 create mode 100644 src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilteringJsonGeneratorBenchmark.java
 create mode 100644 src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonFilteringGeneratorTests.java
 create mode 100644 src/test/java/org/elasticsearch/common/xcontent/support/filtering/SmileFilteringGeneratorTests.java
 create mode 100644 src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java

diff --git a/docs/reference/api-conventions.asciidoc b/docs/reference/api-conventions.asciidoc
index 25b9ac4fcea..7dfb3936e35 100644
--- a/docs/reference/api-conventions.asciidoc
+++ b/docs/reference/api-conventions.asciidoc
@@ -81,6 +81,113 @@ being consumed by a monitoring tool, rather than intended for human
 consumption.  The default for the `human` flag is
 `false`.
 
+[float]
+=== Response Filtering
+
+All REST APIs accept a `filter_path` parameter that can be used to reduce
+the response returned by elasticsearch. This parameter takes a comma
+separated list of filters expressed with the dot notation:
+
+[source,sh]
+--------------------------------------------------
+curl -XGET 'localhost:9200/_search?pretty&filter_path=took,hits.hits._id,hits.hits._score'
+{
+  "took" : 3,
+  "hits" : {
+    "hits" : [
+      {
+        "_id" : "3640",
+        "_score" : 1.0
+      },
+      {
+        "_id" : "3642",
+        "_score" : 1.0
+      }
+    ]
+  }
+}
+--------------------------------------------------
+
+It also supports the `*` wildcard character to match any field or part
+of a field's name:
+
+[source,sh]
+--------------------------------------------------
+curl -XGET 'localhost:9200/_nodes/stats?filter_path=nodes.*.ho*'
+{
+  "nodes" : {
+    "lvJHed8uQQu4brS-SXKsNA" : {
+      "host" : "portable"
+    }
+  }
+}
+--------------------------------------------------
+
+And the `**` wildcard can be used to include fields without knowing the
+exact path of the field. For example, we can return the Lucene version
+of every segment with this request:
+
+[source,sh]
+--------------------------------------------------
+curl 'localhost:9200/_segments?pretty&filter_path=indices.**.version'
+{
+  "indices" : {
+    "movies" : {
+      "shards" : {
+        "0" : [ {
+          "segments" : {
+            "_0" : {
+              "version" : "5.2.0"
+            }
+          }
+        } ],
+        "2" : [ {
+          "segments" : {
+            "_0" : {
+              "version" : "5.2.0"
+            }
+          }
+        } ]
+      }
+    },
+    "books" : {
+      "shards" : {
+        "0" : [ {
+          "segments" : {
+            "_0" : {
+              "version" : "5.2.0"
+            }
+          }
+        } ]
+      }
+    }
+  }
+}
+--------------------------------------------------
+
+Note that elasticsearch sometimes returns directly the raw value of a field,
+like the `_source` field. If you want to filter _source fields, you should
+consider combining the already existing `_source` parameter (see
+<<get-source-filtering,Get API>> for more details) with the `filter_path`
+ parameter like this:
+
+[source,sh]
+--------------------------------------------------
+curl -XGET 'localhost:9200/_search?pretty&filter_path=hits.hits._source&_source=title'
+{
+  "hits" : {
+    "hits" : [ {
+      "_source":{"title":"Book #2"}
+    }, {
+      "_source":{"title":"Book #1"}
+    }, {
+      "_source":{"title":"Book #3"}
+    } ]
+  }
+}
+--------------------------------------------------
+
+
 [float]
 === Flat Settings
 
diff --git a/rest-api-spec/api/nodes.stats.json b/rest-api-spec/api/nodes.stats.json
index 0a0870020b3..478dc7c8465 100644
--- a/rest-api-spec/api/nodes.stats.json
+++ b/rest-api-spec/api/nodes.stats.json
@@ -56,6 +56,10 @@
           "options" : ["node", "indices", "shards"],
           "default" : "node"
         },
+        "filter_path": {
+          "type" : "list",
+          "description" : "A comma-separated list of fields to include in the returned response"
+        },
         "types" : {
           "type" : "list",
           "description" : "A comma-separated list of document types for the `indexing` index metric"
diff --git a/rest-api-spec/api/search.json b/rest-api-spec/api/search.json
index e3c286c842c..2d37ce4432f 100644
--- a/rest-api-spec/api/search.json
+++ b/rest-api-spec/api/search.json
@@ -72,6 +72,10 @@
           "type" : "boolean",
           "description" : "Specify whether query terms should be lowercased"
         },
+        "filter_path": {
+          "type" : "list",
+          "description" : "A comma-separated list of fields to include in the returned response"
+        },
         "preference": {
           "type" : "string",
           "description" : "Specify the node or shard the operation should be performed on (default: random)"
diff --git a/rest-api-spec/test/nodes.stats/20_response_filtering.yaml b/rest-api-spec/test/nodes.stats/20_response_filtering.yaml
new file mode 100644
index 00000000000..4031f405259
--- /dev/null
+++ b/rest-api-spec/test/nodes.stats/20_response_filtering.yaml
@@ -0,0 +1,154 @@
+---
+"Nodes Stats with response filtering":
+  - do:
+      cluster.state: {}
+
+  # Get master node id
+  - set: { master_node: master }
+
+  # Nodes Stats with no filtering
+  - do:
+      nodes.stats: {}
+
+  - is_true: cluster_name
+  - is_true: nodes
+  - is_true: nodes.$master.name
+  - is_true: nodes.$master.indices
+  - is_true: nodes.$master.indices.docs
+  - gte:     { nodes.$master.indices.docs.count: 0 }
+  - is_true: nodes.$master.indices.segments
+  - gte:     { nodes.$master.indices.segments.count: 0 }
+  - is_true: nodes.$master.jvm
+  - is_true: nodes.$master.jvm.threads
+  - gte:     { nodes.$master.jvm.threads.count: 0 }
+  - is_true: nodes.$master.jvm.buffer_pools.direct
+  - gte:     { nodes.$master.jvm.buffer_pools.direct.count: 0 }
+  - gte:     { nodes.$master.jvm.buffer_pools.direct.used_in_bytes: 0 }
+
+  # Nodes Stats with only "cluster_name" field
+  - do:
+      nodes.stats:
+        filter_path: cluster_name
+
+  - is_true:  cluster_name
+  - is_false: nodes
+  - is_false: nodes.$master.name
+  - is_false: nodes.$master.indices
+  - is_false: nodes.$master.jvm
+
+  # Nodes Stats with "nodes" field and sub-fields
+  - do:
+      nodes.stats:
+        filter_path: nodes.*
+
+  - is_false: cluster_name
+  - is_true:  nodes
+  - is_true:  nodes.$master.name
+  - is_true:  nodes.$master.indices
+  - is_true:  nodes.$master.indices.docs
+  - gte:      { nodes.$master.indices.docs.count: 0 }
+  - is_true:  nodes.$master.indices.segments
+  - gte:      { nodes.$master.indices.segments.count: 0 }
+  - is_true:  nodes.$master.jvm
+  - is_true:  nodes.$master.jvm.threads
+  - gte:      { nodes.$master.jvm.threads.count: 0 }
+  - is_true:  nodes.$master.jvm.buffer_pools.direct
+  - gte:      { nodes.$master.jvm.buffer_pools.direct.count: 0 }
+  - gte:     { nodes.$master.jvm.buffer_pools.direct.used_in_bytes: 0 }
+
+  # Nodes Stats with "nodes.*.indices" field and sub-fields
+  - do:
+      nodes.stats:
+        filter_path: nodes.*.indices
+
+  - is_false: cluster_name
+  - is_true:  nodes
+  - is_false: nodes.$master.name
+  - is_true:  nodes.$master.indices
+  - is_true:  nodes.$master.indices.docs
+  - gte:      { nodes.$master.indices.docs.count: 0 }
+  - is_true:  nodes.$master.indices.segments
+  - gte:      { nodes.$master.indices.segments.count: 0 }
+  - is_false: nodes.$master.jvm
+
+  # Nodes Stats with "nodes.*.name" and "nodes.*.indices.docs.count" fields
+  - do:
+      nodes.stats:
+        filter_path: [ "nodes.*.name", "nodes.*.indices.docs.count" ]
+
+  - is_false: cluster_name
+  - is_true:  nodes
+  - is_true:  nodes.$master.name
+  - is_true:  nodes.$master.indices
+  - is_true:  nodes.$master.indices.docs
+  - gte:      { nodes.$master.indices.docs.count: 0 }
+  - is_false: nodes.$master.indices.segments
+  - is_false: nodes.$master.jvm
+
+  # Nodes Stats with all "count" fields
+  - do:
+      nodes.stats:
+        filter_path: "nodes.**.count"
+
+  - is_false: cluster_name
+  - is_true:  nodes
+  - is_false: nodes.$master.name
+  - is_true:  nodes.$master.indices
+  - is_true:  nodes.$master.indices.docs
+  - gte:      { nodes.$master.indices.docs.count: 0 }
+  - is_true:  nodes.$master.indices.segments
+  - gte:      { nodes.$master.indices.segments.count: 0 }
+  - is_true:  nodes.$master.jvm
+  - is_true:  nodes.$master.jvm.threads
+  - gte:      { nodes.$master.jvm.threads.count: 0 }
+  - is_true:  nodes.$master.jvm.buffer_pools.direct
+  - gte:      { nodes.$master.jvm.buffer_pools.direct.count: 0 }
+  - is_false: nodes.$master.jvm.buffer_pools.direct.used_in_bytes
+
+  # Nodes Stats with all "count" fields in sub-fields of "jvm" field
+  - do:
+      nodes.stats:
+        filter_path: "nodes.**.jvm.**.count"
+
+  - is_false: cluster_name
+  - is_true:  nodes
+  - is_false: nodes.$master.name
+  - is_false: nodes.$master.indices
+  - is_false: nodes.$master.indices.docs.count
+  - is_false: nodes.$master.indices.segments.count
+  - is_true:  nodes.$master.jvm
+  - is_true:  nodes.$master.jvm.threads
+  - gte:      { nodes.$master.jvm.threads.count: 0 }
+  - is_true:  nodes.$master.jvm.buffer_pools.direct
+  - gte:      { nodes.$master.jvm.buffer_pools.direct.count: 0 }
+  - is_false: nodes.$master.jvm.buffer_pools.direct.used_in_bytes
+
+  # Nodes Stats with "nodes.*.fs.data" fields
+  - do:
+      nodes.stats:
+        filter_path: "nodes.*.fs.data"
+
+  - is_false: cluster_name
+  - is_true:  nodes
+  - is_false: nodes.$master.name
+  - is_false: nodes.$master.indices
+  - is_false: nodes.$master.jvm
+  - is_true:  nodes.$master.fs.data
+  - is_true:  nodes.$master.fs.data.0.path
+  - is_true:  nodes.$master.fs.data.0.type
+  - is_true:  nodes.$master.fs.data.0.total_in_bytes
+
+  # Nodes Stats with "nodes.*.fs.data.t*" fields
+  - do:
+      nodes.stats:
+        filter_path: "nodes.*.fs.data.t*"
+
+  - is_false: cluster_name
+  - is_true:  nodes
+  - is_false: nodes.$master.name
+  - is_false: nodes.$master.indices
+  - is_false: nodes.$master.jvm
+  - is_true:  nodes.$master.fs.data
+  - is_false: nodes.$master.fs.data.0.path
+  - is_true:  nodes.$master.fs.data.0.type
+  - is_true:  nodes.$master.fs.data.0.total_in_bytes
diff --git a/rest-api-spec/test/search/70_response_filtering.yaml b/rest-api-spec/test/search/70_response_filtering.yaml
new file mode 100644
index 00000000000..ade3b68e256
--- /dev/null
+++ b/rest-api-spec/test/search/70_response_filtering.yaml
@@ -0,0 +1,87 @@
+---
+"Search with response filtering":
+  - do:
+      indices.create:
+          index:  test
+  - do:
+      index:
+          index:  test
+          type:   test
+          id:     1
+          body:   { foo: bar }
+
+  - do:
+      index:
+          index:  test
+          type:   test
+          id:     2
+          body:   { foo: bar }
+
+  - do:
+      indices.refresh:
+        index: [test]
+
+  - do:
+      search:
+        index: test
+        filter_path: "*"
+        body: "{ query: { match_all: {} } }"
+
+  - is_true: took
+  - is_true: _shards.total
+  - is_true: hits.total
+  - is_true: hits.hits.0._index
+  - is_true: hits.hits.0._type
+  - is_true: hits.hits.0._id
+  - is_true: hits.hits.1._index
+  - is_true: hits.hits.1._type
+  - is_true: hits.hits.1._id
+
+  - do:
+      search:
+        index: test
+        filter_path: "took"
+        body: "{ query: { match_all: {} } }"
+
+  - is_true:  took
+  - is_false: _shards.total
+  - is_false: hits.total
+  - is_false: hits.hits.0._index
+  - is_false: hits.hits.0._type
+  - is_false: hits.hits.0._id
+  - is_false: hits.hits.1._index
+  - is_false: hits.hits.1._type
+  - is_false: hits.hits.1._id
+
+  - do:
+      search:
+        index: test
+        filter_path: "_shards.*"
+        body: "{ query: { match_all: {} } }"
+
+  - is_false: took
+  - is_true:  _shards.total
+  - is_false: hits.total
+  - is_false: hits.hits.0._index
+  - is_false: hits.hits.0._type
+  - is_false: hits.hits.0._id
+  - is_false: hits.hits.1._index
+  - is_false: hits.hits.1._type
+  - is_false: hits.hits.1._id
+
+  - do:
+      search:
+        index: test
+        filter_path: [ "hits.**._i*", "**.total" ]
+        body: "{ query: { match_all: {} } }"
+
+  - is_false: took
+  - is_true:  _shards.total
+  - is_true:  hits.total
+  - is_true:  hits.hits.0._index
+  - is_false: hits.hits.0._type
+  - is_true:  hits.hits.0._id
+  - is_true:  hits.hits.1._index
+  - is_false: hits.hits.1._type
+  - is_true:  hits.hits.1._id
+
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContent.java b/src/main/java/org/elasticsearch/common/xcontent/XContent.java
index d9cf704725c..101098d67a4 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/XContent.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/XContent.java
@@ -40,6 +40,11 @@ public interface XContent {
      */
     XContentGenerator createGenerator(OutputStream os) throws IOException;
 
+    /**
+     * Creates a new generator using the provided output stream and some filters.
+     */
+    XContentGenerator createGenerator(OutputStream os, String[] filters) throws IOException;
+
     /**
      * Creates a new generator using the provided writer.
      */
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java b/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java
index b2cf8738fe0..fb31bd89a95 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java
@@ -77,6 +77,10 @@ public final class XContentBuilder implements BytesStream, Releasable {
         return new XContentBuilder(xContent, new BytesStreamOutput());
     }
 
+    public static XContentBuilder builder(XContent xContent, String[] filters) throws IOException {
+        return new XContentBuilder(xContent, new BytesStreamOutput(), filters);
+    }
+
     private XContentGenerator generator;
 
     private final OutputStream bos;
@@ -92,8 +96,17 @@ public final class XContentBuilder implements BytesStream, Releasable {
      * to call {@link #close()} when the builder is done with.
      */
     public XContentBuilder(XContent xContent, OutputStream bos) throws IOException {
+        this(xContent, bos, null);
+    }
+
+    /**
+     * Constructs a new builder using the provided xcontent, an OutputStream and some filters. The
+     * filters are used to filter fields that won't be written to the OutputStream. Make sure
+     * to call {@link #close()} when the builder is done with.
+     */
+    public XContentBuilder(XContent xContent, OutputStream bos, String[] filters) throws IOException {
         this.bos = bos;
-        this.generator = xContent.createGenerator(bos);
+        this.generator = xContent.createGenerator(bos, filters);
     }
 
     public XContentBuilder fieldCaseConversion(FieldCaseConversion fieldCaseConversion) {
diff --git a/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java b/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java
index 06f8605ec24..5210a82527e 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContent.java
@@ -20,11 +20,15 @@
 package org.elasticsearch.common.xcontent.cbor;
 
 import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.FastStringReader;
+import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.common.xcontent.*;
+import org.elasticsearch.common.xcontent.json.BaseJsonGenerator;
+import org.elasticsearch.common.xcontent.support.filtering.FilteringJsonGenerator;
 
 import java.io.*;
 
@@ -59,14 +63,27 @@ public class CborXContent implements XContent {
         throw new ElasticsearchParseException("cbor does not support stream parsing...");
     }
 
+    private XContentGenerator newXContentGenerator(JsonGenerator jsonGenerator) {
+        return new CborXContentGenerator(new BaseJsonGenerator(jsonGenerator));
+    }
+
     @Override
     public XContentGenerator createGenerator(OutputStream os) throws IOException {
-        return new CborXContentGenerator(cborFactory.createGenerator(os, JsonEncoding.UTF8));
+        return newXContentGenerator(cborFactory.createGenerator(os, JsonEncoding.UTF8));
+    }
+
+    @Override
+    public XContentGenerator createGenerator(OutputStream os, String[] filters) throws IOException {
+        if (CollectionUtils.isEmpty(filters)) {
+            return createGenerator(os);
+        }
+        FilteringJsonGenerator cborGenerator = new FilteringJsonGenerator(cborFactory.createGenerator(os, JsonEncoding.UTF8), filters);
+        return new CborXContentGenerator(cborGenerator);
     }
 
     @Override
     public XContentGenerator createGenerator(Writer writer) throws IOException {
-        return new CborXContentGenerator(cborFactory.createGenerator(writer));
+        return newXContentGenerator(cborFactory.createGenerator(writer));
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java b/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java
index c410d777b0d..70b92b0708c 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/cbor/CborXContentGenerator.java
@@ -19,10 +19,10 @@
 
 package org.elasticsearch.common.xcontent.cbor;
 
-import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.dataformat.cbor.CBORParser;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.common.xcontent.json.BaseJsonGenerator;
 import org.elasticsearch.common.xcontent.json.JsonXContentGenerator;
 
 import java.io.IOException;
@@ -34,7 +34,7 @@ import java.io.OutputStream;
  */
 public class CborXContentGenerator extends JsonXContentGenerator {
 
-    public CborXContentGenerator(JsonGenerator generator) {
+    public CborXContentGenerator(BaseJsonGenerator generator) {
         super(generator);
     }
 
diff --git a/src/main/java/org/elasticsearch/common/xcontent/json/BaseJsonGenerator.java b/src/main/java/org/elasticsearch/common/xcontent/json/BaseJsonGenerator.java
new file mode 100644
index 00000000000..0b485508c32
--- /dev/null
+++ b/src/main/java/org/elasticsearch/common/xcontent/json/BaseJsonGenerator.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.common.xcontent.json;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.base.GeneratorBase;
+import com.fasterxml.jackson.core.util.JsonGeneratorDelegate;
+import org.elasticsearch.common.bytes.BytesReference;
+import org.elasticsearch.common.io.Streams;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class BaseJsonGenerator extends JsonGeneratorDelegate {
+
+    protected final GeneratorBase base;
+
+    public BaseJsonGenerator(JsonGenerator generator, JsonGenerator base) {
+        super(generator, true);
+        if (base instanceof GeneratorBase) {
+            this.base = (GeneratorBase) base;
+        } else {
+            this.base = null;
+        }
+    }
+
+    public BaseJsonGenerator(JsonGenerator generator) {
+        this(generator, generator);
+    }
+
+    protected void writeStartRaw(String fieldName) throws IOException {
+        writeFieldName(fieldName);
+        writeRaw(':');
+    }
+
+    public void writeEndRaw() {
+        assert base != null : "JsonGenerator should be of instance GeneratorBase but was: " + delegate.getClass();
+        if (base != null) {
+            base.getOutputContext().writeValue();
+        }
+    }
+
+    protected void writeRawValue(byte[] content, OutputStream bos) throws IOException {
+        flush();
+        bos.write(content);
+    }
+
+    protected void writeRawValue(byte[] content, int offset, int length, OutputStream bos) throws IOException {
+        flush();
+        bos.write(content, offset, length);
+    }
+
+    protected void writeRawValue(InputStream content, OutputStream bos) throws IOException {
+        flush();
+        Streams.copy(content, bos);
+    }
+
+    protected void writeRawValue(BytesReference content, OutputStream bos) throws IOException {
+        flush();
+        content.writeTo(bos);
+    }
+}
diff --git a/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java b/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java
index 5b8fd1b0e59..47da7934939 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContent.java
@@ -25,7 +25,9 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.FastStringReader;
+import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.common.xcontent.*;
+import org.elasticsearch.common.xcontent.support.filtering.FilteringJsonGenerator;
 
 import java.io.*;
 
@@ -63,14 +65,27 @@ public class JsonXContent implements XContent {
         return '\n';
     }
 
+    private XContentGenerator newXContentGenerator(JsonGenerator jsonGenerator) {
+        return new JsonXContentGenerator(new BaseJsonGenerator(jsonGenerator));
+    }
+
     @Override
     public XContentGenerator createGenerator(OutputStream os) throws IOException {
-        return new JsonXContentGenerator(jsonFactory.createGenerator(os, JsonEncoding.UTF8));
+        return newXContentGenerator(jsonFactory.createGenerator(os, JsonEncoding.UTF8));
+    }
+
+    @Override
+    public XContentGenerator createGenerator(OutputStream os, String[] filters) throws IOException {
+        if (CollectionUtils.isEmpty(filters)) {
+            return createGenerator(os);
+        }
+        FilteringJsonGenerator jsonGenerator = new FilteringJsonGenerator(jsonFactory.createGenerator(os, JsonEncoding.UTF8), filters);
+        return new JsonXContentGenerator(jsonGenerator);
     }
 
     @Override
     public XContentGenerator createGenerator(Writer writer) throws IOException {
-        return new JsonXContentGenerator(jsonFactory.createGenerator(writer));
+        return newXContentGenerator(jsonFactory.createGenerator(writer));
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java b/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java
index 71b41919b55..a7946218e21 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java
@@ -19,11 +19,8 @@
 
 package org.elasticsearch.common.xcontent.json;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.base.GeneratorBase;
 import com.fasterxml.jackson.core.io.SerializedString;
 import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.common.io.Streams;
 import org.elasticsearch.common.xcontent.*;
 
 import java.io.IOException;
@@ -35,18 +32,11 @@ import java.io.OutputStream;
  */
 public class JsonXContentGenerator implements XContentGenerator {
 
-    protected final JsonGenerator generator;
+    protected final BaseJsonGenerator generator;
     private boolean writeLineFeedAtEnd;
-    private final GeneratorBase base;
 
-    public JsonXContentGenerator(JsonGenerator generator) {
+    public JsonXContentGenerator(BaseJsonGenerator generator) {
         this.generator = generator;
-        if (generator instanceof GeneratorBase) {
-            base = (GeneratorBase) generator;
-        } else {
-            base = null;
-        }
-
     }
 
     @Override
@@ -261,29 +251,23 @@ public class JsonXContentGenerator implements XContentGenerator {
 
     @Override
     public void writeRawField(String fieldName, byte[] content, OutputStream bos) throws IOException {
-        generator.writeFieldName(fieldName);
-        generator.writeRaw(':');
-        flush();
-        bos.write(content);
-        finishWriteRaw();
+        generator.writeStartRaw(fieldName);
+        generator.writeRawValue(content, bos);
+        generator.writeEndRaw();
     }
 
     @Override
     public void writeRawField(String fieldName, byte[] content, int offset, int length, OutputStream bos) throws IOException {
-        generator.writeFieldName(fieldName);
-        generator.writeRaw(':');
-        flush();
-        bos.write(content, offset, length);
-        finishWriteRaw();
+        generator.writeStartRaw(fieldName);
+        generator.writeRawValue(content, offset, length, bos);
+        generator.writeEndRaw();
     }
 
     @Override
     public void writeRawField(String fieldName, InputStream content, OutputStream bos) throws IOException {
-        generator.writeFieldName(fieldName);
-        generator.writeRaw(':');
-        flush();
-        Streams.copy(content, bos);
-        finishWriteRaw();
+        generator.writeStartRaw(fieldName);
+        generator.writeRawValue(content, bos);
+        generator.writeEndRaw();
     }
 
     @Override
@@ -308,18 +292,9 @@ public class JsonXContentGenerator implements XContentGenerator {
     }
 
     protected void writeObjectRaw(String fieldName, BytesReference content, OutputStream bos) throws IOException {
-        generator.writeFieldName(fieldName);
-        generator.writeRaw(':');
-        flush();
-        content.writeTo(bos);
-        finishWriteRaw();
-    }
-
-    private void finishWriteRaw() {
-        assert base != null : "JsonGenerator should be of instance GeneratorBase but was: " + generator.getClass();
-        if (base != null) {
-            base.getOutputContext().writeValue();
-        }
+        generator.writeStartRaw(fieldName);
+        generator.writeRawValue(content, bos);
+        generator.writeEndRaw();
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java b/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java
index 50fd0442905..8a21ce1d93a 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContent.java
@@ -20,13 +20,15 @@
 package org.elasticsearch.common.xcontent.smile;
 
 import com.fasterxml.jackson.core.JsonEncoding;
-import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.FastStringReader;
+import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.common.xcontent.*;
-import org.elasticsearch.common.xcontent.json.JsonXContentParser;
+import org.elasticsearch.common.xcontent.json.BaseJsonGenerator;
+import org.elasticsearch.common.xcontent.support.filtering.FilteringJsonGenerator;
 
 import java.io.*;
 
@@ -62,14 +64,27 @@ public class SmileXContent implements XContent {
         return (byte) 0xFF;
     }
 
+    private XContentGenerator newXContentGenerator(JsonGenerator jsonGenerator) {
+        return new SmileXContentGenerator(new BaseJsonGenerator(jsonGenerator));
+    }
+
     @Override
     public XContentGenerator createGenerator(OutputStream os) throws IOException {
-        return new SmileXContentGenerator(smileFactory.createGenerator(os, JsonEncoding.UTF8));
+        return newXContentGenerator(smileFactory.createGenerator(os, JsonEncoding.UTF8));
+    }
+
+    @Override
+    public XContentGenerator createGenerator(OutputStream os, String[] filters) throws IOException {
+        if (CollectionUtils.isEmpty(filters)) {
+            return createGenerator(os);
+        }
+        FilteringJsonGenerator smileGenerator = new FilteringJsonGenerator(smileFactory.createGenerator(os, JsonEncoding.UTF8), filters);
+        return new SmileXContentGenerator(smileGenerator);
     }
 
     @Override
     public XContentGenerator createGenerator(Writer writer) throws IOException {
-        return new SmileXContentGenerator(smileFactory.createGenerator(writer));
+        return newXContentGenerator(smileFactory.createGenerator(writer));
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java b/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java
index fb0b7d5e4b8..b8c1b3dad65 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/smile/SmileXContentGenerator.java
@@ -19,10 +19,10 @@
 
 package org.elasticsearch.common.xcontent.smile;
 
-import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.dataformat.smile.SmileParser;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.common.xcontent.json.BaseJsonGenerator;
 import org.elasticsearch.common.xcontent.json.JsonXContentGenerator;
 
 import java.io.IOException;
@@ -34,7 +34,7 @@ import java.io.OutputStream;
  */
 public class SmileXContentGenerator extends JsonXContentGenerator {
 
-    public SmileXContentGenerator(JsonGenerator generator) {
+    public SmileXContentGenerator(BaseJsonGenerator generator) {
         super(generator);
     }
 
diff --git a/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterContext.java b/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterContext.java
new file mode 100644
index 00000000000..215af370b31
--- /dev/null
+++ b/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterContext.java
@@ -0,0 +1,225 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.common.xcontent.support.filtering;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import org.elasticsearch.common.regex.Regex;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A FilterContext contains the description of a field about to be written by a JsonGenerator.
+ */
+public class FilterContext {
+
+    /**
+     * The field/property name to be write
+     */
+    private String property;
+
+    /**
+     * List of XContentFilter matched by the current filtering context
+     */
+    private List<String[]> matchings;
+
+    /**
+     * Flag to indicate if the field/property must be written
+     */
+    private Boolean write = null;
+
+    /**
+     * Flag to indicate if the field/property match a filter
+     */
+    private boolean match = false;
+
+    /**
+     * Points to the parent context
+     */
+    private FilterContext parent;
+
+    /**
+     * Type of the field/property
+     */
+    private Type type = Type.VALUE;
+
+    protected enum Type {
+        VALUE,
+        OBJECT,
+        ARRAY,
+        ARRAY_OF_OBJECT
+    }
+
+    public FilterContext(String property, FilterContext parent) {
+        this.property = property;
+        this.parent = parent;
+    }
+
+    public void reset(String property) {
+        this.property = property;
+        this.write = null;
+        if (matchings != null) {
+            matchings.clear();
+        }
+        this.match = false;
+        this.type = Type.VALUE;
+    }
+
+    public void reset(String property, FilterContext parent) {
+        reset(property);
+        this.parent = parent;
+        if (parent.isMatch()) {
+            match = true;
+        }
+    }
+
+    public FilterContext parent() {
+        return parent;
+    }
+
+    public List<String[]> matchings() {
+        return matchings;
+    }
+
+    public void addMatching(String[] matching) {
+        if (matchings == null) {
+            matchings = new ArrayList<>();
+        }
+        matchings.add(matching);
+    }
+
+    public boolean isRoot() {
+        return parent == null;
+    }
+
+    public boolean isArray() {
+        return Type.ARRAY.equals(type);
+    }
+
+    public void initArray() {
+        this.type = Type.ARRAY;
+    }
+
+    public boolean isObject() {
+        return Type.OBJECT.equals(type);
+    }
+
+    public void initObject() {
+        this.type = Type.OBJECT;
+    }
+
+    public boolean isArrayOfObject() {
+        return Type.ARRAY_OF_OBJECT.equals(type);
+    }
+
+    public void initArrayOfObject() {
+        this.type = Type.ARRAY_OF_OBJECT;
+    }
+
+    public boolean isMatch() {
+        return match;
+    }
+
+    /**
+     * This method contains the logic to check if a field/property must be included
+     * or not.
+     */
+    public boolean include() {
+        if (write == null) {
+            if (parent != null) {
+                // the parent context matches the end of a filter list:
+                // by default we include all the sub properties so we
+                // don't need to check if the sub properties also match
+                if (parent.isMatch()) {
+                    write = true;
+                    match = true;
+                    return write;
+                }
+
+                if (parent.matchings() != null) {
+
+                    // Iterates over the filters matched by the parent context
+                    // and checks if the current context also match
+                    for (String[] matcher : parent.matchings()) {
+                        if (matcher.length > 0) {
+                            String field = matcher[0];
+
+                            if ("**".equals(field)) {
+                                addMatching(matcher);
+                            }
+
+                            if ((field != null) && (Regex.simpleMatch(field, property))) {
+                                int remaining = matcher.length - 1;
+
+                                // the current context matches the end of a filter list:
+                                // it must be written and it is flagged as a direct match
+                                if (remaining == 0) {
+                                    write = true;
+                                    match = true;
+                                    return write;
+                                } else {
+                                    String[] submatching = new String[remaining];
+                                    System.arraycopy(matcher, 1, submatching, 0, remaining);
+                                    addMatching(submatching);
+                                }
+                            }
+                        }
+                    }
+                }
+            } else {
+                // Root object is always written
+                write = true;
+            }
+
+            if (write == null) {
+                write = false;
+            }
+        }
+        return write;
+    }
+
+    /**
+     * Ensure that the full path to the current field is write by the JsonGenerator
+     *
+     * @param generator
+     * @throws IOException
+     */
+    public void writePath(JsonGenerator generator) throws IOException {
+        if (parent != null) {
+            parent.writePath(generator);
+        }
+
+        if ((write == null) || (!write)) {
+            write = true;
+
+            if (property == null) {
+                generator.writeStartObject();
+            } else {
+                generator.writeFieldName(property);
+                if (isArray()) {
+                    generator.writeStartArray();
+                } else if (isObject() || isArrayOfObject()) {
+                    generator.writeStartObject();
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilteringJsonGenerator.java b/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilteringJsonGenerator.java
new file mode 100644
index 00000000000..2748b4b5097
--- /dev/null
+++ b/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilteringJsonGenerator.java
@@ -0,0 +1,423 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.common.xcontent.support.filtering;
+
+import com.fasterxml.jackson.core.Base64Variant;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.SerializableString;
+import com.google.common.collect.ImmutableList;
+import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.bytes.BytesReference;
+import org.elasticsearch.common.xcontent.json.BaseJsonGenerator;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayDeque;
+import java.util.List;
+import java.util.Queue;
+
+/**
+ * A FilteringJsonGenerator uses antpath-like filters to include/exclude fields when writing XContent streams.
+ *
+ * When writing a XContent stream, this class instantiates (or reuses) a FilterContext instance for each
+ * field (or property) that must be generated. This filter context is used to check if the field/property must be
+ * written according to the current list of XContentFilter filters.
+ */
+public class FilteringJsonGenerator extends BaseJsonGenerator {
+
+    /**
+     * List of previous contexts
+     * (MAX_CONTEXTS contexts are kept around in order to be reused)
+     */
+    private Queue<FilterContext> contexts = new ArrayDeque<>();
+    private static final int MAX_CONTEXTS = 10;
+
+    /**
+     * Current filter context
+     */
+    private FilterContext context;
+
+    public FilteringJsonGenerator(JsonGenerator generator, String[] filters) {
+        super(generator);
+
+        ImmutableList.Builder<String[]> builder = ImmutableList.builder();
+        if (filters != null) {
+            for (String filter : filters) {
+                String[] matcher = Strings.delimitedListToStringArray(filter, ".");
+                if (matcher != null) {
+                    builder.add(matcher);
+                }
+            }
+        }
+
+        // Creates a root context that matches all filtering rules
+        this.context = get(null, null, builder.build());
+    }
+
+    /**
+     * Get a new context instance (and reset it if needed)
+     */
+    private FilterContext get(String property, FilterContext parent) {
+        FilterContext ctx = contexts.poll();
+        if (ctx == null) {
+            ctx = new FilterContext(property, parent);
+        } else {
+            ctx.reset(property, parent);
+        }
+        return ctx;
+    }
+
+    /**
+     * Get a new context instance (and reset it if needed)
+     */
+    private FilterContext get(String property, FilterContext context, List<String[]> matchings) {
+        FilterContext ctx = get(property, context);
+        if (matchings != null) {
+            for (String[] matching : matchings) {
+                ctx.addMatching(matching);
+            }
+        }
+        return ctx;
+    }
+
+    /**
+     * Adds a context instance to the pool in order to reuse it if needed
+     */
+    private void put(FilterContext ctx) {
+        if (contexts.size() <= MAX_CONTEXTS) {
+            contexts.offer(ctx);
+        }
+    }
+
+    @Override
+    public void writeStartArray() throws IOException {
+        context.initArray();
+        if (context.include()) {
+            super.writeStartArray();
+        }
+    }
+
+    @Override
+    public void writeStartArray(int size) throws IOException {
+        context.initArray();
+        if (context.include()) {
+            super.writeStartArray(size);
+        }
+    }
+
+    @Override
+    public void writeEndArray() throws IOException {
+        // Case of array of objects
+        if (context.isArrayOfObject()) {
+            // Release current context and go one level up
+            FilterContext parent = context.parent();
+            put(context);
+            context = parent;
+        }
+
+        if (context.include()) {
+            super.writeEndArray();
+        }
+    }
+
+    @Override
+    public void writeStartObject() throws IOException {
+        // Case of array of objects
+        if (context.isArray()) {
+            // Get a context for the anonymous object
+            context = get(null, context, context.matchings());
+            context.initArrayOfObject();
+        }
+
+        if (!context.isArrayOfObject()) {
+            context.initObject();
+        }
+
+        if (context.include()) {
+            super.writeStartObject();
+        }
+
+        context = get(null, context);
+    }
+
+    @Override
+    public void writeEndObject() throws IOException {
+        if (!context.isRoot()) {
+            // Release current context and go one level up
+            FilterContext parent = context.parent();
+            put(context);
+            context = parent;
+        }
+
+        if (context.include()) {
+            super.writeEndObject();
+        }
+    }
+
+    @Override
+    public void writeFieldName(String name) throws IOException {
+        context.reset(name);
+
+        if (context.include()) {
+            // Ensure that the full path to the field is written
+            context.writePath(delegate);
+            super.writeFieldName(name);
+        }
+    }
+
+    @Override
+    public void writeFieldName(SerializableString name) throws IOException {
+        context.reset(name.getValue());
+
+        if (context.include()) {
+            // Ensure that the full path to the field is written
+            context.writePath(delegate);
+            super.writeFieldName(name);
+        }
+    }
+
+    @Override
+    public void writeString(String text) throws IOException {
+        if (context.include()) {
+            super.writeString(text);
+        }
+    }
+
+    @Override
+    public void writeString(char[] text, int offset, int len) throws IOException {
+        if (context.include()) {
+            super.writeString(text, offset, len);
+        }
+    }
+
+    @Override
+    public void writeString(SerializableString text) throws IOException {
+        if (context.include()) {
+            super.writeString(text);
+        }
+    }
+
+    @Override
+    public void writeRawUTF8String(byte[] text, int offset, int length) throws IOException {
+        if (context.include()) {
+            super.writeRawUTF8String(text, offset, length);
+        }
+    }
+
+    @Override
+    public void writeUTF8String(byte[] text, int offset, int length) throws IOException {
+        if (context.include()) {
+            super.writeUTF8String(text, offset, length);
+        }
+    }
+
+    @Override
+    public void writeRaw(String text) throws IOException {
+        if (context.include()) {
+            super.writeRaw(text);
+        }
+    }
+
+    @Override
+    public void writeRaw(String text, int offset, int len) throws IOException {
+        if (context.include()) {
+            super.writeRaw(text, offset, len);
+        }
+    }
+
+    @Override
+    public void writeRaw(SerializableString raw) throws IOException {
+        if (context.include()) {
+            super.writeRaw(raw);
+        }
+    }
+
+    @Override
+    public void writeRaw(char[] text, int offset, int len) throws IOException {
+        if (context.include()) {
+            super.writeRaw(text, offset, len);
+        }
+    }
+
+    @Override
+    public void writeRaw(char c) throws IOException {
+        if (context.include()) {
+            super.writeRaw(c);
+        }
+    }
+
+    @Override
+    public void writeRawValue(String text) throws IOException {
+        if (context.include()) {
+            super.writeRawValue(text);
+        }
+    }
+
+    @Override
+    public void writeRawValue(String text, int offset, int len) throws IOException {
+        if (context.include()) {
+            super.writeRawValue(text, offset, len);
+        }
+    }
+
+    @Override
+    public void writeRawValue(char[] text, int offset, int len) throws IOException {
+        if (context.include()) {
+            super.writeRawValue(text, offset, len);
+        }
+    }
+
+    @Override
+    public void writeBinary(Base64Variant b64variant, byte[] data, int offset, int len) throws IOException {
+        if (context.include()) {
+            super.writeBinary(b64variant, data, offset, len);
+        }
+    }
+
+    @Override
+    public int writeBinary(Base64Variant b64variant, InputStream data, int dataLength) throws IOException {
+        if (context.include()) {
+            return super.writeBinary(b64variant, data, dataLength);
+        }
+        return 0;
+    }
+
+    @Override
+    public void writeNumber(short v) throws IOException {
+        if (context.include()) {
+            super.writeNumber(v);
+        }
+    }
+
+    @Override
+    public void writeNumber(int v) throws IOException {
+        if (context.include()) {
+            super.writeNumber(v);
+        }
+    }
+
+    @Override
+    public void writeNumber(long v) throws IOException {
+        if (context.include()) {
+            super.writeNumber(v);
+        }
+    }
+
+    @Override
+    public void writeNumber(BigInteger v) throws IOException {
+        if (context.include()) {
+            super.writeNumber(v);
+        }
+    }
+
+    @Override
+    public void writeNumber(double v) throws IOException {
+        if (context.include()) {
+            super.writeNumber(v);
+        }
+    }
+
+    @Override
+    public void writeNumber(float v) throws IOException {
+        if (context.include()) {
+            super.writeNumber(v);
+        }
+    }
+
+    @Override
+    public void writeNumber(BigDecimal v) throws IOException {
+        if (context.include()) {
+            super.writeNumber(v);
+        }
+    }
+
+    @Override
+    public void writeNumber(String encodedValue) throws IOException, UnsupportedOperationException {
+        if (context.include()) {
+            super.writeNumber(encodedValue);
+        }
+    }
+
+    @Override
+    public void writeBoolean(boolean state) throws IOException {
+        if (context.include()) {
+            super.writeBoolean(state);
+        }
+    }
+
+    @Override
+    public void writeNull() throws IOException {
+        if (context.include()) {
+            super.writeNull();
+        }
+    }
+
+    @Override
+    public void copyCurrentEvent(JsonParser jp) throws IOException {
+        if (context.include()) {
+            super.copyCurrentEvent(jp);
+        }
+    }
+
+    @Override
+    public void copyCurrentStructure(JsonParser jp) throws IOException {
+        if (context.include()) {
+            super.copyCurrentStructure(jp);
+        }
+    }
+
+    @Override
+    protected void writeRawValue(byte[] content, OutputStream bos) throws IOException {
+        if (context.include()) {
+            super.writeRawValue(content, bos);
+        }
+    }
+
+    @Override
+    protected void writeRawValue(byte[] content, int offset, int length, OutputStream bos) throws IOException {
+        if (context.include()) {
+            super.writeRawValue(content, offset, length, bos);
+        }
+    }
+
+    @Override
+    protected void writeRawValue(InputStream content, OutputStream bos) throws IOException {
+        if (context.include()) {
+            super.writeRawValue(content, bos);
+        }
+    }
+
+    @Override
+    protected void writeRawValue(BytesReference content, OutputStream bos) throws IOException {
+        if (context.include()) {
+            super.writeRawValue(content, bos);
+        }
+    }
+
+    @Override
+    public void close() throws IOException {
+        contexts.clear();
+        super.close();
+    }
+}
diff --git a/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java b/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java
index e7111849f7e..388cd992e2b 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContent.java
@@ -20,11 +20,15 @@
 package org.elasticsearch.common.xcontent.yaml;
 
 import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.FastStringReader;
+import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.common.xcontent.*;
+import org.elasticsearch.common.xcontent.json.BaseJsonGenerator;
+import org.elasticsearch.common.xcontent.support.filtering.FilteringJsonGenerator;
 
 import java.io.*;
 
@@ -58,14 +62,27 @@ public class YamlXContent implements XContent {
         throw new ElasticsearchParseException("yaml does not support stream parsing...");
     }
 
+    private XContentGenerator newXContentGenerator(JsonGenerator jsonGenerator) {
+        return new YamlXContentGenerator(new BaseJsonGenerator(jsonGenerator));
+    }
+
     @Override
     public XContentGenerator createGenerator(OutputStream os) throws IOException {
-        return new YamlXContentGenerator(yamlFactory.createGenerator(os, JsonEncoding.UTF8));
+        return newXContentGenerator(yamlFactory.createGenerator(os, JsonEncoding.UTF8));
+    }
+
+    @Override
+    public XContentGenerator createGenerator(OutputStream os, String[] filters) throws IOException {
+        if (CollectionUtils.isEmpty(filters)) {
+            return createGenerator(os);
+        }
+        FilteringJsonGenerator yamlGenerator = new FilteringJsonGenerator(yamlFactory.createGenerator(os, JsonEncoding.UTF8), filters);
+        return new YamlXContentGenerator(yamlGenerator);
     }
 
     @Override
     public XContentGenerator createGenerator(Writer writer) throws IOException {
-        return new YamlXContentGenerator(yamlFactory.createGenerator(writer));
+        return newXContentGenerator(yamlFactory.createGenerator(writer));
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java b/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java
index 350554ac6f1..62967247a82 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/yaml/YamlXContentGenerator.java
@@ -19,10 +19,10 @@
 
 package org.elasticsearch.common.xcontent.yaml;
 
-import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.dataformat.yaml.YAMLParser;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.common.xcontent.json.BaseJsonGenerator;
 import org.elasticsearch.common.xcontent.json.JsonXContentGenerator;
 
 import java.io.IOException;
@@ -34,7 +34,7 @@ import java.io.OutputStream;
  */
 public class YamlXContentGenerator extends JsonXContentGenerator {
 
-    public YamlXContentGenerator(JsonGenerator generator) {
+    public YamlXContentGenerator(BaseJsonGenerator generator) {
         super(generator);
     }
 
diff --git a/src/main/java/org/elasticsearch/rest/BytesRestResponse.java b/src/main/java/org/elasticsearch/rest/BytesRestResponse.java
index 693188307e3..02820158a6e 100644
--- a/src/main/java/org/elasticsearch/rest/BytesRestResponse.java
+++ b/src/main/java/org/elasticsearch/rest/BytesRestResponse.java
@@ -115,7 +115,7 @@ public class BytesRestResponse extends RestResponse {
     }
 
     private static XContentBuilder convert(RestChannel channel, RestStatus status, Throwable t) throws IOException {
-        XContentBuilder builder = channel.newBuilder().startObject();
+        XContentBuilder builder = channel.newErrorBuilder().startObject();
         if (t == null) {
             builder.field("error", "unknown");
         } else if (channel.detailedErrorsEnabled()) {
diff --git a/src/main/java/org/elasticsearch/rest/RestChannel.java b/src/main/java/org/elasticsearch/rest/RestChannel.java
index 773d939493f..cd185b07958 100644
--- a/src/main/java/org/elasticsearch/rest/RestChannel.java
+++ b/src/main/java/org/elasticsearch/rest/RestChannel.java
@@ -44,10 +44,15 @@ public abstract class RestChannel {
     }
 
     public XContentBuilder newBuilder() throws IOException {
-        return newBuilder(request.hasContent() ? request.content() : null);
+        return newBuilder(request.hasContent() ? request.content() : null, request.hasParam("filter_path"));
     }
 
-    public XContentBuilder newBuilder(@Nullable BytesReference autoDetectSource) throws IOException {
+    public XContentBuilder newErrorBuilder() throws IOException {
+        // Disable filtering when building error responses
+        return newBuilder(request.hasContent() ? request.content() : null, false);
+    }
+
+    public XContentBuilder newBuilder(@Nullable BytesReference autoDetectSource, boolean useFiltering) throws IOException {
         XContentType contentType = XContentType.fromRestContentType(request.param("format", request.header("Content-Type")));
         if (contentType == null) {
             // try and guess it from the auto detect source
@@ -59,7 +64,9 @@ public abstract class RestChannel {
             // default to JSON
             contentType = XContentType.JSON;
         }
-        XContentBuilder builder = new XContentBuilder(XContentFactory.xContent(contentType), bytesOutput());
+
+        String[] filters = useFiltering ? request.paramAsStringArrayOrEmptyIfAll("filter_path") :  null;
+        XContentBuilder builder = new XContentBuilder(XContentFactory.xContent(contentType), bytesOutput(), filters);
         if (request.paramAsBoolean("pretty", false)) {
             builder.prettyPrint().lfAtEnd();
         }
diff --git a/src/main/java/org/elasticsearch/rest/RestController.java b/src/main/java/org/elasticsearch/rest/RestController.java
index f2e36d2b22c..3e3360337de 100644
--- a/src/main/java/org/elasticsearch/rest/RestController.java
+++ b/src/main/java/org/elasticsearch/rest/RestController.java
@@ -187,7 +187,7 @@ public class RestController extends AbstractLifecycleComponent<RestController> {
         // error_trace cannot be used when we disable detailed errors
         if (channel.detailedErrorsEnabled() == false && request.paramAsBoolean("error_trace", false)) {
             try {
-                XContentBuilder builder = channel.newBuilder();
+                XContentBuilder builder = channel.newErrorBuilder();
                 builder.startObject().field("error","error traces in responses are disabled.").endObject().string();
                 RestResponse response = new BytesRestResponse(BAD_REQUEST, builder);
                 response.addHeader("Content-Type", "application/json");
diff --git a/src/main/java/org/elasticsearch/rest/action/get/RestGetSourceAction.java b/src/main/java/org/elasticsearch/rest/action/get/RestGetSourceAction.java
index db3954ec5e8..1fe07156d99 100644
--- a/src/main/java/org/elasticsearch/rest/action/get/RestGetSourceAction.java
+++ b/src/main/java/org/elasticsearch/rest/action/get/RestGetSourceAction.java
@@ -73,7 +73,7 @@ public class RestGetSourceAction extends BaseRestHandler {
         client.get(getRequest, new RestResponseListener<GetResponse>(channel) {
             @Override
             public RestResponse buildResponse(GetResponse response) throws Exception {
-                XContentBuilder builder = channel.newBuilder(response.getSourceInternal());
+                XContentBuilder builder = channel.newBuilder(response.getSourceInternal(), false);
                 if (!response.isExists()) {
                     return new BytesRestResponse(NOT_FOUND, builder);
                 } else {
diff --git a/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java b/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java
index a0d5b279e71..3d3ecdfa880 100644
--- a/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java
+++ b/src/main/java/org/elasticsearch/rest/action/index/RestIndexAction.java
@@ -88,7 +88,7 @@ public class RestIndexAction extends BaseRestHandler {
                 indexRequest.opType(IndexRequest.OpType.fromString(sOpType));
             } catch (IllegalArgumentException eia){
                 try {
-                    XContentBuilder builder = channel.newBuilder();
+                    XContentBuilder builder = channel.newErrorBuilder();
                     channel.sendResponse(new BytesRestResponse(BAD_REQUEST, builder.startObject().field("error", eia.getMessage()).endObject()));
                 } catch (IOException e1) {
                     logger.warn("Failed to send response", e1);
diff --git a/src/main/java/org/elasticsearch/rest/action/script/RestPutIndexedScriptAction.java b/src/main/java/org/elasticsearch/rest/action/script/RestPutIndexedScriptAction.java
index 35e3f2cc473..33145be6a47 100644
--- a/src/main/java/org/elasticsearch/rest/action/script/RestPutIndexedScriptAction.java
+++ b/src/main/java/org/elasticsearch/rest/action/script/RestPutIndexedScriptAction.java
@@ -85,7 +85,7 @@ public class RestPutIndexedScriptAction extends BaseRestHandler {
                 putRequest.opType(IndexRequest.OpType.fromString(sOpType));
             } catch (IllegalArgumentException eia){
                 try {
-                    XContentBuilder builder = channel.newBuilder();
+                    XContentBuilder builder = channel.newErrorBuilder();
                     channel.sendResponse(new BytesRestResponse(BAD_REQUEST, builder.startObject().field("error", eia.getMessage()).endObject()));
                     return;
                 } catch (IOException e1) {
diff --git a/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractFilteringJsonGeneratorTests.java b/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractFilteringJsonGeneratorTests.java
new file mode 100644
index 00000000000..d07bf442887
--- /dev/null
+++ b/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractFilteringJsonGeneratorTests.java
@@ -0,0 +1,524 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.common.xcontent.support.filtering;
+
+import org.elasticsearch.common.bytes.BytesReference;
+import org.elasticsearch.common.xcontent.*;
+import org.elasticsearch.test.ElasticsearchTestCase;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.nullValue;
+
+public abstract class AbstractFilteringJsonGeneratorTests extends ElasticsearchTestCase {
+
+    protected abstract XContentType getXContentType();
+
+    protected abstract void assertXContentBuilder(XContentBuilder expected, XContentBuilder builder);
+
+    protected void assertString(XContentBuilder expected, XContentBuilder builder) {
+        assertNotNull(builder);
+        assertNotNull(expected);
+
+        // Verify that the result is equal to the expected string
+        assertThat(builder.bytes().toUtf8(), is(expected.bytes().toUtf8()));
+    }
+
+    protected void assertBinary(XContentBuilder expected, XContentBuilder builder) {
+        assertNotNull(builder);
+        assertNotNull(expected);
+
+        try {
+            XContent xContent = XContentFactory.xContent(builder.contentType());
+            XContentParser jsonParser = xContent.createParser(expected.bytes());
+            XContentParser testParser = xContent.createParser(builder.bytes());
+
+            while (true) {
+                XContentParser.Token token1 = jsonParser.nextToken();
+                XContentParser.Token token2 = testParser.nextToken();
+                if (token1 == null) {
+                    assertThat(token2, nullValue());
+                    return;
+                }
+                assertThat(token1, equalTo(token2));
+                switch (token1) {
+                    case FIELD_NAME:
+                        assertThat(jsonParser.currentName(), equalTo(testParser.currentName()));
+                        break;
+                    case VALUE_STRING:
+                        assertThat(jsonParser.text(), equalTo(testParser.text()));
+                        break;
+                    case VALUE_NUMBER:
+                        assertThat(jsonParser.numberType(), equalTo(testParser.numberType()));
+                        assertThat(jsonParser.numberValue(), equalTo(testParser.numberValue()));
+                        break;
+                }
+            }
+        } catch (Exception e) {
+            fail("Fail to verify the result of the XContentBuilder: " + e.getMessage());
+        }
+    }
+
+    private XContentBuilder newXContentBuilder(String... filters) throws IOException {
+        return XContentBuilder.builder(getXContentType().xContent(), filters);
+    }
+
+    /**
+     * Build a sample using a given XContentBuilder
+     */
+    private XContentBuilder sample(XContentBuilder builder) throws IOException {
+        assertNotNull(builder);
+        builder.startObject()
+                .field("title", "My awesome book")
+                .field("pages", 456)
+                .field("price", 27.99)
+                .field("timestamp", 1428582942867L)
+                .nullField("default")
+                .startArray("tags")
+                    .value("elasticsearch")
+                    .value("java")
+                .endArray()
+                .startArray("authors")
+                    .startObject()
+                        .field("name", "John Doe")
+                        .field("lastname", "John")
+                        .field("firstname", "Doe")
+                    .endObject()
+                    .startObject()
+                        .field("name", "William Smith")
+                        .field("lastname", "William")
+                        .field("firstname", "Smith")
+                    .endObject()
+                .endArray()
+                .startObject("properties")
+                    .field("weight", 0.8d)
+                    .startObject("language")
+                        .startObject("en")
+                            .field("lang", "English")
+                            .field("available", true)
+                            .startArray("distributors")
+                                .startObject()
+                                    .field("name", "The Book Shop")
+                                    .startArray("addresses")
+                                        .startObject()
+                                            .field("name", "address #1")
+                                            .field("street", "Hampton St")
+                                            .field("city", "London")
+                                        .endObject()
+                                        .startObject()
+                                            .field("name", "address #2")
+                                            .field("street", "Queen St")
+                                            .field("city", "Stornoway")
+                                        .endObject()
+                                    .endArray()
+                                .endObject()
+                                .startObject()
+                                    .field("name", "Sussex Books House")
+                                .endObject()
+                            .endArray()
+                        .endObject()
+                        .startObject("fr")
+                            .field("lang", "French")
+                            .field("available", false)
+                            .startArray("distributors")
+                                .startObject()
+                                    .field("name", "La Maison du Livre")
+                                    .startArray("addresses")
+                                        .startObject()
+                                            .field("name", "address #1")
+                                            .field("street", "Rue Mouffetard")
+                                            .field("city", "Paris")
+                                        .endObject()
+                                    .endArray()
+                                .endObject()
+                                .startObject()
+                                    .field("name", "Thetra")
+                                .endObject()
+                            .endArray()
+                        .endObject()
+                    .endObject()
+                .endObject()
+            .endObject();
+        return builder;
+    }
+
+    /**
+     * Instanciates a new XContentBuilder with the given filters and builds a sample with it.
+     */
+    private XContentBuilder sample(String... filters) throws IOException {
+        return sample(newXContentBuilder(filters));
+    }
+
+    @Test
+    public void testNoFiltering() throws Exception {
+        XContentBuilder expected = sample();
+
+        assertXContentBuilder(expected, sample());
+        assertXContentBuilder(expected, sample("*"));
+        assertXContentBuilder(expected, sample("**"));
+    }
+
+    @Test
+    public void testNoMatch() throws Exception {
+        XContentBuilder expected = newXContentBuilder().startObject().endObject();
+
+        assertXContentBuilder(expected, sample("xyz"));
+    }
+
+    @Test
+    public void testSimpleField() throws Exception {
+        XContentBuilder expected = newXContentBuilder().startObject()
+                                                            .field("title", "My awesome book")
+                                                        .endObject();
+
+        assertXContentBuilder(expected, sample("title"));
+    }
+
+    @Test
+    public void testSimpleFieldWithWildcard() throws Exception {
+        XContentBuilder expected = newXContentBuilder().startObject()
+                                                            .field("price", 27.99)
+                                                            .startObject("properties")
+                                                                .field("weight", 0.8d)
+                                                                .startObject("language")
+                                                                    .startObject("en")
+                                                                        .field("lang", "English")
+                                                                        .field("available", true)
+                                                                        .startArray("distributors")
+                                                                            .startObject()
+                                                                                .field("name", "The Book Shop")
+                                                                                .startArray("addresses")
+                                                                                    .startObject()
+                                                                                        .field("name", "address #1")
+                                                                                        .field("street", "Hampton St")
+                                                                                        .field("city", "London")
+                                                                                    .endObject()
+                                                                                    .startObject()
+                                                                                        .field("name", "address #2")
+                                                                                        .field("street", "Queen St")
+                                                                                        .field("city", "Stornoway")
+                                                                                    .endObject()
+                                                                                .endArray()
+                                                                            .endObject()
+                                                                            .startObject()
+                                                                                .field("name", "Sussex Books House")
+                                                                            .endObject()
+                                                                        .endArray()
+                                                                    .endObject()
+                                                                    .startObject("fr")
+                                                                        .field("lang", "French")
+                                                                        .field("available", false)
+                                                                        .startArray("distributors")
+                                                                            .startObject()
+                                                                                .field("name", "La Maison du Livre")
+                                                                                .startArray("addresses")
+                                                                                    .startObject()
+                                                                                        .field("name", "address #1")
+                                                                                        .field("street", "Rue Mouffetard")
+                                                                                        .field("city", "Paris")
+                                                                                    .endObject()
+                                                                                .endArray()
+                                                                            .endObject()
+                                                                            .startObject()
+                                                                                .field("name", "Thetra")
+                                                                            .endObject()
+                                                                        .endArray()
+                                                                    .endObject()
+                                                                .endObject()
+                                                            .endObject()
+                                                        .endObject();
+
+        assertXContentBuilder(expected, sample("pr*"));
+    }
+
+    @Test
+    public void testMultipleFields() throws Exception {
+        XContentBuilder expected = newXContentBuilder().startObject()
+                                                            .field("title", "My awesome book")
+                                                            .field("pages", 456)
+                                                        .endObject();
+
+        assertXContentBuilder(expected, sample("title", "pages"));
+    }
+
+    @Test
+    public void testSimpleArray() throws Exception {
+        XContentBuilder expected = newXContentBuilder().startObject()
+                                                        .startArray("tags")
+                                                            .value("elasticsearch")
+                                                            .value("java")
+                                                        .endArray()
+                                                    .endObject();
+
+        assertXContentBuilder(expected, sample("tags"));
+    }
+
+    @Test
+    public void testSimpleArrayOfObjects() throws Exception {
+        XContentBuilder expected = newXContentBuilder().startObject()
+                                                        .startArray("authors")
+                                                            .startObject()
+                                                                .field("name", "John Doe")
+                                                                .field("lastname", "John")
+                                                                .field("firstname", "Doe")
+                                                            .endObject()
+                                                            .startObject()
+                                                                .field("name", "William Smith")
+                                                                .field("lastname", "William")
+                                                                .field("firstname", "Smith")
+                                                            .endObject()
+                                                        .endArray()
+                                                    .endObject();
+
+        assertXContentBuilder(expected, sample("authors"));
+        assertXContentBuilder(expected, sample("authors.*"));
+        assertXContentBuilder(expected, sample("authors.*name"));
+    }
+
+    @Test
+    public void testSimpleArrayOfObjectsProperty() throws Exception {
+        XContentBuilder expected = newXContentBuilder().startObject()
+                                                            .startArray("authors")
+                                                                .startObject()
+                                                                    .field("lastname", "John")
+                                                                .endObject()
+                                                                .startObject()
+                                                                    .field("lastname", "William")
+                                                                .endObject()
+                                                            .endArray()
+                                                        .endObject();
+
+        assertXContentBuilder(expected, sample("authors.lastname"));
+        assertXContentBuilder(expected, sample("authors.l*"));
+    }
+
+    @Test
+    public void testRecurseField1() throws Exception {
+        XContentBuilder expected = newXContentBuilder().startObject()
+                                                            .startArray("authors")
+                                                                .startObject()
+                                                                    .field("name", "John Doe")
+                                                                .endObject()
+                                                                .startObject()
+                                                                    .field("name", "William Smith")
+                                                            .   endObject()
+                                                            .endArray()
+                                                            .startObject("properties")
+                                                                .startObject("language")
+                                                                    .startObject("en")
+                                                                        .startArray("distributors")
+                                                                            .startObject()
+                                                                                .field("name", "The Book Shop")
+                                                                                .startArray("addresses")
+                                                                                    .startObject()
+                                                                                        .field("name", "address #1")
+                                                                                    .endObject()
+                                                                                    .startObject()
+                                                                                        .field("name", "address #2")
+                                                                                    .endObject()
+                                                                                .endArray()
+                                                                            .endObject()
+                                                                            .startObject()
+                                                                                .field("name", "Sussex Books House")
+                                                                            .endObject()
+                                                                        .endArray()
+                                                                    .endObject()
+                                                                    .startObject("fr")
+                                                                        .startArray("distributors")
+                                                                            .startObject()
+                                                                                .field("name", "La Maison du Livre")
+                                                                                .startArray("addresses")
+                                                                                    .startObject()
+                                                                                        .field("name", "address #1")
+                                                                                    .endObject()
+                                                                                .endArray()
+                                                                            .endObject()
+                                                                            .startObject()
+                                                                                .field("name", "Thetra")
+                                                                            .endObject()
+                                                                        .endArray()
+                                                                    .endObject()
+                                                                .endObject()
+                                                            .endObject()
+                                                        .endObject();
+
+        assertXContentBuilder(expected, sample("**.name"));
+    }
+
+    @Test
+    public void testRecurseField2() throws Exception {
+        XContentBuilder expected = newXContentBuilder().startObject()
+                                                            .startObject("properties")
+                                                                .startObject("language")
+                                                                    .startObject("en")
+                                                                        .startArray("distributors")
+                                                                            .startObject()
+                                                                                .field("name", "The Book Shop")
+                                                                                .startArray("addresses")
+                                                                                    .startObject()
+                                                                                        .field("name", "address #1")
+                                                                                    .endObject()
+                                                                                    .startObject()
+                                                                                        .field("name", "address #2")
+                                                                                    .endObject()
+                                                                                .endArray()
+                                                                            .endObject()
+                                                                            .startObject()
+                                                                                .field("name", "Sussex Books House")
+                                                                            .endObject()
+                                                                        .endArray()
+                                                                    .endObject()
+                                                                    .startObject("fr")
+                                                                        .startArray("distributors")
+                                                                            .startObject()
+                                                                                .field("name", "La Maison du Livre")
+                                                                                .startArray("addresses")
+                                                                                    .startObject()
+                                                                                        .field("name", "address #1")
+                                                                                    .endObject()
+                                                                                .endArray()
+                                                                            .endObject()
+                                                                            .startObject()
+                                                                                .field("name", "Thetra")
+                                                                            .endObject()
+                                                                        .endArray()
+                                                                    .endObject()
+                                                                .endObject()
+                                                            .endObject()
+                                                        .endObject();
+
+        assertXContentBuilder(expected, sample("properties.**.name"));
+    }
+
+    @Test
+    public void testRecurseField3() throws Exception {
+        XContentBuilder expected = newXContentBuilder().startObject()
+                                                        .startObject("properties")
+                                                            .startObject("language")
+                                                                .startObject("en")
+                                                                    .startArray("distributors")
+                                                                        .startObject()
+                                                                            .field("name", "The Book Shop")
+                                                                            .startArray("addresses")
+                                                                                .startObject()
+                                                                                    .field("name", "address #1")
+                                                                                .endObject()
+                                                                                .startObject()
+                                                                                    .field("name", "address #2")
+                                                                                .endObject()
+                                                                            .endArray()
+                                                                        .endObject()
+                                                                        .startObject()
+                                                                            .field("name", "Sussex Books House")
+                                                                        .endObject()
+                                                                    .endArray()
+                                                                .endObject()
+                                                            .endObject()
+                                                        .endObject()
+                                                    .endObject();
+
+        assertXContentBuilder(expected, sample("properties.*.en.**.name"));
+    }
+
+    @Test
+    public void testRecurseField4() throws Exception {
+        XContentBuilder expected = newXContentBuilder().startObject()
+                                                            .startObject("properties")
+                                                                .startObject("language")
+                                                                    .startObject("en")
+                                                                        .startArray("distributors")
+                                                                            .startObject()
+                                                                                .field("name", "The Book Shop")
+                                                                            .endObject()
+                                                                            .startObject()
+                                                                                .field("name", "Sussex Books House")
+                                                                            .endObject()
+                                                                        .endArray()
+                                                                    .endObject()
+                                                                    .startObject("fr")
+                                                                        .startArray("distributors")
+                                                                            .startObject()
+                                                                                .field("name", "La Maison du Livre")
+                                                                            .endObject()
+                                                                            .startObject()
+                                                                                .field("name", "Thetra")
+                                                                            .endObject()
+                                                                        .endArray()
+                                                                    .endObject()
+                                                                .endObject()
+                                                            .endObject()
+                                                        .endObject();
+
+        assertXContentBuilder(expected, sample("properties.**.distributors.name"));
+    }
+
+    @Test
+    public void testRawField() throws Exception {
+
+        XContentBuilder expectedRawField = newXContentBuilder().startObject().field("foo", 0).startObject("raw").field("content", "hello world!").endObject().endObject();
+        XContentBuilder expectedRawFieldFiltered = newXContentBuilder().startObject().field("foo", 0).endObject();
+        XContentBuilder expectedRawFieldNotFiltered =newXContentBuilder().startObject().startObject("raw").field("content", "hello world!").endObject().endObject();
+
+        BytesReference raw = newXContentBuilder().startObject().field("content", "hello world!").endObject().bytes();
+
+        // Test method: rawField(String fieldName, BytesReference content)
+        assertXContentBuilder(expectedRawField, newXContentBuilder().startObject().field("foo", 0).rawField("raw", raw).endObject());
+        assertXContentBuilder(expectedRawFieldFiltered, newXContentBuilder("f*").startObject().field("foo", 0).rawField("raw", raw).endObject());
+        assertXContentBuilder(expectedRawFieldNotFiltered, newXContentBuilder("r*").startObject().field("foo", 0).rawField("raw", raw).endObject());
+
+        // Test method: rawField(String fieldName, byte[] content)
+        assertXContentBuilder(expectedRawField, newXContentBuilder().startObject().field("foo", 0).rawField("raw", raw.toBytes()).endObject());
+        assertXContentBuilder(expectedRawFieldFiltered, newXContentBuilder("f*").startObject().field("foo", 0).rawField("raw", raw.toBytes()).endObject());
+        assertXContentBuilder(expectedRawFieldNotFiltered, newXContentBuilder("r*").startObject().field("foo", 0).rawField("raw", raw.toBytes()).endObject());
+
+        // Test method: rawField(String fieldName, InputStream content)
+        assertXContentBuilder(expectedRawField, newXContentBuilder().startObject().field("foo", 0).rawField("raw", new ByteArrayInputStream(raw.toBytes())).endObject());
+        assertXContentBuilder(expectedRawFieldFiltered, newXContentBuilder("f*").startObject().field("foo", 0).rawField("raw", new ByteArrayInputStream(raw.toBytes())).endObject());
+        assertXContentBuilder(expectedRawFieldNotFiltered, newXContentBuilder("r*").startObject().field("foo", 0).rawField("raw", new ByteArrayInputStream(raw.toBytes())).endObject());
+    }
+
+    @Test
+    public void testArrays() throws Exception {
+        // Test: Array of values (no filtering)
+        XContentBuilder expected = newXContentBuilder().startObject().startArray("tags").value("lorem").value("ipsum").value("dolor").endArray().endObject();
+        assertXContentBuilder(expected, newXContentBuilder("t*").startObject().startArray("tags").value("lorem").value("ipsum").value("dolor").endArray().endObject());
+        assertXContentBuilder(expected, newXContentBuilder("tags").startObject().startArray("tags").value("lorem").value("ipsum").value("dolor").endArray().endObject());
+
+        // Test: Array of values (with filtering)
+        assertXContentBuilder(newXContentBuilder().startObject().endObject(), newXContentBuilder("foo").startObject().startArray("tags").value("lorem").value("ipsum").value("dolor").endArray().endObject());
+
+        // Test: Array of objects (no filtering)
+        expected = newXContentBuilder().startObject().startArray("tags").startObject().field("lastname", "lorem").endObject().startObject().field("firstname", "ipsum").endObject().endArray().endObject();
+        assertXContentBuilder(expected, newXContentBuilder("t*").startObject().startArray("tags").startObject().field("lastname", "lorem").endObject().startObject().field("firstname", "ipsum").endObject().endArray().endObject());
+        assertXContentBuilder(expected, newXContentBuilder("tags").startObject().startArray("tags").startObject().field("lastname", "lorem").endObject().startObject().field("firstname", "ipsum").endObject().endArray().endObject());
+
+        // Test: Array of objects (with filtering)
+        assertXContentBuilder(newXContentBuilder().startObject().endObject(), newXContentBuilder("foo").startObject().startArray("tags").startObject().field("lastname", "lorem").endObject().startObject().field("firstname", "ipsum").endObject().endArray().endObject());
+
+        // Test: Array of objects (with partial filtering)
+        expected = newXContentBuilder().startObject().startArray("tags").startObject().field("firstname", "ipsum").endObject().endArray().endObject();
+        assertXContentBuilder(expected, newXContentBuilder("t*.firstname").startObject().startArray("tags").startObject().field("lastname", "lorem").endObject().startObject().field("firstname", "ipsum").endObject().endArray().endObject());
+
+    }
+}
diff --git a/src/test/java/org/elasticsearch/common/xcontent/support/filtering/CborFilteringGeneratorTests.java b/src/test/java/org/elasticsearch/common/xcontent/support/filtering/CborFilteringGeneratorTests.java
new file mode 100644
index 00000000000..fab77a26be7
--- /dev/null
+++ b/src/test/java/org/elasticsearch/common/xcontent/support/filtering/CborFilteringGeneratorTests.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.common.xcontent.support.filtering;
+
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentType;
+
+public class CborFilteringGeneratorTests extends JsonFilteringGeneratorTests {
+
+    @Override
+    protected XContentType getXContentType() {
+        return XContentType.CBOR;
+    }
+
+    @Override
+    protected void assertXContentBuilder(XContentBuilder expected, XContentBuilder builder) {
+        assertBinary(expected, builder);
+    }
+}
diff --git a/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilteringJsonGeneratorBenchmark.java b/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilteringJsonGeneratorBenchmark.java
new file mode 100644
index 00000000000..97ce4fcb838
--- /dev/null
+++ b/src/test/java/org/elasticsearch/common/xcontent/support/filtering/FilteringJsonGeneratorBenchmark.java
@@ -0,0 +1,99 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.common.xcontent.support.filtering;
+
+import org.elasticsearch.common.io.stream.BytesStreamOutput;
+import org.elasticsearch.common.xcontent.XContent;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.json.JsonXContent;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Locale;
+
+/**
+ * Benchmark class to compare filtered and unfiltered XContent generators.
+ */
+public class FilteringJsonGeneratorBenchmark {
+
+    public static void main(String[] args) throws IOException {
+        final XContent XCONTENT = JsonXContent.jsonXContent;
+
+        System.out.println("Executing " + FilteringJsonGeneratorBenchmark.class + "...");
+
+        System.out.println("Warming up...");
+        run(XCONTENT, 500_000, 100, 0.5);
+        System.out.println("Warmed up.");
+
+        System.out.println("nb documents | nb fields | nb fields written | % fields written | time (millis) | rate (docs/sec) | avg size");
+
+        for (int nbFields : Arrays.asList(10, 25, 50, 100, 250)) {
+            for (int nbDocs : Arrays.asList(100, 1000, 10_000, 100_000, 500_000)) {
+                for (double ratio : Arrays.asList(0.0, 1.0, 0.99, 0.95, 0.9, 0.75, 0.5, 0.25, 0.1, 0.05, 0.01)) {
+                    run(XCONTENT, nbDocs, nbFields, ratio);
+                }
+            }
+        }
+        System.out.println("Done.");
+    }
+
+    private static void run(XContent xContent, long nbIterations, int nbFields, double ratio) throws IOException {
+        String[] fields = fields(nbFields);
+        String[] filters = fields((int) (nbFields * ratio));
+
+        long size = 0;
+        BytesStreamOutput os = new BytesStreamOutput();
+
+        long start = System.nanoTime();
+        for (int i = 0; i < nbIterations; i++) {
+            XContentBuilder builder = new XContentBuilder(xContent, os, filters);
+            builder.startObject();
+
+            for (String field : fields) {
+                builder.field(field, System.nanoTime());
+            }
+            builder.endObject();
+
+            size += builder.bytes().length();
+            os.reset();
+        }
+        double milliseconds = (System.nanoTime() - start) / 1_000_000d;
+
+        System.out.printf(Locale.ROOT, "%12d | %9d | %17d | %14.2f %% | %10.3f ms | %15.2f | %8.0f %n",
+                nbIterations, nbFields,
+                (int) (nbFields * ratio),
+                (ratio * 100d),
+                milliseconds,
+                ((double) nbIterations) / (milliseconds / 1000d),
+                size / ((double) nbIterations));
+    }
+
+    /**
+     * Returns a String array of field names starting from "field_0" with a length of n.
+     * If n=3, the array is ["field_0","field_1","field_2"]
+     */
+    private static String[] fields(int n) {
+        String[] fields = new String[n];
+        for (int i = 0; i < n; i++) {
+            fields[i] = "field_" + i;
+        }
+        return fields;
+    }
+}
diff --git a/src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonFilteringGeneratorTests.java b/src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonFilteringGeneratorTests.java
new file mode 100644
index 00000000000..9468746fac6
--- /dev/null
+++ b/src/test/java/org/elasticsearch/common/xcontent/support/filtering/JsonFilteringGeneratorTests.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.common.xcontent.support.filtering;
+
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentType;
+
+public class JsonFilteringGeneratorTests extends AbstractFilteringJsonGeneratorTests {
+
+    @Override
+    protected XContentType getXContentType() {
+        return XContentType.JSON;
+    }
+
+    @Override
+    protected void assertXContentBuilder(XContentBuilder expected, XContentBuilder builder) {
+        assertString(expected, builder);
+    }
+}
diff --git a/src/test/java/org/elasticsearch/common/xcontent/support/filtering/SmileFilteringGeneratorTests.java b/src/test/java/org/elasticsearch/common/xcontent/support/filtering/SmileFilteringGeneratorTests.java
new file mode 100644
index 00000000000..a12e12be172
--- /dev/null
+++ b/src/test/java/org/elasticsearch/common/xcontent/support/filtering/SmileFilteringGeneratorTests.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.common.xcontent.support.filtering;
+
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentType;
+
+public class SmileFilteringGeneratorTests extends JsonFilteringGeneratorTests {
+
+    @Override
+    protected XContentType getXContentType() {
+        return XContentType.SMILE;
+    }
+
+    @Override
+    protected void assertXContentBuilder(XContentBuilder expected, XContentBuilder builder) {
+        assertBinary(expected, builder);
+    }
+}
diff --git a/src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java b/src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java
new file mode 100644
index 00000000000..d7e3a934ec4
--- /dev/null
+++ b/src/test/java/org/elasticsearch/common/xcontent/support/filtering/YamlFilteringGeneratorTests.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.common.xcontent.support.filtering;
+
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentType;
+
+public class YamlFilteringGeneratorTests extends AbstractFilteringJsonGeneratorTests {
+
+    @Override
+    protected XContentType getXContentType() {
+        return XContentType.YAML;
+    }
+
+    @Override
+    protected void assertXContentBuilder(XContentBuilder expected, XContentBuilder builder) {
+        assertString(expected, builder);
+    }
+}
diff --git a/src/test/java/org/elasticsearch/rest/RestFilterChainTests.java b/src/test/java/org/elasticsearch/rest/RestFilterChainTests.java
index dc537468c28..087bc306321 100644
--- a/src/test/java/org/elasticsearch/rest/RestFilterChainTests.java
+++ b/src/test/java/org/elasticsearch/rest/RestFilterChainTests.java
@@ -168,8 +168,13 @@ public class RestFilterChainTests extends ElasticsearchTestCase {
         }
 
         @Override
-        public XContentBuilder newBuilder(@Nullable BytesReference autoDetectSource) throws IOException {
-            return super.newBuilder(autoDetectSource);
+        public XContentBuilder newErrorBuilder() throws IOException {
+            return super.newErrorBuilder();
+        }
+
+        @Override
+        public XContentBuilder newBuilder(@Nullable BytesReference autoDetectSource, boolean useFiltering) throws IOException {
+            return super.newBuilder(autoDetectSource, useFiltering);
         }
 
         @Override

From b465e19e5f6416239f3c9e875257109c8fb96a6c Mon Sep 17 00:00:00 2001
From: Alexander Reelsen <alexander@reelsen.net>
Date: Tue, 26 May 2015 14:42:59 +0200
Subject: [PATCH 013/123] Release script: Always check for valid environment

In order to be sure that a release can be executed on the local machine,
the build_release script now checks for environment variables and tries
to execute a  couple of commands.

In order to easily check for a correctly setup environment, you can
run the following commands, which exits early and does not trigger a
release process.

```
python3 dev-tools/build_release.py --check-only
```
---
 dev-tools/build_release.py | 94 +++++++++++++++++++++++++++++---------
 1 file changed, 72 insertions(+), 22 deletions(-)

diff --git a/dev-tools/build_release.py b/dev-tools/build_release.py
index ca3223c0a92..8ae300d98fd 100644
--- a/dev-tools/build_release.py
+++ b/dev-tools/build_release.py
@@ -30,6 +30,7 @@ import socket
 import urllib.request
 import subprocess
 
+from functools import partial
 from http.client import HTTPConnection
 from http.client import HTTPSConnection
 
@@ -72,6 +73,11 @@ PLUGINS = [('license', 'elasticsearch/license/latest'),
 
 LOG = env.get('ES_RELEASE_LOG', '/tmp/elasticsearch_release.log')
 
+# console colors
+COLOR_OK = '\033[92m'
+COLOR_END = '\033[0m'
+COLOR_FAIL = '\033[91m'
+
 def log(msg):
   log_plain('\n%s' % msg)
 
@@ -137,9 +143,6 @@ def get_tag_hash(tag):
 def get_current_branch():
   return os.popen('git rev-parse --abbrev-ref HEAD  2>&1').read().strip()
 
-verify_java_version('1.7') # we require to build with 1.7
-verify_mvn_java_version('1.7', MVN)
-
 # Utility that returns the name of the release branch for a given version
 def release_branch(version):
   return 'release_branch_%s' % version
@@ -545,14 +548,6 @@ def print_sonatype_notice():
   </settings>
   """)
 
-def check_s3_credentials():
-  if not env.get('AWS_ACCESS_KEY_ID', None) or not env.get('AWS_SECRET_ACCESS_KEY', None):
-    raise RuntimeError('Could not find "AWS_ACCESS_KEY_ID" / "AWS_SECRET_ACCESS_KEY" in the env variables please export in order to upload to S3')
-
-def check_gpg_credentials():
-  if not env.get('GPG_KEY_ID', None) or not env.get('GPG_PASSPHRASE', None):
-    raise RuntimeError('Could not find "GPG_KEY_ID" / "GPG_PASSPHRASE" in the env variables please export in order to sign the packages (also make sure that GPG_KEYRING is set when not in ~/.gnupg)')
-
 def check_command_exists(name, cmd):
   try:
     subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
@@ -562,9 +557,6 @@ def check_command_exists(name, cmd):
 VERSION_FILE = 'src/main/java/org/elasticsearch/Version.java'
 POM_FILE = 'pom.xml'
 
-# we print a notice if we can not find the relevant infos in the ~/.m2/settings.xml
-print_sonatype_notice()
-
 # finds the highest available bwc version to test against
 def find_bwc_version(release_version, bwc_dir='backwards'):
   log('  Lookup bwc version in directory [%s]' % bwc_dir)
@@ -618,6 +610,60 @@ def check_norelease(path='src'):
           if pattern.search(line):
             raise RuntimeError('Found //norelease comment in %s line %s' % (full_path, line_number))
 
+def run_and_print(text, run_function):
+  try:
+    print(text, end='')
+    run_function()
+    print(COLOR_OK + 'OK' + COLOR_END)
+    return True
+  except RuntimeError:
+    print(COLOR_FAIL + 'NOT OK' + COLOR_END)
+    return False
+
+def check_env_var(text, env_var):
+  try:
+    print(text, end='')
+    env[env_var]
+    print(COLOR_OK + 'OK' + COLOR_END)
+    return True
+  except KeyError:
+    print(COLOR_FAIL + 'NOT OK' + COLOR_END)
+    return False
+
+def check_environment_and_commandline_tools(check_only):
+  checks = list()
+  checks.append(check_env_var('Checking for AWS env configuration AWS_SECRET_ACCESS_KEY_ID...     ', 'AWS_SECRET_ACCESS_KEY'))
+  checks.append(check_env_var('Checking for AWS env configuration AWS_ACCESS_KEY_ID...            ', 'AWS_ACCESS_KEY_ID'))
+  checks.append(check_env_var('Checking for SONATYPE env configuration SONATYPE_USERNAME...       ', 'SONATYPE_USERNAME'))
+  checks.append(check_env_var('Checking for SONATYPE env configuration SONATYPE_PASSWORD...       ', 'SONATYPE_PASSWORD'))
+  checks.append(check_env_var('Checking for GPG env configuration GPG_KEY_ID...                   ', 'GPG_KEY_ID'))
+  checks.append(check_env_var('Checking for GPG env configuration GPG_PASSPHRASE...               ', 'GPG_PASSPHRASE'))
+  checks.append(check_env_var('Checking for S3 repo upload env configuration S3_BUCKET_SYNC_TO... ', 'S3_BUCKET_SYNC_TO'))
+  checks.append(check_env_var('Checking for git env configuration GIT_AUTHOR_NAME...              ', 'GIT_AUTHOR_NAME'))
+  checks.append(check_env_var('Checking for git env configuration GIT_AUTHOR_EMAIL...             ', 'GIT_AUTHOR_EMAIL'))
+
+  checks.append(run_and_print('Checking command: rpm...            ', partial(check_command_exists, 'rpm', 'rpm --version')))
+  checks.append(run_and_print('Checking command: dpkg...           ', partial(check_command_exists, 'dpkg', 'dpkg --version')))
+  checks.append(run_and_print('Checking command: gpg...            ', partial(check_command_exists, 'gpg', 'gpg --version')))
+  checks.append(run_and_print('Checking command: expect...         ', partial(check_command_exists, 'expect', 'expect -v')))
+  checks.append(run_and_print('Checking command: createrepo...     ', partial(check_command_exists, 'createrepo', 'createrepo --version')))
+  checks.append(run_and_print('Checking command: s3cmd...          ', partial(check_command_exists, 's3cmd', 's3cmd --version')))
+  checks.append(run_and_print('Checking command: apt-ftparchive... ', partial(check_command_exists, 'apt-ftparchive', 'apt-ftparchive --version')))
+
+  # boto, check error code being returned
+  location = os.path.dirname(os.path.realpath(__file__))
+  command = 'python %s/upload-s3.py -h' % (location)
+  checks.append(run_and_print('Testing boto python dependency...   ', partial(check_command_exists, 'python-boto', command)))
+
+  checks.append(run_and_print('Checking java version...            ', partial(verify_java_version, '1.7')))
+  checks.append(run_and_print('Checking java mvn version...        ', partial(verify_mvn_java_version, '1.7', MVN)))
+
+  if check_only:
+    sys.exit(0)
+
+  if False in checks:
+    print("Exiting due to failing checks")
+    sys.exit(0)
 
 if __name__ == '__main__':
   parser = argparse.ArgumentParser(description='Builds and publishes a Elasticsearch Release')
@@ -636,9 +682,12 @@ if __name__ == '__main__':
                       help='Smoke tests the given release')
   parser.add_argument('--bwc', '-w', dest='bwc', metavar='backwards', default='backwards',
                       help='Backwards compatibility version path to use to run compatibility tests against')
+  parser.add_argument('--check-only', dest='check_only', action='store_true',
+                      help='Checks and reports for all requirements and then exits')
 
   parser.set_defaults(dryrun=True)
   parser.set_defaults(smoke=None)
+  parser.set_defaults(check_only=False)
   args = parser.parse_args()
   bwc_path = args.bwc
   src_branch = args.branch
@@ -649,18 +698,19 @@ if __name__ == '__main__':
   build = not args.smoke
   smoke_test_version = args.smoke
 
+  check_environment_and_commandline_tools(args.check_only)
+
+  # we print a notice if we can not find the relevant infos in the ~/.m2/settings.xml
+  print_sonatype_notice()
+
+  # we require to build with 1.7
+  verify_java_version('1.7')
+  verify_mvn_java_version('1.7', MVN)
+
   if os.path.exists(LOG):
     raise RuntimeError('please remove old release log %s first' % LOG)
 
-  check_gpg_credentials()
-  check_command_exists('gpg', 'gpg --version')
-  check_command_exists('expect', 'expect -v')
-  
   if not dry_run:
-    check_s3_credentials()
-    check_command_exists('createrepo', 'createrepo --version')
-    check_command_exists('s3cmd', 's3cmd --version')
-    check_command_exists('apt-ftparchive', 'apt-ftparchive --version')
     print('WARNING: dryrun is set to "false" - this will push and publish the release')
     input('Press Enter to continue...')
 

From 820314db4e7e631880fcbad590b6abd822d20f14 Mon Sep 17 00:00:00 2001
From: Tanguy Leroux <tlrx.dev@gmail.com>
Date: Tue, 26 May 2015 13:29:58 +0200
Subject: [PATCH 014/123] Change project.name to project.artifactId in
 bin/elasticsearch script because of 60519911b4e50bcc958c924a768dca2ae618101b

---
 bin/elasticsearch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/elasticsearch b/bin/elasticsearch
index 23591222fb0..bd324a7b5c4 100755
--- a/bin/elasticsearch
+++ b/bin/elasticsearch
@@ -57,7 +57,7 @@
 # Maven will replace the project.name with elasticsearch below. If that
 # hasn't been done, we assume that this is not a packaged version and the
 # user has forgotten to run Maven to create a package.
-IS_PACKAGED_VERSION='${project.name}'
+IS_PACKAGED_VERSION='${project.artifactId}'
 if [ "$IS_PACKAGED_VERSION" != "elasticsearch" ]; then
     cat >&2 << EOF
 Error: You must build the project with Maven or download a pre-built package

From 44fe99a3a878ce88a00ba963c53bf4a85a4410dc Mon Sep 17 00:00:00 2001
From: javanna <cavannaluca@gmail.com>
Date: Tue, 26 May 2015 15:08:49 +0200
Subject: [PATCH 015/123] [TEST] make filter_path a default parameter in java
 rest runner

Closes #11351
---
 rest-api-spec/api/nodes.stats.json                       | 4 ----
 rest-api-spec/api/search.json                            | 4 ----
 .../org/elasticsearch/test/rest/client/RestClient.java   | 9 +++++++--
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/rest-api-spec/api/nodes.stats.json b/rest-api-spec/api/nodes.stats.json
index 478dc7c8465..0a0870020b3 100644
--- a/rest-api-spec/api/nodes.stats.json
+++ b/rest-api-spec/api/nodes.stats.json
@@ -56,10 +56,6 @@
           "options" : ["node", "indices", "shards"],
           "default" : "node"
         },
-        "filter_path": {
-          "type" : "list",
-          "description" : "A comma-separated list of fields to include in the returned response"
-        },
         "types" : {
           "type" : "list",
           "description" : "A comma-separated list of document types for the `indexing` index metric"
diff --git a/rest-api-spec/api/search.json b/rest-api-spec/api/search.json
index 2d37ce4432f..e3c286c842c 100644
--- a/rest-api-spec/api/search.json
+++ b/rest-api-spec/api/search.json
@@ -72,10 +72,6 @@
           "type" : "boolean",
           "description" : "Specify whether query terms should be lowercased"
         },
-        "filter_path": {
-          "type" : "list",
-          "description" : "A comma-separated list of fields to include in the returned response"
-        },
         "preference": {
           "type" : "string",
           "description" : "Specify the node or shard the operation should be performed on (default: random)"
diff --git a/src/test/java/org/elasticsearch/test/rest/client/RestClient.java b/src/test/java/org/elasticsearch/test/rest/client/RestClient.java
index 495fabc8e7b..b6222948fdb 100644
--- a/src/test/java/org/elasticsearch/test/rest/client/RestClient.java
+++ b/src/test/java/org/elasticsearch/test/rest/client/RestClient.java
@@ -21,6 +21,7 @@ package org.elasticsearch.test.rest.client;
 import com.carrotsearch.randomizedtesting.RandomizedTest;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
@@ -41,6 +42,7 @@ import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -50,6 +52,8 @@ import java.util.concurrent.TimeUnit;
 public class RestClient implements Closeable {
 
     private static final ESLogger logger = Loggers.getLogger(RestClient.class);
+    //query_string params that don't need to be declared in the spec, thay are supported by default
+    private static final Set<String> ALWAYS_ACCEPTED_QUERY_STRING_PARAMS = Sets.newHashSet("pretty", "source", "filter_path");
 
     private final RestSpec restSpec;
     private final CloseableHttpClient httpClient;
@@ -172,10 +176,11 @@ public class RestClient implements Closeable {
                 if (restApi.getPathParts().contains(entry.getKey())) {
                     pathParts.put(entry.getKey(), entry.getValue());
                 } else {
-                    if (!restApi.getParams().contains(entry.getKey())) {
+                    if (restApi.getParams().contains(entry.getKey()) || ALWAYS_ACCEPTED_QUERY_STRING_PARAMS.contains(entry.getKey())) {
+                        httpRequestBuilder.addParam(entry.getKey(), entry.getValue());
+                    } else {
                         throw new IllegalArgumentException("param [" + entry.getKey() + "] not supported in [" + restApi.getName() + "] api");
                     }
-                    httpRequestBuilder.addParam(entry.getKey(), entry.getValue());
                 }
             }
         }

From 9d1f6f7615f329c90b52c48c0e18819abb190e4e Mon Sep 17 00:00:00 2001
From: Michael McCandless <mail@mikemccandless.com>
Date: Tue, 26 May 2015 09:54:44 -0400
Subject: [PATCH 016/123] a few more ImmutableSettings -> Settings

---
 src/main/java/org/elasticsearch/node/NodeBuilder.java           | 2 +-
 .../{ImmutableSettingsTests.java => SettingsTests.java}         | 2 +-
 .../org/elasticsearch/common/settings/bar/BarTestClass.java     | 2 +-
 .../org/elasticsearch/common/settings/foo/FooTestClass.java     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename src/test/java/org/elasticsearch/common/settings/{ImmutableSettingsTests.java => SettingsTests.java} (99%)

diff --git a/src/main/java/org/elasticsearch/node/NodeBuilder.java b/src/main/java/org/elasticsearch/node/NodeBuilder.java
index edd89efbee4..9107cf0833e 100644
--- a/src/main/java/org/elasticsearch/node/NodeBuilder.java
+++ b/src/main/java/org/elasticsearch/node/NodeBuilder.java
@@ -45,7 +45,7 @@ import org.elasticsearch.common.settings.Settings;
  * <p/>
  * <pre>
  * Node node = NodeBuilder.nodeBuilder()
- *                      .settings(ImmutableSettings.settingsBuilder().put("node.data", false)
+ *                      .settings(Settings.settingsBuilder().put("node.data", false)
  *                      .node();
  * </pre>
  * <p/>
diff --git a/src/test/java/org/elasticsearch/common/settings/ImmutableSettingsTests.java b/src/test/java/org/elasticsearch/common/settings/SettingsTests.java
similarity index 99%
rename from src/test/java/org/elasticsearch/common/settings/ImmutableSettingsTests.java
rename to src/test/java/org/elasticsearch/common/settings/SettingsTests.java
index f8a542a9cc6..c8334ba0691 100644
--- a/src/test/java/org/elasticsearch/common/settings/ImmutableSettingsTests.java
+++ b/src/test/java/org/elasticsearch/common/settings/SettingsTests.java
@@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.*;
 
 /**
  */
-public class ImmutableSettingsTests extends ElasticsearchTestCase {
+public class SettingsTests extends ElasticsearchTestCase {
 
     @Test
     public void testCamelCaseSupport() {
diff --git a/src/test/java/org/elasticsearch/common/settings/bar/BarTestClass.java b/src/test/java/org/elasticsearch/common/settings/bar/BarTestClass.java
index d4d5d14a86d..8c7b0c1f255 100644
--- a/src/test/java/org/elasticsearch/common/settings/bar/BarTestClass.java
+++ b/src/test/java/org/elasticsearch/common/settings/bar/BarTestClass.java
@@ -19,6 +19,6 @@
 
 package org.elasticsearch.common.settings.bar;
 
-//used in ImmutableSettingsTest
+//used in SettingsTest
 public class BarTestClass {
 }
diff --git a/src/test/java/org/elasticsearch/common/settings/foo/FooTestClass.java b/src/test/java/org/elasticsearch/common/settings/foo/FooTestClass.java
index 36f152778b4..6d8ca4a7986 100644
--- a/src/test/java/org/elasticsearch/common/settings/foo/FooTestClass.java
+++ b/src/test/java/org/elasticsearch/common/settings/foo/FooTestClass.java
@@ -19,6 +19,6 @@
 
 package org.elasticsearch.common.settings.foo;
 
-// used in ImmutableSettingsTest
+// used in SettingsTest
 public class FooTestClass {
 }

From 045f01c085faa32d1ded248d69726197f610bda4 Mon Sep 17 00:00:00 2001
From: Alexander Reelsen <alexander@reelsen.net>
Date: Tue, 26 May 2015 17:44:52 +0200
Subject: [PATCH 017/123] Infra for deprecation logging

Add support for a specific deprecation logging that can be used to turn
on in order to notify users of a specific feature, flag, setting,
parameter, ... being deprecated.

The deprecation logger logs with a "deprecation." prefix logge
(or "org.elasticsearch.deprecation." if full name is used), and outputs
the logging to a dedicated deprecation log file.

Deprecation logging are logged under the DEBUG category. The idea is not to
enabled them by default (under WARN or ERROR) when running embedded in
another application.

By default they are turned off (INFO), in order to turn it on, the
"deprecation" category need to be set to DEBUG. This can be set in the
logging file or using the cluster update settings API, see the documentation

Closes #11033
---
 config/logging.yml                            | 13 +++++
 docs/reference/setup/configuration.asciidoc   | 17 +++++++
 .../common/component/AbstractComponent.java   |  5 +-
 .../common/logging/DeprecationLogger.java     | 51 +++++++++++++++++++
 .../common/logging/ESLoggerFactory.java       |  8 +++
 .../logging/log4j/Log4jESLoggerFactory.java   |  1 -
 .../index/AbstractIndexComponent.java         |  5 +-
 .../shard/AbstractIndexShardComponent.java    |  5 +-
 .../common/logging/jdk/JDKESLoggerTests.java  |  1 -
 .../logging/log4j/Log4jESLoggerTests.java     | 23 ++++++++-
 10 files changed, 121 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java

diff --git a/config/logging.yml b/config/logging.yml
index a76eb175fc4..035106eeec6 100644
--- a/config/logging.yml
+++ b/config/logging.yml
@@ -4,6 +4,10 @@ rootLogger: ${es.logger.level}, console, file
 logger:
   # log action execution errors for easier debugging
   action: DEBUG
+
+  # deprecation logging, turn to DEBUG to see them
+  deprecation: INFO, deprecation_log_file
+
   # reduce the logging for aws, too much is logged under the default INFO
   com.amazonaws: WARN
   org.apache.http: INFO
@@ -24,6 +28,7 @@ logger:
 additivity:
   index.search.slowlog: false
   index.indexing.slowlog: false
+  deprecation: false
 
 appender:
   console:
@@ -51,6 +56,14 @@ appender:
       #type: pattern
       #conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
 
+  deprecation_log_file:
+    type: dailyRollingFile
+    file: ${path.logs}/${cluster.name}_deprecation.log
+    datePattern: "'.'yyyy-MM-dd"
+    layout:
+      type: pattern
+      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
+
   index_search_slow_log_file:
     type: dailyRollingFile
     file: ${path.logs}/${cluster.name}_index_search_slowlog.log
diff --git a/docs/reference/setup/configuration.asciidoc b/docs/reference/setup/configuration.asciidoc
index eed595e25ba..c6ae144e78e 100644
--- a/docs/reference/setup/configuration.asciidoc
+++ b/docs/reference/setup/configuration.asciidoc
@@ -337,3 +337,20 @@ the http://logging.apache.org/log4j/1.2/manual.html[log4j documentation].
 Additional Appenders and other logging classes provided by 
 http://logging.apache.org/log4j/extras/[log4j-extras] are also available, 
 out of the box.
+
+==== Deprecation logging
+
+In addition to regular logging, Elasticsearch allows you to enable logging
+of deprecated actions. For example this allows you to determine early, if
+you need to migrate certain functionality in the future. By default,
+deprecation logging is disabled. You can enable it in the `config/logging.yml`
+file by setting the deprecation log level to `DEBUG`.
+
+[source,yaml]
+--------------------------------------------------
+deprecation: DEBUG, deprecation_log_file
+--------------------------------------------------
+
+This will create a daily rolling deprecation log file in your log directory.
+Check this file regularly, especially when you intend to upgrade to a new
+major version.
diff --git a/src/main/java/org/elasticsearch/common/component/AbstractComponent.java b/src/main/java/org/elasticsearch/common/component/AbstractComponent.java
index 353d27747cd..a31bf119402 100644
--- a/src/main/java/org/elasticsearch/common/component/AbstractComponent.java
+++ b/src/main/java/org/elasticsearch/common/component/AbstractComponent.java
@@ -19,6 +19,7 @@
 
 package org.elasticsearch.common.component;
 
+import org.elasticsearch.common.logging.DeprecationLogger;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
@@ -29,16 +30,18 @@ import org.elasticsearch.common.settings.Settings;
 public abstract class AbstractComponent {
 
     protected final ESLogger logger;
-
+    protected final DeprecationLogger deprecationLogger;
     protected final Settings settings;
 
     public AbstractComponent(Settings settings) {
         this.logger = Loggers.getLogger(getClass(), settings);
+        this.deprecationLogger = new DeprecationLogger(logger);
         this.settings = settings;
     }
 
     public AbstractComponent(Settings settings, Class customClass) {
         this.logger = Loggers.getLogger(customClass, settings);
+        this.deprecationLogger = new DeprecationLogger(logger);
         this.settings = settings;
     }
 
diff --git a/src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java b/src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java
new file mode 100644
index 00000000000..870b5f61466
--- /dev/null
+++ b/src/main/java/org/elasticsearch/common/logging/DeprecationLogger.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.common.logging;
+
+/**
+ * A logger that logs deprecation notices.
+ */
+public class DeprecationLogger {
+
+    private final ESLogger logger;
+
+    /**
+     * Creates a new deprecation logger based on the parent logger. Automatically
+     * prefixes the logger name with "deprecation", if it starts with "org.elasticsearch.",
+     * it replaces "org.elasticsearch" with "org.elasticsearch.deprecation" to maintain
+     * the "org.elasticsearch" namespace.
+     */
+    public DeprecationLogger(ESLogger parentLogger) {
+        String name = parentLogger.getName();
+        if (name.startsWith("org.elasticsearch")) {
+            name = name.replace("org.elasticsearch.", "org.elasticsearch.deprecation.");
+        } else {
+            name = "deprecation." + name;
+        }
+        this.logger = ESLoggerFactory.getLogger(parentLogger.getPrefix(), name);
+    }
+
+    /**
+     * Logs a deprecated message.
+     */
+    public void deprecated(String msg, Object... params) {
+        logger.debug(msg, params);
+    }
+}
diff --git a/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java b/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java
index 67434293b6e..a0645c6a4d3 100644
--- a/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java
+++ b/src/main/java/org/elasticsearch/common/logging/ESLoggerFactory.java
@@ -66,6 +66,14 @@ public abstract class ESLoggerFactory {
         return defaultFactory.newInstance(name.intern());
     }
 
+    public static DeprecationLogger getDeprecationLogger(String name) {
+        return new DeprecationLogger(getLogger(name));
+    }
+
+    public static DeprecationLogger getDeprecationLogger(String prefix, String name) {
+        return new DeprecationLogger(getLogger(prefix, name));
+    }
+
     public static ESLogger getRootLogger() {
         return defaultFactory.rootLogger();
     }
diff --git a/src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerFactory.java b/src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerFactory.java
index 1bfb2d83d6a..b95e0987c90 100644
--- a/src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerFactory.java
+++ b/src/main/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerFactory.java
@@ -19,7 +19,6 @@
 
 package org.elasticsearch.common.logging.log4j;
 
-import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.ESLoggerFactory;
diff --git a/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java b/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java
index 6b2cd15a18d..3cfecc4cf07 100644
--- a/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java
+++ b/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java
@@ -19,6 +19,7 @@
 
 package org.elasticsearch.index;
 
+import org.elasticsearch.common.logging.DeprecationLogger;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
@@ -30,9 +31,8 @@ import org.elasticsearch.index.settings.IndexSettings;
 public abstract class AbstractIndexComponent implements IndexComponent {
 
     protected final ESLogger logger;
-
+    protected final DeprecationLogger deprecationLogger;
     protected final Index index;
-
     protected final Settings indexSettings;
 
     /**
@@ -45,6 +45,7 @@ public abstract class AbstractIndexComponent implements IndexComponent {
         this.index = index;
         this.indexSettings = indexSettings;
         this.logger = Loggers.getLogger(getClass(), indexSettings, index);
+        this.deprecationLogger = new DeprecationLogger(logger);
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java b/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java
index 9f9bdd5bde2..bb19dd49080 100644
--- a/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java
+++ b/src/main/java/org/elasticsearch/index/shard/AbstractIndexShardComponent.java
@@ -19,6 +19,7 @@
 
 package org.elasticsearch.index.shard;
 
+import org.elasticsearch.common.logging.DeprecationLogger;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
@@ -30,15 +31,15 @@ import org.elasticsearch.index.settings.IndexSettings;
 public abstract class AbstractIndexShardComponent implements IndexShardComponent {
 
     protected final ESLogger logger;
-
+    protected final DeprecationLogger deprecationLogger;
     protected final ShardId shardId;
-
     protected final Settings indexSettings;
 
     protected AbstractIndexShardComponent(ShardId shardId, @IndexSettings Settings indexSettings) {
         this.shardId = shardId;
         this.indexSettings = indexSettings;
         this.logger = Loggers.getLogger(getClass(), indexSettings, shardId);
+        this.deprecationLogger = new DeprecationLogger(logger);
     }
 
     @Override
diff --git a/src/test/java/org/elasticsearch/common/logging/jdk/JDKESLoggerTests.java b/src/test/java/org/elasticsearch/common/logging/jdk/JDKESLoggerTests.java
index 2588912467b..d236ad5ecf8 100644
--- a/src/test/java/org/elasticsearch/common/logging/jdk/JDKESLoggerTests.java
+++ b/src/test/java/org/elasticsearch/common/logging/jdk/JDKESLoggerTests.java
@@ -91,7 +91,6 @@ public class JDKESLoggerTests extends ElasticsearchTestCase {
         assertThat(record.getMessage(), equalTo("This is a trace"));
         assertThat(record.getSourceClassName(), equalTo(JDKESLoggerTests.class.getCanonicalName()));
         assertThat(record.getSourceMethodName(), equalTo("locationInfoTest"));
-        
     }
 
     private static class TestHandler extends Handler {
diff --git a/src/test/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerTests.java b/src/test/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerTests.java
index d854b2bd33d..f0d0c076eba 100644
--- a/src/test/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerTests.java
+++ b/src/test/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerTests.java
@@ -24,6 +24,7 @@ import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.spi.LocationInfo;
 import org.apache.log4j.spi.LoggingEvent;
+import org.elasticsearch.common.logging.DeprecationLogger;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.test.ElasticsearchTestCase;
@@ -42,6 +43,8 @@ public class Log4jESLoggerTests extends ElasticsearchTestCase {
     private ESLogger esTestLogger;
     private TestAppender testAppender;
     private String testLevel;
+    private DeprecationLogger deprecationLogger;
+    private TestAppender deprecationAppender;
 
     @Override
     public void setUp() throws Exception {
@@ -61,6 +64,13 @@ public class Log4jESLoggerTests extends ElasticsearchTestCase {
         assertThat(testLogger.getLevel(), equalTo(Level.TRACE));
         testAppender = new TestAppender();
         testLogger.addAppender(testAppender);
+
+        // deprecation setup, needs to be set to debug to log
+        deprecationLogger = Log4jESLoggerFactory.getDeprecationLogger("test");
+        deprecationAppender = new TestAppender();
+        ESLogger logger = Log4jESLoggerFactory.getLogger("deprecation.test");
+        logger.setLevel("DEBUG");
+        (((Log4jESLogger) logger).logger()).addAppender(deprecationAppender);
     }
 
     @Override
@@ -70,6 +80,8 @@ public class Log4jESLoggerTests extends ElasticsearchTestCase {
         esTestLogger.setLevel(testLevel);
         Logger testLogger = ((Log4jESLogger) esTestLogger).logger();
         testLogger.removeAppender(testAppender);
+        Logger deprecationLogger = ((Log4jESLogger) Log4jESLoggerFactory.getLogger("deprecation.test")).logger();
+        deprecationLogger.removeAppender(deprecationAppender);
     }
 
     @Test
@@ -122,7 +134,16 @@ public class Log4jESLoggerTests extends ElasticsearchTestCase {
         assertThat(locationInfo, notNullValue());
         assertThat(locationInfo.getClassName(), equalTo(Log4jESLoggerTests.class.getCanonicalName()));
         assertThat(locationInfo.getMethodName(), equalTo("locationInfoTest"));
-        
+    }
+
+    @Test
+    public void testDeprecationLogger() {
+        deprecationLogger.deprecated("This is a deprecation message");
+        List<LoggingEvent> deprecationEvents = deprecationAppender.getEvents();
+        LoggingEvent event = deprecationEvents.get(0);
+        assertThat(event, notNullValue());
+        assertThat(event.getLevel(), equalTo(Level.DEBUG));
+        assertThat(event.getRenderedMessage(), equalTo("This is a deprecation message"));
     }
 
     private static class TestAppender extends AppenderSkeleton {

From 1fa21a76cf6d11635133200c02b173376696aee5 Mon Sep 17 00:00:00 2001
From: Alexander Reelsen <alexander@reelsen.net>
Date: Tue, 26 May 2015 18:16:12 +0200
Subject: [PATCH 018/123] Documentation: Fix elasticsearch documentation build

The commit for closing #11033 was not building the asciidoc
documentation.
---
 docs/reference/setup/configuration.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/reference/setup/configuration.asciidoc b/docs/reference/setup/configuration.asciidoc
index c6ae144e78e..b822b223ce5 100644
--- a/docs/reference/setup/configuration.asciidoc
+++ b/docs/reference/setup/configuration.asciidoc
@@ -338,6 +338,8 @@ Additional Appenders and other logging classes provided by
 http://logging.apache.org/log4j/extras/[log4j-extras] are also available, 
 out of the box.
 
+[float]
+[[deprecation-logging]]
 ==== Deprecation logging
 
 In addition to regular logging, Elasticsearch allows you to enable logging

From 6c81a8daf390ac97dbeefddbaea4493ee4061fe9 Mon Sep 17 00:00:00 2001
From: javanna <cavannaluca@gmail.com>
Date: Sat, 16 May 2015 12:58:27 +0200
Subject: [PATCH 019/123] Internal: count api to become a shortcut to the
 search api

The count api used to have its own execution path, although it would do the same (up to bugs!) of the search api. This commit makes it a shortcut to the search api with size set to 0. The change is made in a backwards compatible manner, by leaving all of the java api code around too, given that you may not want to get back a whole SearchResponse when asking only for number of hits matching a query, also cause migrating from countResponse.getCount() to searchResponse.getHits().totalHits() doesn't look great from a user perspective. We can always decide to drop more code around the count api if we want to break backwards compatibility on the java api, making it a shortcut on the rest layer only.

Closes #9117
Closes #11198
---
 docs/reference/migration/migrate_2_0.asciidoc |   6 +
 .../elasticsearch/action/ActionModule.java    |   3 -
 .../action/ActionRequestBuilder.java          |   8 +-
 .../action/count/CountAction.java             |   4 +-
 .../action/count/CountRequest.java            |  49 +-
 .../action/count/CountRequestBuilder.java     |  15 +
 .../action/count/CountResponse.java           |  31 +-
 .../action/count/ShardCountRequest.java       | 137 ---
 .../action/count/ShardCountResponse.java      |  71 --
 .../action/count/TransportCountAction.java    | 193 ----
 .../broadcast/BroadcastOperationResponse.java |  12 +-
 .../client/support/AbstractClient.java        |  19 +-
 .../search/builder/SearchSourceBuilder.java   |  20 +-
 .../action/IndicesRequestTests.java           |  14 -
 .../action/count/CountRequestTests.java       | 110 +++
 .../action/count/CountResponseTests.java      |  51 ++
 .../broadcast/BroadcastActionsTests.java      |  15 +-
 .../count/query/CountQueryTests.java          | 843 ------------------
 .../document/DocumentActionsTests.java        |  15 +-
 19 files changed, 263 insertions(+), 1353 deletions(-)
 delete mode 100644 src/main/java/org/elasticsearch/action/count/ShardCountRequest.java
 delete mode 100644 src/main/java/org/elasticsearch/action/count/ShardCountResponse.java
 delete mode 100644 src/main/java/org/elasticsearch/action/count/TransportCountAction.java
 create mode 100644 src/test/java/org/elasticsearch/action/count/CountRequestTests.java
 create mode 100644 src/test/java/org/elasticsearch/action/count/CountResponseTests.java
 delete mode 100644 src/test/java/org/elasticsearch/count/query/CountQueryTests.java

diff --git a/docs/reference/migration/migrate_2_0.asciidoc b/docs/reference/migration/migrate_2_0.asciidoc
index 2e7fcfe828e..34b022b95d2 100644
--- a/docs/reference/migration/migrate_2_0.asciidoc
+++ b/docs/reference/migration/migrate_2_0.asciidoc
@@ -404,6 +404,12 @@ The `count` search type has been deprecated. All benefits from this search type
 now be achieved by using the `query_then_fetch` search type (which is the
 default) and setting `size` to `0`.
 
+=== The count api internally uses the search api
+
+The count api is now a shortcut to the search api with `size` set to 0. As a
+result, a total failure will result in an exception being returned rather
+than a normal response with `count` set to `0` and shard failures.
+
 === JSONP support
 
 JSONP callback support has now been removed. CORS should be used to access Elasticsearch
diff --git a/src/main/java/org/elasticsearch/action/ActionModule.java b/src/main/java/org/elasticsearch/action/ActionModule.java
index 1c273f67b5b..0decb393405 100644
--- a/src/main/java/org/elasticsearch/action/ActionModule.java
+++ b/src/main/java/org/elasticsearch/action/ActionModule.java
@@ -122,8 +122,6 @@ import org.elasticsearch.action.admin.indices.warmer.put.TransportPutWarmerActio
 import org.elasticsearch.action.bulk.BulkAction;
 import org.elasticsearch.action.bulk.TransportBulkAction;
 import org.elasticsearch.action.bulk.TransportShardBulkAction;
-import org.elasticsearch.action.count.CountAction;
-import org.elasticsearch.action.count.TransportCountAction;
 import org.elasticsearch.action.delete.DeleteAction;
 import org.elasticsearch.action.delete.TransportDeleteAction;
 import org.elasticsearch.action.exists.ExistsAction;
@@ -273,7 +271,6 @@ public class ActionModule extends AbstractModule {
         registerAction(MultiTermVectorsAction.INSTANCE, TransportMultiTermVectorsAction.class,
                 TransportShardMultiTermsVectorAction.class);
         registerAction(DeleteAction.INSTANCE, TransportDeleteAction.class);
-        registerAction(CountAction.INSTANCE, TransportCountAction.class);
         registerAction(ExistsAction.INSTANCE, TransportExistsAction.class);
         registerAction(SuggestAction.INSTANCE, TransportSuggestAction.class);
         registerAction(UpdateAction.INSTANCE, TransportUpdateAction.class);
diff --git a/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java b/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java
index e675e8befed..aaf5c9e48fd 100644
--- a/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java
+++ b/src/main/java/org/elasticsearch/action/ActionRequestBuilder.java
@@ -20,15 +20,9 @@
 package org.elasticsearch.action;
 
 import com.google.common.base.Preconditions;
-
-import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.support.PlainListenableActionFuture;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.ElasticsearchClient;
-import org.elasticsearch.client.IndicesAdminClient;
 import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorBuilder;
 import org.elasticsearch.threadpool.ThreadPool;
 
 /**
@@ -87,7 +81,7 @@ public abstract class ActionRequestBuilder<Request extends ActionRequest, Respon
         return execute().actionGet(timeout);
     }
 
-    public final void execute(ActionListener<Response> listener) {
+    public void execute(ActionListener<Response> listener) {
         client.execute(action, beforeExecute(request), listener);
     }
 
diff --git a/src/main/java/org/elasticsearch/action/count/CountAction.java b/src/main/java/org/elasticsearch/action/count/CountAction.java
index 4c7c8a2fcc2..4cc6210b60c 100644
--- a/src/main/java/org/elasticsearch/action/count/CountAction.java
+++ b/src/main/java/org/elasticsearch/action/count/CountAction.java
@@ -23,6 +23,8 @@ import org.elasticsearch.action.Action;
 import org.elasticsearch.client.ElasticsearchClient;
 
 /**
+ * Action that shortcuts to the search api with size set to 0. It doesn't have a corresponding
+ * transport action, it just runs the search api internally.
  */
 public class CountAction extends Action<CountRequest, CountResponse, CountRequestBuilder> {
 
@@ -35,7 +37,7 @@ public class CountAction extends Action<CountRequest, CountResponse, CountReques
 
     @Override
     public CountResponse newResponse() {
-        return new CountResponse();
+        throw new UnsupportedOperationException("CountAction doesn't have its own transport action, gets executed as a SearchAction internally");
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/action/count/CountRequest.java b/src/main/java/org/elasticsearch/action/count/CountRequest.java
index a37ba887fd5..dfee07b2ee9 100644
--- a/src/main/java/org/elasticsearch/action/count/CountRequest.java
+++ b/src/main/java/org/elasticsearch/action/count/CountRequest.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.count;
 
 import org.elasticsearch.ElasticsearchGenerationException;
-import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.support.QuerySourceBuilder;
 import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
 import org.elasticsearch.client.Requests;
@@ -33,6 +33,7 @@ import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -67,12 +68,8 @@ public class CountRequest extends BroadcastOperationRequest<CountRequest> {
 
     private String[] types = Strings.EMPTY_ARRAY;
 
-    long nowInMillis;
     private int terminateAfter = DEFAULT_TERMINATE_AFTER;
 
-    CountRequest() {
-    }
-
     /**
      * Constructs a new count request against the provided indices. No indices provided means it will
      * run against all indices.
@@ -81,12 +78,6 @@ public class CountRequest extends BroadcastOperationRequest<CountRequest> {
         super(indices);
     }
 
-    @Override
-    public ActionRequestValidationException validate() {
-        ActionRequestValidationException validationException = super.validate();
-        return validationException;
-    }
-
     /**
      * The minimum score of the documents to include in the count.
      */
@@ -121,6 +112,7 @@ public class CountRequest extends BroadcastOperationRequest<CountRequest> {
     /**
      * The source to execute in the form of a map.
      */
+    @SuppressWarnings("unchecked")
     public CountRequest source(Map querySource) {
         try {
             XContentBuilder builder = XContentFactory.contentBuilder(Requests.CONTENT_TYPE);
@@ -228,24 +220,12 @@ public class CountRequest extends BroadcastOperationRequest<CountRequest> {
 
     @Override
     public void readFrom(StreamInput in) throws IOException {
-        super.readFrom(in);
-        minScore = in.readFloat();
-        routing = in.readOptionalString();
-        preference = in.readOptionalString();
-        source = in.readBytesReference();
-        types = in.readStringArray();
-        terminateAfter = in.readVInt();
+        throw new UnsupportedOperationException("CountRequest doesn't support being sent over the wire, just a shortcut to the search api");
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        super.writeTo(out);
-        out.writeFloat(minScore);
-        out.writeOptionalString(routing);
-        out.writeOptionalString(preference);
-        out.writeBytesReference(source);
-        out.writeStringArray(types);
-        out.writeVInt(terminateAfter);
+        throw new UnsupportedOperationException("CountRequest doesn't support being sent over the wire, just a shortcut to the search api");
     }
 
     @Override
@@ -258,4 +238,23 @@ public class CountRequest extends BroadcastOperationRequest<CountRequest> {
         }
         return "[" + Arrays.toString(indices) + "]" + Arrays.toString(types) + ", source[" + sSource + "]";
     }
+
+    public SearchRequest toSearchRequest() {
+        SearchRequest searchRequest = new SearchRequest(indices());
+        searchRequest.indicesOptions(indicesOptions());
+        searchRequest.types(types());
+        searchRequest.routing(routing());
+        searchRequest.preference(preference());
+        searchRequest.source(source());
+        SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+        searchSourceBuilder.size(0);
+        if (minScore() != DEFAULT_MIN_SCORE) {
+            searchSourceBuilder.minScore(minScore());
+        }
+        if (terminateAfter() != DEFAULT_TERMINATE_AFTER) {
+            searchSourceBuilder.terminateAfter(terminateAfter());
+        }
+        searchRequest.extraSource(searchSourceBuilder);
+        return searchRequest;
+    }
 }
diff --git a/src/main/java/org/elasticsearch/action/count/CountRequestBuilder.java b/src/main/java/org/elasticsearch/action/count/CountRequestBuilder.java
index fd30a2d3fc7..3716bf21a68 100644
--- a/src/main/java/org/elasticsearch/action/count/CountRequestBuilder.java
+++ b/src/main/java/org/elasticsearch/action/count/CountRequestBuilder.java
@@ -20,6 +20,10 @@
 package org.elasticsearch.action.count;
 
 import org.elasticsearch.ExceptionsHelper;
+import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.search.SearchAction;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.action.support.DelegatingActionListener;
 import org.elasticsearch.action.support.QuerySourceBuilder;
 import org.elasticsearch.action.support.broadcast.BroadcastOperationRequestBuilder;
 import org.elasticsearch.client.ElasticsearchClient;
@@ -145,6 +149,17 @@ public class CountRequestBuilder extends BroadcastOperationRequestBuilder<CountR
         return sourceBuilder;
     }
 
+    @Override
+    public void execute(ActionListener<CountResponse> listener) {
+        CountRequest countRequest = beforeExecute(request);
+        client.execute(SearchAction.INSTANCE, countRequest.toSearchRequest(), new DelegatingActionListener<SearchResponse, CountResponse>(listener) {
+            @Override
+            protected CountResponse getDelegatedFromInstigator(SearchResponse response) {
+                return new CountResponse(response);
+            }
+        });
+    }
+
     @Override
     public String toString() {
         if (sourceBuilder != null) {
diff --git a/src/main/java/org/elasticsearch/action/count/CountResponse.java b/src/main/java/org/elasticsearch/action/count/CountResponse.java
index 394d266eedc..91fd77e596b 100644
--- a/src/main/java/org/elasticsearch/action/count/CountResponse.java
+++ b/src/main/java/org/elasticsearch/action/count/CountResponse.java
@@ -19,30 +19,27 @@
 
 package org.elasticsearch.action.count;
 
-import java.io.IOException;
-import java.util.List;
-import org.elasticsearch.action.ShardOperationFailedException;
+import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.rest.RestStatus;
 
+import java.io.IOException;
+import java.util.Arrays;
+
 /**
  * The response of the count action.
  */
 public class CountResponse extends BroadcastOperationResponse {
 
-    private boolean terminatedEarly;
-    private long count;
+    private final boolean terminatedEarly;
+    private final long count;
 
-    CountResponse() {
-
-    }
-
-    CountResponse(long count, boolean hasTerminatedEarly, int totalShards, int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures) {
-        super(totalShards, successfulShards, failedShards, shardFailures);
-        this.count = count;
-        this.terminatedEarly = hasTerminatedEarly;
+    public CountResponse(SearchResponse searchResponse) {
+        super(searchResponse.getTotalShards(), searchResponse.getSuccessfulShards(), searchResponse.getFailedShards(), Arrays.asList(searchResponse.getShardFailures()));
+        this.count = searchResponse.getHits().totalHits();
+        this.terminatedEarly = searchResponse.isTerminatedEarly() != null && searchResponse.isTerminatedEarly();
     }
 
     /**
@@ -65,15 +62,11 @@ public class CountResponse extends BroadcastOperationResponse {
 
     @Override
     public void readFrom(StreamInput in) throws IOException {
-        super.readFrom(in);
-        count = in.readVLong();
-        terminatedEarly = in.readBoolean();
+        throw new UnsupportedOperationException("CountResponse doesn't support being sent over the wire, just a shortcut to the search api");
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        super.writeTo(out);
-        out.writeVLong(count);
-        out.writeBoolean(terminatedEarly);
+        throw new UnsupportedOperationException("CountResponse doesn't support being sent over the wire, just a shortcut to the search api");
     }
 }
diff --git a/src/main/java/org/elasticsearch/action/count/ShardCountRequest.java b/src/main/java/org/elasticsearch/action/count/ShardCountRequest.java
deleted file mode 100644
index 14a8b0026f9..00000000000
--- a/src/main/java/org/elasticsearch/action/count/ShardCountRequest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.action.count;
-
-import org.elasticsearch.Version;
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest;
-import org.elasticsearch.common.Nullable;
-import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.index.shard.ShardId;
-
-import java.io.IOException;
-
-import static org.elasticsearch.search.internal.SearchContext.DEFAULT_TERMINATE_AFTER;
-
-/**
- * Internal count request executed directly against a specific index shard.
- */
-class ShardCountRequest extends BroadcastShardOperationRequest {
-
-    private float minScore;
-    private int terminateAfter;
-
-    private BytesReference querySource;
-
-    private String[] types = Strings.EMPTY_ARRAY;
-
-    private long nowInMillis;
-
-    @Nullable
-    private String[] filteringAliases;
-
-    ShardCountRequest() {
-
-    }
-
-    ShardCountRequest(ShardId shardId, @Nullable String[] filteringAliases, CountRequest request) {
-        super(shardId, request);
-        this.minScore = request.minScore();
-        this.querySource = request.source();
-        this.types = request.types();
-        this.filteringAliases = filteringAliases;
-        this.nowInMillis = request.nowInMillis;
-        this.terminateAfter = request.terminateAfter();
-    }
-
-    public float minScore() {
-        return minScore;
-    }
-
-    public BytesReference querySource() {
-        return querySource;
-    }
-
-    public String[] types() {
-        return this.types;
-    }
-
-    public String[] filteringAliases() {
-        return filteringAliases;
-    }
-
-    public long nowInMillis() {
-        return this.nowInMillis;
-    }
-
-    public int terminateAfter() {
-        return this.terminateAfter;
-    }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        super.readFrom(in);
-        minScore = in.readFloat();
-
-        querySource = in.readBytesReference();
-
-        int typesSize = in.readVInt();
-        if (typesSize > 0) {
-            types = new String[typesSize];
-            for (int i = 0; i < typesSize; i++) {
-                types[i] = in.readString();
-            }
-        }
-        int aliasesSize = in.readVInt();
-        if (aliasesSize > 0) {
-            filteringAliases = new String[aliasesSize];
-            for (int i = 0; i < aliasesSize; i++) {
-                filteringAliases[i] = in.readString();
-            }
-        }
-        nowInMillis = in.readVLong();
-        terminateAfter = in.readVInt();
-    }
-
-    @Override
-    public void writeTo(StreamOutput out) throws IOException {
-        super.writeTo(out);
-        out.writeFloat(minScore);
-
-        out.writeBytesReference(querySource);
-
-        out.writeVInt(types.length);
-        for (String type : types) {
-            out.writeString(type);
-        }
-        if (filteringAliases != null) {
-            out.writeVInt(filteringAliases.length);
-            for (String alias : filteringAliases) {
-                out.writeString(alias);
-            }
-        } else {
-            out.writeVInt(0);
-        }
-        out.writeVLong(nowInMillis);
-        out.writeVInt(terminateAfter);
-    }
-}
diff --git a/src/main/java/org/elasticsearch/action/count/ShardCountResponse.java b/src/main/java/org/elasticsearch/action/count/ShardCountResponse.java
deleted file mode 100644
index 1847ba0cb02..00000000000
--- a/src/main/java/org/elasticsearch/action/count/ShardCountResponse.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.action.count;
-
-import org.elasticsearch.Version;
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
-import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.index.shard.ShardId;
-
-import java.io.IOException;
-
-/**
- * Internal count response of a shard count request executed directly against a specific shard.
- *
- *
- */
-class ShardCountResponse extends BroadcastShardOperationResponse {
-
-    private long count;
-    private boolean terminatedEarly;
-
-    ShardCountResponse() {
-
-    }
-
-    ShardCountResponse(ShardId shardId, long count, boolean terminatedEarly) {
-        super(shardId);
-        this.count = count;
-        this.terminatedEarly = terminatedEarly;
-    }
-
-    public long getCount() {
-        return this.count;
-    }
-
-    public boolean terminatedEarly() {
-        return this.terminatedEarly;
-    }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        super.readFrom(in);
-        count = in.readVLong();
-        terminatedEarly = in.readBoolean();
-    }
-
-    @Override
-    public void writeTo(StreamOutput out) throws IOException {
-        super.writeTo(out);
-        out.writeVLong(count);
-        out.writeBoolean(terminatedEarly);
-    }
-}
diff --git a/src/main/java/org/elasticsearch/action/count/TransportCountAction.java b/src/main/java/org/elasticsearch/action/count/TransportCountAction.java
deleted file mode 100644
index 93e0a378ed6..00000000000
--- a/src/main/java/org/elasticsearch/action/count/TransportCountAction.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.action.count;
-
-import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.ShardOperationFailedException;
-import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.DefaultShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
-import org.elasticsearch.cache.recycler.PageCacheRecycler;
-import org.elasticsearch.cluster.ClusterService;
-import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.block.ClusterBlockException;
-import org.elasticsearch.cluster.block.ClusterBlockLevel;
-import org.elasticsearch.cluster.routing.GroupShardsIterator;
-import org.elasticsearch.cluster.routing.ShardRouting;
-import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.common.inject.Inject;
-import org.elasticsearch.common.lucene.Lucene;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.util.BigArrays;
-import org.elasticsearch.index.query.QueryParseContext;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.shard.IndexShard;
-import org.elasticsearch.indices.IndicesService;
-import org.elasticsearch.script.ScriptService;
-import org.elasticsearch.search.SearchShardTarget;
-import org.elasticsearch.search.internal.DefaultSearchContext;
-import org.elasticsearch.search.internal.SearchContext;
-import org.elasticsearch.search.internal.ShardSearchLocalRequest;
-import org.elasticsearch.search.query.QueryPhaseExecutionException;
-import org.elasticsearch.threadpool.ThreadPool;
-import org.elasticsearch.transport.TransportService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReferenceArray;
-
-import static com.google.common.collect.Lists.newArrayList;
-import static org.elasticsearch.search.internal.SearchContext.DEFAULT_TERMINATE_AFTER;
-
-/**
- *
- */
-public class TransportCountAction extends TransportBroadcastOperationAction<CountRequest, CountResponse, ShardCountRequest, ShardCountResponse> {
-
-    private final IndicesService indicesService;
-    private final ScriptService scriptService;
-    private final PageCacheRecycler pageCacheRecycler;
-    private final BigArrays bigArrays;
-
-    @Inject
-    public TransportCountAction(Settings settings, ThreadPool threadPool, ClusterService clusterService, TransportService transportService,
-                                IndicesService indicesService, ScriptService scriptService, PageCacheRecycler pageCacheRecycler,
-                                BigArrays bigArrays, ActionFilters actionFilters) {
-        super(settings, CountAction.NAME, threadPool, clusterService, transportService, actionFilters,
-                CountRequest.class, ShardCountRequest.class, ThreadPool.Names.SEARCH);
-        this.indicesService = indicesService;
-        this.scriptService = scriptService;
-        this.pageCacheRecycler = pageCacheRecycler;
-        this.bigArrays = bigArrays;
-    }
-
-    @Override
-    protected void doExecute(CountRequest request, ActionListener<CountResponse> listener) {
-        request.nowInMillis = System.currentTimeMillis();
-        super.doExecute(request, listener);
-    }
-
-    @Override
-    protected ShardCountRequest newShardRequest(int numShards, ShardRouting shard, CountRequest request) {
-        String[] filteringAliases = clusterService.state().metaData().filteringAliases(shard.index(), request.indices());
-        return new ShardCountRequest(shard.shardId(), filteringAliases, request);
-    }
-
-    @Override
-    protected ShardCountResponse newShardResponse() {
-        return new ShardCountResponse();
-    }
-
-    @Override
-    protected GroupShardsIterator shards(ClusterState clusterState, CountRequest request, String[] concreteIndices) {
-        Map<String, Set<String>> routingMap = clusterState.metaData().resolveSearchRouting(request.routing(), request.indices());
-        return clusterService.operationRouting().searchShards(clusterState, request.indices(), concreteIndices, routingMap, request.preference());
-    }
-
-    @Override
-    protected ClusterBlockException checkGlobalBlock(ClusterState state, CountRequest request) {
-        return state.blocks().globalBlockedException(ClusterBlockLevel.READ);
-    }
-
-    @Override
-    protected ClusterBlockException checkRequestBlock(ClusterState state, CountRequest countRequest, String[] concreteIndices) {
-        return state.blocks().indicesBlockedException(ClusterBlockLevel.READ, concreteIndices);
-    }
-
-    @Override
-    protected CountResponse newResponse(CountRequest request, AtomicReferenceArray shardsResponses, ClusterState clusterState) {
-        int successfulShards = 0;
-        int failedShards = 0;
-        long count = 0;
-        boolean terminatedEarly = false;
-        List<ShardOperationFailedException> shardFailures = null;
-        for (int i = 0; i < shardsResponses.length(); i++) {
-            Object shardResponse = shardsResponses.get(i);
-            if (shardResponse == null) {
-                // simply ignore non active shards
-            } else if (shardResponse instanceof BroadcastShardOperationFailedException) {
-                failedShards++;
-                if (shardFailures == null) {
-                    shardFailures = newArrayList();
-                }
-                shardFailures.add(new DefaultShardOperationFailedException((BroadcastShardOperationFailedException) shardResponse));
-            } else {
-                count += ((ShardCountResponse) shardResponse).getCount();
-                if (((ShardCountResponse) shardResponse).terminatedEarly()) {
-                    terminatedEarly = true;
-                }
-                successfulShards++;
-            }
-        }
-        return new CountResponse(count, terminatedEarly, shardsResponses.length(), successfulShards, failedShards, shardFailures);
-    }
-
-    @Override
-    protected ShardCountResponse shardOperation(ShardCountRequest request) {
-        IndexService indexService = indicesService.indexServiceSafe(request.shardId().getIndex());
-        IndexShard indexShard = indexService.shardSafe(request.shardId().id());
-
-        SearchShardTarget shardTarget = new SearchShardTarget(clusterService.localNode().id(), request.shardId().getIndex(), request.shardId().id());
-        SearchContext context = new DefaultSearchContext(0,
-                new ShardSearchLocalRequest(request.types(), request.nowInMillis(), request.filteringAliases()),
-                shardTarget, indexShard.acquireSearcher("count"), indexService, indexShard,
-                scriptService, pageCacheRecycler, bigArrays, threadPool.estimatedTimeInMillisCounter());
-        SearchContext.setCurrent(context);
-
-        try {
-            // TODO: min score should move to be "null" as a value that is not initialized...
-            if (request.minScore() != -1) {
-                context.minimumScore(request.minScore());
-            }
-            BytesReference source = request.querySource();
-            if (source != null && source.length() > 0) {
-                try {
-                    QueryParseContext.setTypes(request.types());
-                    context.parsedQuery(indexService.queryParserService().parseQuery(source));
-                } finally {
-                    QueryParseContext.removeTypes();
-                }
-            }
-            final boolean hasTerminateAfterCount = request.terminateAfter() != DEFAULT_TERMINATE_AFTER;
-            boolean terminatedEarly = false;
-            context.preProcess();
-            try {
-                long count;
-                if (hasTerminateAfterCount) {
-                    final Lucene.EarlyTerminatingCollector countCollector =
-                            Lucene.createCountBasedEarlyTerminatingCollector(request.terminateAfter());
-                    terminatedEarly = Lucene.countWithEarlyTermination(context.searcher(), context.query(), countCollector);
-                    count = countCollector.count();
-                } else {
-                    count = Lucene.count(context.searcher(), context.query());
-                }
-                return new ShardCountResponse(request.shardId(), count, terminatedEarly);
-            } catch (Exception e) {
-                throw new QueryPhaseExecutionException(context, "failed to execute count", e);
-            }
-        } finally {
-            // this will also release the index searcher
-            context.close();
-            SearchContext.removeCurrent();
-        }
-    }
-}
diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java
index 2fd4f97ca29..e8e2a2aa0ce 100644
--- a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java
+++ b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java
@@ -19,16 +19,16 @@
 
 package org.elasticsearch.action.support.broadcast;
 
-import static org.elasticsearch.action.support.DefaultShardOperationFailedException.readShardOperationFailed;
-
-import java.io.IOException;
-import java.util.List;
-
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.ShardOperationFailedException;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
+import java.io.IOException;
+import java.util.List;
+
+import static org.elasticsearch.action.support.DefaultShardOperationFailedException.readShardOperationFailed;
+
 /**
  * Base class for all broadcast operation based responses.
  */
@@ -42,7 +42,7 @@ public abstract class BroadcastOperationResponse extends ActionResponse {
     protected BroadcastOperationResponse() {
     }
 
-    protected BroadcastOperationResponse(int totalShards, int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures) {
+    protected BroadcastOperationResponse(int totalShards, int successfulShards, int failedShards, List<? extends ShardOperationFailedException> shardFailures) {
         this.totalShards = totalShards;
         this.successfulShards = successfulShards;
         this.failedShards = failedShards;
diff --git a/src/main/java/org/elasticsearch/client/support/AbstractClient.java b/src/main/java/org/elasticsearch/client/support/AbstractClient.java
index 18b0a377ac0..75e8ada560b 100644
--- a/src/main/java/org/elasticsearch/client/support/AbstractClient.java
+++ b/src/main/java/org/elasticsearch/client/support/AbstractClient.java
@@ -259,6 +259,8 @@ import org.elasticsearch.action.suggest.SuggestAction;
 import org.elasticsearch.action.suggest.SuggestRequest;
 import org.elasticsearch.action.suggest.SuggestRequestBuilder;
 import org.elasticsearch.action.suggest.SuggestResponse;
+import org.elasticsearch.action.support.AdapterActionFuture;
+import org.elasticsearch.action.support.DelegatingActionListener;
 import org.elasticsearch.action.support.PlainActionFuture;
 import org.elasticsearch.action.support.ThreadedActionListener;
 import org.elasticsearch.action.termvectors.*;
@@ -335,7 +337,6 @@ public abstract class AbstractClient extends AbstractComponent implements Client
 
     protected abstract <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> void doExecute(final Action<Request, Response, RequestBuilder> action, final Request request, ActionListener<Response> listener);
 
-
     @Override
     public ActionFuture<IndexResponse> index(final IndexRequest request) {
         return execute(IndexAction.INSTANCE, request);
@@ -594,12 +595,24 @@ public abstract class AbstractClient extends AbstractComponent implements Client
 
     @Override
     public ActionFuture<CountResponse> count(final CountRequest request) {
-        return execute(CountAction.INSTANCE, request);
+        AdapterActionFuture<CountResponse, SearchResponse> actionFuture = new AdapterActionFuture<CountResponse, SearchResponse>() {
+            @Override
+            protected CountResponse convert(SearchResponse listenerResponse) {
+                return new CountResponse(listenerResponse);
+            }
+        };
+        execute(SearchAction.INSTANCE, request.toSearchRequest(), actionFuture);
+        return actionFuture;
     }
 
     @Override
     public void count(final CountRequest request, final ActionListener<CountResponse> listener) {
-        execute(CountAction.INSTANCE, request, listener);
+        execute(SearchAction.INSTANCE, request.toSearchRequest(), new DelegatingActionListener<SearchResponse, CountResponse>(listener) {
+            @Override
+            protected CountResponse getDelegatedFromInstigator(SearchResponse response) {
+                return new CountResponse(response);
+            }
+        });
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
index 57dfe4a362b..55e74d9303d 100644
--- a/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
+++ b/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
@@ -47,10 +47,7 @@ import org.elasticsearch.search.sort.SortOrder;
 import org.elasticsearch.search.suggest.SuggestBuilder;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * A search source builder allowing to easily build search source. Simple
@@ -188,6 +185,7 @@ public class SearchSourceBuilder extends ToXContentToBytes {
     /**
      * Constructs a new search source builder with a query from a map.
      */
+    @SuppressWarnings("unchecked")
     public SearchSourceBuilder query(Map query) {
         try {
             XContentBuilder builder = XContentFactory.contentBuilder(Requests.CONTENT_TYPE);
@@ -251,6 +249,7 @@ public class SearchSourceBuilder extends ToXContentToBytes {
     /**
      * Constructs a new search source builder with a query from a map.
      */
+    @SuppressWarnings("unchecked")
     public SearchSourceBuilder postFilter(Map postFilter) {
         try {
             XContentBuilder builder = XContentFactory.contentBuilder(Requests.CONTENT_TYPE);
@@ -415,9 +414,6 @@ public class SearchSourceBuilder extends ToXContentToBytes {
 
     /**
      * Set the rescore window size for rescores that don't specify their window.
-     * 
-     * @param defaultRescoreWindowSize
-     * @return
      */
     public SearchSourceBuilder defaultRescoreWindowSize(int defaultRescoreWindowSize) {
         this.defaultRescoreWindowSize = defaultRescoreWindowSize;
@@ -427,6 +423,7 @@ public class SearchSourceBuilder extends ToXContentToBytes {
     /**
      * Sets a raw (xcontent / json) addAggregation.
      */
+    @SuppressWarnings("unchecked")
     public SearchSourceBuilder aggregations(Map aggregations) {
         try {
             XContentBuilder builder = XContentFactory.contentBuilder(Requests.CONTENT_TYPE);
@@ -482,9 +479,6 @@ public class SearchSourceBuilder extends ToXContentToBytes {
     /**
      * Indicates whether the response should contain the stored _source for
      * every hit
-     *
-     * @param fetch
-     * @return
      */
     public SearchSourceBuilder fetchSource(boolean fetch) {
         if (this.fetchSourceContext == null) {
@@ -563,9 +557,7 @@ public class SearchSourceBuilder extends ToXContentToBytes {
         if (fieldNames == null) {
             fieldNames = new ArrayList<>();
         }
-        for (String field : fields) {
-            fieldNames.add(field);
-        }
+        Collections.addAll(fieldNames, fields);
         return this;
     }
 
@@ -777,7 +769,7 @@ public class SearchSourceBuilder extends ToXContentToBytes {
         }
 
         if (trackScores) {
-            builder.field("track_scores", trackScores);
+            builder.field("track_scores", true);
         }
 
         if (indexBoost != null) {
diff --git a/src/test/java/org/elasticsearch/action/IndicesRequestTests.java b/src/test/java/org/elasticsearch/action/IndicesRequestTests.java
index 62df5e8fd54..7825d62fe81 100644
--- a/src/test/java/org/elasticsearch/action/IndicesRequestTests.java
+++ b/src/test/java/org/elasticsearch/action/IndicesRequestTests.java
@@ -57,8 +57,6 @@ import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryAction
 import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryRequest;
 import org.elasticsearch.action.bulk.BulkAction;
 import org.elasticsearch.action.bulk.BulkRequest;
-import org.elasticsearch.action.count.CountAction;
-import org.elasticsearch.action.count.CountRequest;
 import org.elasticsearch.action.delete.DeleteAction;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.exists.ExistsAction;
@@ -356,18 +354,6 @@ public class IndicesRequestTests extends ElasticsearchIntegrationTest {
         assertIndicesSubset(indices, multiGetShardAction);
     }
 
-    @Test
-    public void testCount() {
-        String countShardAction = CountAction.NAME + "[s]";
-        interceptTransportActions(countShardAction);
-
-        CountRequest countRequest = new CountRequest(randomIndicesOrAliases());
-        internalCluster().clientNodeClient().count(countRequest).actionGet();
-
-        clearInterceptedActions();
-        assertSameIndices(countRequest, countShardAction);
-    }
-
     @Test
     public void testExists() {
         String existsShardAction = ExistsAction.NAME + "[s]";
diff --git a/src/test/java/org/elasticsearch/action/count/CountRequestTests.java b/src/test/java/org/elasticsearch/action/count/CountRequestTests.java
new file mode 100644
index 00000000000..a972ff56d12
--- /dev/null
+++ b/src/test/java/org/elasticsearch/action/count/CountRequestTests.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.count;
+
+import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.action.support.IndicesOptions;
+import org.elasticsearch.action.support.QuerySourceBuilder;
+import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.internal.SearchContext;
+import org.elasticsearch.test.ElasticsearchTestCase;
+import org.junit.Test;
+
+import java.util.Map;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
+
+public class CountRequestTests extends ElasticsearchTestCase {
+
+    @Test
+    public void testToSearchRequest() {
+        CountRequest countRequest;
+        if (randomBoolean()) {
+            countRequest = new CountRequest(randomStringArray());
+        } else {
+            countRequest = new CountRequest();
+        }
+        if (randomBoolean()) {
+            countRequest.indicesOptions(IndicesOptions.fromOptions(randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean()));
+        }
+        if (randomBoolean()) {
+            countRequest.types(randomStringArray());
+        }
+        if (randomBoolean()) {
+            countRequest.routing(randomStringArray());
+        }
+        if (randomBoolean()) {
+            countRequest.preference(randomAsciiOfLengthBetween(1, 10));
+        }
+        if (randomBoolean()) {
+            countRequest.source(new QuerySourceBuilder().setQuery(QueryBuilders.termQuery("field", "value")));
+        }
+        if (randomBoolean()) {
+            countRequest.minScore(randomFloat());
+        }
+        if (randomBoolean()) {
+            countRequest.terminateAfter(randomIntBetween(1, 1000));
+        }
+
+        SearchRequest searchRequest = countRequest.toSearchRequest();
+        assertThat(searchRequest.indices(), equalTo(countRequest.indices()));
+        assertThat(searchRequest.indicesOptions(), equalTo(countRequest.indicesOptions()));
+        assertThat(searchRequest.types(), equalTo(countRequest.types()));
+        assertThat(searchRequest.routing(), equalTo(countRequest.routing()));
+        assertThat(searchRequest.preference(), equalTo(countRequest.preference()));
+
+        if (countRequest.source() == null) {
+            assertThat(searchRequest.source(), nullValue());
+        } else {
+            Map<String, Object> sourceMap = XContentHelper.convertToMap(searchRequest.source(), false).v2();
+            assertThat(sourceMap.size(), equalTo(1));
+            assertThat(sourceMap.get("query"), notNullValue());
+        }
+
+        Map<String, Object> extraSourceMap = XContentHelper.convertToMap(searchRequest.extraSource(), false).v2();
+        int count = 1;
+        assertThat((Integer)extraSourceMap.get("size"), equalTo(0));
+        if (countRequest.minScore() == CountRequest.DEFAULT_MIN_SCORE) {
+            assertThat(extraSourceMap.get("min_score"), nullValue());
+        } else {
+            assertThat(((Number)extraSourceMap.get("min_score")).floatValue(), equalTo(countRequest.minScore()));
+            count++;
+        }
+        if (countRequest.terminateAfter() == SearchContext.DEFAULT_TERMINATE_AFTER) {
+            assertThat(extraSourceMap.get("terminate_after"), nullValue());
+        } else {
+            assertThat((Integer)extraSourceMap.get("terminate_after"), equalTo(countRequest.terminateAfter()));
+            count++;
+        }
+        assertThat(extraSourceMap.size(), equalTo(count));
+    }
+
+    private static String[] randomStringArray() {
+        int count = randomIntBetween(1, 5);
+        String[] indices = new String[count];
+        for (int i = 0; i < count; i++) {
+            indices[i] = randomAsciiOfLengthBetween(1, 10);
+        }
+        return indices;
+    }
+}
diff --git a/src/test/java/org/elasticsearch/action/count/CountResponseTests.java b/src/test/java/org/elasticsearch/action/count/CountResponseTests.java
new file mode 100644
index 00000000000..bbe6c64edf3
--- /dev/null
+++ b/src/test/java/org/elasticsearch/action/count/CountResponseTests.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.count;
+
+import org.elasticsearch.action.ShardOperationFailedException;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.action.search.ShardSearchFailure;
+import org.elasticsearch.search.internal.InternalSearchHits;
+import org.elasticsearch.search.internal.InternalSearchResponse;
+import org.elasticsearch.test.ElasticsearchTestCase;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+
+public class CountResponseTests extends ElasticsearchTestCase {
+
+    @Test
+    public void testFromSearchResponse() {
+        InternalSearchResponse internalSearchResponse = new InternalSearchResponse(new InternalSearchHits(null, randomLong(), randomFloat()), null, null, randomBoolean(), randomBoolean());
+        ShardSearchFailure[] shardSearchFailures = new ShardSearchFailure[randomIntBetween(0, 5)];
+        for (int i = 0; i < shardSearchFailures.length; i++) {
+            shardSearchFailures[i] = new ShardSearchFailure(new IllegalArgumentException());
+        }
+        SearchResponse searchResponse = new SearchResponse(internalSearchResponse, null, randomIntBetween(0, 100), randomIntBetween(0, 100), randomIntBetween(0, 100), shardSearchFailures);
+
+        CountResponse countResponse = new CountResponse(searchResponse);
+        assertThat(countResponse.getTotalShards(), equalTo(searchResponse.getTotalShards()));
+        assertThat(countResponse.getSuccessfulShards(), equalTo(searchResponse.getSuccessfulShards()));
+        assertThat(countResponse.getFailedShards(), equalTo(searchResponse.getFailedShards()));
+        assertThat(countResponse.getShardFailures(), equalTo((ShardOperationFailedException[])searchResponse.getShardFailures()));
+        assertThat(countResponse.getCount(), equalTo(searchResponse.getHits().totalHits()));
+        assertThat(countResponse.terminatedEarly(), equalTo(searchResponse.isTerminatedEarly()));
+    }
+}
diff --git a/src/test/java/org/elasticsearch/broadcast/BroadcastActionsTests.java b/src/test/java/org/elasticsearch/broadcast/BroadcastActionsTests.java
index 09b4b601ee3..baaa5045be7 100644
--- a/src/test/java/org/elasticsearch/broadcast/BroadcastActionsTests.java
+++ b/src/test/java/org/elasticsearch/broadcast/BroadcastActionsTests.java
@@ -20,8 +20,8 @@
 package org.elasticsearch.broadcast;
 
 import com.google.common.base.Charsets;
-import org.elasticsearch.action.ShardOperationFailedException;
 import org.elasticsearch.action.count.CountResponse;
+import org.elasticsearch.action.search.SearchPhaseExecutionException;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
@@ -33,7 +33,6 @@ import static org.elasticsearch.client.Requests.countRequest;
 import static org.elasticsearch.client.Requests.indexRequest;
 import static org.elasticsearch.index.query.QueryBuilders.termQuery;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
-import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 
 public class BroadcastActionsTests extends ElasticsearchIntegrationTest {
@@ -72,14 +71,10 @@ public class BroadcastActionsTests extends ElasticsearchIntegrationTest {
 
         for (int i = 0; i < 5; i++) {
             // test failed (simply query that can't be parsed)
-            CountResponse countResponse = client().count(countRequest("test").source("{ term : { _type : \"type1 } }".getBytes(Charsets.UTF_8))).actionGet();
-
-            assertThat(countResponse.getCount(), equalTo(0l));
-            assertThat(countResponse.getTotalShards(), equalTo(numShards.numPrimaries));
-            assertThat(countResponse.getSuccessfulShards(), equalTo(0));
-            assertThat(countResponse.getFailedShards(), equalTo(numShards.numPrimaries));
-            for (ShardOperationFailedException exp : countResponse.getShardFailures()) {
-                assertThat(exp.reason(), containsString("QueryParsingException"));
+            try {
+                client().count(countRequest("test").source("{ term : { _type : \"type1 } }".getBytes(Charsets.UTF_8))).actionGet();
+            } catch(SearchPhaseExecutionException e) {
+                assertThat(e.shardFailures().length, equalTo(numShards.numPrimaries));
             }
         }
     }
diff --git a/src/test/java/org/elasticsearch/count/query/CountQueryTests.java b/src/test/java/org/elasticsearch/count/query/CountQueryTests.java
deleted file mode 100644
index e693be7c8bb..00000000000
--- a/src/test/java/org/elasticsearch/count/query/CountQueryTests.java
+++ /dev/null
@@ -1,843 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.count.query;
-
-import org.elasticsearch.Version;
-import org.elasticsearch.action.ShardOperationFailedException;
-import org.elasticsearch.action.count.CountResponse;
-import org.elasticsearch.cluster.metadata.IndexMetaData;
-import org.elasticsearch.common.bytes.BytesArray;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder.Operator;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder.Type;
-import org.elasticsearch.index.query.MultiMatchQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.WrapperQueryBuilder;
-import org.elasticsearch.rest.RestStatus;
-import org.elasticsearch.test.ElasticsearchIntegrationTest;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.joda.time.format.ISODateTimeFormat;
-import org.junit.Test;
-
-import java.io.IOException;
-
-import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
-import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
-import static org.elasticsearch.index.query.QueryBuilders.constantScoreQuery;
-import static org.elasticsearch.index.query.QueryBuilders.existsQuery;
-import static org.elasticsearch.index.query.QueryBuilders.filteredQuery;
-import static org.elasticsearch.index.query.QueryBuilders.idsQuery;
-import static org.elasticsearch.index.query.QueryBuilders.limitQuery;
-import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
-import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
-import static org.elasticsearch.index.query.QueryBuilders.missingQuery;
-import static org.elasticsearch.index.query.QueryBuilders.multiMatchQuery;
-import static org.elasticsearch.index.query.QueryBuilders.queryStringQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termsLookupQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termsQuery;
-import static org.elasticsearch.index.query.QueryBuilders.typeQuery;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.anyOf;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-
-public class CountQueryTests extends ElasticsearchIntegrationTest {
-
-    @Test
-    public void passQueryAsStringTest() throws Exception {
-        createIndex("test");
-
-        client().prepareIndex("test", "type1", "1").setSource("field1", "value1_1", "field2", "value2_1").setRefresh(true).get();
-
-        CountResponse countResponse = client().prepareCount().setSource(new BytesArray("{ \"query\" : { \"term\" : { \"field1\" : \"value1_1\" }}}").array()).get();
-        assertHitCount(countResponse, 1l);
-    }
-
-    @Test
-    public void testIndexOptions() throws Exception {
-        assertAcked(prepareCreate("test")
-                .addMapping("type1", "field1", "type=string,index_options=docs"));
-
-        client().prepareIndex("test", "type1", "1").setSource("field1", "quick brown fox", "field2", "quick brown fox").get();
-        client().prepareIndex("test", "type1", "2").setSource("field1", "quick lazy huge brown fox", "field2", "quick lazy huge brown fox").get();
-        refresh();
-
-        CountResponse countResponse = client().prepareCount().setQuery(QueryBuilders.matchQuery("field2", "quick brown").type(Type.PHRASE).slop(0)).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.matchQuery("field1", "quick brown").type(Type.PHRASE).slop(0)).get();
-        assertHitCount(countResponse, 0l);
-        assertThat(countResponse.getFailedShards(), anyOf(equalTo(1), equalTo(2)));
-        assertThat(countResponse.getFailedShards(), equalTo(countResponse.getShardFailures().length));
-        for (ShardOperationFailedException shardFailure : countResponse.getShardFailures()) {
-            assertThat(shardFailure.status(), equalTo(RestStatus.INTERNAL_SERVER_ERROR));
-            assertThat(shardFailure.reason(), containsString("[field \"field1\" was indexed without position data; cannot run PhraseQuery"));
-        }
-    }
-
-    @Test
-    public void testCommonTermsQuery() throws Exception {
-        assertAcked(prepareCreate("test")
-                .addMapping("type1", "field1", "type=string,analyzer=whitespace")
-                .setSettings(SETTING_NUMBER_OF_SHARDS, 1));
-
-        indexRandom(true,
-                client().prepareIndex("test", "type1", "3").setSource("field1", "quick lazy huge brown pidgin", "field2", "the quick lazy huge brown fox jumps over the tree"),
-                client().prepareIndex("test", "type1", "1").setSource("field1", "the quick brown fox"),
-                client().prepareIndex("test", "type1", "2").setSource("field1", "the quick lazy huge brown fox jumps over the tree") );
-
-        CountResponse countResponse = client().prepareCount().setQuery(QueryBuilders.commonTermsQuery("field1", "the quick brown").cutoffFrequency(3).lowFreqOperator(Operator.OR)).get();
-        assertHitCount(countResponse, 3l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.commonTermsQuery("field1", "the quick brown").cutoffFrequency(3).lowFreqOperator(Operator.AND)).get();
-        assertHitCount(countResponse, 2l);
-
-        // Default
-        countResponse = client().prepareCount().setQuery(QueryBuilders.commonTermsQuery("field1", "the quick brown").cutoffFrequency(3)).get();
-        assertHitCount(countResponse, 3l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.commonTermsQuery("field1", "the huge fox").lowFreqMinimumShouldMatch("2")).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.commonTermsQuery("field1", "the lazy fox brown").cutoffFrequency(1).highFreqMinimumShouldMatch("3")).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.commonTermsQuery("field1", "the lazy fox brown").cutoffFrequency(1).highFreqMinimumShouldMatch("4")).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setSource(new BytesArray("{ \"query\" : { \"common\" : { \"field1\" : { \"query\" : \"the lazy fox brown\", \"cutoff_frequency\" : 1, \"minimum_should_match\" : { \"high_freq\" : 4 } } } } }").array()).get();
-        assertHitCount(countResponse, 1l);
-
-        // Default
-        countResponse = client().prepareCount().setQuery(QueryBuilders.commonTermsQuery("field1", "the lazy fox brown").cutoffFrequency(1)).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.commonTermsQuery("field1", "the quick brown").cutoffFrequency(3).analyzer("standard")).get();
-        assertHitCount(countResponse, 3l);
-        // standard drops "the" since its a stopword
-
-        // try the same with match query
-        countResponse = client().prepareCount().setQuery(QueryBuilders.matchQuery("field1", "the quick brown").cutoffFrequency(3).operator(MatchQueryBuilder.Operator.AND)).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.matchQuery("field1", "the quick brown").cutoffFrequency(3).operator(MatchQueryBuilder.Operator.OR)).get();
-        assertHitCount(countResponse, 3l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.matchQuery("field1", "the quick brown").cutoffFrequency(3).operator(MatchQueryBuilder.Operator.AND).analyzer("stop")).get();
-        assertHitCount(countResponse, 3l);
-        // standard drops "the" since its a stopword
-
-        // try the same with multi match query
-        countResponse = client().prepareCount().setQuery(QueryBuilders.multiMatchQuery("the quick brown", "field1", "field2").cutoffFrequency(3).operator(MatchQueryBuilder.Operator.AND)).get();
-        assertHitCount(countResponse, 3l);
-    }
-
-    @Test
-    public void queryStringAnalyzedWildcard() throws Exception {
-        createIndex("test");
-
-        client().prepareIndex("test", "type1", "1").setSource("field1", "value_1", "field2", "value_2").get();
-        refresh();
-
-        CountResponse countResponse = client().prepareCount().setQuery(queryStringQuery("value*").analyzeWildcard(true)).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(queryStringQuery("*ue*").analyzeWildcard(true)).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(queryStringQuery("*ue_1").analyzeWildcard(true)).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(queryStringQuery("val*e_1").analyzeWildcard(true)).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(queryStringQuery("v?l*e?1").analyzeWildcard(true)).get();
-        assertHitCount(countResponse, 1l);
-    }
-
-    @Test
-    public void testLowercaseExpandedTerms() {
-        createIndex("test");
-
-        client().prepareIndex("test", "type1", "1").setSource("field1", "value_1", "field2", "value_2").get();
-        refresh();
-
-        CountResponse countResponse = client().prepareCount().setQuery(queryStringQuery("VALUE_3~1").lowercaseExpandedTerms(true)).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount().setQuery(queryStringQuery("VALUE_3~1").lowercaseExpandedTerms(false)).get();
-        assertHitCount(countResponse, 0l);
-        countResponse = client().prepareCount().setQuery(queryStringQuery("ValUE_*").lowercaseExpandedTerms(true)).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount().setQuery(queryStringQuery("vAl*E_1")).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount().setQuery(queryStringQuery("[VALUE_1 TO VALUE_3]")).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount().setQuery(queryStringQuery("[VALUE_1 TO VALUE_3]").lowercaseExpandedTerms(false)).get();
-        assertHitCount(countResponse, 0l);
-    }
-
-    @Test //https://github.com/elasticsearch/elasticsearch/issues/3540
-    public void testDateRangeInQueryString() {
-        //the mapping needs to be provided upfront otherwise we are not sure how many failures we get back
-        //as with dynamic mappings some shards might be lacking behind and parse a different query
-        assertAcked(prepareCreate("test").addMapping(
-                "type", "past", "type=date", "future", "type=date"
-        ));
-        ensureGreen();
-
-        NumShards test = getNumShards("test");
-
-        String aMonthAgo = ISODateTimeFormat.yearMonthDay().print(new DateTime(DateTimeZone.UTC).minusMonths(1));
-        String aMonthFromNow = ISODateTimeFormat.yearMonthDay().print(new DateTime(DateTimeZone.UTC).plusMonths(1));
-
-        client().prepareIndex("test", "type", "1").setSource("past", aMonthAgo, "future", aMonthFromNow).get();
-        refresh();
-
-        CountResponse countResponse = client().prepareCount().setQuery(queryStringQuery("past:[now-2M/d TO now/d]")).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(queryStringQuery("future:[now/d TO now+2M/d]").lowercaseExpandedTerms(false)).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount("test").setQuery(queryStringQuery("future:[now/D TO now+2M/d]").lowercaseExpandedTerms(false)).get();
-        //D is an unsupported unit in date math
-        assertThat(countResponse.getSuccessfulShards(), equalTo(0));
-        assertThat(countResponse.getFailedShards(), equalTo(test.numPrimaries));
-        assertThat(countResponse.getShardFailures().length, equalTo(test.numPrimaries));
-        for (ShardOperationFailedException shardFailure : countResponse.getShardFailures()) {
-            assertThat(shardFailure.status(), equalTo(RestStatus.BAD_REQUEST));
-            assertThat(shardFailure.reason(), allOf(containsString("Failed to parse"), containsString("unit [D] not supported for date math")));
-        }
-    }
-
-    @Test
-    public void typeFilterTypeIndexedTests() throws Exception {
-        typeFilterTests("not_analyzed");
-    }
-
-    @Test
-    public void typeFilterTypeNotIndexedTests() throws Exception {
-        typeFilterTests("no");
-    }
-
-    private void typeFilterTests(String index) throws Exception {
-        Settings indexSettings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.V_1_4_2.id).build();
-        assertAcked(prepareCreate("test").setSettings(indexSettings)
-                .addMapping("type1", jsonBuilder().startObject().startObject("type1")
-                        .startObject("_type").field("index", index).endObject()
-                        .endObject().endObject())
-                .addMapping("type2", jsonBuilder().startObject().startObject("type2")
-                        .startObject("_type").field("index", index).endObject()
-                        .endObject().endObject()));
-        indexRandom(true, client().prepareIndex("test", "type1", "1").setSource("field1", "value1"),
-                client().prepareIndex("test", "type2", "1").setSource("field1", "value1"),
-                client().prepareIndex("test", "type1", "2").setSource("field1", "value1"),
-                client().prepareIndex("test", "type2", "2").setSource("field1", "value1"),
-                client().prepareIndex("test", "type2", "3").setSource("field1", "value1"));
-
-        assertHitCount(client().prepareCount().setQuery(filteredQuery(matchAllQuery(), typeQuery("type1"))).get(), 2l);
-        assertHitCount(client().prepareCount().setQuery(filteredQuery(matchAllQuery(), typeQuery("type2"))).get(), 3l);
-
-        assertHitCount(client().prepareCount().setTypes("type1").setQuery(matchAllQuery()).get(), 2l);
-        assertHitCount(client().prepareCount().setTypes("type2").setQuery(matchAllQuery()).get(), 3l);
-
-        assertHitCount(client().prepareCount().setTypes("type1", "type2").setQuery(matchAllQuery()).get(), 5l);
-    }
-
-    @Test
-    public void idsQueryTestsIdIndexed() throws Exception {
-        idsQueryTests("not_analyzed");
-    }
-
-    @Test
-    public void idsQueryTestsIdNotIndexed() throws Exception {
-        idsQueryTests("no");
-    }
-
-    private void idsQueryTests(String index) throws Exception {
-        Settings indexSettings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.V_1_4_2.id).build();
-        assertAcked(prepareCreate("test").setSettings(indexSettings)
-            .addMapping("type1", jsonBuilder().startObject().startObject("type1")
-                .startObject("_id").field("index", index).endObject()
-                .endObject().endObject()));
-
-        indexRandom(true, client().prepareIndex("test", "type1", "1").setSource("field1", "value1"),
-                client().prepareIndex("test", "type1", "2").setSource("field1", "value2"),
-                client().prepareIndex("test", "type1", "3").setSource("field1", "value3"));
-
-        CountResponse countResponse = client().prepareCount().setQuery(constantScoreQuery(idsQuery("type1").ids("1", "3"))).get();
-        assertHitCount(countResponse, 2l);
-
-        // no type
-        countResponse = client().prepareCount().setQuery(constantScoreQuery(idsQuery().ids("1", "3"))).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount().setQuery(idsQuery("type1").ids("1", "3")).get();
-        assertHitCount(countResponse, 2l);
-
-        // no type
-        countResponse = client().prepareCount().setQuery(idsQuery().ids("1", "3")).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount().setQuery(idsQuery("type1").ids("7", "10")).get();
-        assertHitCount(countResponse, 0l);
-
-        // repeat..., with terms
-        countResponse = client().prepareCount().setTypes("type1").setQuery(constantScoreQuery(termsQuery("_id", "1", "3"))).get();
-        assertHitCount(countResponse, 2l);
-    }
-
-    @Test
-    public void testLimitFilter() throws Exception {
-        assertAcked(prepareCreate("test").setSettings(SETTING_NUMBER_OF_SHARDS, 1));
-
-        indexRandom(true, client().prepareIndex("test", "type1", "1").setSource("field1", "value1_1"),
-                client().prepareIndex("test", "type1", "2").setSource("field1", "value1_2"),
-                client().prepareIndex("test", "type1", "3").setSource("field2", "value2_3"),
-                client().prepareIndex("test", "type1", "4").setSource("field3", "value3_4"));
-
-        CountResponse countResponse = client().prepareCount().setQuery(filteredQuery(matchAllQuery(), limitQuery(2))).get();
-        assertHitCount(countResponse, 4l); // limit is a no-op
-    }
-
-    @Test
-    public void filterExistsMissingTests() throws Exception {
-        createIndex("test");
-
-        indexRandom(true,
-                client().prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject().startObject("obj1").field("obj1_val", "1").endObject().field("x1", "x_1").field("field1", "value1_1").field("field2", "value2_1").endObject()),
-                client().prepareIndex("test", "type1", "2").setSource(jsonBuilder().startObject().startObject("obj1").field("obj1_val", "1").endObject().field("x2", "x_2").field("field1", "value1_2").endObject()),
-                client().prepareIndex("test", "type1", "3").setSource(jsonBuilder().startObject().startObject("obj2").field("obj2_val", "1").endObject().field("y1", "y_1").field("field2", "value2_3").endObject()),
-                client().prepareIndex("test", "type1", "4").setSource(jsonBuilder().startObject().startObject("obj2").field("obj2_val", "1").endObject().field("y2", "y_2").field("field3", "value3_4").endObject()));
-
-        CountResponse countResponse = client().prepareCount().setQuery(filteredQuery(matchAllQuery(), existsQuery("field1"))).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount().setQuery(constantScoreQuery(existsQuery("field1"))).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount().setQuery(queryStringQuery("_exists_:field1")).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount().setQuery(filteredQuery(matchAllQuery(), existsQuery("field2"))).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount().setQuery(filteredQuery(matchAllQuery(), existsQuery("field3"))).get();
-        assertHitCount(countResponse, 1l);
-
-        // wildcard check
-        countResponse = client().prepareCount().setQuery(filteredQuery(matchAllQuery(), existsQuery("x*"))).get();
-        assertHitCount(countResponse, 2l);
-
-        // object check
-        countResponse = client().prepareCount().setQuery(filteredQuery(matchAllQuery(), existsQuery("obj1"))).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount().setQuery(filteredQuery(matchAllQuery(), missingQuery("field1"))).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount().setQuery(filteredQuery(matchAllQuery(), missingQuery("field1"))).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount().setQuery(constantScoreQuery(missingQuery("field1"))).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount().setQuery(queryStringQuery("_missing_:field1")).get();
-        assertHitCount(countResponse, 2l);
-
-        // wildcard check
-        countResponse = client().prepareCount().setQuery(filteredQuery(matchAllQuery(), missingQuery("x*"))).get();
-        assertHitCount(countResponse, 2l);
-
-        // object check
-        countResponse = client().prepareCount().setQuery(filteredQuery(matchAllQuery(), missingQuery("obj1"))).get();
-        assertHitCount(countResponse, 2l);
-    }
-
-    @Test
-    public void passQueryAsJSONStringTest() throws Exception {
-        createIndex("test");
-
-        client().prepareIndex("test", "type1", "1").setSource("field1", "value1_1", "field2", "value2_1").setRefresh(true).get();
-
-        WrapperQueryBuilder wrapper = new WrapperQueryBuilder("{ \"term\" : { \"field1\" : \"value1_1\" } }");
-        assertHitCount(client().prepareCount().setQuery(wrapper).get(), 1l);
-
-        BoolQueryBuilder bool = boolQuery().must(wrapper).must(new TermQueryBuilder("field2", "value2_1"));
-        assertHitCount(client().prepareCount().setQuery(bool).get(), 1l);
-    }
-
-    @Test
-    public void testMatchQueryNumeric() throws Exception {
-        createIndex("test");
-
-        client().prepareIndex("test", "type1", "1").setSource("long", 1l, "double", 1.0d).get();
-        client().prepareIndex("test", "type1", "2").setSource("long", 2l, "double", 2.0d).get();
-        client().prepareIndex("test", "type1", "3").setSource("long", 3l, "double", 3.0d).get();
-        refresh();
-        CountResponse countResponse = client().prepareCount().setQuery(matchQuery("long", "1")).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(matchQuery("double", "2")).get();
-        assertHitCount(countResponse, 1l);
-    }
-
-    @Test
-    public void testMultiMatchQuery() throws Exception {
-        createIndex("test");
-
-        client().prepareIndex("test", "type1", "1").setSource("field1", "value1", "field2", "value4", "field3", "value3").get();
-        client().prepareIndex("test", "type1", "2").setSource("field1", "value2", "field2", "value5", "field3", "value2").get();
-        client().prepareIndex("test", "type1", "3").setSource("field1", "value3", "field2", "value6", "field3", "value1").get();
-        refresh();
-
-        MultiMatchQueryBuilder builder = QueryBuilders.multiMatchQuery("value1 value2 value4", "field1", "field2");
-        CountResponse countResponse = client().prepareCount().setQuery(builder).get();
-        assertHitCount(countResponse, 2l);
-
-        refresh();
-        builder = QueryBuilders.multiMatchQuery("value1", "field1", "field2")
-                .operator(MatchQueryBuilder.Operator.AND); // Operator only applies on terms inside a field! Fields are always OR-ed together.
-        countResponse = client().prepareCount().setQuery(builder).get();
-        assertHitCount(countResponse, 1l);
-
-        refresh();
-        builder = QueryBuilders.multiMatchQuery("value1", "field1", "field3^1.5")
-                .operator(MatchQueryBuilder.Operator.AND); // Operator only applies on terms inside a field! Fields are always OR-ed together.
-        countResponse = client().prepareCount().setQuery(builder).get();
-        assertHitCount(countResponse, 2l);
-
-        refresh();
-        builder = QueryBuilders.multiMatchQuery("value1").field("field1").field("field3", 1.5f)
-                .operator(MatchQueryBuilder.Operator.AND); // Operator only applies on terms inside a field! Fields are always OR-ed together.
-        countResponse = client().prepareCount().setQuery(builder).get();
-        assertHitCount(countResponse, 2l);
-
-        // Test lenient
-        client().prepareIndex("test", "type1", "3").setSource("field1", "value7", "field2", "value8", "field4", 5).get();
-        refresh();
-
-        builder = QueryBuilders.multiMatchQuery("value1", "field1", "field2", "field4");
-        builder.lenient(true);
-        countResponse = client().prepareCount().setQuery(builder).get();
-        assertHitCount(countResponse, 1l);
-    }
-
-    @Test
-    public void testMatchQueryZeroTermsQuery() {
-        assertAcked(prepareCreate("test")
-            .addMapping("type1", "field1", "type=string,analyzer=classic", "field2", "type=string,analyzer=classic"));
-        client().prepareIndex("test", "type1", "1").setSource("field1", "value1").get();
-        client().prepareIndex("test", "type1", "2").setSource("field1", "value2").get();
-        refresh();
-
-        BoolQueryBuilder boolQuery = boolQuery()
-                .must(matchQuery("field1", "a").zeroTermsQuery(MatchQueryBuilder.ZeroTermsQuery.NONE))
-                .must(matchQuery("field1", "value1").zeroTermsQuery(MatchQueryBuilder.ZeroTermsQuery.NONE));
-        CountResponse countResponse = client().prepareCount().setQuery(boolQuery).get();
-        assertHitCount(countResponse, 0l);
-
-        boolQuery = boolQuery()
-                .must(matchQuery("field1", "a").zeroTermsQuery(MatchQueryBuilder.ZeroTermsQuery.ALL))
-                .must(matchQuery("field1", "value1").zeroTermsQuery(MatchQueryBuilder.ZeroTermsQuery.ALL));
-        countResponse = client().prepareCount().setQuery(boolQuery).get();
-        assertHitCount(countResponse, 1l);
-
-        boolQuery = boolQuery().must(matchQuery("field1", "a").zeroTermsQuery(MatchQueryBuilder.ZeroTermsQuery.ALL));
-        countResponse = client().prepareCount().setQuery(boolQuery).get();
-        assertHitCount(countResponse, 2l);
-    }
-
-    @Test
-    public void testMultiMatchQueryZeroTermsQuery() {
-        assertAcked(prepareCreate("test")
-                .addMapping("type1", "field1", "type=string,analyzer=classic", "field2", "type=string,analyzer=classic"));
-        client().prepareIndex("test", "type1", "1").setSource("field1", "value1", "field2", "value2").get();
-        client().prepareIndex("test", "type1", "2").setSource("field1", "value3", "field2", "value4").get();
-        refresh();
-
-        BoolQueryBuilder boolQuery = boolQuery()
-                .must(multiMatchQuery("a", "field1", "field2").zeroTermsQuery(MatchQueryBuilder.ZeroTermsQuery.NONE))
-                .must(multiMatchQuery("value1", "field1", "field2").zeroTermsQuery(MatchQueryBuilder.ZeroTermsQuery.NONE)); // Fields are ORed together
-        CountResponse countResponse = client().prepareCount().setQuery(boolQuery).get();
-        assertHitCount(countResponse, 0l);
-
-        boolQuery = boolQuery()
-                .must(multiMatchQuery("a", "field1", "field2").zeroTermsQuery(MatchQueryBuilder.ZeroTermsQuery.ALL))
-                .must(multiMatchQuery("value4", "field1", "field2").zeroTermsQuery(MatchQueryBuilder.ZeroTermsQuery.ALL));
-        countResponse = client().prepareCount().setQuery(boolQuery).get();
-        assertHitCount(countResponse, 1l);
-
-        boolQuery = boolQuery().must(multiMatchQuery("a", "field1").zeroTermsQuery(MatchQueryBuilder.ZeroTermsQuery.ALL));
-        countResponse = client().prepareCount().setQuery(boolQuery).get();
-        assertHitCount(countResponse, 2l);
-    }
-
-    @Test
-    public void testMultiMatchQueryMinShouldMatch() {
-        createIndex("test");
-        client().prepareIndex("test", "type1", "1").setSource("field1", new String[]{"value1", "value2", "value3"}).get();
-        client().prepareIndex("test", "type1", "2").setSource("field2", "value1").get();
-        refresh();
-
-        MultiMatchQueryBuilder multiMatchQuery = multiMatchQuery("value1 value2 foo", "field1", "field2");
-
-        multiMatchQuery.useDisMax(true);
-        multiMatchQuery.minimumShouldMatch("70%");
-        CountResponse countResponse = client().prepareCount().setQuery(multiMatchQuery).get();
-        assertHitCount(countResponse, 1l);
-
-        multiMatchQuery.minimumShouldMatch("30%");
-        countResponse = client().prepareCount().setQuery(multiMatchQuery).get();
-        assertHitCount(countResponse, 2l);
-
-        multiMatchQuery.useDisMax(false);
-        multiMatchQuery.minimumShouldMatch("70%");
-        countResponse = client().prepareCount().setQuery(multiMatchQuery).get();
-        assertHitCount(countResponse, 1l);
-
-        multiMatchQuery.minimumShouldMatch("30%");
-        countResponse = client().prepareCount().setQuery(multiMatchQuery).get();
-        assertHitCount(countResponse, 2l);
-
-        multiMatchQuery = multiMatchQuery("value1 value2 bar", "field1");
-        multiMatchQuery.minimumShouldMatch("100%");
-        countResponse = client().prepareCount().setQuery(multiMatchQuery).get();
-        assertHitCount(countResponse, 0l);
-
-        multiMatchQuery.minimumShouldMatch("70%");
-        countResponse = client().prepareCount().setQuery(multiMatchQuery).get();
-        assertHitCount(countResponse, 1l);
-    }
-
-    @Test
-    public void testFuzzyQueryString() {
-        createIndex("test");
-        client().prepareIndex("test", "type1", "1").setSource("str", "kimchy", "date", "2012-02-01", "num", 12).get();
-        client().prepareIndex("test", "type1", "2").setSource("str", "shay", "date", "2012-02-05", "num", 20).get();
-        refresh();
-
-        CountResponse countResponse = client().prepareCount().setQuery(queryStringQuery("str:kimcy~1")).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(queryStringQuery("num:11~1")).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(queryStringQuery("date:2012-02-02~1d")).get();
-        assertHitCount(countResponse, 1l);
-    }
-
-    @Test
-    public void testSpecialRangeSyntaxInQueryString() {
-        createIndex("test");
-        client().prepareIndex("test", "type1", "1").setSource("str", "kimchy", "date", "2012-02-01", "num", 12).get();
-        client().prepareIndex("test", "type1", "2").setSource("str", "shay", "date", "2012-02-05", "num", 20).get();
-        refresh();
-
-        CountResponse countResponse = client().prepareCount().setQuery(queryStringQuery("num:>19")).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(queryStringQuery("num:>20")).get();
-        assertHitCount(countResponse, 0l);
-
-        countResponse = client().prepareCount().setQuery(queryStringQuery("num:>=20")).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(queryStringQuery("num:>11")).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount().setQuery(queryStringQuery("num:<20")).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(queryStringQuery("num:<=20")).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount().setQuery(queryStringQuery("+num:>11 +num:<20")).get();
-        assertHitCount(countResponse, 1l);
-    }
-
-    @Test
-    public void testEmptyTermsFilter() throws Exception {
-        assertAcked(prepareCreate("test").addMapping("type", "terms", "type=string"));
-        ensureGreen();
-        client().prepareIndex("test", "type", "1").setSource("term", "1").get();
-        client().prepareIndex("test", "type", "2").setSource("term", "2").get();
-        client().prepareIndex("test", "type", "3").setSource("term", "3").get();
-        client().prepareIndex("test", "type", "4").setSource("term", "4").get();
-        refresh();
-        CountResponse countResponse = client().prepareCount("test")
-                .setQuery(filteredQuery(matchAllQuery(), termsQuery("term", new String[0]))).get();
-        assertHitCount(countResponse, 0l);
-
-        countResponse = client().prepareCount("test")
-                .setQuery(filteredQuery(matchAllQuery(), idsQuery())).get();
-        assertHitCount(countResponse, 0l);
-    }
-
-    @Test
-    public void testTermsLookupFilter() throws Exception {
-        assertAcked(prepareCreate("lookup").addMapping("type", "terms", "type=string", "other", "type=string"));
-        assertAcked(prepareCreate("lookup2").addMapping("type",
-                jsonBuilder().startObject().startObject("type").startObject("properties")
-                        .startObject("arr").startObject("properties").startObject("term").field("type", "string")
-                        .endObject().endObject().endObject().endObject().endObject().endObject()));
-        assertAcked(prepareCreate("test").addMapping("type", "term", "type=string"));
-        ensureGreen();
-
-        indexRandom(true, client().prepareIndex("lookup", "type", "1").setSource("terms", new String[]{"1", "3"}),
-                client().prepareIndex("lookup", "type", "2").setSource("terms", new String[]{"2"}),
-                client().prepareIndex("lookup", "type", "3").setSource("terms", new String[]{"2", "4"}),
-                client().prepareIndex("lookup", "type", "4").setSource("other", "value"),
-                client().prepareIndex("lookup2", "type", "1").setSource(XContentFactory.jsonBuilder().startObject()
-                        .startArray("arr")
-                        .startObject().field("term", "1").endObject()
-                        .startObject().field("term", "3").endObject()
-                        .endArray()
-                        .endObject()),
-                client().prepareIndex("lookup2", "type", "2").setSource(XContentFactory.jsonBuilder().startObject()
-                        .startArray("arr")
-                        .startObject().field("term", "2").endObject()
-                        .endArray()
-                        .endObject()),
-                client().prepareIndex("lookup2", "type", "3").setSource(XContentFactory.jsonBuilder().startObject()
-                        .startArray("arr")
-                        .startObject().field("term", "2").endObject()
-                        .startObject().field("term", "4").endObject()
-                        .endArray()
-                        .endObject()),
-                client().prepareIndex("test", "type", "1").setSource("term", "1"),
-                client().prepareIndex("test", "type", "2").setSource("term", "2"),
-                client().prepareIndex("test", "type", "3").setSource("term", "3"),
-                client().prepareIndex("test", "type", "4").setSource("term", "4"));
-
-        CountResponse countResponse = client().prepareCount("test")
-                .setQuery(filteredQuery(matchAllQuery(), termsLookupQuery("term").lookupIndex("lookup").lookupType("type").lookupId("1").lookupPath("terms"))).get();
-        assertHitCount(countResponse, 2l);
-
-        // same as above, just on the _id...
-        countResponse = client().prepareCount("test")
-                .setQuery(filteredQuery(matchAllQuery(), termsLookupQuery("_id").lookupIndex("lookup").lookupType("type").lookupId("1").lookupPath("terms"))).get();
-        assertHitCount(countResponse, 2l);
-
-        // another search with same parameters...
-        countResponse = client().prepareCount("test")
-                .setQuery(filteredQuery(matchAllQuery(), termsLookupQuery("term").lookupIndex("lookup").lookupType("type").lookupId("1").lookupPath("terms"))).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount("test")
-                .setQuery(filteredQuery(matchAllQuery(), termsLookupQuery("term").lookupIndex("lookup").lookupType("type").lookupId("2").lookupPath("terms"))).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount("test")
-                .setQuery(filteredQuery(matchAllQuery(), termsLookupQuery("term").lookupIndex("lookup").lookupType("type").lookupId("3").lookupPath("terms"))
-                ).get();
-        assertNoFailures(countResponse);
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount("test")
-                .setQuery(filteredQuery(matchAllQuery(), termsLookupQuery("term").lookupIndex("lookup").lookupType("type").lookupId("4").lookupPath("terms"))).get();
-        assertHitCount(countResponse, 0l);
-
-        countResponse = client().prepareCount("test")
-                .setQuery(filteredQuery(matchAllQuery(), termsLookupQuery("term").lookupIndex("lookup2").lookupType("type").lookupId("1").lookupPath("arr.term"))).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount("test")
-                .setQuery(filteredQuery(matchAllQuery(), termsLookupQuery("term").lookupIndex("lookup2").lookupType("type").lookupId("2").lookupPath("arr.term"))).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount("test")
-                .setQuery(filteredQuery(matchAllQuery(), termsLookupQuery("term").lookupIndex("lookup2").lookupType("type").lookupId("3").lookupPath("arr.term"))).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount("test")
-                .setQuery(filteredQuery(matchAllQuery(), termsLookupQuery("not_exists").lookupIndex("lookup2").lookupType("type").lookupId("3").lookupPath("arr.term"))).get();
-        assertHitCount(countResponse, 0l);
-    }
-
-    @Test
-    public void testBasicFilterById() throws Exception {
-        createIndex("test");
-        ensureGreen();
-
-        client().prepareIndex("test", "type1", "1").setSource("field1", "value1").get();
-        client().prepareIndex("test", "type2", "2").setSource("field1", "value2").get();
-        refresh();
-
-        CountResponse countResponse = client().prepareCount().setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery("type1", "type2").ids("1", "2"))).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().ids("1", "2"))).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery("type1").ids("1", "2"))).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery().ids("1"))).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery(null).ids("1"))).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.idsQuery("type1", "type2", "type3").ids("1", "2", "3", "4"))).get();
-        assertHitCount(countResponse, 2l);
-    }
-
-    @Test
-    public void testBasicQueryById() throws Exception {
-        createIndex("test");
-        ensureGreen();
-
-        client().prepareIndex("test", "type1", "1").setSource("field1", "value1").get();
-        client().prepareIndex("test", "type2", "2").setSource("field1", "value2").get();
-        refresh();
-
-        CountResponse countResponse = client().prepareCount().setQuery(QueryBuilders.idsQuery("type1", "type2").ids("1", "2")).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.idsQuery().ids("1")).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.idsQuery().ids("1", "2")).get();
-        assertHitCount(countResponse, 2l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.idsQuery("type1").ids("1", "2")).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.idsQuery().ids("1")).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.idsQuery(null).ids("1")).get();
-        assertHitCount(countResponse, 1l);
-
-        countResponse = client().prepareCount().setQuery(QueryBuilders.idsQuery("type1", "type2", "type3").ids("1", "2", "3", "4")).get();
-        assertHitCount(countResponse, 2l);
-    }
-
-    @Test
-    public void testNumericTermsAndRanges() throws Exception {
-        assertAcked(prepareCreate("test")
-                .addMapping("type1",
-                        "num_byte", "type=byte", "num_short", "type=short",
-                        "num_integer", "type=integer", "num_long", "type=long",
-                        "num_float", "type=float", "num_double", "type=double"));
-        ensureGreen();
-
-        client().prepareIndex("test", "type1", "1").setSource("num_byte", 1, "num_short", 1, "num_integer", 1,
-                "num_long", 1, "num_float", 1, "num_double", 1).get();
-
-        client().prepareIndex("test", "type1", "2").setSource("num_byte", 2, "num_short", 2, "num_integer", 2,
-                "num_long", 2, "num_float", 2, "num_double", 2).get();
-
-        client().prepareIndex("test", "type1", "17").setSource("num_byte", 17, "num_short", 17, "num_integer", 17,
-                "num_long", 17, "num_float", 17, "num_double", 17).get();
-        refresh();
-
-        CountResponse countResponse;
-        logger.info("--> term query on 1");
-        countResponse = client().prepareCount("test").setQuery(termQuery("num_byte", 1)).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(termQuery("num_short", 1)).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(termQuery("num_integer", 1)).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(termQuery("num_long", 1)).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(termQuery("num_float", 1)).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(termQuery("num_double", 1)).get();
-        assertHitCount(countResponse, 1l);
-
-        logger.info("--> terms query on 1");
-        countResponse = client().prepareCount("test").setQuery(termsQuery("num_byte", new int[]{1})).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(termsQuery("num_short", new int[]{1})).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(termsQuery("num_integer", new int[]{1})).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(termsQuery("num_long", new int[]{1})).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(termsQuery("num_float", new double[]{1})).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(termsQuery("num_double", new double[]{1})).get();
-        assertHitCount(countResponse, 1l);
-
-        logger.info("--> term filter on 1");
-        countResponse = client().prepareCount("test").setQuery(filteredQuery(matchAllQuery(), termQuery("num_byte", 1))).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(filteredQuery(matchAllQuery(), termQuery("num_short", 1))).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(filteredQuery(matchAllQuery(), termQuery("num_integer", 1))).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(filteredQuery(matchAllQuery(), termQuery("num_long", 1))).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(filteredQuery(matchAllQuery(), termQuery("num_float", 1))).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(filteredQuery(matchAllQuery(), termQuery("num_double", 1))).get();
-        assertHitCount(countResponse, 1l);
-
-        logger.info("--> terms filter on 1");
-        countResponse = client().prepareCount("test").setQuery(filteredQuery(matchAllQuery(), termsQuery("num_byte", new int[]{1}))).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(filteredQuery(matchAllQuery(), termsQuery("num_short", new int[]{1}))).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(filteredQuery(matchAllQuery(), termsQuery("num_integer", new int[]{1}))).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(filteredQuery(matchAllQuery(), termsQuery("num_long", new int[]{1}))).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(filteredQuery(matchAllQuery(), termsQuery("num_float", new int[]{1}))).get();
-        assertHitCount(countResponse, 1l);
-        countResponse = client().prepareCount("test").setQuery(filteredQuery(matchAllQuery(), termsQuery("num_double", new int[]{1}))).get();
-        assertHitCount(countResponse, 1l);
-    }
-
-    @Test // see #2994
-    public void testSimpleSpan() throws IOException {
-        createIndex("test");
-        ensureGreen();
-
-        client().prepareIndex("test", "test", "1").setSource("description", "foo other anything bar").get();
-        client().prepareIndex("test", "test", "2").setSource("description", "foo other anything").get();
-        client().prepareIndex("test", "test", "3").setSource("description", "foo other").get();
-        client().prepareIndex("test", "test", "4").setSource("description", "foo").get();
-        refresh();
-
-        CountResponse response = client().prepareCount("test")
-                .setQuery(QueryBuilders.spanOrQuery().clause(QueryBuilders.spanTermQuery("description", "bar"))).get();
-        assertHitCount(response, 1l);
-
-        response = client().prepareCount("test").setQuery(
-                QueryBuilders.spanNearQuery()
-                        .clause(QueryBuilders.spanTermQuery("description", "foo"))
-                        .clause(QueryBuilders.spanTermQuery("description", "other"))
-                        .slop(3)).get();
-        assertHitCount(response, 3l);
-    }
-}
diff --git a/src/test/java/org/elasticsearch/document/DocumentActionsTests.java b/src/test/java/org/elasticsearch/document/DocumentActionsTests.java
index 8673a93dc3e..0b869d72e36 100644
--- a/src/test/java/org/elasticsearch/document/DocumentActionsTests.java
+++ b/src/test/java/org/elasticsearch/document/DocumentActionsTests.java
@@ -19,7 +19,6 @@
 
 package org.elasticsearch.document;
 
-import com.google.common.base.Charsets;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus;
 import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheResponse;
 import org.elasticsearch.action.admin.indices.flush.FlushResponse;
@@ -30,6 +29,7 @@ import org.elasticsearch.action.count.CountResponse;
 import org.elasticsearch.action.delete.DeleteResponse;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.index.IndexResponse;
+import org.elasticsearch.action.search.SearchPhaseExecutionException;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
@@ -40,7 +40,8 @@ import java.io.IOException;
 import static org.elasticsearch.client.Requests.*;
 import static org.elasticsearch.index.query.QueryBuilders.termQuery;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.nullValue;
 
 /**
  *
@@ -163,11 +164,11 @@ public class DocumentActionsTests extends ElasticsearchIntegrationTest {
             assertThat(countResponse.getFailedShards(), equalTo(0));
 
             // test failed (simply query that can't be parsed)
-            countResponse = client().count(countRequest("test").source("{ term : { _type : \"type1 } }".getBytes(Charsets.UTF_8))).actionGet();
-
-            assertThat(countResponse.getCount(), equalTo(0l));
-            assertThat(countResponse.getSuccessfulShards(), equalTo(0));
-            assertThat(countResponse.getFailedShards(), equalTo(numShards.numPrimaries));
+            try {
+                client().count(countRequest("test").source("{ term : { _type : \"type1 } }")).actionGet();
+            } catch(SearchPhaseExecutionException e) {
+                assertThat(e.shardFailures().length, equalTo(numShards.numPrimaries));
+            }
 
             // count with no query is a match all one
             countResponse = client().prepareCount("test").execute().actionGet();

From fcccd45601bdeb6b1bf54da4a5bde317297cb3bd Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Tue, 26 May 2015 21:39:20 +0200
Subject: [PATCH 020/123] Be more lenient in EIT#waitForDocs

The count request now acts like search and barfs if all shards fail
this behavior changed and some tests like RecoveryWhileUnderLoadTests
relied on the lenient behavior of the old count API. This might be
a temporary solution to stop current test failures.

Relates to #11198
---
 .../test/ElasticsearchIntegrationTest.java        | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
index ea05c58ae35..d046a2f05ad 100644
--- a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
+++ b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
@@ -1067,12 +1067,17 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
                     lastKnownCount.set(indexer.totalIndexedDocs());
                 }
                 if (lastKnownCount.get() >= numDocs) {
-                    long count = client().prepareCount().setQuery(matchAllQuery()).execute().actionGet().getCount();
-                    if (count == lastKnownCount.get()) {
-                        // no progress - try to refresh for the next time
-                        client().admin().indices().prepareRefresh().get();
+                    try {
+                        long count = client().prepareCount().setQuery(matchAllQuery()).execute().actionGet().getCount();
+                        if (count == lastKnownCount.get()) {
+                            // no progress - try to refresh for the next time
+                            client().admin().indices().prepareRefresh().get();
+                        }
+                        lastKnownCount.set(count);
+                    } catch (Throwable e) { // count now acts like search and barfs if all shards failed...
+                        logger.debug("failed to executed count", e);
+                        return false;
                     }
-                    lastKnownCount.set(count);
                     logger.debug("[{}] docs visible for search. waiting for [{}]", lastKnownCount.get(), numDocs);
                 } else {
                     logger.debug("[{}] docs indexed. waiting for [{}]", lastKnownCount.get(), numDocs);

From 6646881bb6176d7761aaaf9bc83788e3055670f3 Mon Sep 17 00:00:00 2001
From: Lee Hinman <lee@writequit.org>
Date: Tue, 26 May 2015 14:33:24 -0600
Subject: [PATCH 021/123] [CORE] Read segment info from latest commit whenever
 possible

Instead of listing the directory to file the latest segments_N file, we
should re-use the generation/filename from the last commit. This allows
us to avoid potential race conditions on the filesystem as well as
reduce the number of directory listings performed.
---
 .../elasticsearch/common/lucene/Lucene.java   |  7 ++++--
 .../elasticsearch/index/engine/Engine.java    | 23 +++++++++++--------
 .../index/engine/InternalEngine.java          |  2 +-
 .../index/engine/ShadowEngine.java            |  4 ++--
 .../org/elasticsearch/index/store/Store.java  |  3 ++-
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/src/main/java/org/elasticsearch/common/lucene/Lucene.java
index e38af307a8a..385607d89ba 100644
--- a/src/main/java/org/elasticsearch/common/lucene/Lucene.java
+++ b/src/main/java/org/elasticsearch/common/lucene/Lucene.java
@@ -159,8 +159,11 @@ public class Lucene {
     /**
      * Reads the segments infos from the given commit, failing if it fails to load
      */
-    public static SegmentInfos readSegmentInfos(IndexCommit commit, Directory directory) throws IOException {
-        return SegmentInfos.readCommit(directory, commit.getSegmentsFileName());
+    public static SegmentInfos readSegmentInfos(IndexCommit commit) throws IOException {
+        // Using commit.getSegmentsFileName() does NOT work here, have to
+        // manually create the segment filename
+        String filename = IndexFileNames.fileNameFromGeneration(IndexFileNames.SEGMENTS, "", commit.getGeneration());
+        return SegmentInfos.readCommit(commit.getDirectory(), filename);
     }
 
     /**
diff --git a/src/main/java/org/elasticsearch/index/engine/Engine.java b/src/main/java/org/elasticsearch/index/engine/Engine.java
index 3a2f1eba93d..e2811bb0698 100644
--- a/src/main/java/org/elasticsearch/index/engine/Engine.java
+++ b/src/main/java/org/elasticsearch/index/engine/Engine.java
@@ -21,15 +21,7 @@ package org.elasticsearch.index.engine;
 
 import com.google.common.base.Preconditions;
 
-import org.apache.lucene.index.FilterLeafReader;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.LeafReader;
-import org.apache.lucene.index.LeafReaderContext;
-import org.apache.lucene.index.SegmentCommitInfo;
-import org.apache.lucene.index.SegmentInfos;
-import org.apache.lucene.index.SegmentReader;
-import org.apache.lucene.index.Term;
+import org.apache.lucene.index.*;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.SearcherManager;
@@ -324,7 +316,18 @@ public abstract class Engine implements Closeable {
         return new CommitStats(getLastCommittedSegmentInfos());
     }
 
-
+    /**
+     * Read the last segments info from the commit pointed to by the searcher manager
+     */
+    protected static SegmentInfos readLastCommittedSegmentInfos(SearcherManager sm) throws IOException {
+        IndexSearcher searcher = sm.acquire();
+        try {
+            IndexCommit latestCommit = ((DirectoryReader) searcher.getIndexReader()).getIndexCommit();
+            return Lucene.readSegmentInfos(latestCommit);
+        } finally {
+            sm.release(searcher);
+        }
+    }
 
     /**
      * Global stats on segments.
diff --git a/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
index 151298acd07..393dff33907 100644
--- a/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
+++ b/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
@@ -275,7 +275,7 @@ public class InternalEngine extends Engine {
             try {
                 final DirectoryReader directoryReader = ElasticsearchDirectoryReader.wrap(DirectoryReader.open(indexWriter, true), shardId);
                 searcherManager = new SearcherManager(directoryReader, searcherFactory);
-                lastCommittedSegmentInfos = store.readLastCommittedSegmentsInfo();
+                lastCommittedSegmentInfos = readLastCommittedSegmentInfos(searcherManager);
                 success = true;
                 return searcherManager;
             } catch (IOException e) {
diff --git a/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java b/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java
index e09acaa0e28..301f6176a00 100644
--- a/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java
+++ b/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java
@@ -79,7 +79,7 @@ public class ShadowEngine extends Engine {
                 if (Lucene.waitForIndex(store.directory(), nonexistentRetryTime)) {
                     reader = ElasticsearchDirectoryReader.wrap(DirectoryReader.open(store.directory()), shardId);
                     this.searcherManager = new SearcherManager(reader, searcherFactory);
-                    this.lastCommittedSegmentInfos = store.readLastCommittedSegmentsInfo();
+                    this.lastCommittedSegmentInfos = readLastCommittedSegmentInfos(searcherManager);
                     success = true;
                 } else {
                     throw new IndexShardException(shardId, "failed to open a shadow engine after" +
@@ -148,7 +148,7 @@ public class ShadowEngine extends Engine {
         store.incRef();
         try (ReleasableLock lock = readLock.acquire()) {
             // reread the last committed segment infos
-            lastCommittedSegmentInfos = store.readLastCommittedSegmentsInfo();
+            lastCommittedSegmentInfos = readLastCommittedSegmentInfos(searcherManager);
         } catch (Throwable e) {
             if (isClosed.get() == false) {
                 logger.warn("failed to read latest segment infos on flush", e);
diff --git a/src/main/java/org/elasticsearch/index/store/Store.java b/src/main/java/org/elasticsearch/index/store/Store.java
index 722c00c506d..c889dd16c20 100644
--- a/src/main/java/org/elasticsearch/index/store/Store.java
+++ b/src/main/java/org/elasticsearch/index/store/Store.java
@@ -151,8 +151,9 @@ public class Store extends AbstractIndexShardComponent implements Closeable, Ref
      * @throws IOException if the index is corrupted or the segments file is not present
      */
     private static SegmentInfos readSegmentsInfo(IndexCommit commit, Directory directory) throws IOException {
+        assert commit == null || commit.getDirectory() == directory;
         try {
-            return commit == null ? Lucene.readSegmentInfos(directory) : Lucene.readSegmentInfos(commit, directory);
+            return commit == null ? Lucene.readSegmentInfos(directory) : Lucene.readSegmentInfos(commit);
         } catch (EOFException eof) {
             // TODO this should be caught by lucene - EOF is almost certainly an index corruption
             throw new CorruptIndexException("Read past EOF while reading segment infos", "commit(" + commit + ")", eof);

From 7451b4708ec912d4ed40fe11d7bcf5b584f05bc4 Mon Sep 17 00:00:00 2001
From: Boaz Leskes <b.leskes@gmail.com>
Date: Tue, 26 May 2015 11:58:27 +0300
Subject: [PATCH 022/123] Simplify Transport*OperationAction names

As a follow up to #11332, this commit simplifies more class names by remove the superfluous Operation:

TransportBroadcastOperationAction -> TransportBroadcastAction
TransportMasterNodeOperationAction -> TransportMasterNodeAction
TransportMasterNodeReadOperationAction -> TransportMasterNodeReadAction
TransportShardSingleOperationAction -> TransportSingleShardAction

Closes #11349
---
 .../cluster/health/ClusterHealthRequest.java  |  4 ++--
 .../health/TransportClusterHealthAction.java  |  4 ++--
 .../node/hotthreads/NodeHotThreads.java       |  4 ++--
 .../hotthreads/NodesHotThreadsRequest.java    |  4 ++--
 .../hotthreads/NodesHotThreadsResponse.java   |  4 ++--
 .../TransportNodesHotThreadsAction.java       |  8 +++----
 .../admin/cluster/node/info/NodeInfo.java     |  4 ++--
 .../cluster/node/info/NodesInfoRequest.java   |  4 ++--
 .../cluster/node/info/NodesInfoResponse.java  |  4 ++--
 .../node/info/TransportNodesInfoAction.java   |  8 +++----
 .../admin/cluster/node/stats/NodeStats.java   |  7 ++----
 .../cluster/node/stats/NodesStatsRequest.java |  4 ++--
 .../node/stats/NodesStatsResponse.java        |  4 ++--
 .../node/stats/TransportNodesStatsAction.java |  8 +++----
 .../TransportDeleteRepositoryAction.java      |  4 ++--
 .../get/GetRepositoriesRequest.java           |  5 ++---
 .../get/TransportGetRepositoriesAction.java   |  4 ++--
 .../put/TransportPutRepositoryAction.java     |  4 ++--
 .../TransportVerifyRepositoryAction.java      |  4 ++--
 .../TransportClusterRerouteAction.java        |  4 ++--
 .../TransportClusterUpdateSettingsAction.java |  4 ++--
 .../shards/ClusterSearchShardsRequest.java    |  4 ++--
 .../TransportClusterSearchShardsAction.java   |  4 ++--
 .../create/CreateSnapshotRequest.java         |  4 ++--
 .../create/TransportCreateSnapshotAction.java |  4 ++--
 .../delete/DeleteSnapshotRequest.java         |  4 ++--
 .../delete/TransportDeleteSnapshotAction.java |  4 ++--
 .../snapshots/get/GetSnapshotsRequest.java    |  4 ++--
 .../get/TransportGetSnapshotsAction.java      |  4 ++--
 .../restore/RestoreSnapshotRequest.java       |  4 ++--
 .../TransportRestoreSnapshotAction.java       |  4 ++--
 .../status/SnapshotIndexShardStatus.java      |  4 ++--
 .../status/SnapshotsStatusRequest.java        |  4 ++--
 .../status/TransportNodesSnapshotsStatus.java | 10 ++++-----
 .../TransportSnapshotsStatusAction.java       |  4 ++--
 .../cluster/state/ClusterStateRequest.java    |  5 ++---
 .../state/TransportClusterStateAction.java    |  4 ++--
 .../stats/ClusterStatsNodeResponse.java       |  4 ++--
 .../cluster/stats/ClusterStatsRequest.java    |  4 ++--
 .../cluster/stats/ClusterStatsResponse.java   |  4 ++--
 .../stats/TransportClusterStatsAction.java    |  8 +++----
 .../tasks/PendingClusterTasksRequest.java     |  9 ++------
 .../TransportPendingClusterTasksAction.java   |  4 ++--
 .../alias/TransportIndicesAliasesAction.java  |  4 ++--
 .../exists/TransportAliasesExistAction.java   |  4 ++--
 .../indices/alias/get/GetAliasesRequest.java  |  5 ++---
 .../alias/get/TransportGetAliasesAction.java  |  4 ++--
 .../cache/clear/ClearIndicesCacheRequest.java |  5 ++---
 .../clear/ClearIndicesCacheResponse.java      |  4 ++--
 .../clear/ShardClearIndicesCacheRequest.java  |  5 ++---
 .../clear/ShardClearIndicesCacheResponse.java |  4 ++--
 .../TransportClearIndicesCacheAction.java     |  4 ++--
 .../close/TransportCloseIndexAction.java      |  4 ++--
 .../create/TransportCreateIndexAction.java    |  4 ++--
 .../indices/delete/DeleteIndexRequest.java    |  4 ++--
 .../delete/TransportDeleteIndexAction.java    |  4 ++--
 .../exists/indices/IndicesExistsRequest.java  |  5 ++---
 .../indices/TransportIndicesExistsAction.java |  4 ++--
 .../types/TransportTypesExistsAction.java     |  4 ++--
 .../exists/types/TypesExistsRequest.java      |  5 ++---
 .../admin/indices/flush/FlushRequest.java     |  5 ++---
 .../admin/indices/flush/FlushResponse.java    |  4 ++--
 .../indices/flush/ShardFlushRequest.java      |  5 ++---
 .../indices/flush/ShardFlushResponse.java     |  4 ++--
 .../indices/flush/TransportFlushAction.java   |  4 ++--
 .../put/TransportPutMappingAction.java        |  4 ++--
 .../open/TransportOpenIndexAction.java        |  4 ++--
 .../indices/optimize/OptimizeRequest.java     |  5 ++---
 .../indices/optimize/OptimizeResponse.java    |  4 ++--
 .../optimize/ShardOptimizeRequest.java        |  5 ++---
 .../optimize/ShardOptimizeResponse.java       |  4 ++--
 .../optimize/TransportOptimizeAction.java     |  4 ++--
 .../indices/recovery/RecoveryRequest.java     |  8 +++----
 .../indices/recovery/RecoveryResponse.java    |  4 ++--
 .../recovery/ShardRecoveryResponse.java       |  4 ++--
 .../recovery/TransportRecoveryAction.java     |  8 +++----
 .../admin/indices/refresh/RefreshRequest.java |  8 ++-----
 .../indices/refresh/RefreshResponse.java      |  4 ++--
 .../indices/refresh/ShardRefreshRequest.java  |  8 ++-----
 .../indices/refresh/ShardRefreshResponse.java |  4 ++--
 .../refresh/TransportRefreshAction.java       |  4 ++--
 .../indices/seal/SealIndicesRequest.java      |  4 ++--
 .../segments/IndicesSegmentResponse.java      |  5 ++---
 .../segments/IndicesSegmentsRequest.java      |  5 ++---
 .../admin/indices/segments/ShardSegments.java |  4 ++--
 .../TransportIndicesSegmentsAction.java       | 10 ++++-----
 .../settings/get/GetSettingsRequest.java      |  5 ++---
 .../get/TransportGetSettingsAction.java       |  4 ++--
 .../put/TransportUpdateSettingsAction.java    |  4 ++--
 .../indices/stats/IndicesStatsRequest.java    |  4 ++--
 .../indices/stats/IndicesStatsResponse.java   |  4 ++--
 .../admin/indices/stats/ShardStats.java       |  4 ++--
 .../stats/TransportIndicesStatsAction.java    |  8 +++----
 .../delete/DeleteIndexTemplateRequest.java    |  4 ++--
 .../TransportDeleteIndexTemplateAction.java   |  4 ++--
 .../get/GetIndexTemplatesRequest.java         |  5 ++---
 .../get/TransportGetIndexTemplatesAction.java |  4 ++--
 .../template/put/PutIndexTemplateRequest.java |  4 ++--
 .../put/TransportPutIndexTemplateAction.java  |  4 ++--
 .../query/ShardValidateQueryRequest.java      |  4 ++--
 .../query/ShardValidateQueryResponse.java     |  4 ++--
 .../query/TransportValidateQueryAction.java   |  4 ++--
 .../validate/query/ValidateQueryRequest.java  |  4 ++--
 .../validate/query/ValidateQueryResponse.java |  4 ++--
 .../delete/TransportDeleteWarmerAction.java   |  4 ++--
 .../warmer/put/TransportPutWarmerAction.java  |  4 ++--
 .../action/count/CountRequest.java            |  4 ++--
 .../action/count/CountResponse.java           |  4 ++--
 .../action/exists/ExistsRequest.java          |  4 ++--
 .../action/exists/ExistsResponse.java         |  4 ++--
 .../action/exists/ShardExistsRequest.java     |  4 ++--
 .../action/exists/ShardExistsResponse.java    |  4 ++--
 .../action/exists/TransportExistsAction.java  |  6 ++---
 .../action/explain/ExplainRequest.java        |  4 ++--
 .../explain/TransportExplainAction.java       |  8 +++----
 .../action/fieldstats/FieldStatsRequest.java  |  4 ++--
 .../action/fieldstats/FieldStatsResponse.java |  4 ++--
 .../fieldstats/FieldStatsShardRequest.java    |  4 ++--
 .../fieldstats/FieldStatsShardResponse.java   |  4 ++--
 .../TransportFieldStatsTransportAction.java   |  9 +++++---
 .../elasticsearch/action/get/GetRequest.java  |  4 ++--
 .../action/get/MultiGetShardRequest.java      |  8 ++-----
 .../action/get/TransportGetAction.java        |  4 ++--
 .../get/TransportShardMultiGetAction.java     |  8 +++----
 .../action/percolate/PercolateRequest.java    |  6 ++---
 .../action/percolate/PercolateResponse.java   |  4 ++--
 .../percolate/PercolateShardRequest.java      |  5 ++---
 .../percolate/PercolateShardResponse.java     |  5 ++---
 .../percolate/TransportPercolateAction.java   |  4 ++--
 .../TransportShardMultiPercolateAction.java   |  8 +++----
 .../action/suggest/ShardSuggestRequest.java   |  4 ++--
 .../action/suggest/ShardSuggestResponse.java  |  4 ++--
 .../action/suggest/SuggestRequest.java        |  4 ++--
 .../action/suggest/SuggestResponse.java       |  4 ++--
 .../suggest/TransportSuggestAction.java       |  6 ++---
 .../BroadcastOperationRequestBuilder.java     |  2 +-
 ...tionRequest.java => BroadcastRequest.java} |  8 +++----
 ...onResponse.java => BroadcastResponse.java} |  8 +++----
 ...equest.java => BroadcastShardRequest.java} |  8 +++----
 ...ponse.java => BroadcastShardResponse.java} |  6 ++---
 ...ion.java => TransportBroadcastAction.java} |  6 ++---
 .../support/master/AcknowledgedRequest.java   |  2 +-
 .../MasterNodeOperationRequestBuilder.java    |  4 +---
 ...MasterNodeReadOperationRequestBuilder.java |  4 +---
 ...equest.java => MasterNodeReadRequest.java} |  3 +--
 ...ionRequest.java => MasterNodeRequest.java} |  6 ++---
 ...on.java => TransportMasterNodeAction.java} | 11 ++++++----
 ...ava => TransportMasterNodeReadAction.java} |  4 ++--
 .../master/info/ClusterInfoRequest.java       |  4 ++--
 .../info/TransportClusterInfoAction.java      |  4 ++--
 ...ationRequest.java => BaseNodeRequest.java} |  6 ++---
 ...ionResponse.java => BaseNodeResponse.java} |  6 ++---
 ...tionRequest.java => BaseNodesRequest.java} |  8 +++----
 ...onResponse.java => BaseNodesResponse.java} | 20 ++++++++---------
 .../nodes/NodesOperationRequestBuilder.java   |  2 +-
 ...nAction.java => TransportNodesAction.java} | 22 +++++++++----------
 .../SingleShardOperationRequestBuilder.java   |  3 +--
 ...onRequest.java => SingleShardRequest.java} | 10 ++++-----
 ...n.java => TransportSingleShardAction.java} |  6 ++---
 .../MultiTermVectorsShardRequest.java         |  4 ++--
 .../termvectors/TermVectorsRequest.java       |  4 ++--
 .../TransportShardMultiTermsVectorAction.java |  4 ++--
 .../TransportTermVectorsAction.java           |  6 ++---
 .../termvectors/dfs/DfsOnlyRequest.java       |  4 ++--
 .../termvectors/dfs/DfsOnlyResponse.java      |  4 ++--
 .../termvectors/dfs/ShardDfsOnlyRequest.java  |  4 ++--
 .../termvectors/dfs/ShardDfsOnlyResponse.java |  4 ++--
 .../dfs/TransportDfsOnlyAction.java           |  4 ++--
 .../metadata/MetaDataDeleteIndexService.java  |  4 ++--
 .../MetaDataIndexTemplateService.java         |  6 ++---
 .../gateway/AsyncShardFetch.java              | 20 ++++++++---------
 .../gateway/GatewayAllocator.java             |  8 +++----
 .../TransportNodesListGatewayMetaState.java   | 10 ++++-----
 ...ransportNodesListGatewayStartedShards.java | 10 ++++-----
 .../TransportNodesListShardStoreMetaData.java | 10 ++++-----
 .../rest/action/support/RestActions.java      |  4 ++--
 .../org/elasticsearch/tribe/TribeService.java |  4 ++--
 .../action/admin/HotThreadsTest.java          | 11 +++-------
 .../gateway/AsyncShardFetchTests.java         |  4 ++--
 .../hamcrest/ElasticsearchAssertions.java     |  8 +++----
 180 files changed, 449 insertions(+), 491 deletions(-)
 rename src/main/java/org/elasticsearch/action/support/broadcast/{BroadcastOperationRequest.java => BroadcastRequest.java} (88%)
 rename src/main/java/org/elasticsearch/action/support/broadcast/{BroadcastOperationResponse.java => BroadcastResponse.java} (90%)
 rename src/main/java/org/elasticsearch/action/support/broadcast/{BroadcastShardOperationRequest.java => BroadcastShardRequest.java} (86%)
 rename src/main/java/org/elasticsearch/action/support/broadcast/{BroadcastShardOperationResponse.java => BroadcastShardResponse.java} (89%)
 rename src/main/java/org/elasticsearch/action/support/broadcast/{TransportBroadcastOperationAction.java => TransportBroadcastAction.java} (95%)
 rename src/main/java/org/elasticsearch/action/support/master/{MasterNodeReadOperationRequest.java => MasterNodeReadRequest.java} (90%)
 rename src/main/java/org/elasticsearch/action/support/master/{MasterNodeOperationRequest.java => MasterNodeRequest.java} (90%)
 rename src/main/java/org/elasticsearch/action/support/master/{TransportMasterNodeOperationAction.java => TransportMasterNodeAction.java} (94%)
 rename src/main/java/org/elasticsearch/action/support/master/{TransportMasterNodeReadOperationAction.java => TransportMasterNodeReadAction.java} (80%)
 rename src/main/java/org/elasticsearch/action/support/nodes/{NodeOperationRequest.java => BaseNodeRequest.java} (88%)
 rename src/main/java/org/elasticsearch/action/support/nodes/{NodeOperationResponse.java => BaseNodeResponse.java} (90%)
 rename src/main/java/org/elasticsearch/action/support/nodes/{NodesOperationRequest.java => BaseNodesRequest.java} (90%)
 rename src/main/java/org/elasticsearch/action/support/nodes/{NodesOperationResponse.java => BaseNodesResponse.java} (79%)
 rename src/main/java/org/elasticsearch/action/support/nodes/{TransportNodesOperationAction.java => TransportNodesAction.java} (87%)
 rename src/main/java/org/elasticsearch/action/support/single/shard/{SingleShardOperationRequest.java => SingleShardRequest.java} (89%)
 rename src/main/java/org/elasticsearch/action/support/single/shard/{TransportShardSingleOperationAction.java => TransportSingleShardAction.java} (96%)

diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java
index f373689566f..aff58a7b327 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java
@@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.cluster.health;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeReadRequest;
 import org.elasticsearch.common.Priority;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -37,7 +37,7 @@ import static org.elasticsearch.common.unit.TimeValue.readTimeValue;
 /**
  *
  */
-public class ClusterHealthRequest extends MasterNodeReadOperationRequest<ClusterHealthRequest> implements IndicesRequest.Replaceable {
+public class ClusterHealthRequest extends MasterNodeReadRequest<ClusterHealthRequest> implements IndicesRequest.Replaceable {
 
     private String[] indices;
     private TimeValue timeout = new TimeValue(30, TimeUnit.SECONDS);
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java
index d183ddd865c..c4cb95c501b 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java
@@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.cluster.health;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
 import org.elasticsearch.cluster.*;
 import org.elasticsearch.cluster.block.ClusterBlockException;
 import org.elasticsearch.common.Strings;
@@ -37,7 +37,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  *
  */
-public class TransportClusterHealthAction extends TransportMasterNodeReadOperationAction<ClusterHealthRequest, ClusterHealthResponse> {
+public class TransportClusterHealthAction extends TransportMasterNodeReadAction<ClusterHealthRequest, ClusterHealthResponse> {
 
     private final ClusterName clusterName;
     private final GatewayAllocator gatewayAllocator;
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java
index 9485395057e..635be28a646 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodeHotThreads.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.admin.cluster.node.hotthreads;
 
-import org.elasticsearch.action.support.nodes.NodeOperationResponse;
+import org.elasticsearch.action.support.nodes.BaseNodeResponse;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -28,7 +28,7 @@ import java.io.IOException;
 
 /**
  */
-public class NodeHotThreads extends NodeOperationResponse {
+public class NodeHotThreads extends BaseNodeResponse {
 
     private String hotThreads;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java
index fe092d7dc81..f7ab360c59f 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.admin.cluster.node.hotthreads;
 
 import org.elasticsearch.Version;
-import org.elasticsearch.action.support.nodes.NodesOperationRequest;
+import org.elasticsearch.action.support.nodes.BaseNodesRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.unit.TimeValue;
@@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit;
 
 /**
  */
-public class NodesHotThreadsRequest extends NodesOperationRequest<NodesHotThreadsRequest> {
+public class NodesHotThreadsRequest extends BaseNodesRequest<NodesHotThreadsRequest> {
 
     int threads = 3;
     String type = "cpu";
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java
index 2b04435eeb4..22d4795fc95 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsResponse.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.admin.cluster.node.hotthreads;
 
-import org.elasticsearch.action.support.nodes.NodesOperationResponse;
+import org.elasticsearch.action.support.nodes.BaseNodesResponse;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -28,7 +28,7 @@ import java.io.IOException;
 
 /**
  */
-public class NodesHotThreadsResponse extends NodesOperationResponse<NodeHotThreads> {
+public class NodesHotThreadsResponse extends BaseNodesResponse<NodeHotThreads> {
 
     NodesHotThreadsResponse() {
     }
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java
index 8b509ef2d94..a73982e5c0c 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java
@@ -22,8 +22,8 @@ package org.elasticsearch.action.admin.cluster.node.hotthreads;
 import com.google.common.collect.Lists;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.nodes.NodeOperationRequest;
-import org.elasticsearch.action.support.nodes.TransportNodesOperationAction;
+import org.elasticsearch.action.support.nodes.BaseNodeRequest;
+import org.elasticsearch.action.support.nodes.TransportNodesAction;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.common.inject.Inject;
@@ -41,7 +41,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
 /**
  *
  */
-public class TransportNodesHotThreadsAction extends TransportNodesOperationAction<NodesHotThreadsRequest, NodesHotThreadsResponse, TransportNodesHotThreadsAction.NodeRequest, NodeHotThreads> {
+public class TransportNodesHotThreadsAction extends TransportNodesAction<NodesHotThreadsRequest, NodesHotThreadsResponse, TransportNodesHotThreadsAction.NodeRequest, NodeHotThreads> {
 
     @Inject
     public TransportNodesHotThreadsAction(Settings settings, ClusterName clusterName, ThreadPool threadPool,
@@ -92,7 +92,7 @@ public class TransportNodesHotThreadsAction extends TransportNodesOperationActio
         return false;
     }
 
-    static class NodeRequest extends NodeOperationRequest {
+    static class NodeRequest extends BaseNodeRequest {
 
         NodesHotThreadsRequest request;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java
index 66904933db4..f3c5eb7e1fc 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java
@@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.cluster.node.info;
 import com.google.common.collect.ImmutableMap;
 import org.elasticsearch.Build;
 import org.elasticsearch.Version;
-import org.elasticsearch.action.support.nodes.NodeOperationResponse;
+import org.elasticsearch.action.support.nodes.BaseNodeResponse;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -42,7 +42,7 @@ import java.util.Map;
 /**
  * Node information (static, does not change over time).
  */
-public class NodeInfo extends NodeOperationResponse {
+public class NodeInfo extends BaseNodeResponse {
 
     @Nullable
     private ImmutableMap<String, String> serviceAttributes;
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java
index 589471af36d..d01167ceeca 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.admin.cluster.node.info;
 
-import org.elasticsearch.action.support.nodes.NodesOperationRequest;
+import org.elasticsearch.action.support.nodes.BaseNodesRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -28,7 +28,7 @@ import java.io.IOException;
 /**
  * A request to get node (cluster) level information.
  */
-public class NodesInfoRequest extends NodesOperationRequest<NodesInfoRequest> {
+public class NodesInfoRequest extends BaseNodesRequest<NodesInfoRequest> {
 
     private boolean settings = true;
     private boolean os = true;
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java
index b7ce109484d..e872be90142 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoResponse.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.admin.cluster.node.info;
 
-import org.elasticsearch.action.support.nodes.NodesOperationResponse;
+import org.elasticsearch.action.support.nodes.BaseNodesResponse;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -34,7 +34,7 @@ import java.util.Map;
 /**
  *
  */
-public class NodesInfoResponse extends NodesOperationResponse<NodeInfo> implements ToXContent {
+public class NodesInfoResponse extends BaseNodesResponse<NodeInfo> implements ToXContent {
 
     public NodesInfoResponse() {
     }
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java
index 29a904fa551..74221fc79ed 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java
@@ -20,8 +20,8 @@
 package org.elasticsearch.action.admin.cluster.node.info;
 
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.nodes.NodeOperationRequest;
-import org.elasticsearch.action.support.nodes.TransportNodesOperationAction;
+import org.elasticsearch.action.support.nodes.BaseNodeRequest;
+import org.elasticsearch.action.support.nodes.TransportNodesAction;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.common.inject.Inject;
@@ -40,7 +40,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
 /**
  *
  */
-public class TransportNodesInfoAction extends TransportNodesOperationAction<NodesInfoRequest, NodesInfoResponse, TransportNodesInfoAction.NodeInfoRequest, NodeInfo> {
+public class TransportNodesInfoAction extends TransportNodesAction<NodesInfoRequest, NodesInfoResponse, TransportNodesInfoAction.NodeInfoRequest, NodeInfo> {
 
     private final NodeService nodeService;
 
@@ -87,7 +87,7 @@ public class TransportNodesInfoAction extends TransportNodesOperationAction<Node
         return false;
     }
 
-    static class NodeInfoRequest extends NodeOperationRequest {
+    static class NodeInfoRequest extends BaseNodeRequest {
 
         NodesInfoRequest request;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java
index 87ec019192f..c7a6f4615a3 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStats.java
@@ -19,11 +19,9 @@
 
 package org.elasticsearch.action.admin.cluster.node.stats;
 
-import org.elasticsearch.Version;
-import org.elasticsearch.action.support.nodes.NodeOperationResponse;
+import org.elasticsearch.action.support.nodes.BaseNodeResponse;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.Nullable;
-import org.elasticsearch.common.breaker.CircuitBreaker;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.ToXContent;
@@ -31,7 +29,6 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.http.HttpStats;
 import org.elasticsearch.indices.NodeIndicesStats;
 import org.elasticsearch.indices.breaker.AllCircuitBreakerStats;
-import org.elasticsearch.indices.breaker.CircuitBreakerStats;
 import org.elasticsearch.monitor.fs.FsStats;
 import org.elasticsearch.monitor.jvm.JvmStats;
 import org.elasticsearch.monitor.network.NetworkStats;
@@ -46,7 +43,7 @@ import java.util.Map;
 /**
  * Node statistics (dynamic, changes depending on when created).
  */
-public class NodeStats extends NodeOperationResponse implements ToXContent {
+public class NodeStats extends BaseNodeResponse implements ToXContent {
 
     private long timestamp;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java
index f37208ddd2e..4fa654e7259 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsRequest.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.admin.cluster.node.stats;
 
 import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags;
-import org.elasticsearch.action.support.nodes.NodesOperationRequest;
+import org.elasticsearch.action.support.nodes.BaseNodesRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -29,7 +29,7 @@ import java.io.IOException;
 /**
  * A request to get node (cluster) level stats.
  */
-public class NodesStatsRequest extends NodesOperationRequest<NodesStatsRequest> {
+public class NodesStatsRequest extends BaseNodesRequest<NodesStatsRequest> {
 
     private CommonStatsFlags indices = new CommonStatsFlags();
     private boolean os;
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java
index 27affe2b898..e57fd552d7c 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.admin.cluster.node.stats;
 
-import org.elasticsearch.action.support.nodes.NodesOperationResponse;
+import org.elasticsearch.action.support.nodes.BaseNodesResponse;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -32,7 +32,7 @@ import java.io.IOException;
 /**
  *
  */
-public class NodesStatsResponse extends NodesOperationResponse<NodeStats> implements ToXContent {
+public class NodesStatsResponse extends BaseNodesResponse<NodeStats> implements ToXContent {
 
     NodesStatsResponse() {
     }
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java
index 1f8dea37aae..d808f859037 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java
@@ -21,8 +21,8 @@ package org.elasticsearch.action.admin.cluster.node.stats;
 
 import com.google.common.collect.Lists;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.nodes.NodeOperationRequest;
-import org.elasticsearch.action.support.nodes.TransportNodesOperationAction;
+import org.elasticsearch.action.support.nodes.BaseNodeRequest;
+import org.elasticsearch.action.support.nodes.TransportNodesAction;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.common.inject.Inject;
@@ -40,7 +40,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
 /**
  *
  */
-public class TransportNodesStatsAction extends TransportNodesOperationAction<NodesStatsRequest, NodesStatsResponse, TransportNodesStatsAction.NodeStatsRequest, NodeStats> {
+public class TransportNodesStatsAction extends TransportNodesAction<NodesStatsRequest, NodesStatsResponse, TransportNodesStatsAction.NodeStatsRequest, NodeStats> {
 
     private final NodeService nodeService;
 
@@ -87,7 +87,7 @@ public class TransportNodesStatsAction extends TransportNodesOperationAction<Nod
         return false;
     }
 
-    static class NodeStatsRequest extends NodeOperationRequest {
+    static class NodeStatsRequest extends BaseNodeRequest {
 
         NodesStatsRequest request;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java
index a7c73f32df5..e4c06400831 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.cluster.repositories.delete;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
@@ -36,7 +36,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Transport action for unregister repository operation
  */
-public class TransportDeleteRepositoryAction extends TransportMasterNodeOperationAction<DeleteRepositoryRequest, DeleteRepositoryResponse> {
+public class TransportDeleteRepositoryAction extends TransportMasterNodeAction<DeleteRepositoryRequest, DeleteRepositoryResponse> {
 
     private final RepositoriesService repositoriesService;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java
index 86c999982d1..4f5f99b2072 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java
@@ -19,9 +19,8 @@
 
 package org.elasticsearch.action.admin.cluster.repositories.get;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
-import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeReadRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -33,7 +32,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
 /**
  * Get repository request
  */
-public class GetRepositoriesRequest extends MasterNodeReadOperationRequest<GetRepositoriesRequest> {
+public class GetRepositoriesRequest extends MasterNodeReadRequest<GetRepositoriesRequest> {
 
     private String[] repositories = Strings.EMPTY_ARRAY;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java
index 45026f08786..5c58628dc35 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/get/TransportGetRepositoriesAction.java
@@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.cluster.repositories.get;
 import com.google.common.collect.ImmutableList;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -39,7 +39,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Transport action for get repositories operation
  */
-public class TransportGetRepositoriesAction extends TransportMasterNodeReadOperationAction<GetRepositoriesRequest, GetRepositoriesResponse> {
+public class TransportGetRepositoriesAction extends TransportMasterNodeReadAction<GetRepositoriesRequest, GetRepositoriesResponse> {
 
     @Inject
     public TransportGetRepositoriesAction(Settings settings, TransportService transportService, ClusterService clusterService,
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java
index bde461ccf8a..a395d9b9ef2 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.cluster.repositories.put;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
@@ -36,7 +36,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Transport action for register repository operation
  */
-public class TransportPutRepositoryAction extends TransportMasterNodeOperationAction<PutRepositoryRequest, PutRepositoryResponse> {
+public class TransportPutRepositoryAction extends TransportMasterNodeAction<PutRepositoryRequest, PutRepositoryResponse> {
 
     private final RepositoriesService repositoriesService;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java
index 978738d9f8c..ed687ae2bfd 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.cluster.repositories.verify;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
@@ -37,7 +37,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Transport action for verifying repository operation
  */
-public class TransportVerifyRepositoryAction extends TransportMasterNodeOperationAction<VerifyRepositoryRequest, VerifyRepositoryResponse> {
+public class TransportVerifyRepositoryAction extends TransportMasterNodeAction<VerifyRepositoryRequest, VerifyRepositoryResponse> {
 
     private final RepositoriesService repositoriesService;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java
index 1d4f0a6185e..d9829d1e078 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.cluster.reroute;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.AckedClusterStateUpdateTask;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
@@ -38,7 +38,7 @@ import org.elasticsearch.transport.TransportService;
 
 /**
  */
-public class TransportClusterRerouteAction extends TransportMasterNodeOperationAction<ClusterRerouteRequest, ClusterRerouteResponse> {
+public class TransportClusterRerouteAction extends TransportMasterNodeAction<ClusterRerouteRequest, ClusterRerouteResponse> {
 
     private final AllocationService allocationService;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java
index db872f868fd..31375a8912d 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java
@@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.cluster.settings;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.AckedClusterStateUpdateTask;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
@@ -49,7 +49,7 @@ import static org.elasticsearch.cluster.ClusterState.builder;
 /**
  *
  */
-public class TransportClusterUpdateSettingsAction extends TransportMasterNodeOperationAction<ClusterUpdateSettingsRequest, ClusterUpdateSettingsResponse> {
+public class TransportClusterUpdateSettingsAction extends TransportMasterNodeAction<ClusterUpdateSettingsRequest, ClusterUpdateSettingsResponse> {
 
     private final AllocationService allocationService;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java
index de8e1fcdfab..21ecf8a4c4f 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java
@@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.cluster.shards;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeReadRequest;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -32,7 +32,7 @@ import java.io.IOException;
 
 /**
  */
-public class ClusterSearchShardsRequest extends MasterNodeReadOperationRequest<ClusterSearchShardsRequest> implements IndicesRequest.Replaceable {
+public class ClusterSearchShardsRequest extends MasterNodeReadRequest<ClusterSearchShardsRequest> implements IndicesRequest.Replaceable {
     private String[] indices;
     @Nullable
     private String routing;
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java
index 1575f3c61a8..10ef0348e46 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/shards/TransportClusterSearchShardsAction.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.cluster.shards;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -42,7 +42,7 @@ import static com.google.common.collect.Sets.newHashSet;
 
 /**
  */
-public class TransportClusterSearchShardsAction extends TransportMasterNodeReadOperationAction<ClusterSearchShardsRequest, ClusterSearchShardsResponse> {
+public class TransportClusterSearchShardsAction extends TransportMasterNodeReadAction<ClusterSearchShardsRequest, ClusterSearchShardsResponse> {
 
     @Inject
     public TransportClusterSearchShardsAction(Settings settings, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters) {
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java
index 9e8c87bbbae..1373eed1507 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java
@@ -23,7 +23,7 @@ import org.elasticsearch.ElasticsearchGenerationException;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.action.support.master.MasterNodeOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -60,7 +60,7 @@ import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeBo
  * <li>must not contain invalid file name characters {@link org.elasticsearch.common.Strings#INVALID_FILENAME_CHARS} </li>
  * </ul>
  */
-public class CreateSnapshotRequest extends MasterNodeOperationRequest<CreateSnapshotRequest> implements IndicesRequest.Replaceable {
+public class CreateSnapshotRequest extends MasterNodeRequest<CreateSnapshotRequest> implements IndicesRequest.Replaceable {
 
     private String snapshot;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java
index 533d0778925..e97633932d1 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.create;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -37,7 +37,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Transport action for create snapshot operation
  */
-public class TransportCreateSnapshotAction extends TransportMasterNodeOperationAction<CreateSnapshotRequest, CreateSnapshotResponse> {
+public class TransportCreateSnapshotAction extends TransportMasterNodeAction<CreateSnapshotRequest, CreateSnapshotResponse> {
     private final SnapshotsService snapshotsService;
 
     @Inject
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java
index 5d6c5544184..d997786d5fc 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/DeleteSnapshotRequest.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.admin.cluster.snapshots.delete;
 
 import org.elasticsearch.action.ActionRequestValidationException;
-import org.elasticsearch.action.support.master.MasterNodeOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -35,7 +35,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
  * files that are associated with this particular snapshot. All files that are shared with
  * at least one other existing snapshot are left intact.
  */
-public class DeleteSnapshotRequest extends MasterNodeOperationRequest<DeleteSnapshotRequest> {
+public class DeleteSnapshotRequest extends MasterNodeRequest<DeleteSnapshotRequest> {
 
     private String repository;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java
index 5b5a31bedde..97f89c9f647 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.delete;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -36,7 +36,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Transport action for delete snapshot operation
  */
-public class TransportDeleteSnapshotAction extends TransportMasterNodeOperationAction<DeleteSnapshotRequest, DeleteSnapshotResponse> {
+public class TransportDeleteSnapshotAction extends TransportMasterNodeAction<DeleteSnapshotRequest, DeleteSnapshotResponse> {
     private final SnapshotsService snapshotsService;
 
     @Inject
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java
index 6b6927b5e0d..03edadd755b 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.admin.cluster.snapshots.get;
 
 import org.elasticsearch.action.ActionRequestValidationException;
-import org.elasticsearch.action.support.master.MasterNodeOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -32,7 +32,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
 /**
  * Get snapshot request
  */
-public class GetSnapshotsRequest extends MasterNodeOperationRequest<GetSnapshotsRequest> {
+public class GetSnapshotsRequest extends MasterNodeRequest<GetSnapshotsRequest> {
 
     public static final String ALL_SNAPSHOTS = "_all";
     public static final String CURRENT_SNAPSHOT = "_current";
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java
index 9ead8554943..6f480219857 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java
@@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.get;
 import com.google.common.collect.ImmutableList;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -39,7 +39,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Transport Action for get snapshots operation
  */
-public class TransportGetSnapshotsAction extends TransportMasterNodeOperationAction<GetSnapshotsRequest, GetSnapshotsResponse> {
+public class TransportGetSnapshotsAction extends TransportMasterNodeAction<GetSnapshotsRequest, GetSnapshotsResponse> {
     private final SnapshotsService snapshotsService;
 
     @Inject
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
index 63f595747a1..ddb177e273b 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
@@ -23,7 +23,7 @@ import org.elasticsearch.ElasticsearchGenerationException;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.action.support.master.MasterNodeOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -48,7 +48,7 @@ import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeBo
 /**
  * Restore snapshot request
  */
-public class RestoreSnapshotRequest extends MasterNodeOperationRequest<RestoreSnapshotRequest> {
+public class RestoreSnapshotRequest extends MasterNodeRequest<RestoreSnapshotRequest> {
 
     private String snapshot;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java
index 70ab71b6e8f..205a2d1178b 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.cluster.snapshots.restore;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -37,7 +37,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Transport action for restore snapshot operation
  */
-public class TransportRestoreSnapshotAction extends TransportMasterNodeOperationAction<RestoreSnapshotRequest, RestoreSnapshotResponse> {
+public class TransportRestoreSnapshotAction extends TransportMasterNodeAction<RestoreSnapshotRequest, RestoreSnapshotResponse> {
     private final RestoreService restoreService;
 
     @Inject
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java
index 878ca704345..1f358915662 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotIndexShardStatus.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.admin.cluster.snapshots.status;
 
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.ToXContent;
@@ -32,7 +32,7 @@ import java.io.IOException;
 
 /**
  */
-public class SnapshotIndexShardStatus extends BroadcastShardOperationResponse implements ToXContent {
+public class SnapshotIndexShardStatus extends BroadcastShardResponse implements ToXContent {
 
     private SnapshotIndexShardStage stage = SnapshotIndexShardStage.INIT;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java
index c84ad073bd8..b7b2b631b31 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.admin.cluster.snapshots.status;
 
 import org.elasticsearch.action.ActionRequestValidationException;
-import org.elasticsearch.action.support.master.MasterNodeOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -32,7 +32,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
 /**
  * Get snapshot status request
  */
-public class SnapshotsStatusRequest extends MasterNodeOperationRequest<SnapshotsStatusRequest> {
+public class SnapshotsStatusRequest extends MasterNodeRequest<SnapshotsStatusRequest> {
 
     private String repository = "_all";
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java
index b23010e3ecc..22a1753660e 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportNodesSnapshotsStatus.java
@@ -47,7 +47,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
 /**
  * Transport client that collects snapshot shard statuses from data nodes
  */
-public class TransportNodesSnapshotsStatus extends TransportNodesOperationAction<TransportNodesSnapshotsStatus.Request, TransportNodesSnapshotsStatus.NodesSnapshotStatus, TransportNodesSnapshotsStatus.NodeRequest, TransportNodesSnapshotsStatus.NodeSnapshotStatus> {
+public class TransportNodesSnapshotsStatus extends TransportNodesAction<TransportNodesSnapshotsStatus.Request, TransportNodesSnapshotsStatus.NodesSnapshotStatus, TransportNodesSnapshotsStatus.NodeRequest, TransportNodesSnapshotsStatus.NodeSnapshotStatus> {
 
     public static final String ACTION_NAME = SnapshotsStatusAction.NAME + "[nodes]";
 
@@ -128,7 +128,7 @@ public class TransportNodesSnapshotsStatus extends TransportNodesOperationAction
         return true;
     }
 
-    static class Request extends NodesOperationRequest<Request> {
+    static class Request extends BaseNodesRequest<Request> {
 
         private SnapshotId[] snapshotIds;
 
@@ -157,7 +157,7 @@ public class TransportNodesSnapshotsStatus extends TransportNodesOperationAction
         }
     }
 
-    public static class NodesSnapshotStatus extends NodesOperationResponse<NodeSnapshotStatus> {
+    public static class NodesSnapshotStatus extends BaseNodesResponse<NodeSnapshotStatus> {
 
         private FailedNodeException[] failures;
 
@@ -194,7 +194,7 @@ public class TransportNodesSnapshotsStatus extends TransportNodesOperationAction
     }
 
 
-    static class NodeRequest extends NodeOperationRequest {
+    static class NodeRequest extends BaseNodeRequest {
 
         private SnapshotId[] snapshotIds;
 
@@ -230,7 +230,7 @@ public class TransportNodesSnapshotsStatus extends TransportNodesOperationAction
         }
     }
 
-    public static class NodeSnapshotStatus extends NodeOperationResponse {
+    public static class NodeSnapshotStatus extends BaseNodeResponse {
 
         private ImmutableMap<SnapshotId, ImmutableMap<ShardId, SnapshotIndexShardStatus>> status;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java
index edfc9d5fd32..a38e894e90f 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java
@@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -49,7 +49,7 @@ import static com.google.common.collect.Sets.newHashSet;
 
 /**
  */
-public class TransportSnapshotsStatusAction extends TransportMasterNodeOperationAction<SnapshotsStatusRequest, SnapshotsStatusResponse> {
+public class TransportSnapshotsStatusAction extends TransportMasterNodeAction<SnapshotsStatusRequest, SnapshotsStatusResponse> {
 
     private final SnapshotsService snapshotsService;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java
index 574ed0170f3..4edd26812a0 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java
@@ -19,11 +19,10 @@
 
 package org.elasticsearch.action.admin.cluster.state;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeReadRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -33,7 +32,7 @@ import java.io.IOException;
 /**
  *
  */
-public class ClusterStateRequest extends MasterNodeReadOperationRequest<ClusterStateRequest> implements IndicesRequest.Replaceable {
+public class ClusterStateRequest extends MasterNodeReadRequest<ClusterStateRequest> implements IndicesRequest.Replaceable {
 
     private boolean routingTable = true;
     private boolean nodes = true;
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java
index d4d647b99b0..e989b7a5df8 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java
@@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.cluster.state;
 import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
@@ -39,7 +39,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  *
  */
-public class TransportClusterStateAction extends TransportMasterNodeReadOperationAction<ClusterStateRequest, ClusterStateResponse> {
+public class TransportClusterStateAction extends TransportMasterNodeReadAction<ClusterStateRequest, ClusterStateResponse> {
 
     private final ClusterName clusterName;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java
index 24222da8b5a..d0f91f7e9b9 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java
@@ -23,7 +23,7 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus;
 import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
 import org.elasticsearch.action.admin.cluster.node.stats.NodeStats;
 import org.elasticsearch.action.admin.indices.stats.ShardStats;
-import org.elasticsearch.action.support.nodes.NodeOperationResponse;
+import org.elasticsearch.action.support.nodes.BaseNodeResponse;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -31,7 +31,7 @@ import org.elasticsearch.common.io.stream.StreamOutput;
 
 import java.io.IOException;
 
-public class ClusterStatsNodeResponse extends NodeOperationResponse {
+public class ClusterStatsNodeResponse extends BaseNodeResponse {
 
     private NodeInfo nodeInfo;
     private NodeStats nodeStats;
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java
index 3a0c26af10c..d33f9acf296 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsRequest.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.admin.cluster.stats;
 
-import org.elasticsearch.action.support.nodes.NodesOperationRequest;
+import org.elasticsearch.action.support.nodes.BaseNodesRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -28,7 +28,7 @@ import java.io.IOException;
 /**
  * A request to get cluster level stats.
  */
-public class ClusterStatsRequest extends NodesOperationRequest<ClusterStatsRequest> {
+public class ClusterStatsRequest extends BaseNodesRequest<ClusterStatsRequest> {
 
     ClusterStatsRequest() {
     }
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java
index 3b84e86ea8e..aebdf6c31c3 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.admin.cluster.stats;
 
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus;
-import org.elasticsearch.action.support.nodes.NodesOperationResponse;
+import org.elasticsearch.action.support.nodes.BaseNodesResponse;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -37,7 +37,7 @@ import java.util.Map;
 /**
  *
  */
-public class ClusterStatsResponse extends NodesOperationResponse<ClusterStatsNodeResponse> implements ToXContent {
+public class ClusterStatsResponse extends BaseNodesResponse<ClusterStatsNodeResponse> implements ToXContent {
 
     ClusterStatsNodes nodesStats;
     ClusterStatsIndices indicesStats;
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java
index c2254ed1294..40c1c8b9e74 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java
@@ -26,8 +26,8 @@ import org.elasticsearch.action.admin.cluster.node.stats.NodeStats;
 import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags;
 import org.elasticsearch.action.admin.indices.stats.ShardStats;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.nodes.NodeOperationRequest;
-import org.elasticsearch.action.support.nodes.TransportNodesOperationAction;
+import org.elasticsearch.action.support.nodes.BaseNodeRequest;
+import org.elasticsearch.action.support.nodes.TransportNodesAction;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
@@ -51,7 +51,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
 /**
  *
  */
-public class TransportClusterStatsAction extends TransportNodesOperationAction<ClusterStatsRequest, ClusterStatsResponse,
+public class TransportClusterStatsAction extends TransportNodesAction<ClusterStatsRequest, ClusterStatsResponse,
         TransportClusterStatsAction.ClusterStatsNodeRequest, ClusterStatsNodeResponse> {
 
     private static final CommonStatsFlags SHARD_STATS_FLAGS = new CommonStatsFlags(CommonStatsFlags.Flag.Docs, CommonStatsFlags.Flag.Store,
@@ -142,7 +142,7 @@ public class TransportClusterStatsAction extends TransportNodesOperationAction<C
         return false;
     }
 
-    static class ClusterStatsNodeRequest extends NodeOperationRequest {
+    static class ClusterStatsNodeRequest extends BaseNodeRequest {
 
         ClusterStatsRequest request;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java
index a7392cc734d..09f25feb90f 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java
@@ -19,17 +19,12 @@
 
 package org.elasticsearch.action.admin.cluster.tasks;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
-import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
-import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.common.io.stream.StreamOutput;
-
-import java.io.IOException;
+import org.elasticsearch.action.support.master.MasterNodeReadRequest;
 
 /**
  */
-public class PendingClusterTasksRequest extends MasterNodeReadOperationRequest<PendingClusterTasksRequest> {
+public class PendingClusterTasksRequest extends MasterNodeReadRequest<PendingClusterTasksRequest> {
 
     @Override
     public ActionRequestValidationException validate() {
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java b/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java
index 40f634cef2c..5b7f2a881c3 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.cluster.tasks;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -33,7 +33,7 @@ import org.elasticsearch.transport.TransportService;
 
 /**
  */
-public class TransportPendingClusterTasksAction extends TransportMasterNodeReadOperationAction<PendingClusterTasksRequest, PendingClusterTasksResponse> {
+public class TransportPendingClusterTasksAction extends TransportMasterNodeReadAction<PendingClusterTasksRequest, PendingClusterTasksResponse> {
 
     private final ClusterService clusterService;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java
index 2ba0c606614..4bedc3e3ee8 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java
@@ -23,7 +23,7 @@ import com.google.common.collect.Sets;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
@@ -42,7 +42,7 @@ import java.util.*;
 /**
  * Add/remove aliases action
  */
-public class TransportIndicesAliasesAction extends TransportMasterNodeOperationAction<IndicesAliasesRequest, IndicesAliasesResponse> {
+public class TransportIndicesAliasesAction extends TransportMasterNodeAction<IndicesAliasesRequest, IndicesAliasesResponse> {
 
     private final MetaDataIndexAliasesService indexAliasesService;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java
index a85202a308c..29754edeb6f 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/alias/exists/TransportAliasesExistAction.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.indices.alias.exists;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -33,7 +33,7 @@ import org.elasticsearch.transport.TransportService;
 
 /**
  */
-public class TransportAliasesExistAction extends TransportMasterNodeReadOperationAction<GetAliasesRequest, AliasesExistResponse> {
+public class TransportAliasesExistAction extends TransportMasterNodeReadAction<GetAliasesRequest, AliasesExistResponse> {
 
     @Inject
     public TransportAliasesExistAction(Settings settings, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters) {
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java
index e22e110c942..182b86fd149 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/alias/get/GetAliasesRequest.java
@@ -18,11 +18,10 @@
  */
 package org.elasticsearch.action.admin.indices.alias.get;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.AliasesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeReadRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -31,7 +30,7 @@ import java.io.IOException;
 
 /**
  */
-public class GetAliasesRequest extends MasterNodeReadOperationRequest<GetAliasesRequest> implements AliasesRequest {
+public class GetAliasesRequest extends MasterNodeReadRequest<GetAliasesRequest> implements AliasesRequest {
 
     private String[] indices = Strings.EMPTY_ARRAY;
     private String[] aliases = Strings.EMPTY_ARRAY;
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java
index 9c1475136a8..a1088d4fbcd 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesAction.java
@@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.indices.alias.get;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -36,7 +36,7 @@ import java.util.List;
 
 /**
  */
-public class TransportGetAliasesAction extends TransportMasterNodeReadOperationAction<GetAliasesRequest, GetAliasesResponse> {
+public class TransportGetAliasesAction extends TransportMasterNodeReadAction<GetAliasesRequest, GetAliasesResponse> {
 
     @Inject
     public TransportGetAliasesAction(Settings settings, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters) {
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java
index 323d8869024..cf471ab0c77 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java
@@ -19,8 +19,7 @@
 
 package org.elasticsearch.action.admin.indices.cache.clear;
 
-import org.elasticsearch.Version;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -29,7 +28,7 @@ import java.io.IOException;
 /**
  *
  */
-public class ClearIndicesCacheRequest extends BroadcastOperationRequest<ClearIndicesCacheRequest> {
+public class ClearIndicesCacheRequest extends BroadcastRequest<ClearIndicesCacheRequest> {
 
     private boolean filterCache = false;
     private boolean fieldDataCache = false;
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java
index a9f094892d4..cd3355cae87 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheResponse.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.admin.indices.cache.clear;
 
 import org.elasticsearch.action.ShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -32,7 +32,7 @@ import java.util.List;
  *
  *
  */
-public class ClearIndicesCacheResponse extends BroadcastOperationResponse {
+public class ClearIndicesCacheResponse extends BroadcastResponse {
 
     ClearIndicesCacheResponse() {
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java
index 46044b7862d..8aefde1eb70 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheRequest.java
@@ -19,8 +19,7 @@
 
 package org.elasticsearch.action.admin.indices.cache.clear;
 
-import org.elasticsearch.Version;
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.index.shard.ShardId;
@@ -30,7 +29,7 @@ import java.io.IOException;
 /**
  *
  */
-class ShardClearIndicesCacheRequest extends BroadcastShardOperationRequest {
+class ShardClearIndicesCacheRequest extends BroadcastShardRequest {
 
     private boolean filterCache = false;
     private boolean fieldDataCache = false;
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheResponse.java
index d89bfe088f6..c2931df6003 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/ShardClearIndicesCacheResponse.java
@@ -19,13 +19,13 @@
 
 package org.elasticsearch.action.admin.indices.cache.clear;
 
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
 import org.elasticsearch.index.shard.ShardId;
 
 /**
  *
  */
-class ShardClearIndicesCacheResponse extends BroadcastShardOperationResponse {
+class ShardClearIndicesCacheResponse extends BroadcastShardResponse {
 
     ShardClearIndicesCacheResponse() {
     }
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java
index 8e356f2fd84..88595c70647 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/cache/clear/TransportClearIndicesCacheAction.java
@@ -23,7 +23,7 @@ import org.elasticsearch.action.ShardOperationFailedException;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
+import org.elasticsearch.action.support.broadcast.TransportBroadcastAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -47,7 +47,7 @@ import static com.google.common.collect.Lists.newArrayList;
 /**
  * Indices clear cache action.
  */
-public class TransportClearIndicesCacheAction extends TransportBroadcastOperationAction<ClearIndicesCacheRequest, ClearIndicesCacheResponse, ShardClearIndicesCacheRequest, ShardClearIndicesCacheResponse> {
+public class TransportClearIndicesCacheAction extends TransportBroadcastAction<ClearIndicesCacheRequest, ClearIndicesCacheResponse, ShardClearIndicesCacheRequest, ShardClearIndicesCacheResponse> {
 
     private final IndicesService indicesService;
     private final IndicesQueryCache indicesQueryCache;
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java
index 43343e83894..26a7fa1ffdf 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java
@@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.indices.close;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.DestructiveOperations;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
@@ -38,7 +38,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Close index action
  */
-public class TransportCloseIndexAction extends TransportMasterNodeOperationAction<CloseIndexRequest, CloseIndexResponse> {
+public class TransportCloseIndexAction extends TransportMasterNodeAction<CloseIndexRequest, CloseIndexResponse> {
 
     private final MetaDataIndexStateService indexStateService;
     private final DestructiveOperations destructiveOperations;
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java
index eca8894e43d..9c671cc9505 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/create/TransportCreateIndexAction.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.indices.create;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
@@ -37,7 +37,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Create index action.
  */
-public class TransportCreateIndexAction extends TransportMasterNodeOperationAction<CreateIndexRequest, CreateIndexResponse> {
+public class TransportCreateIndexAction extends TransportMasterNodeAction<CreateIndexRequest, CreateIndexResponse> {
 
     private final MetaDataCreateIndexService createIndexService;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java
index c52fc57e653..3720f5fe78b 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequest.java
@@ -23,7 +23,7 @@ import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;
-import org.elasticsearch.action.support.master.MasterNodeOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.unit.TimeValue;
@@ -37,7 +37,7 @@ import static org.elasticsearch.common.unit.TimeValue.readTimeValue;
 /**
  * A request to delete an index. Best created with {@link org.elasticsearch.client.Requests#deleteIndexRequest(String)}.
  */
-public class DeleteIndexRequest extends MasterNodeOperationRequest<DeleteIndexRequest> implements IndicesRequest.Replaceable {
+public class DeleteIndexRequest extends MasterNodeRequest<DeleteIndexRequest> implements IndicesRequest.Replaceable {
 
     private String[] indices;
     // Delete index should work by default on both open and closed indices.
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java
index 4c0de6d799b..a25b56eef47 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java
@@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.indices.delete;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.DestructiveOperations;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -38,7 +38,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Delete index action.
  */
-public class TransportDeleteIndexAction extends TransportMasterNodeOperationAction<DeleteIndexRequest, DeleteIndexResponse> {
+public class TransportDeleteIndexAction extends TransportMasterNodeAction<DeleteIndexRequest, DeleteIndexResponse> {
 
     private final MetaDataDeleteIndexService deleteIndexService;
     private final DestructiveOperations destructiveOperations;
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java
index e104090e962..e822f45e7f6 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/IndicesExistsRequest.java
@@ -19,11 +19,10 @@
 
 package org.elasticsearch.action.admin.indices.exists.indices;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeReadRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -32,7 +31,7 @@ import java.io.IOException;
 
 import static org.elasticsearch.action.ValidateActions.addValidationError;
 
-public class IndicesExistsRequest extends MasterNodeReadOperationRequest<IndicesExistsRequest> implements IndicesRequest.Replaceable {
+public class IndicesExistsRequest extends MasterNodeReadRequest<IndicesExistsRequest> implements IndicesRequest.Replaceable {
 
     private String[] indices = Strings.EMPTY_ARRAY;
     private IndicesOptions indicesOptions = IndicesOptions.fromOptions(false, false, true, true);
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java
index 0c360468e98..019e8c2f34b 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/exists/indices/TransportIndicesExistsAction.java
@@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.indices.exists.indices;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -36,7 +36,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Indices exists action.
  */
-public class TransportIndicesExistsAction extends TransportMasterNodeReadOperationAction<IndicesExistsRequest, IndicesExistsResponse> {
+public class TransportIndicesExistsAction extends TransportMasterNodeReadAction<IndicesExistsRequest, IndicesExistsResponse> {
 
     @Inject
     public TransportIndicesExistsAction(Settings settings, TransportService transportService, ClusterService clusterService,
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java
index fb617f233d3..ef1dc16b190 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TransportTypesExistsAction.java
@@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.indices.exists.types;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -35,7 +35,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Types exists transport action.
  */
-public class TransportTypesExistsAction extends TransportMasterNodeReadOperationAction<TypesExistsRequest, TypesExistsResponse> {
+public class TransportTypesExistsAction extends TransportMasterNodeReadAction<TypesExistsRequest, TypesExistsResponse> {
 
     @Inject
     public TransportTypesExistsAction(Settings settings, TransportService transportService, ClusterService clusterService,
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java
index 868f32a7a78..8eeb7422bf3 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/exists/types/TypesExistsRequest.java
@@ -18,11 +18,10 @@
  */
 package org.elasticsearch.action.admin.indices.exists.types;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeReadRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -32,7 +31,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
 
 /**
  */
-public class TypesExistsRequest extends MasterNodeReadOperationRequest<TypesExistsRequest> implements IndicesRequest.Replaceable {
+public class TypesExistsRequest extends MasterNodeReadRequest<TypesExistsRequest> implements IndicesRequest.Replaceable {
 
     private String[] indices;
     private String[] types;
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java
index e34ac8cfab5..57d9455ff91 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushRequest.java
@@ -19,9 +19,8 @@
 
 package org.elasticsearch.action.admin.indices.flush;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequest;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -38,7 +37,7 @@ import java.io.IOException;
  * @see org.elasticsearch.client.IndicesAdminClient#flush(FlushRequest)
  * @see FlushResponse
  */
-public class FlushRequest extends BroadcastOperationRequest<FlushRequest> {
+public class FlushRequest extends BroadcastRequest<FlushRequest> {
 
     private boolean force = false;
     private boolean waitIfOngoing = false;
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java
index c4c52e7071c..a158b02611b 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/flush/FlushResponse.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.admin.indices.flush;
 
 import org.elasticsearch.action.ShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -32,7 +32,7 @@ import java.util.List;
  *
  *
  */
-public class FlushResponse extends BroadcastOperationResponse {
+public class FlushResponse extends BroadcastResponse {
 
     FlushResponse() {
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java
index 55153562c15..0e38181fa61 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushRequest.java
@@ -19,8 +19,7 @@
 
 package org.elasticsearch.action.admin.indices.flush;
 
-import org.elasticsearch.Version;
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.index.shard.ShardId;
@@ -30,7 +29,7 @@ import java.io.IOException;
 /**
  *
  */
-class ShardFlushRequest extends BroadcastShardOperationRequest {
+class ShardFlushRequest extends BroadcastShardRequest {
     private FlushRequest request = new FlushRequest();
 
     ShardFlushRequest() {
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushResponse.java
index 3ba91768732..6f2cc6a5522 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/flush/ShardFlushResponse.java
@@ -19,13 +19,13 @@
 
 package org.elasticsearch.action.admin.indices.flush;
 
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
 import org.elasticsearch.index.shard.ShardId;
 
 /**
  *
  */
-class ShardFlushResponse extends BroadcastShardOperationResponse {
+class ShardFlushResponse extends BroadcastShardResponse {
 
     ShardFlushResponse() {
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java b/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java
index c9f637e4371..e546d6f616b 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/flush/TransportFlushAction.java
@@ -23,7 +23,7 @@ import org.elasticsearch.action.ShardOperationFailedException;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
+import org.elasticsearch.action.support.broadcast.TransportBroadcastAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -45,7 +45,7 @@ import static com.google.common.collect.Lists.newArrayList;
 /**
  * Flush Action.
  */
-public class TransportFlushAction extends TransportBroadcastOperationAction<FlushRequest, FlushResponse, ShardFlushRequest, ShardFlushResponse> {
+public class TransportFlushAction extends TransportBroadcastAction<FlushRequest, FlushResponse, ShardFlushRequest, ShardFlushResponse> {
 
     private final IndicesService indicesService;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java b/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java
index 9772754d330..1f853b6b397 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.indices.mapping.put;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
@@ -36,7 +36,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Put mapping action.
  */
-public class TransportPutMappingAction extends TransportMasterNodeOperationAction<PutMappingRequest, PutMappingResponse> {
+public class TransportPutMappingAction extends TransportMasterNodeAction<PutMappingRequest, PutMappingResponse> {
 
     private final MetaDataMappingService metaDataMappingService;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java
index 83063492c07..1df33c56463 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java
@@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.indices.open;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.DestructiveOperations;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
@@ -38,7 +38,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Open index action
  */
-public class TransportOpenIndexAction extends TransportMasterNodeOperationAction<OpenIndexRequest, OpenIndexResponse> {
+public class TransportOpenIndexAction extends TransportMasterNodeAction<OpenIndexRequest, OpenIndexResponse> {
 
     private final MetaDataIndexStateService indexStateService;
     private final DestructiveOperations destructiveOperations;
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java
index d5b822f58cb..3510a3b7f96 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java
@@ -19,8 +19,7 @@
 
 package org.elasticsearch.action.admin.indices.optimize;
 
-import org.elasticsearch.Version;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -37,7 +36,7 @@ import java.io.IOException;
  * @see org.elasticsearch.client.IndicesAdminClient#optimize(OptimizeRequest)
  * @see OptimizeResponse
  */
-public class OptimizeRequest extends BroadcastOperationRequest<OptimizeRequest> {
+public class OptimizeRequest extends BroadcastRequest<OptimizeRequest> {
 
     public static final class Defaults {
         public static final int MAX_NUM_SEGMENTS = -1;
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java
index d4a189eb7f4..88341ef2619 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeResponse.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.admin.indices.optimize;
 
 import org.elasticsearch.action.ShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -32,7 +32,7 @@ import java.util.List;
  *
  *
  */
-public class OptimizeResponse extends BroadcastOperationResponse {
+public class OptimizeResponse extends BroadcastResponse {
 
     OptimizeResponse() {
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeRequest.java
index 9113581038b..05aeabe21a6 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeRequest.java
@@ -20,8 +20,7 @@
 package org.elasticsearch.action.admin.indices.optimize;
 
 
-import org.elasticsearch.Version;
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.index.shard.ShardId;
@@ -31,7 +30,7 @@ import java.io.IOException;
 /**
  *
  */
-final class ShardOptimizeRequest extends BroadcastShardOperationRequest {
+final class ShardOptimizeRequest extends BroadcastShardRequest {
 
     private OptimizeRequest request = new OptimizeRequest();
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeResponse.java
index 61adb62f1d6..1c9dc4482d9 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/optimize/ShardOptimizeResponse.java
@@ -19,13 +19,13 @@
 
 package org.elasticsearch.action.admin.indices.optimize;
 
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
 import org.elasticsearch.index.shard.ShardId;
 
 /**
  *
  */
-class ShardOptimizeResponse extends BroadcastShardOperationResponse {
+class ShardOptimizeResponse extends BroadcastShardResponse {
 
     ShardOptimizeResponse() {
     }
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java
index c4f276126fa..17a18bae971 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/optimize/TransportOptimizeAction.java
@@ -23,7 +23,7 @@ import org.elasticsearch.action.ShardOperationFailedException;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
+import org.elasticsearch.action.support.broadcast.TransportBroadcastAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -45,7 +45,7 @@ import static com.google.common.collect.Lists.newArrayList;
 /**
  * Optimize index/indices action.
  */
-public class TransportOptimizeAction extends TransportBroadcastOperationAction<OptimizeRequest, OptimizeResponse, ShardOptimizeRequest, ShardOptimizeResponse> {
+public class TransportOptimizeAction extends TransportBroadcastAction<OptimizeRequest, OptimizeResponse, ShardOptimizeRequest, ShardOptimizeResponse> {
 
     private final IndicesService indicesService;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java
index f2a97ef5fb5..8878713765b 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryRequest.java
@@ -19,17 +19,17 @@
 
 package org.elasticsearch.action.admin.indices.recovery;
 
-import java.io.IOException;
-
-import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
+import java.io.IOException;
+
 /**
  * Request for recovery information
  */
-public class RecoveryRequest extends BroadcastOperationRequest<RecoveryRequest> {
+public class RecoveryRequest extends BroadcastRequest<RecoveryRequest> {
 
     private boolean detailed = false;       // Provides extra details in the response
     private boolean activeOnly = false;     // Only reports on active recoveries
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java
index 9fd15cd371e..fea33688c14 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.admin.indices.recovery;
 
 import org.elasticsearch.action.ShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.ToXContent;
@@ -35,7 +35,7 @@ import java.util.Map;
 /**
  * Information regarding the recovery state of indices and their associated shards.
  */
-public class RecoveryResponse extends BroadcastOperationResponse implements ToXContent {
+public class RecoveryResponse extends BroadcastResponse implements ToXContent {
 
     private boolean detailed = false;
     private Map<String, List<ShardRecoveryResponse>> shardResponses = new HashMap<>();
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/recovery/ShardRecoveryResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/recovery/ShardRecoveryResponse.java
index 2e12de4f39f..a4104fbc449 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/recovery/ShardRecoveryResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/recovery/ShardRecoveryResponse.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.admin.indices.recovery;
 
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -33,7 +33,7 @@ import java.io.IOException;
 /**
  * Information regarding the recovery state of a shard.
  */
-public class ShardRecoveryResponse extends BroadcastShardOperationResponse implements ToXContent {
+public class ShardRecoveryResponse extends BroadcastShardResponse implements ToXContent {
 
     RecoveryState recoveryState;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java b/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java
index 2996247963f..2483efbc498 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java
@@ -23,8 +23,8 @@ import org.elasticsearch.action.ShardOperationFailedException;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest;
-import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
+import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
+import org.elasticsearch.action.support.broadcast.TransportBroadcastAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -51,7 +51,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
  * Transport action for shard recovery operation. This transport action does not actually
  * perform shard recovery, it only reports on recoveries (both active and complete).
  */
-public class TransportRecoveryAction extends TransportBroadcastOperationAction<RecoveryRequest, RecoveryResponse, TransportRecoveryAction.ShardRecoveryRequest, ShardRecoveryResponse> {
+public class TransportRecoveryAction extends TransportBroadcastAction<RecoveryRequest, RecoveryResponse, TransportRecoveryAction.ShardRecoveryRequest, ShardRecoveryResponse> {
 
     private final IndicesService indicesService;
 
@@ -149,7 +149,7 @@ public class TransportRecoveryAction extends TransportBroadcastOperationAction<R
         return state.blocks().indicesBlockedException(ClusterBlockLevel.READ, concreteIndices);
     }
 
-    static class ShardRecoveryRequest extends BroadcastShardOperationRequest {
+    static class ShardRecoveryRequest extends BroadcastShardRequest {
 
         ShardRecoveryRequest() {
         }
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java
index 44544ec049c..8f871307135 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshRequest.java
@@ -20,11 +20,7 @@
 package org.elasticsearch.action.admin.indices.refresh;
 
 import org.elasticsearch.action.ActionRequest;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
-import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.common.io.stream.StreamOutput;
-
-import java.io.IOException;
+import org.elasticsearch.action.support.broadcast.BroadcastRequest;
 
 /**
  * A refresh request making all operations performed since the last refresh available for search. The (near) real-time
@@ -35,7 +31,7 @@ import java.io.IOException;
  * @see org.elasticsearch.client.IndicesAdminClient#refresh(RefreshRequest)
  * @see RefreshResponse
  */
-public class RefreshRequest extends BroadcastOperationRequest<RefreshRequest> {
+public class RefreshRequest extends BroadcastRequest<RefreshRequest> {
 
 
     RefreshRequest() {
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java
index 3130b0713da..28295fdd0a0 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/refresh/RefreshResponse.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.admin.indices.refresh;
 
 import org.elasticsearch.action.ShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -32,7 +32,7 @@ import java.util.List;
  *
  *
  */
-public class RefreshResponse extends BroadcastOperationResponse {
+public class RefreshResponse extends BroadcastResponse {
 
     RefreshResponse() {
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshRequest.java
index da3c5fea9eb..37ea2cc46de 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshRequest.java
@@ -19,17 +19,13 @@
 
 package org.elasticsearch.action.admin.indices.refresh;
 
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest;
-import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
 import org.elasticsearch.index.shard.ShardId;
 
-import java.io.IOException;
-
 /**
  *
  */
-class ShardRefreshRequest extends BroadcastShardOperationRequest {
+class ShardRefreshRequest extends BroadcastShardRequest {
 
     ShardRefreshRequest() {
     }
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshResponse.java
index c2ab17890eb..4de0f5877dd 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/refresh/ShardRefreshResponse.java
@@ -19,13 +19,13 @@
 
 package org.elasticsearch.action.admin.indices.refresh;
 
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
 import org.elasticsearch.index.shard.ShardId;
 
 /**
  *
  */
-class ShardRefreshResponse extends BroadcastShardOperationResponse {
+class ShardRefreshResponse extends BroadcastShardResponse {
 
     ShardRefreshResponse() {
     }
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java b/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java
index 001793ecd17..e2fe442f951 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/refresh/TransportRefreshAction.java
@@ -23,7 +23,7 @@ import org.elasticsearch.action.ShardOperationFailedException;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
+import org.elasticsearch.action.support.broadcast.TransportBroadcastAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -45,7 +45,7 @@ import static com.google.common.collect.Lists.newArrayList;
 /**
  * Refresh action.
  */
-public class TransportRefreshAction extends TransportBroadcastOperationAction<RefreshRequest, RefreshResponse, ShardRefreshRequest, ShardRefreshResponse> {
+public class TransportRefreshAction extends TransportBroadcastAction<RefreshRequest, RefreshResponse, ShardRefreshRequest, ShardRefreshResponse> {
 
     private final IndicesService indicesService;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesRequest.java
index 42cdc51ed32..2e8e3ac0cf8 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/seal/SealIndicesRequest.java
@@ -19,14 +19,14 @@
 
 package org.elasticsearch.action.admin.indices.seal;
 
-import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastRequest;
 
 import java.util.Arrays;
 
 /**
  * A request to seal one or more indices.
  */
-public class SealIndicesRequest extends BroadcastOperationRequest {
+public class SealIndicesRequest extends BroadcastRequest {
 
     SealIndicesRequest() {
     }
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java
index 983e5350a5d..6b0dc8697f3 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java
@@ -24,7 +24,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import org.apache.lucene.util.Accountable;
 import org.elasticsearch.action.ShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastResponse;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -36,12 +36,11 @@ import org.elasticsearch.index.engine.Segment;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-public class IndicesSegmentResponse extends BroadcastOperationResponse implements ToXContent {
+public class IndicesSegmentResponse extends BroadcastResponse implements ToXContent {
 
     private ShardSegments[] shards;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java
index cefc2ebc3bf..570fa89e026 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequest.java
@@ -19,15 +19,14 @@
 
 package org.elasticsearch.action.admin.indices.segments;
 
-import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
 import java.io.IOException;
 
-public class IndicesSegmentsRequest extends BroadcastOperationRequest<IndicesSegmentsRequest> {
+public class IndicesSegmentsRequest extends BroadcastRequest<IndicesSegmentsRequest> {
 
     protected boolean verbose = false;
     
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java b/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java
index 09d20271776..d33df00fc8c 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/segments/ShardSegments.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.admin.indices.segments;
 
 import com.google.common.collect.ImmutableList;
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
 import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -33,7 +33,7 @@ import java.util.List;
 
 import static org.elasticsearch.cluster.routing.ImmutableShardRouting.readShardRoutingEntry;
 
-public class ShardSegments extends BroadcastShardOperationResponse implements Iterable<Segment> {
+public class ShardSegments extends BroadcastShardResponse implements Iterable<Segment> {
 
     private ShardRouting shardRouting;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java
index fa9639424b4..f043d8ebdb0 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/segments/TransportIndicesSegmentsAction.java
@@ -23,8 +23,8 @@ import org.elasticsearch.action.ShardOperationFailedException;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest;
-import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
+import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
+import org.elasticsearch.action.support.broadcast.TransportBroadcastAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -36,8 +36,8 @@ import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.index.shard.IndexShard;
+import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
@@ -51,7 +51,7 @@ import static com.google.common.collect.Lists.newArrayList;
 /**
  *
  */
-public class TransportIndicesSegmentsAction extends TransportBroadcastOperationAction<IndicesSegmentsRequest, IndicesSegmentResponse, TransportIndicesSegmentsAction.IndexShardSegmentRequest, ShardSegments> {
+public class TransportIndicesSegmentsAction extends TransportBroadcastAction<IndicesSegmentsRequest, IndicesSegmentResponse, TransportIndicesSegmentsAction.IndexShardSegmentRequest, ShardSegments> {
 
     private final IndicesService indicesService;
 
@@ -122,7 +122,7 @@ public class TransportIndicesSegmentsAction extends TransportBroadcastOperationA
         return new ShardSegments(indexShard.routingEntry(), indexShard.engine().segments(request.verbose));
     }
 
-    static class IndexShardSegmentRequest extends BroadcastShardOperationRequest {
+    static class IndexShardSegmentRequest extends BroadcastShardRequest {
         boolean verbose;
         
         IndexShardSegmentRequest() {
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java
index 2f01e28f969..daf011ece62 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java
@@ -19,12 +19,11 @@
 
 package org.elasticsearch.action.admin.indices.settings.get;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.ValidateActions;
 import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeReadRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -33,7 +32,7 @@ import java.io.IOException;
 
 /**
  */
-public class GetSettingsRequest extends MasterNodeReadOperationRequest<GetSettingsRequest> implements IndicesRequest.Replaceable {
+public class GetSettingsRequest extends MasterNodeReadRequest<GetSettingsRequest> implements IndicesRequest.Replaceable {
 
     private String[] indices = Strings.EMPTY_ARRAY;
     private IndicesOptions indicesOptions = IndicesOptions.fromOptions(false, true, true, true);
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java
index c3a8948d1bb..f48b2c4853f 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/settings/get/TransportGetSettingsAction.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.indices.settings.get;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -40,7 +40,7 @@ import java.util.Map;
 
 /**
  */
-public class TransportGetSettingsAction extends TransportMasterNodeReadOperationAction<GetSettingsRequest, GetSettingsResponse> {
+public class TransportGetSettingsAction extends TransportMasterNodeReadAction<GetSettingsRequest, GetSettingsResponse> {
 
     private final SettingsFilter settingsFilter;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java
index 8185badb5af..1278b97934b 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.indices.settings.put;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
@@ -37,7 +37,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  *
  */
-public class TransportUpdateSettingsAction extends TransportMasterNodeOperationAction<UpdateSettingsRequest, UpdateSettingsResponse> {
+public class TransportUpdateSettingsAction extends TransportMasterNodeAction<UpdateSettingsRequest, UpdateSettingsResponse> {
 
     private final MetaDataUpdateSettingsService updateSettingsService;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java
index b8a94ab4d51..a99c0f52def 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsRequest.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.admin.indices.stats;
 
 import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags.Flag;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -34,7 +34,7 @@ import java.io.IOException;
  * <p>All the stats to be returned can be cleared using {@link #clear()}, at which point, specific
  * stats can be enabled.
  */
-public class IndicesStatsRequest extends BroadcastOperationRequest<IndicesStatsRequest> {
+public class IndicesStatsRequest extends BroadcastRequest<IndicesStatsRequest> {
 
     private CommonStatsFlags flags = new CommonStatsFlags();
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java
index f2f10c48f0a..2d9bf1e78f9 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java
@@ -24,7 +24,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import org.elasticsearch.action.ShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastResponse;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -41,7 +41,7 @@ import java.util.Set;
 
 /**
  */
-public class IndicesStatsResponse extends BroadcastOperationResponse implements ToXContent {
+public class IndicesStatsResponse extends BroadcastResponse implements ToXContent {
 
     private ShardStats[] shards;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java b/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java
index 951c4b95223..fbba68cbee9 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/stats/ShardStats.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.admin.indices.stats;
 
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
 import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -36,7 +36,7 @@ import static org.elasticsearch.cluster.routing.ImmutableShardRouting.readShardR
 
 /**
  */
-public class ShardStats extends BroadcastShardOperationResponse implements ToXContent {
+public class ShardStats extends BroadcastShardResponse implements ToXContent {
 
     private ShardRouting shardRouting;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java
index 75191bb903f..b4b0d6a4435 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/stats/TransportIndicesStatsAction.java
@@ -24,8 +24,8 @@ import org.elasticsearch.action.ShardOperationFailedException;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest;
-import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
+import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
+import org.elasticsearch.action.support.broadcast.TransportBroadcastAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -52,7 +52,7 @@ import static com.google.common.collect.Lists.newArrayList;
 
 /**
  */
-public class TransportIndicesStatsAction extends TransportBroadcastOperationAction<IndicesStatsRequest, IndicesStatsResponse, TransportIndicesStatsAction.IndexShardStatsRequest, ShardStats> {
+public class TransportIndicesStatsAction extends TransportBroadcastAction<IndicesStatsRequest, IndicesStatsResponse, TransportIndicesStatsAction.IndexShardStatsRequest, ShardStats> {
 
     private final IndicesService indicesService;
 
@@ -190,7 +190,7 @@ public class TransportIndicesStatsAction extends TransportBroadcastOperationActi
         return new ShardStats(indexShard, indexShard.routingEntry(), flags);
     }
 
-    static class IndexShardStatsRequest extends BroadcastShardOperationRequest {
+    static class IndexShardStatsRequest extends BroadcastShardRequest {
 
         // TODO if there are many indices, the request might hold a large indices array..., we don't really need to serialize it
         IndicesStatsRequest request;
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java
index 08801434868..42907787803 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java
@@ -19,7 +19,7 @@
 package org.elasticsearch.action.admin.indices.template.delete;
 
 import org.elasticsearch.action.ActionRequestValidationException;
-import org.elasticsearch.action.support.master.MasterNodeOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -30,7 +30,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
 /**
  * A request to delete an index template.
  */
-public class DeleteIndexTemplateRequest extends MasterNodeOperationRequest<DeleteIndexTemplateRequest> {
+public class DeleteIndexTemplateRequest extends MasterNodeRequest<DeleteIndexTemplateRequest> {
 
     private String name;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java
index c1a063e6662..d66b0bb0a96 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java
@@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.indices.template.delete;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -34,7 +34,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Delete index action.
  */
-public class TransportDeleteIndexTemplateAction extends TransportMasterNodeOperationAction<DeleteIndexTemplateRequest, DeleteIndexTemplateResponse> {
+public class TransportDeleteIndexTemplateAction extends TransportMasterNodeAction<DeleteIndexTemplateRequest, DeleteIndexTemplateResponse> {
 
     private final MetaDataIndexTemplateService indexTemplateService;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java
index 949944fa61e..aeefc63bfa0 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java
@@ -18,9 +18,8 @@
  */
 package org.elasticsearch.action.admin.indices.template.get;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
-import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeReadRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -32,7 +31,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
 /**
  * Request that allows to retrieve index templates
  */
-public class GetIndexTemplatesRequest extends MasterNodeReadOperationRequest<GetIndexTemplatesRequest> {
+public class GetIndexTemplatesRequest extends MasterNodeReadRequest<GetIndexTemplatesRequest> {
 
     private String[] names;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java b/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java
index c2600112542..039ca1a726f 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/template/get/TransportGetIndexTemplatesAction.java
@@ -22,7 +22,7 @@ import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
 import com.google.common.collect.Lists;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -39,7 +39,7 @@ import java.util.List;
 /**
  *
  */
-public class TransportGetIndexTemplatesAction extends TransportMasterNodeReadOperationAction<GetIndexTemplatesRequest, GetIndexTemplatesResponse> {
+public class TransportGetIndexTemplatesAction extends TransportMasterNodeReadAction<GetIndexTemplatesRequest, GetIndexTemplatesResponse> {
 
     @Inject
     public TransportGetIndexTemplatesAction(Settings settings, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters) {
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java
index 6e21ba4753f..a4b10cb7783 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutIndexTemplateRequest.java
@@ -25,7 +25,7 @@ import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.admin.indices.alias.Alias;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.action.support.master.MasterNodeOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeRequest;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
@@ -50,7 +50,7 @@ import static org.elasticsearch.common.settings.Settings.writeSettingsToStream;
 /**
  * A request to create an index template.
  */
-public class PutIndexTemplateRequest extends MasterNodeOperationRequest<PutIndexTemplateRequest> implements IndicesRequest {
+public class PutIndexTemplateRequest extends MasterNodeRequest<PutIndexTemplateRequest> implements IndicesRequest {
 
     private String name;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java b/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java
index 5c4979e6253..492dbf352c7 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java
@@ -20,7 +20,7 @@ package org.elasticsearch.action.admin.indices.template.put;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -34,7 +34,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Put index template action.
  */
-public class TransportPutIndexTemplateAction extends TransportMasterNodeOperationAction<PutIndexTemplateRequest, PutIndexTemplateResponse> {
+public class TransportPutIndexTemplateAction extends TransportMasterNodeAction<PutIndexTemplateRequest, PutIndexTemplateResponse> {
 
     private final MetaDataIndexTemplateService indexTemplateService;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java
index 7b771f32091..648ab21afd6 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryRequest.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.admin.indices.validate.query;
 
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesReference;
@@ -32,7 +32,7 @@ import java.io.IOException;
 /**
  * Internal validate request executed directly against a specific index shard.
  */
-class ShardValidateQueryRequest extends BroadcastShardOperationRequest {
+class ShardValidateQueryRequest extends BroadcastShardRequest {
 
     private BytesReference source;
     private String[] types = Strings.EMPTY_ARRAY;
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java
index d4e75578f1f..43d3ad82305 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ShardValidateQueryResponse.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.admin.indices.validate.query;
 
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.index.shard.ShardId;
@@ -31,7 +31,7 @@ import java.io.IOException;
  *
  *
  */
-class ShardValidateQueryResponse extends BroadcastShardOperationResponse {
+class ShardValidateQueryResponse extends BroadcastShardResponse {
 
     private boolean valid;
     
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java
index baa4949d29d..5d8e98beac1 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/TransportValidateQueryAction.java
@@ -27,7 +27,7 @@ import org.elasticsearch.action.ShardOperationFailedException;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
+import org.elasticsearch.action.support.broadcast.TransportBroadcastAction;
 import org.elasticsearch.cache.recycler.PageCacheRecycler;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
@@ -63,7 +63,7 @@ import static com.google.common.collect.Lists.newArrayList;
 /**
  *
  */
-public class TransportValidateQueryAction extends TransportBroadcastOperationAction<ValidateQueryRequest, ValidateQueryResponse, ShardValidateQueryRequest, ShardValidateQueryResponse> {
+public class TransportValidateQueryAction extends TransportBroadcastAction<ValidateQueryRequest, ValidateQueryResponse, ShardValidateQueryRequest, ShardValidateQueryResponse> {
 
     private final IndicesService indicesService;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java
index d5612235995..3499852c515 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryRequest.java
@@ -23,7 +23,7 @@ import org.elasticsearch.ElasticsearchGenerationException;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.QuerySourceBuilder;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastRequest;
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesArray;
@@ -44,7 +44,7 @@ import java.util.Map;
  * <p>The request requires the query source to be set either using {@link #source(QuerySourceBuilder)},
  * or {@link #source(byte[])}.
  */
-public class ValidateQueryRequest extends BroadcastOperationRequest<ValidateQueryRequest> {
+public class ValidateQueryRequest extends BroadcastRequest<ValidateQueryRequest> {
 
     private BytesReference source;
 
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java
index 6c0a065d3d2..3d1ef78d2bf 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.indices.validate.query;
 
 import com.google.common.collect.ImmutableList;
 import org.elasticsearch.action.ShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -36,7 +36,7 @@ import static org.elasticsearch.action.admin.indices.validate.query.QueryExplana
  *
  *
  */
-public class ValidateQueryResponse extends BroadcastOperationResponse {
+public class ValidateQueryResponse extends BroadcastResponse {
 
     private boolean valid;
     
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/TransportDeleteWarmerAction.java b/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/TransportDeleteWarmerAction.java
index bcf3bad07fc..9e135e9a715 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/TransportDeleteWarmerAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/warmer/delete/TransportDeleteWarmerAction.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.admin.indices.warmer.delete;
 import com.google.common.collect.Lists;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.AckedClusterStateUpdateTask;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
@@ -47,7 +47,7 @@ import java.util.List;
  *
  * Note: this is an internal API and should not be used / called by any client code.
  */
-public class TransportDeleteWarmerAction extends TransportMasterNodeOperationAction<DeleteWarmerRequest, DeleteWarmerResponse> {
+public class TransportDeleteWarmerAction extends TransportMasterNodeAction<DeleteWarmerRequest, DeleteWarmerResponse> {
 
     @Inject
     public TransportDeleteWarmerAction(Settings settings, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters) {
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java b/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java
index e92eb3195d7..0b11e0bcf5d 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/warmer/put/TransportPutWarmerAction.java
@@ -25,7 +25,7 @@ import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.TransportSearchAction;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
 import org.elasticsearch.cluster.AckedClusterStateUpdateTask;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
@@ -51,7 +51,7 @@ import java.util.List;
  *
  * Note: this is an internal API and should not be used / called by any client code.
  */
-public class TransportPutWarmerAction extends TransportMasterNodeOperationAction<PutWarmerRequest, PutWarmerResponse> {
+public class TransportPutWarmerAction extends TransportMasterNodeAction<PutWarmerRequest, PutWarmerResponse> {
 
     private final TransportSearchAction searchAction;
 
diff --git a/src/main/java/org/elasticsearch/action/count/CountRequest.java b/src/main/java/org/elasticsearch/action/count/CountRequest.java
index dfee07b2ee9..1d35af42e53 100644
--- a/src/main/java/org/elasticsearch/action/count/CountRequest.java
+++ b/src/main/java/org/elasticsearch/action/count/CountRequest.java
@@ -22,7 +22,7 @@ package org.elasticsearch.action.count;
 import org.elasticsearch.ElasticsearchGenerationException;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.support.QuerySourceBuilder;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastRequest;
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Strings;
@@ -52,7 +52,7 @@ import static org.elasticsearch.search.internal.SearchContext.DEFAULT_TERMINATE_
  * @see org.elasticsearch.client.Client#count(CountRequest)
  * @see org.elasticsearch.client.Requests#countRequest(String...)
  */
-public class CountRequest extends BroadcastOperationRequest<CountRequest> {
+public class CountRequest extends BroadcastRequest<CountRequest> {
 
     public static final float DEFAULT_MIN_SCORE = -1f;
 
diff --git a/src/main/java/org/elasticsearch/action/count/CountResponse.java b/src/main/java/org/elasticsearch/action/count/CountResponse.java
index 91fd77e596b..916c4ef9373 100644
--- a/src/main/java/org/elasticsearch/action/count/CountResponse.java
+++ b/src/main/java/org/elasticsearch/action/count/CountResponse.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.count;
 
 import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.rest.RestStatus;
@@ -31,7 +31,7 @@ import java.util.Arrays;
 /**
  * The response of the count action.
  */
-public class CountResponse extends BroadcastOperationResponse {
+public class CountResponse extends BroadcastResponse {
 
     private final boolean terminatedEarly;
     private final long count;
diff --git a/src/main/java/org/elasticsearch/action/exists/ExistsRequest.java b/src/main/java/org/elasticsearch/action/exists/ExistsRequest.java
index 84c5d32aaf5..32ff0b1e014 100644
--- a/src/main/java/org/elasticsearch/action/exists/ExistsRequest.java
+++ b/src/main/java/org/elasticsearch/action/exists/ExistsRequest.java
@@ -22,7 +22,7 @@ package org.elasticsearch.action.exists;
 import org.elasticsearch.ElasticsearchGenerationException;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.QuerySourceBuilder;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastRequest;
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Strings;
@@ -38,7 +38,7 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.Map;
 
-public class ExistsRequest extends BroadcastOperationRequest<ExistsRequest> {
+public class ExistsRequest extends BroadcastRequest<ExistsRequest> {
 
     public static final float DEFAULT_MIN_SCORE = -1f;
     private float minScore = DEFAULT_MIN_SCORE;
diff --git a/src/main/java/org/elasticsearch/action/exists/ExistsResponse.java b/src/main/java/org/elasticsearch/action/exists/ExistsResponse.java
index 6b1c58990dd..f271dc65f7f 100644
--- a/src/main/java/org/elasticsearch/action/exists/ExistsResponse.java
+++ b/src/main/java/org/elasticsearch/action/exists/ExistsResponse.java
@@ -20,14 +20,14 @@
 package org.elasticsearch.action.exists;
 
 import org.elasticsearch.action.ShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
 import java.io.IOException;
 import java.util.List;
 
-public class ExistsResponse extends BroadcastOperationResponse {
+public class ExistsResponse extends BroadcastResponse {
 
     private boolean exists = false;
 
diff --git a/src/main/java/org/elasticsearch/action/exists/ShardExistsRequest.java b/src/main/java/org/elasticsearch/action/exists/ShardExistsRequest.java
index a8f8bff91fa..276e6ea117e 100644
--- a/src/main/java/org/elasticsearch/action/exists/ShardExistsRequest.java
+++ b/src/main/java/org/elasticsearch/action/exists/ShardExistsRequest.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.exists;
 
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesReference;
@@ -29,7 +29,7 @@ import org.elasticsearch.index.shard.ShardId;
 
 import java.io.IOException;
 
-class ShardExistsRequest extends BroadcastShardOperationRequest {
+class ShardExistsRequest extends BroadcastShardRequest {
 
     private float minScore;
 
diff --git a/src/main/java/org/elasticsearch/action/exists/ShardExistsResponse.java b/src/main/java/org/elasticsearch/action/exists/ShardExistsResponse.java
index e94330c042f..25f813ee424 100644
--- a/src/main/java/org/elasticsearch/action/exists/ShardExistsResponse.java
+++ b/src/main/java/org/elasticsearch/action/exists/ShardExistsResponse.java
@@ -19,14 +19,14 @@
 
 package org.elasticsearch.action.exists;
 
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.index.shard.ShardId;
 
 import java.io.IOException;
 
-class ShardExistsResponse extends BroadcastShardOperationResponse {
+class ShardExistsResponse extends BroadcastShardResponse {
 
     private boolean exists;
 
diff --git a/src/main/java/org/elasticsearch/action/exists/TransportExistsAction.java b/src/main/java/org/elasticsearch/action/exists/TransportExistsAction.java
index cf4e41ce965..f9118e8c05a 100644
--- a/src/main/java/org/elasticsearch/action/exists/TransportExistsAction.java
+++ b/src/main/java/org/elasticsearch/action/exists/TransportExistsAction.java
@@ -25,7 +25,7 @@ import org.elasticsearch.action.ShardOperationFailedException;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
+import org.elasticsearch.action.support.broadcast.TransportBroadcastAction;
 import org.elasticsearch.cache.recycler.PageCacheRecycler;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
@@ -39,8 +39,8 @@ import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.BigArrays;
-import org.elasticsearch.index.query.QueryParseContext;
 import org.elasticsearch.index.IndexService;
+import org.elasticsearch.index.query.QueryParseContext;
 import org.elasticsearch.index.shard.IndexShard;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.script.ScriptService;
@@ -61,7 +61,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
 import static com.google.common.collect.Lists.newArrayList;
 import static org.elasticsearch.action.exists.ExistsRequest.DEFAULT_MIN_SCORE;
 
-public class TransportExistsAction extends TransportBroadcastOperationAction<ExistsRequest, ExistsResponse, ShardExistsRequest, ShardExistsResponse> {
+public class TransportExistsAction extends TransportBroadcastAction<ExistsRequest, ExistsResponse, ShardExistsRequest, ShardExistsResponse> {
 
     private final IndicesService indicesService;
     private final ScriptService scriptService;
diff --git a/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java b/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java
index f1b7b571833..8a8eaee36cf 100644
--- a/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java
+++ b/src/main/java/org/elasticsearch/action/explain/ExplainRequest.java
@@ -22,7 +22,7 @@ package org.elasticsearch.action.explain;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ValidateActions;
 import org.elasticsearch.action.support.QuerySourceBuilder;
-import org.elasticsearch.action.support.single.shard.SingleShardOperationRequest;
+import org.elasticsearch.action.support.single.shard.SingleShardRequest;
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesReference;
@@ -35,7 +35,7 @@ import java.io.IOException;
 /**
  * Explain request encapsulating the explain query and document identifier to get an explanation for.
  */
-public class ExplainRequest extends SingleShardOperationRequest<ExplainRequest> {
+public class ExplainRequest extends SingleShardRequest<ExplainRequest> {
 
     private String type = "_all";
     private String id;
diff --git a/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java b/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java
index c2ca4c7558a..8cfba3dd1ce 100644
--- a/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java
+++ b/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java
@@ -25,7 +25,7 @@ import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.RoutingMissingException;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.single.shard.TransportShardSingleOperationAction;
+import org.elasticsearch.action.support.single.shard.TransportSingleShardAction;
 import org.elasticsearch.cache.recycler.PageCacheRecycler;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
@@ -33,13 +33,13 @@ import org.elasticsearch.cluster.routing.ShardIterator;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.BigArrays;
+import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.get.GetResult;
 import org.elasticsearch.index.mapper.Uid;
 import org.elasticsearch.index.mapper.internal.UidFieldMapper;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.index.shard.IndexShard;
+import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.search.internal.DefaultSearchContext;
@@ -56,7 +56,7 @@ import java.io.IOException;
  * Explain transport action. Computes the explain on the targeted shard.
  */
 // TODO: AggregatedDfs. Currently the idf can be different then when executing a normal search with explain.
-public class TransportExplainAction extends TransportShardSingleOperationAction<ExplainRequest, ExplainResponse> {
+public class TransportExplainAction extends TransportSingleShardAction<ExplainRequest, ExplainResponse> {
 
     private final IndicesService indicesService;
 
diff --git a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequest.java b/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequest.java
index ff61fe88ee9..e157865ecdf 100644
--- a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequest.java
+++ b/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsRequest.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.fieldstats;
 
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ValidateActions;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -29,7 +29,7 @@ import java.io.IOException;
 
 /**
  */
-public class FieldStatsRequest extends BroadcastOperationRequest<FieldStatsRequest> {
+public class FieldStatsRequest extends BroadcastRequest<FieldStatsRequest> {
 
     public final static String DEFAULT_LEVEL = "cluster";
 
diff --git a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsResponse.java b/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsResponse.java
index e6f69e9791a..a8f66ca56ea 100644
--- a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsResponse.java
+++ b/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsResponse.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.fieldstats;
 
 import org.elasticsearch.action.ShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastResponse;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -32,7 +32,7 @@ import java.util.Map;
 
 /**
  */
-public class FieldStatsResponse extends BroadcastOperationResponse {
+public class FieldStatsResponse extends BroadcastResponse {
 
     private Map<String, Map<String, FieldStats>> indicesMergedFieldStats;
 
diff --git a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardRequest.java b/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardRequest.java
index fb46ff66d3b..0ce83d99296 100644
--- a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardRequest.java
+++ b/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardRequest.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.fieldstats;
 
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.index.shard.ShardId;
@@ -28,7 +28,7 @@ import java.io.IOException;
 
 /**
  */
-public class FieldStatsShardRequest extends BroadcastShardOperationRequest {
+public class FieldStatsShardRequest extends BroadcastShardRequest {
 
     private String[] fields;
 
diff --git a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardResponse.java b/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardResponse.java
index ada4552e94c..c1094ce4d3e 100644
--- a/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardResponse.java
+++ b/src/main/java/org/elasticsearch/action/fieldstats/FieldStatsShardResponse.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.fieldstats;
 
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.index.shard.ShardId;
@@ -30,7 +30,7 @@ import java.util.Map;
 
 /**
  */
-public class FieldStatsShardResponse extends BroadcastShardOperationResponse {
+public class FieldStatsShardResponse extends BroadcastShardResponse {
 
     private Map<String, FieldStats> fieldStats;
 
diff --git a/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java b/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java
index 12a6f41e13d..43e78ec5b87 100644
--- a/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java
+++ b/src/main/java/org/elasticsearch/action/fieldstats/TransportFieldStatsTransportAction.java
@@ -27,7 +27,7 @@ import org.elasticsearch.action.ShardOperationFailedException;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
+import org.elasticsearch.action.support.broadcast.TransportBroadcastAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -47,10 +47,13 @@ import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicReferenceArray;
 
-public class TransportFieldStatsTransportAction extends TransportBroadcastOperationAction<FieldStatsRequest, FieldStatsResponse, FieldStatsShardRequest, FieldStatsShardResponse> {
+public class TransportFieldStatsTransportAction extends TransportBroadcastAction<FieldStatsRequest, FieldStatsResponse, FieldStatsShardRequest, FieldStatsShardResponse> {
 
     private final IndicesService indicesService;
 
diff --git a/src/main/java/org/elasticsearch/action/get/GetRequest.java b/src/main/java/org/elasticsearch/action/get/GetRequest.java
index 6a8497ace71..1d2769017bc 100644
--- a/src/main/java/org/elasticsearch/action/get/GetRequest.java
+++ b/src/main/java/org/elasticsearch/action/get/GetRequest.java
@@ -22,7 +22,7 @@ package org.elasticsearch.action.get;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ValidateActions;
-import org.elasticsearch.action.support.single.shard.SingleShardOperationRequest;
+import org.elasticsearch.action.support.single.shard.SingleShardRequest;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -43,7 +43,7 @@ import java.io.IOException;
  * @see org.elasticsearch.client.Requests#getRequest(String)
  * @see org.elasticsearch.client.Client#get(GetRequest)
  */
-public class GetRequest extends SingleShardOperationRequest<GetRequest> {
+public class GetRequest extends SingleShardRequest<GetRequest> {
 
     private String type;
     private String id;
diff --git a/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java b/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java
index eb3e25c1330..8a6d552807b 100644
--- a/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java
+++ b/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java
@@ -20,19 +20,15 @@
 package org.elasticsearch.action.get;
 
 import com.carrotsearch.hppc.IntArrayList;
-import com.carrotsearch.hppc.LongArrayList;
-import org.elasticsearch.Version;
-import org.elasticsearch.action.support.single.shard.SingleShardOperationRequest;
+import org.elasticsearch.action.support.single.shard.SingleShardRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.index.VersionType;
-import org.elasticsearch.search.fetch.source.FetchSourceContext;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class MultiGetShardRequest extends SingleShardOperationRequest<MultiGetShardRequest> {
+public class MultiGetShardRequest extends SingleShardRequest<MultiGetShardRequest> {
 
     private int shardId;
     private String preference;
diff --git a/src/main/java/org/elasticsearch/action/get/TransportGetAction.java b/src/main/java/org/elasticsearch/action/get/TransportGetAction.java
index 2324835b9dc..08774a2b421 100644
--- a/src/main/java/org/elasticsearch/action/get/TransportGetAction.java
+++ b/src/main/java/org/elasticsearch/action/get/TransportGetAction.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.get;
 
 import org.elasticsearch.action.RoutingMissingException;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.single.shard.TransportShardSingleOperationAction;
+import org.elasticsearch.action.support.single.shard.TransportSingleShardAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
@@ -40,7 +40,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Performs the get operation.
  */
-public class TransportGetAction extends TransportShardSingleOperationAction<GetRequest, GetResponse> {
+public class TransportGetAction extends TransportSingleShardAction<GetRequest, GetResponse> {
 
     private final IndicesService indicesService;
     private final boolean realtime;
diff --git a/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java b/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java
index fb6bac8cdc8..fb1b751a9eb 100644
--- a/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java
+++ b/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java
@@ -23,21 +23,21 @@ import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.TransportActions;
-import org.elasticsearch.action.support.single.shard.TransportShardSingleOperationAction;
+import org.elasticsearch.action.support.single.shard.TransportSingleShardAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.routing.ShardIterator;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.index.get.GetResult;
 import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.shard.ShardId;
+import org.elasticsearch.index.get.GetResult;
 import org.elasticsearch.index.shard.IndexShard;
+import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
 
-public class TransportShardMultiGetAction extends TransportShardSingleOperationAction<MultiGetShardRequest, MultiGetShardResponse> {
+public class TransportShardMultiGetAction extends TransportSingleShardAction<MultiGetShardRequest, MultiGetShardResponse> {
 
     private static final String ACTION_NAME = MultiGetAction.NAME + "[shard]";
 
diff --git a/src/main/java/org/elasticsearch/action/percolate/PercolateRequest.java b/src/main/java/org/elasticsearch/action/percolate/PercolateRequest.java
index f68745e0adf..9c9a3859585 100644
--- a/src/main/java/org/elasticsearch/action/percolate/PercolateRequest.java
+++ b/src/main/java/org/elasticsearch/action/percolate/PercolateRequest.java
@@ -24,7 +24,7 @@ import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.CompositeIndicesRequest;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.get.GetRequest;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastRequest;
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
@@ -43,7 +43,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError;
 /**
  * A request to execute a percolate operation.
  */
-public class PercolateRequest extends BroadcastOperationRequest<PercolateRequest> implements CompositeIndicesRequest {
+public class PercolateRequest extends BroadcastRequest<PercolateRequest> implements CompositeIndicesRequest {
 
     private String documentType;
     private String routing;
@@ -55,7 +55,7 @@ public class PercolateRequest extends BroadcastOperationRequest<PercolateRequest
 
     private BytesReference docSource;
 
-    // Used internally in order to compute tookInMillis, TransportBroadcastOperationAction itself doesn't allow
+    // Used internally in order to compute tookInMillis, TransportBroadcastAction itself doesn't allow
     // to hold it temporarily in an easy way
     long startTime;
 
diff --git a/src/main/java/org/elasticsearch/action/percolate/PercolateResponse.java b/src/main/java/org/elasticsearch/action/percolate/PercolateResponse.java
index 2fef36f650c..677f2aa88e6 100644
--- a/src/main/java/org/elasticsearch/action/percolate/PercolateResponse.java
+++ b/src/main/java/org/elasticsearch/action/percolate/PercolateResponse.java
@@ -19,7 +19,7 @@
 package org.elasticsearch.action.percolate;
 
 import org.elasticsearch.action.ShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastResponse;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -40,7 +40,7 @@ import java.util.*;
 /**
  * Encapsulates the response of a percolator request.
  */
-public class PercolateResponse extends BroadcastOperationResponse implements Iterable<PercolateResponse.Match>, ToXContent {
+public class PercolateResponse extends BroadcastResponse implements Iterable<PercolateResponse.Match>, ToXContent {
 
     public static final Match[] EMPTY = new Match[0];
 
diff --git a/src/main/java/org/elasticsearch/action/percolate/PercolateShardRequest.java b/src/main/java/org/elasticsearch/action/percolate/PercolateShardRequest.java
index 8364eb1610d..f0b1a96e1d5 100644
--- a/src/main/java/org/elasticsearch/action/percolate/PercolateShardRequest.java
+++ b/src/main/java/org/elasticsearch/action/percolate/PercolateShardRequest.java
@@ -19,9 +19,8 @@
 
 package org.elasticsearch.action.percolate;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.OriginalIndices;
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -31,7 +30,7 @@ import java.io.IOException;
 
 /**
  */
-public class PercolateShardRequest extends BroadcastShardOperationRequest {
+public class PercolateShardRequest extends BroadcastShardRequest {
 
     private String documentType;
     private BytesReference source;
diff --git a/src/main/java/org/elasticsearch/action/percolate/PercolateShardResponse.java b/src/main/java/org/elasticsearch/action/percolate/PercolateShardResponse.java
index b731208def7..c626cda581e 100644
--- a/src/main/java/org/elasticsearch/action/percolate/PercolateShardResponse.java
+++ b/src/main/java/org/elasticsearch/action/percolate/PercolateShardResponse.java
@@ -19,9 +19,8 @@
 package org.elasticsearch.action.percolate;
 
 import com.google.common.collect.ImmutableList;
-
 import org.apache.lucene.util.BytesRef;
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -42,7 +41,7 @@ import java.util.Map;
 
 /**
  */
-public class PercolateShardResponse extends BroadcastShardOperationResponse {
+public class PercolateShardResponse extends BroadcastShardResponse {
 
     private static final BytesRef[] EMPTY_MATCHES = new BytesRef[0];
     private static final float[] EMPTY_SCORES = new float[0];
diff --git a/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java b/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java
index d1ee7be3b19..622b541a0ea 100644
--- a/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java
+++ b/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java
@@ -26,7 +26,7 @@ import org.elasticsearch.action.get.TransportGetAction;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
+import org.elasticsearch.action.support.broadcast.TransportBroadcastAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -52,7 +52,7 @@ import static com.google.common.collect.Lists.newArrayList;
 /**
  *
  */
-public class TransportPercolateAction extends TransportBroadcastOperationAction<PercolateRequest, PercolateResponse, PercolateShardRequest, PercolateShardResponse> {
+public class TransportPercolateAction extends TransportBroadcastAction<PercolateRequest, PercolateResponse, PercolateShardRequest, PercolateShardResponse> {
 
     private final PercolatorService percolatorService;
     private final TransportGetAction getAction;
diff --git a/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java b/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java
index ce38859174f..adca1883470 100644
--- a/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java
+++ b/src/main/java/org/elasticsearch/action/percolate/TransportShardMultiPercolateAction.java
@@ -26,8 +26,8 @@ import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.OriginalIndices;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.TransportActions;
-import org.elasticsearch.action.support.single.shard.SingleShardOperationRequest;
-import org.elasticsearch.action.support.single.shard.TransportShardSingleOperationAction;
+import org.elasticsearch.action.support.single.shard.SingleShardRequest;
+import org.elasticsearch.action.support.single.shard.TransportSingleShardAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.routing.ShardIterator;
@@ -49,7 +49,7 @@ import java.util.List;
 
 /**
  */
-public class TransportShardMultiPercolateAction extends TransportShardSingleOperationAction<TransportShardMultiPercolateAction.Request, TransportShardMultiPercolateAction.Response> {
+public class TransportShardMultiPercolateAction extends TransportSingleShardAction<TransportShardMultiPercolateAction.Request, TransportShardMultiPercolateAction.Response> {
 
     private final PercolatorService percolatorService;
 
@@ -108,7 +108,7 @@ public class TransportShardMultiPercolateAction extends TransportShardSingleOper
     }
 
 
-    public static class Request extends SingleShardOperationRequest implements IndicesRequest {
+    public static class Request extends SingleShardRequest implements IndicesRequest {
 
         private int shardId;
         private String preference;
diff --git a/src/main/java/org/elasticsearch/action/suggest/ShardSuggestRequest.java b/src/main/java/org/elasticsearch/action/suggest/ShardSuggestRequest.java
index d4c48e5034f..794dd9badf7 100644
--- a/src/main/java/org/elasticsearch/action/suggest/ShardSuggestRequest.java
+++ b/src/main/java/org/elasticsearch/action/suggest/ShardSuggestRequest.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.suggest;
 
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -30,7 +30,7 @@ import java.io.IOException;
 /**
  * Internal suggest request executed directly against a specific index shard.
  */
-final class ShardSuggestRequest extends BroadcastShardOperationRequest {
+final class ShardSuggestRequest extends BroadcastShardRequest {
 
     private BytesReference suggestSource;
 
diff --git a/src/main/java/org/elasticsearch/action/suggest/ShardSuggestResponse.java b/src/main/java/org/elasticsearch/action/suggest/ShardSuggestResponse.java
index f6495c60163..bca29800bd1 100644
--- a/src/main/java/org/elasticsearch/action/suggest/ShardSuggestResponse.java
+++ b/src/main/java/org/elasticsearch/action/suggest/ShardSuggestResponse.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.suggest;
 
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.index.shard.ShardId;
@@ -30,7 +30,7 @@ import java.io.IOException;
 /**
  * Internal suggest response of a shard suggest request executed directly against a specific shard.
  */
-class ShardSuggestResponse extends BroadcastShardOperationResponse {
+class ShardSuggestResponse extends BroadcastShardResponse {
 
     private final Suggest suggest;
 
diff --git a/src/main/java/org/elasticsearch/action/suggest/SuggestRequest.java b/src/main/java/org/elasticsearch/action/suggest/SuggestRequest.java
index fdb5d7a0117..c75e262bac4 100644
--- a/src/main/java/org/elasticsearch/action/suggest/SuggestRequest.java
+++ b/src/main/java/org/elasticsearch/action/suggest/SuggestRequest.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.suggest;
 
 import org.elasticsearch.action.ActionRequestValidationException;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastRequest;
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Strings;
@@ -48,7 +48,7 @@ import java.util.Arrays;
  * @see org.elasticsearch.client.Requests#suggestRequest(String...)
  * @see org.elasticsearch.search.suggest.SuggestBuilders
  */
-public final class SuggestRequest extends BroadcastOperationRequest<SuggestRequest> {
+public final class SuggestRequest extends BroadcastRequest<SuggestRequest> {
 
     @Nullable
     private String routing;
diff --git a/src/main/java/org/elasticsearch/action/suggest/SuggestResponse.java b/src/main/java/org/elasticsearch/action/suggest/SuggestResponse.java
index 24a8922c5f9..445e804b5b5 100644
--- a/src/main/java/org/elasticsearch/action/suggest/SuggestResponse.java
+++ b/src/main/java/org/elasticsearch/action/suggest/SuggestResponse.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.suggest;
 
 import org.elasticsearch.action.ShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.XContentBuilder;
@@ -35,7 +35,7 @@ import static org.elasticsearch.common.xcontent.ToXContent.EMPTY_PARAMS;
 /**
  * The response of the suggest action.
  */
-public final class SuggestResponse extends BroadcastOperationResponse {
+public final class SuggestResponse extends BroadcastResponse {
 
     private final Suggest suggest;
 
diff --git a/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java b/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java
index 9874783ae79..ac046e6552d 100644
--- a/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java
+++ b/src/main/java/org/elasticsearch/action/suggest/TransportSuggestAction.java
@@ -24,7 +24,7 @@ import org.elasticsearch.action.ShardOperationFailedException;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
+import org.elasticsearch.action.support.broadcast.TransportBroadcastAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -36,8 +36,8 @@ import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.IndexService;
+import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.shard.IndexShard;
 import org.elasticsearch.index.suggest.stats.ShardSuggestService;
 import org.elasticsearch.indices.IndicesService;
@@ -58,7 +58,7 @@ import static com.google.common.collect.Lists.newArrayList;
 /**
  * Defines the transport of a suggestion request across the cluster
  */
-public class TransportSuggestAction extends TransportBroadcastOperationAction<SuggestRequest, SuggestResponse, ShardSuggestRequest, ShardSuggestResponse> {
+public class TransportSuggestAction extends TransportBroadcastAction<SuggestRequest, SuggestResponse, ShardSuggestRequest, ShardSuggestResponse> {
 
     private final IndicesService indicesService;
     private final SuggestPhase suggestPhase;
diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java
index 50fb7b097f2..6170d967002 100644
--- a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java
+++ b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequestBuilder.java
@@ -26,7 +26,7 @@ import org.elasticsearch.client.ElasticsearchClient;
 
 /**
  */
-public abstract class BroadcastOperationRequestBuilder<Request extends BroadcastOperationRequest<Request>, Response extends BroadcastOperationResponse, RequestBuilder extends BroadcastOperationRequestBuilder<Request, Response, RequestBuilder>>
+public abstract class BroadcastOperationRequestBuilder<Request extends BroadcastRequest<Request>, Response extends BroadcastResponse, RequestBuilder extends BroadcastOperationRequestBuilder<Request, Response, RequestBuilder>>
         extends ActionRequestBuilder<Request, Response, RequestBuilder> {
 
     protected BroadcastOperationRequestBuilder(ElasticsearchClient client, Action<Request, Response, RequestBuilder> action, Request request) {
diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequest.java b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java
similarity index 88%
rename from src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequest.java
rename to src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java
index 80eeacedbba..19adbdce01a 100644
--- a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequest.java
+++ b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java
@@ -31,20 +31,20 @@ import java.io.IOException;
 /**
  *
  */
-public abstract class BroadcastOperationRequest<T extends BroadcastOperationRequest> extends ActionRequest<T> implements IndicesRequest.Replaceable {
+public abstract class BroadcastRequest<T extends BroadcastRequest> extends ActionRequest<T> implements IndicesRequest.Replaceable {
 
     protected String[] indices;
     private IndicesOptions indicesOptions = IndicesOptions.strictExpandOpenAndForbidClosed();
 
-    protected BroadcastOperationRequest() {
+    protected BroadcastRequest() {
 
     }
 
-    protected BroadcastOperationRequest(ActionRequest originalRequest) {
+    protected BroadcastRequest(ActionRequest originalRequest) {
         super(originalRequest);
     }
 
-    protected BroadcastOperationRequest(String[] indices) {
+    protected BroadcastRequest(String[] indices) {
         this.indices = indices;
     }
 
diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java
similarity index 90%
rename from src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java
rename to src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java
index e8e2a2aa0ce..560c7ec9869 100644
--- a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationResponse.java
+++ b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java
@@ -32,17 +32,17 @@ import static org.elasticsearch.action.support.DefaultShardOperationFailedExcept
 /**
  * Base class for all broadcast operation based responses.
  */
-public abstract class BroadcastOperationResponse extends ActionResponse {
+public abstract class BroadcastResponse extends ActionResponse {
     private static final ShardOperationFailedException[] EMPTY = new ShardOperationFailedException[0];
     private int totalShards;
     private int successfulShards;
     private int failedShards;
     private ShardOperationFailedException[] shardFailures = EMPTY;
 
-    protected BroadcastOperationResponse() {
+    protected BroadcastResponse() {
     }
 
-    protected BroadcastOperationResponse(int totalShards, int successfulShards, int failedShards, List<? extends ShardOperationFailedException> shardFailures) {
+    protected BroadcastResponse(int totalShards, int successfulShards, int failedShards, List<? extends ShardOperationFailedException> shardFailures) {
         this.totalShards = totalShards;
         this.successfulShards = successfulShards;
         this.failedShards = failedShards;
@@ -73,7 +73,7 @@ public abstract class BroadcastOperationResponse extends ActionResponse {
     /**
      * The list of shard failures exception.
      */
-    public ShardOperationFailedException[]  getShardFailures() {
+    public ShardOperationFailedException[] getShardFailures() {
         return shardFailures;
     }
 
diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationRequest.java b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java
similarity index 86%
rename from src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationRequest.java
rename to src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java
index f6c917fbf9b..e416cd517e1 100644
--- a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationRequest.java
+++ b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardRequest.java
@@ -32,22 +32,22 @@ import java.io.IOException;
 /**
  *
  */
-public abstract class BroadcastShardOperationRequest extends TransportRequest implements IndicesRequest {
+public abstract class BroadcastShardRequest extends TransportRequest implements IndicesRequest {
 
     private ShardId shardId;
 
     protected OriginalIndices originalIndices;
 
-    protected BroadcastShardOperationRequest() {
+    protected BroadcastShardRequest() {
     }
 
-    protected BroadcastShardOperationRequest(ShardId shardId, BroadcastOperationRequest request) {
+    protected BroadcastShardRequest(ShardId shardId, BroadcastRequest request) {
         super(request);
         this.shardId = shardId;
         this.originalIndices = new OriginalIndices(request);
     }
 
-    protected BroadcastShardOperationRequest(ShardId shardId, OriginalIndices originalIndices) {
+    protected BroadcastShardRequest(ShardId shardId, OriginalIndices originalIndices) {
         this.shardId = shardId;
         this.originalIndices = originalIndices;
     }
diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationResponse.java b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java
similarity index 89%
rename from src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationResponse.java
rename to src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java
index cc0c64b532d..bf7d271bb6f 100644
--- a/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardOperationResponse.java
+++ b/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastShardResponse.java
@@ -29,15 +29,15 @@ import java.io.IOException;
 /**
  *
  */
-public abstract class BroadcastShardOperationResponse extends TransportResponse {
+public abstract class BroadcastShardResponse extends TransportResponse {
 
     ShardId shardId;
 
-    protected BroadcastShardOperationResponse() {
+    protected BroadcastShardResponse() {
 
     }
 
-    protected BroadcastShardOperationResponse(ShardId shardId) {
+    protected BroadcastShardResponse(ShardId shardId) {
         this.shardId = shardId;
     }
 
diff --git a/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java b/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java
similarity index 95%
rename from src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java
rename to src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java
index 6ff55467f7d..c77f3ec766b 100644
--- a/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java
+++ b/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java
@@ -43,7 +43,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
 /**
  *
  */
-public abstract class TransportBroadcastOperationAction<Request extends BroadcastOperationRequest, Response extends BroadcastOperationResponse, ShardRequest extends BroadcastShardOperationRequest, ShardResponse extends BroadcastShardOperationResponse>
+public abstract class TransportBroadcastAction<Request extends BroadcastRequest, Response extends BroadcastResponse, ShardRequest extends BroadcastShardRequest, ShardResponse extends BroadcastShardResponse>
         extends HandledTransportAction<Request, Response> {
 
     protected final ThreadPool threadPool;
@@ -52,8 +52,8 @@ public abstract class TransportBroadcastOperationAction<Request extends Broadcas
 
     final String transportShardAction;
 
-    protected TransportBroadcastOperationAction(Settings settings, String actionName, ThreadPool threadPool, ClusterService clusterService, TransportService transportService, ActionFilters actionFilters,
-                                                Class<Request> request, Class<ShardRequest> shardRequest, String shardExecutor) {
+    protected TransportBroadcastAction(Settings settings, String actionName, ThreadPool threadPool, ClusterService clusterService, TransportService transportService, ActionFilters actionFilters,
+                                       Class<Request> request, Class<ShardRequest> shardRequest, String shardExecutor) {
         super(settings, actionName, threadPool, transportService, actionFilters, request);
         this.clusterService = clusterService;
         this.transportService = transportService;
diff --git a/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java b/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java
index ea3a1e43bff..870b1077456 100644
--- a/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java
+++ b/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java
@@ -33,7 +33,7 @@ import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds;
  * Abstract class that allows to mark action requests that support acknowledgements.
  * Facilitates consistency across different api.
  */
-public abstract class AcknowledgedRequest<T extends MasterNodeOperationRequest> extends MasterNodeOperationRequest<T> implements AckedRequest {
+public abstract class AcknowledgedRequest<T extends MasterNodeRequest> extends MasterNodeRequest<T> implements AckedRequest {
 
     public static final TimeValue DEFAULT_ACK_TIMEOUT = timeValueSeconds(30);
 
diff --git a/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java b/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java
index 5d7af81927b..0b3b5af36d2 100644
--- a/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java
+++ b/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequestBuilder.java
@@ -22,15 +22,13 @@ package org.elasticsearch.action.support.master;
 import org.elasticsearch.action.Action;
 import org.elasticsearch.action.ActionRequestBuilder;
 import org.elasticsearch.action.ActionResponse;
-import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.ElasticsearchClient;
-import org.elasticsearch.client.IndicesAdminClient;
 import org.elasticsearch.common.unit.TimeValue;
 
 /**
  * Base request builder for master node operations
  */
-public abstract class MasterNodeOperationRequestBuilder<Request extends MasterNodeOperationRequest<Request>, Response extends ActionResponse, RequestBuilder extends MasterNodeOperationRequestBuilder<Request, Response, RequestBuilder>>
+public abstract class MasterNodeOperationRequestBuilder<Request extends MasterNodeRequest<Request>, Response extends ActionResponse, RequestBuilder extends MasterNodeOperationRequestBuilder<Request, Response, RequestBuilder>>
         extends ActionRequestBuilder<Request, Response, RequestBuilder> {
 
     protected MasterNodeOperationRequestBuilder(ElasticsearchClient client, Action<Request, Response, RequestBuilder> action, Request request) {
diff --git a/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java b/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java
index 02c83298c25..7955abfbe96 100644
--- a/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java
+++ b/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequestBuilder.java
@@ -21,14 +21,12 @@ package org.elasticsearch.action.support.master;
 
 import org.elasticsearch.action.Action;
 import org.elasticsearch.action.ActionResponse;
-import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.client.ElasticsearchClient;
-import org.elasticsearch.client.IndicesAdminClient;
 
 /**
  * Base request builder for master node read operations that can be executed on the local node as well
  */
-public abstract class MasterNodeReadOperationRequestBuilder<Request extends MasterNodeReadOperationRequest<Request>, Response extends ActionResponse, RequestBuilder extends MasterNodeReadOperationRequestBuilder<Request, Response, RequestBuilder>>
+public abstract class MasterNodeReadOperationRequestBuilder<Request extends MasterNodeReadRequest<Request>, Response extends ActionResponse, RequestBuilder extends MasterNodeReadOperationRequestBuilder<Request, Response, RequestBuilder>>
         extends MasterNodeOperationRequestBuilder<Request, Response, RequestBuilder> {
 
     protected MasterNodeReadOperationRequestBuilder(ElasticsearchClient client, Action<Request, Response, RequestBuilder> action, Request request) {
diff --git a/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequest.java b/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java
similarity index 90%
rename from src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequest.java
rename to src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java
index df47cae3f1a..b190a6e93c4 100644
--- a/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadOperationRequest.java
+++ b/src/main/java/org/elasticsearch/action/support/master/MasterNodeReadRequest.java
@@ -19,7 +19,6 @@
 
 package org.elasticsearch.action.support.master;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -28,7 +27,7 @@ import java.io.IOException;
 /**
  * Base request for master based read operations that allows to read the cluster state from the local node if needed
  */
-public abstract class MasterNodeReadOperationRequest<T extends MasterNodeReadOperationRequest> extends MasterNodeOperationRequest<T> {
+public abstract class MasterNodeReadRequest<T extends MasterNodeReadRequest> extends MasterNodeRequest<T> {
 
     protected boolean local = false;
 
diff --git a/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequest.java b/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java
similarity index 90%
rename from src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequest.java
rename to src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java
index e1e90e932ff..d3621cac58c 100644
--- a/src/main/java/org/elasticsearch/action/support/master/MasterNodeOperationRequest.java
+++ b/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java
@@ -29,17 +29,17 @@ import java.io.IOException;
 /**
  * A based request for master based operation.
  */
-public abstract class MasterNodeOperationRequest<T extends MasterNodeOperationRequest> extends ActionRequest<T> {
+public abstract class MasterNodeRequest<T extends MasterNodeRequest> extends ActionRequest<T> {
 
     public static final TimeValue DEFAULT_MASTER_NODE_TIMEOUT = TimeValue.timeValueSeconds(30);
 
     protected TimeValue masterNodeTimeout = DEFAULT_MASTER_NODE_TIMEOUT;
 
-    protected MasterNodeOperationRequest() {
+    protected MasterNodeRequest() {
 
     }
 
-    protected MasterNodeOperationRequest(ActionRequest request) {
+    protected MasterNodeRequest(ActionRequest request) {
         super(request);
     }
 
diff --git a/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeOperationAction.java b/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java
similarity index 94%
rename from src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeOperationAction.java
rename to src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java
index 9e1c662cf60..f8c0c07da58 100644
--- a/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeOperationAction.java
+++ b/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java
@@ -36,20 +36,23 @@ import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.discovery.MasterNotDiscoveredException;
 import org.elasticsearch.node.NodeClosedException;
 import org.elasticsearch.threadpool.ThreadPool;
-import org.elasticsearch.transport.*;
+import org.elasticsearch.transport.BaseTransportResponseHandler;
+import org.elasticsearch.transport.ConnectTransportException;
+import org.elasticsearch.transport.TransportException;
+import org.elasticsearch.transport.TransportService;
 
 /**
  * A base class for operations that needs to be performed on the master node.
  */
-public abstract class TransportMasterNodeOperationAction<Request extends MasterNodeOperationRequest, Response extends ActionResponse> extends HandledTransportAction<Request, Response> {
+public abstract class TransportMasterNodeAction<Request extends MasterNodeRequest, Response extends ActionResponse> extends HandledTransportAction<Request, Response> {
 
     protected final TransportService transportService;
     protected final ClusterService clusterService;
 
     final String executor;
 
-    protected TransportMasterNodeOperationAction(Settings settings, String actionName, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters,
-                                                 Class<Request> request) {
+    protected TransportMasterNodeAction(Settings settings, String actionName, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters,
+                                        Class<Request> request) {
         super(settings, actionName, threadPool, transportService, actionFilters, request);
         this.transportService = transportService;
         this.clusterService = clusterService;
diff --git a/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadOperationAction.java b/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java
similarity index 80%
rename from src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadOperationAction.java
rename to src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java
index 383de7ceb53..c33b9fde774 100644
--- a/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadOperationAction.java
+++ b/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeReadAction.java
@@ -30,13 +30,13 @@ import org.elasticsearch.transport.TransportService;
  * A base class for read operations that needs to be performed on the master node.
  * Can also be executed on the local node if needed.
  */
-public abstract class TransportMasterNodeReadOperationAction<Request extends MasterNodeReadOperationRequest, Response extends ActionResponse> extends TransportMasterNodeOperationAction<Request, Response> {
+public abstract class TransportMasterNodeReadAction<Request extends MasterNodeReadRequest, Response extends ActionResponse> extends TransportMasterNodeAction<Request, Response> {
 
     public static final String FORCE_LOCAL_SETTING = "action.master.force_local";
 
     private Boolean forceLocal;
 
-    protected TransportMasterNodeReadOperationAction(Settings settings, String actionName, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters, Class<Request> request) {
+    protected TransportMasterNodeReadAction(Settings settings, String actionName, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters, Class<Request> request) {
         super(settings, actionName, transportService, clusterService, threadPool, actionFilters,request);
         this.forceLocal = settings.getAsBoolean(FORCE_LOCAL_SETTING, null);
     }
diff --git a/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java b/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java
index 5f0d34675b4..fbd095bb874 100644
--- a/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java
+++ b/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.support.master.info;
 
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.action.support.master.MasterNodeReadOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeReadRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -30,7 +30,7 @@ import java.io.IOException;
 
 /**
  */
-public abstract class ClusterInfoRequest<T extends ClusterInfoRequest> extends MasterNodeReadOperationRequest<T> implements IndicesRequest.Replaceable {
+public abstract class ClusterInfoRequest<T extends ClusterInfoRequest> extends MasterNodeReadRequest<T> implements IndicesRequest.Replaceable {
 
     private String[] indices = Strings.EMPTY_ARRAY;
     private String[] types = Strings.EMPTY_ARRAY;
diff --git a/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java b/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java
index fdf6352ef18..d1bdb86e1bb 100644
--- a/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java
+++ b/src/main/java/org/elasticsearch/action/support/master/info/TransportClusterInfoAction.java
@@ -21,7 +21,7 @@ package org.elasticsearch.action.support.master.info;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.common.settings.Settings;
@@ -30,7 +30,7 @@ import org.elasticsearch.transport.TransportService;
 
 /**
  */
-public abstract class TransportClusterInfoAction<Request extends ClusterInfoRequest, Response extends ActionResponse> extends TransportMasterNodeReadOperationAction<Request, Response> {
+public abstract class TransportClusterInfoAction<Request extends ClusterInfoRequest, Response extends ActionResponse> extends TransportMasterNodeReadAction<Request, Response> {
 
     public TransportClusterInfoAction(Settings settings, String actionName, TransportService transportService, ClusterService clusterService, ThreadPool threadPool, ActionFilters actionFilters, Class<Request> request) {
         super(settings, actionName, transportService, clusterService, threadPool, actionFilters, request);
diff --git a/src/main/java/org/elasticsearch/action/support/nodes/NodeOperationRequest.java b/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java
similarity index 88%
rename from src/main/java/org/elasticsearch/action/support/nodes/NodeOperationRequest.java
rename to src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java
index 4d8a42619ad..e25577e2f70 100644
--- a/src/main/java/org/elasticsearch/action/support/nodes/NodeOperationRequest.java
+++ b/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeRequest.java
@@ -28,15 +28,15 @@ import java.io.IOException;
 /**
  *
  */
-public abstract class NodeOperationRequest extends TransportRequest {
+public abstract class BaseNodeRequest extends TransportRequest {
 
     private String nodeId;
 
-    protected NodeOperationRequest() {
+    protected BaseNodeRequest() {
 
     }
 
-    protected NodeOperationRequest(NodesOperationRequest request, String nodeId) {
+    protected BaseNodeRequest(BaseNodesRequest request, String nodeId) {
         super(request);
         this.nodeId = nodeId;
     }
diff --git a/src/main/java/org/elasticsearch/action/support/nodes/NodeOperationResponse.java b/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java
similarity index 90%
rename from src/main/java/org/elasticsearch/action/support/nodes/NodeOperationResponse.java
rename to src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java
index 3415a07c8a2..33e4596e9b2 100644
--- a/src/main/java/org/elasticsearch/action/support/nodes/NodeOperationResponse.java
+++ b/src/main/java/org/elasticsearch/action/support/nodes/BaseNodeResponse.java
@@ -29,14 +29,14 @@ import java.io.IOException;
 /**
  * A base class for node level operations.
  */
-public abstract class NodeOperationResponse extends TransportResponse {
+public abstract class BaseNodeResponse extends TransportResponse {
 
     private DiscoveryNode node;
 
-    protected NodeOperationResponse() {
+    protected BaseNodeResponse() {
     }
 
-    protected NodeOperationResponse(DiscoveryNode node) {
+    protected BaseNodeResponse(DiscoveryNode node) {
         assert node != null;
         this.node = node;
     }
diff --git a/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequest.java b/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java
similarity index 90%
rename from src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequest.java
rename to src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java
index 113e03f1f3c..462c873c633 100644
--- a/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequest.java
+++ b/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java
@@ -31,7 +31,7 @@ import java.io.IOException;
 /**
  *
  */
-public abstract class NodesOperationRequest<T extends NodesOperationRequest> extends ActionRequest<T> {
+public abstract class BaseNodesRequest<T extends BaseNodesRequest> extends ActionRequest<T> {
 
     public static String[] ALL_NODES = Strings.EMPTY_ARRAY;
 
@@ -39,16 +39,16 @@ public abstract class NodesOperationRequest<T extends NodesOperationRequest> ext
 
     private TimeValue timeout;
 
-    protected NodesOperationRequest() {
+    protected BaseNodesRequest() {
 
     }
 
-    protected NodesOperationRequest(ActionRequest request, String... nodesIds) {
+    protected BaseNodesRequest(ActionRequest request, String... nodesIds) {
         super(request);
         this.nodesIds = nodesIds;
     }
 
-    protected NodesOperationRequest(String... nodesIds) {
+    protected BaseNodesRequest(String... nodesIds) {
         this.nodesIds = nodesIds;
     }
 
diff --git a/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationResponse.java b/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java
similarity index 79%
rename from src/main/java/org/elasticsearch/action/support/nodes/NodesOperationResponse.java
rename to src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java
index b2a699529bb..db0a2a89aa7 100644
--- a/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationResponse.java
+++ b/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesResponse.java
@@ -34,16 +34,16 @@ import java.util.Map;
 /**
  *
  */
-public abstract class NodesOperationResponse<NodeResponse extends NodeOperationResponse> extends ActionResponse implements Iterable<NodeResponse> {
+public abstract class BaseNodesResponse<TNodeResponse extends BaseNodeResponse> extends ActionResponse implements Iterable<TNodeResponse> {
 
     private ClusterName clusterName;
-    protected NodeResponse[] nodes;
-    private Map<String, NodeResponse> nodesMap;
+    protected TNodeResponse[] nodes;
+    private Map<String, TNodeResponse> nodesMap;
 
-    protected NodesOperationResponse() {
+    protected BaseNodesResponse() {
     }
 
-    protected NodesOperationResponse(ClusterName clusterName, NodeResponse[] nodes) {
+    protected BaseNodesResponse(ClusterName clusterName, TNodeResponse[] nodes) {
         this.clusterName = clusterName;
         this.nodes = nodes;
     }
@@ -64,23 +64,23 @@ public abstract class NodesOperationResponse<NodeResponse extends NodeOperationR
         return this.clusterName.value();
     }
 
-    public NodeResponse[] getNodes() {
+    public TNodeResponse[] getNodes() {
         return nodes;
     }
 
-    public NodeResponse getAt(int position) {
+    public TNodeResponse getAt(int position) {
         return nodes[position];
     }
 
     @Override
-    public Iterator<NodeResponse> iterator() {
+    public Iterator<TNodeResponse> iterator() {
         return getNodesMap().values().iterator();
     }
 
-    public Map<String, NodeResponse> getNodesMap() {
+    public Map<String, TNodeResponse> getNodesMap() {
         if (nodesMap == null) {
             nodesMap = Maps.newHashMap();
-            for (NodeResponse nodeResponse : nodes) {
+            for (TNodeResponse nodeResponse : nodes) {
                 nodesMap.put(nodeResponse.getNode().id(), nodeResponse);
             }
         }
diff --git a/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java b/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java
index 303671db595..cf8190f2c32 100644
--- a/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java
+++ b/src/main/java/org/elasticsearch/action/support/nodes/NodesOperationRequestBuilder.java
@@ -26,7 +26,7 @@ import org.elasticsearch.common.unit.TimeValue;
 
 /**
  */
-public abstract class NodesOperationRequestBuilder<Request extends NodesOperationRequest<Request>, Response extends NodesOperationResponse, RequestBuilder extends NodesOperationRequestBuilder<Request, Response, RequestBuilder>>
+public abstract class NodesOperationRequestBuilder<Request extends BaseNodesRequest<Request>, Response extends BaseNodesResponse, RequestBuilder extends NodesOperationRequestBuilder<Request, Response, RequestBuilder>>
         extends ActionRequestBuilder<Request, Response, RequestBuilder> {
 
     protected NodesOperationRequestBuilder(ElasticsearchClient client, Action<Request, Response, RequestBuilder> action, Request request) {
diff --git a/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java b/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java
similarity index 87%
rename from src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java
rename to src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java
index 78503930357..065f4ad744a 100644
--- a/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesOperationAction.java
+++ b/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java
@@ -39,7 +39,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
 /**
  *
  */
-public abstract class TransportNodesOperationAction<Request extends NodesOperationRequest, Response extends NodesOperationResponse, NodeRequest extends NodeOperationRequest, NodeResponse extends NodeOperationResponse> extends HandledTransportAction<Request, Response> {
+public abstract class TransportNodesAction<NodesRequest extends BaseNodesRequest, NodesResponse extends BaseNodesResponse, NodeRequest extends BaseNodeRequest, NodeResponse extends BaseNodeResponse> extends HandledTransportAction<NodesRequest, NodesResponse> {
 
     protected final ClusterName clusterName;
     protected final ClusterService clusterService;
@@ -47,9 +47,9 @@ public abstract class TransportNodesOperationAction<Request extends NodesOperati
 
     final String transportNodeAction;
 
-    protected TransportNodesOperationAction(Settings settings, String actionName, ClusterName clusterName, ThreadPool threadPool,
-                                            ClusterService clusterService, TransportService transportService, ActionFilters actionFilters,
-                                            Class<Request> request, Class<NodeRequest> nodeRequest, String nodeExecutor) {
+    protected TransportNodesAction(Settings settings, String actionName, ClusterName clusterName, ThreadPool threadPool,
+                                   ClusterService clusterService, TransportService transportService, ActionFilters actionFilters,
+                                   Class<NodesRequest> request, Class<NodeRequest> nodeRequest, String nodeExecutor) {
         super(settings, actionName, threadPool, transportService, actionFilters, request);
         this.clusterName = clusterName;
         this.clusterService = clusterService;
@@ -61,7 +61,7 @@ public abstract class TransportNodesOperationAction<Request extends NodesOperati
     }
 
     @Override
-    protected void doExecute(Request request, ActionListener<Response> listener) {
+    protected void doExecute(NodesRequest request, ActionListener<NodesResponse> listener) {
         new AsyncAction(request, listener).start();
     }
 
@@ -69,9 +69,9 @@ public abstract class TransportNodesOperationAction<Request extends NodesOperati
         return false;
     }
 
-    protected abstract Response newResponse(Request request, AtomicReferenceArray nodesResponses);
+    protected abstract NodesResponse newResponse(NodesRequest request, AtomicReferenceArray nodesResponses);
 
-    protected abstract NodeRequest newNodeRequest(String nodeId, Request request);
+    protected abstract NodeRequest newNodeRequest(String nodeId, NodesRequest request);
 
     protected abstract NodeResponse newNodeResponse();
 
@@ -85,14 +85,14 @@ public abstract class TransportNodesOperationAction<Request extends NodesOperati
 
     private class AsyncAction {
 
-        private final Request request;
+        private final NodesRequest request;
         private final String[] nodesIds;
-        private final ActionListener<Response> listener;
+        private final ActionListener<NodesResponse> listener;
         private final ClusterState clusterState;
         private final AtomicReferenceArray<Object> responses;
         private final AtomicInteger counter = new AtomicInteger();
 
-        private AsyncAction(Request request, ActionListener<Response> listener) {
+        private AsyncAction(NodesRequest request, ActionListener<NodesResponse> listener) {
             this.request = request;
             this.listener = listener;
             clusterState = clusterService.state();
@@ -179,7 +179,7 @@ public abstract class TransportNodesOperationAction<Request extends NodesOperati
         }
 
         private void finishHim() {
-            Response finalResponse;
+            NodesResponse finalResponse;
             try {
                 finalResponse = newResponse(request, responses);
             } catch (Throwable t) {
diff --git a/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java b/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java
index e9ce5204aaf..3e9897c7c85 100644
--- a/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java
+++ b/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequestBuilder.java
@@ -22,12 +22,11 @@ package org.elasticsearch.action.support.single.shard;
 import org.elasticsearch.action.Action;
 import org.elasticsearch.action.ActionRequestBuilder;
 import org.elasticsearch.action.ActionResponse;
-import org.elasticsearch.client.Client;
 import org.elasticsearch.client.ElasticsearchClient;
 
 /**
  */
-public abstract class SingleShardOperationRequestBuilder<Request extends SingleShardOperationRequest<Request>, Response extends ActionResponse, RequestBuilder extends SingleShardOperationRequestBuilder<Request, Response, RequestBuilder>>
+public abstract class SingleShardOperationRequestBuilder<Request extends SingleShardRequest<Request>, Response extends ActionResponse, RequestBuilder extends SingleShardOperationRequestBuilder<Request, Response, RequestBuilder>>
         extends ActionRequestBuilder<Request, Response, RequestBuilder> {
 
     protected SingleShardOperationRequestBuilder(ElasticsearchClient client, Action<Request, Response, RequestBuilder> action, Request request) {
diff --git a/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequest.java b/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java
similarity index 89%
rename from src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequest.java
rename to src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java
index 74db0435709..180ea877618 100644
--- a/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardOperationRequest.java
+++ b/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java
@@ -33,7 +33,7 @@ import java.io.IOException;
 /**
  *
  */
-public abstract class SingleShardOperationRequest<T extends SingleShardOperationRequest> extends ActionRequest<T> implements IndicesRequest {
+public abstract class SingleShardRequest<T extends SingleShardRequest> extends ActionRequest<T> implements IndicesRequest {
 
     ShardId internalShardId;
 
@@ -41,18 +41,18 @@ public abstract class SingleShardOperationRequest<T extends SingleShardOperation
     public static final IndicesOptions INDICES_OPTIONS = IndicesOptions.strictSingleIndexNoExpandForbidClosed();
     private boolean threadedOperation = true;
 
-    protected SingleShardOperationRequest() {
+    protected SingleShardRequest() {
     }
 
-    protected SingleShardOperationRequest(String index) {
+    protected SingleShardRequest(String index) {
         this.index = index;
     }
 
-    protected SingleShardOperationRequest(ActionRequest request) {
+    protected SingleShardRequest(ActionRequest request) {
         super(request);
     }
 
-    protected SingleShardOperationRequest(ActionRequest request, String index) {
+    protected SingleShardRequest(ActionRequest request, String index) {
         super(request);
         this.index = index;
     }
diff --git a/src/main/java/org/elasticsearch/action/support/single/shard/TransportShardSingleOperationAction.java b/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java
similarity index 96%
rename from src/main/java/org/elasticsearch/action/support/single/shard/TransportShardSingleOperationAction.java
rename to src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java
index 6e7dcd224cb..bf897be804c 100644
--- a/src/main/java/org/elasticsearch/action/support/single/shard/TransportShardSingleOperationAction.java
+++ b/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java
@@ -44,7 +44,7 @@ import static org.elasticsearch.action.support.TransportActions.isShardNotAvaila
 /**
  * A base class for single shard read operations.
  */
-public abstract class TransportShardSingleOperationAction<Request extends SingleShardOperationRequest, Response extends ActionResponse> extends TransportAction<Request, Response> {
+public abstract class TransportSingleShardAction<Request extends SingleShardRequest, Response extends ActionResponse> extends TransportAction<Request, Response> {
 
     protected final ClusterService clusterService;
 
@@ -53,8 +53,8 @@ public abstract class TransportShardSingleOperationAction<Request extends Single
     final String transportShardAction;
     final String executor;
 
-    protected TransportShardSingleOperationAction(Settings settings, String actionName, ThreadPool threadPool, ClusterService clusterService, TransportService transportService, ActionFilters actionFilters,
-                                                  Class<Request> request, String executor) {
+    protected TransportSingleShardAction(Settings settings, String actionName, ThreadPool threadPool, ClusterService clusterService, TransportService transportService, ActionFilters actionFilters,
+                                         Class<Request> request, String executor) {
         super(settings, actionName, threadPool, actionFilters);
         this.clusterService = clusterService;
         this.transportService = transportService;
diff --git a/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java b/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java
index 96fdd91c84f..c33e32eabb4 100644
--- a/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java
+++ b/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.termvectors;
 
 import com.carrotsearch.hppc.IntArrayList;
-import org.elasticsearch.action.support.single.shard.SingleShardOperationRequest;
+import org.elasticsearch.action.support.single.shard.SingleShardRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -28,7 +28,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class MultiTermVectorsShardRequest extends SingleShardOperationRequest<MultiTermVectorsShardRequest> {
+public class MultiTermVectorsShardRequest extends SingleShardRequest<MultiTermVectorsShardRequest> {
 
     private int shardId;
     private String preference;
diff --git a/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java b/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java
index 9198013d307..bc1332e4da3 100644
--- a/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java
+++ b/src/main/java/org/elasticsearch/action/termvectors/TermVectorsRequest.java
@@ -27,7 +27,7 @@ import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.DocumentRequest;
 import org.elasticsearch.action.ValidateActions;
 import org.elasticsearch.action.get.MultiGetRequest;
-import org.elasticsearch.action.support.single.shard.SingleShardOperationRequest;
+import org.elasticsearch.action.support.single.shard.SingleShardRequest;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -50,7 +50,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
  * Note, the {@link #index()}, {@link #type(String)} and {@link #id(String)} are
  * required.
  */
-public class TermVectorsRequest extends SingleShardOperationRequest<TermVectorsRequest> implements DocumentRequest<TermVectorsRequest> {
+public class TermVectorsRequest extends SingleShardRequest<TermVectorsRequest> implements DocumentRequest<TermVectorsRequest> {
 
     private String type;
 
diff --git a/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java b/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java
index f2e9a16d989..9aad9cb479b 100644
--- a/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java
+++ b/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java
@@ -23,7 +23,7 @@ import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.TransportActions;
-import org.elasticsearch.action.support.single.shard.TransportShardSingleOperationAction;
+import org.elasticsearch.action.support.single.shard.TransportSingleShardAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.routing.ShardIterator;
@@ -36,7 +36,7 @@ import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
 
-public class TransportShardMultiTermsVectorAction extends TransportShardSingleOperationAction<MultiTermVectorsShardRequest, MultiTermVectorsShardResponse> {
+public class TransportShardMultiTermsVectorAction extends TransportSingleShardAction<MultiTermVectorsShardRequest, MultiTermVectorsShardResponse> {
 
     private final IndicesService indicesService;
 
diff --git a/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java b/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java
index e03abfee230..623ced5d5ef 100644
--- a/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java
+++ b/src/main/java/org/elasticsearch/action/termvectors/TransportTermVectorsAction.java
@@ -22,15 +22,15 @@ package org.elasticsearch.action.termvectors;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.RoutingMissingException;
 import org.elasticsearch.action.support.ActionFilters;
-import org.elasticsearch.action.support.single.shard.TransportShardSingleOperationAction;
+import org.elasticsearch.action.support.single.shard.TransportSingleShardAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.routing.ShardIterator;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.index.shard.IndexShard;
+import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
@@ -38,7 +38,7 @@ import org.elasticsearch.transport.TransportService;
 /**
  * Performs the get operation.
  */
-public class TransportTermVectorsAction extends TransportShardSingleOperationAction<TermVectorsRequest, TermVectorsResponse> {
+public class TransportTermVectorsAction extends TransportSingleShardAction<TermVectorsRequest, TermVectorsResponse> {
 
     private final IndicesService indicesService;
 
diff --git a/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyRequest.java b/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyRequest.java
index db4624d7464..0171a90ec95 100644
--- a/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyRequest.java
+++ b/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyRequest.java
@@ -24,7 +24,7 @@ import org.apache.lucene.index.Terms;
 import org.apache.lucene.index.TermsEnum;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.search.SearchRequest;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.XContentHelper;
@@ -38,7 +38,7 @@ import java.util.Set;
 
 import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
 
-public class DfsOnlyRequest extends BroadcastOperationRequest<DfsOnlyRequest> {
+public class DfsOnlyRequest extends BroadcastRequest<DfsOnlyRequest> {
 
     private SearchRequest searchRequest = new SearchRequest();
 
diff --git a/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyResponse.java b/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyResponse.java
index 150e7e2289b..db1cddff046 100644
--- a/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyResponse.java
+++ b/src/main/java/org/elasticsearch/action/termvectors/dfs/DfsOnlyResponse.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.action.termvectors.dfs;
 
 import org.elasticsearch.action.ShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.unit.TimeValue;
@@ -32,7 +32,7 @@ import java.util.List;
 /**
  * A response of a dfs only request.
  */
-public class DfsOnlyResponse extends BroadcastOperationResponse {
+public class DfsOnlyResponse extends BroadcastResponse {
 
     private AggregatedDfs dfs;
     private long tookInMillis;
diff --git a/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyRequest.java b/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyRequest.java
index c18892aed67..687910c5922 100644
--- a/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyRequest.java
+++ b/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyRequest.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.termvectors.dfs;
 
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationRequest;
+import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
 import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -29,7 +29,7 @@ import org.elasticsearch.search.internal.ShardSearchTransportRequest;
 
 import java.io.IOException;
 
-class ShardDfsOnlyRequest extends BroadcastShardOperationRequest {
+class ShardDfsOnlyRequest extends BroadcastShardRequest {
 
     private ShardSearchTransportRequest shardSearchRequest = new ShardSearchTransportRequest();
 
diff --git a/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyResponse.java b/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyResponse.java
index 8f414467972..688a475ea64 100644
--- a/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyResponse.java
+++ b/src/main/java/org/elasticsearch/action/termvectors/dfs/ShardDfsOnlyResponse.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.action.termvectors.dfs;
 
-import org.elasticsearch.action.support.broadcast.BroadcastShardOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.index.shard.ShardId;
@@ -30,7 +30,7 @@ import java.io.IOException;
 /**
  *
  */
-class ShardDfsOnlyResponse extends BroadcastShardOperationResponse {
+class ShardDfsOnlyResponse extends BroadcastShardResponse {
 
     private DfsSearchResult dfsSearchResult = new DfsSearchResult();
 
diff --git a/src/main/java/org/elasticsearch/action/termvectors/dfs/TransportDfsOnlyAction.java b/src/main/java/org/elasticsearch/action/termvectors/dfs/TransportDfsOnlyAction.java
index c1d698725e9..682ff47377c 100644
--- a/src/main/java/org/elasticsearch/action/termvectors/dfs/TransportDfsOnlyAction.java
+++ b/src/main/java/org/elasticsearch/action/termvectors/dfs/TransportDfsOnlyAction.java
@@ -24,7 +24,7 @@ import org.elasticsearch.action.ShardOperationFailedException;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.DefaultShardOperationFailedException;
 import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
-import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAction;
+import org.elasticsearch.action.support.broadcast.TransportBroadcastAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
@@ -51,7 +51,7 @@ import static com.google.common.collect.Lists.newArrayList;
 /**
  * Get the dfs only with no fetch phase. This is for internal use only.
  */
-public class TransportDfsOnlyAction extends TransportBroadcastOperationAction<DfsOnlyRequest, DfsOnlyResponse, ShardDfsOnlyRequest, ShardDfsOnlyResponse> {
+public class TransportDfsOnlyAction extends TransportBroadcastAction<DfsOnlyRequest, DfsOnlyResponse, ShardDfsOnlyRequest, ShardDfsOnlyResponse> {
 
     public static final String NAME = "internal:index/termvectors/dfs";
 
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java
index 5b66fafec12..3d5d938bde4 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.cluster.metadata;
 
-import org.elasticsearch.action.support.master.MasterNodeOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeRequest;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.TimeoutClusterStateUpdateTask;
@@ -223,7 +223,7 @@ public class MetaDataDeleteIndexService extends AbstractComponent {
         final String index;
 
         TimeValue timeout = TimeValue.timeValueSeconds(10);
-        TimeValue masterTimeout = MasterNodeOperationRequest.DEFAULT_MASTER_NODE_TIMEOUT;
+        TimeValue masterTimeout = MasterNodeRequest.DEFAULT_MASTER_NODE_TIMEOUT;
 
         public Request(String index) {
             this.index = index;
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java
index 3e945b161eb..840532e8637 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexTemplateService.java
@@ -23,7 +23,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import org.elasticsearch.action.admin.indices.alias.Alias;
-import org.elasticsearch.action.support.master.MasterNodeOperationRequest;
+import org.elasticsearch.action.support.master.MasterNodeRequest;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.TimeoutClusterStateUpdateTask;
@@ -231,7 +231,7 @@ public class MetaDataIndexTemplateService extends AbstractComponent {
         List<Alias> aliases = Lists.newArrayList();
         Map<String, IndexMetaData.Custom> customs = Maps.newHashMap();
 
-        TimeValue masterTimeout = MasterNodeOperationRequest.DEFAULT_MASTER_NODE_TIMEOUT;
+        TimeValue masterTimeout = MasterNodeRequest.DEFAULT_MASTER_NODE_TIMEOUT;
 
         public PutRequest(String cause, String name) {
             this.cause = cause;
@@ -304,7 +304,7 @@ public class MetaDataIndexTemplateService extends AbstractComponent {
 
     public static class RemoveRequest {
         final String name;
-        TimeValue masterTimeout = MasterNodeOperationRequest.DEFAULT_MASTER_NODE_TIMEOUT;
+        TimeValue masterTimeout = MasterNodeRequest.DEFAULT_MASTER_NODE_TIMEOUT;
 
         public RemoveRequest(String name) {
             this.name = name;
diff --git a/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java b/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java
index 3b7c765d7d1..4573e2dac12 100644
--- a/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java
+++ b/src/main/java/org/elasticsearch/gateway/AsyncShardFetch.java
@@ -24,8 +24,8 @@ import org.elasticsearch.ElasticsearchTimeoutException;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.FailedNodeException;
-import org.elasticsearch.action.support.nodes.NodeOperationResponse;
-import org.elasticsearch.action.support.nodes.NodesOperationResponse;
+import org.elasticsearch.action.support.nodes.BaseNodeResponse;
+import org.elasticsearch.action.support.nodes.BaseNodesResponse;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.metadata.MetaData;
 import org.elasticsearch.cluster.node.DiscoveryNode;
@@ -48,29 +48,29 @@ import java.util.*;
  * and once the results are back, it makes sure to schedule a reroute to make sure those results will
  * be taken into account.
  */
-public abstract class AsyncShardFetch<T extends NodeOperationResponse> implements Releasable {
+public abstract class AsyncShardFetch<T extends BaseNodeResponse> implements Releasable {
 
     /**
      * An action that lists the relevant shard data that needs to be fetched.
      */
-    public interface List<NodesResponse extends NodesOperationResponse<NodeResponse>, NodeResponse extends NodeOperationResponse> {
+    public interface List<NodesResponse extends BaseNodesResponse<NodeResponse>, NodeResponse extends BaseNodeResponse> {
         void list(ShardId shardId, IndexMetaData indexMetaData, String[] nodesIds, ActionListener<NodesResponse> listener);
     }
 
     protected final ESLogger logger;
     protected final String type;
     private final ShardId shardId;
-    private final List<NodesOperationResponse<T>, T> action;
+    private final List<BaseNodesResponse<T>, T> action;
     private final Map<String, NodeEntry<T>> cache = new HashMap<>();
     private final Set<String> nodesToIgnore = new HashSet<>();
     private boolean closed;
 
     @SuppressWarnings("unchecked")
-    protected AsyncShardFetch(ESLogger logger, String type, ShardId shardId, List<? extends NodesOperationResponse<T>, T> action) {
+    protected AsyncShardFetch(ESLogger logger, String type, ShardId shardId, List<? extends BaseNodesResponse<T>, T> action) {
         this.logger = logger;
         this.type = type;
         this.shardId = shardId;
-        this.action = (List<NodesOperationResponse<T>, T>) action;
+        this.action = (List<BaseNodesResponse<T>, T>) action;
     }
 
     public synchronized void close() {
@@ -253,9 +253,9 @@ public abstract class AsyncShardFetch<T extends NodeOperationResponse> implement
     // visible for testing
     void asyncFetch(final ShardId shardId, final String[] nodesIds, final MetaData metaData) {
         IndexMetaData indexMetaData = metaData.index(shardId.getIndex());
-        action.list(shardId, indexMetaData, nodesIds, new ActionListener<NodesOperationResponse<T>>() {
+        action.list(shardId, indexMetaData, nodesIds, new ActionListener<BaseNodesResponse<T>>() {
             @Override
-            public void onResponse(NodesOperationResponse<T> response) {
+            public void onResponse(BaseNodesResponse<T> response) {
                 processAsyncFetch(shardId, response.getNodes(), response.failures());
             }
 
@@ -274,7 +274,7 @@ public abstract class AsyncShardFetch<T extends NodeOperationResponse> implement
      * The result of a fetch operation. Make sure to first check {@link #hasData()} before
      * fetching the actual data.
      */
-    public static class FetchResult<T extends NodeOperationResponse> {
+    public static class FetchResult<T extends BaseNodeResponse> {
 
         private final ShardId shardId;
         private final Map<DiscoveryNode, T> data;
diff --git a/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java b/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java
index a7647f73e50..f4385947dc8 100644
--- a/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java
+++ b/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java
@@ -25,8 +25,8 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import org.apache.lucene.util.CollectionUtil;
-import org.elasticsearch.action.support.nodes.NodeOperationResponse;
-import org.elasticsearch.action.support.nodes.NodesOperationResponse;
+import org.elasticsearch.action.support.nodes.BaseNodeResponse;
+import org.elasticsearch.action.support.nodes.BaseNodesResponse;
 import org.elasticsearch.cluster.*;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.metadata.MetaData;
@@ -513,12 +513,12 @@ public class GatewayAllocator extends AbstractComponent {
         return changed;
     }
 
-    static class InternalAsyncFetch<T extends NodeOperationResponse> extends AsyncShardFetch<T> {
+    static class InternalAsyncFetch<T extends BaseNodeResponse> extends AsyncShardFetch<T> {
 
         private final ClusterService clusterService;
         private final AllocationService allocationService;
 
-        public InternalAsyncFetch(ESLogger logger, String type, ShardId shardId, List<? extends NodesOperationResponse<T>, T> action,
+        public InternalAsyncFetch(ESLogger logger, String type, ShardId shardId, List<? extends BaseNodesResponse<T>, T> action,
                                   ClusterService clusterService, AllocationService allocationService) {
             super(logger, type, shardId, action);
             this.clusterService = clusterService;
diff --git a/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java b/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java
index 900a2e7ffc7..6fa20433283 100644
--- a/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java
+++ b/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayMetaState.java
@@ -45,7 +45,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
 /**
  *
  */
-public class TransportNodesListGatewayMetaState extends TransportNodesOperationAction<TransportNodesListGatewayMetaState.Request, TransportNodesListGatewayMetaState.NodesGatewayMetaState, TransportNodesListGatewayMetaState.NodeRequest, TransportNodesListGatewayMetaState.NodeGatewayMetaState> {
+public class TransportNodesListGatewayMetaState extends TransportNodesAction<TransportNodesListGatewayMetaState.Request, TransportNodesListGatewayMetaState.NodesGatewayMetaState, TransportNodesListGatewayMetaState.NodeRequest, TransportNodesListGatewayMetaState.NodeGatewayMetaState> {
 
     public static final String ACTION_NAME = "internal:gateway/local/meta_state";
 
@@ -113,7 +113,7 @@ public class TransportNodesListGatewayMetaState extends TransportNodesOperationA
         return true;
     }
 
-    static class Request extends NodesOperationRequest<Request> {
+    static class Request extends BaseNodesRequest<Request> {
 
         public Request() {
         }
@@ -133,7 +133,7 @@ public class TransportNodesListGatewayMetaState extends TransportNodesOperationA
         }
     }
 
-    public static class NodesGatewayMetaState extends NodesOperationResponse<NodeGatewayMetaState> {
+    public static class NodesGatewayMetaState extends BaseNodesResponse<NodeGatewayMetaState> {
 
         private FailedNodeException[] failures;
 
@@ -170,7 +170,7 @@ public class TransportNodesListGatewayMetaState extends TransportNodesOperationA
     }
 
 
-    static class NodeRequest extends NodeOperationRequest {
+    static class NodeRequest extends BaseNodeRequest {
 
         NodeRequest() {
         }
@@ -190,7 +190,7 @@ public class TransportNodesListGatewayMetaState extends TransportNodesOperationA
         }
     }
 
-    public static class NodeGatewayMetaState extends NodeOperationResponse {
+    public static class NodeGatewayMetaState extends BaseNodeResponse {
 
         private MetaData metaData;
 
diff --git a/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java b/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java
index 649e0a1c31a..d5692b3a5aa 100644
--- a/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java
+++ b/src/main/java/org/elasticsearch/gateway/TransportNodesListGatewayStartedShards.java
@@ -50,7 +50,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
  * We use this to find out which node holds the latest shard version and which of them used to be a primary in order to allocate
  * shards after node or cluster restarts.
  */
-public class TransportNodesListGatewayStartedShards extends TransportNodesOperationAction<TransportNodesListGatewayStartedShards.Request, TransportNodesListGatewayStartedShards.NodesGatewayStartedShards, TransportNodesListGatewayStartedShards.NodeRequest, TransportNodesListGatewayStartedShards.NodeGatewayStartedShards>
+public class TransportNodesListGatewayStartedShards extends TransportNodesAction<TransportNodesListGatewayStartedShards.Request, TransportNodesListGatewayStartedShards.NodesGatewayStartedShards, TransportNodesListGatewayStartedShards.NodeRequest, TransportNodesListGatewayStartedShards.NodeGatewayStartedShards>
         implements AsyncShardFetch.List<TransportNodesListGatewayStartedShards.NodesGatewayStartedShards, TransportNodesListGatewayStartedShards.NodeGatewayStartedShards> {
 
     public static final String ACTION_NAME = "internal:gateway/local/started_shards";
@@ -148,7 +148,7 @@ public class TransportNodesListGatewayStartedShards extends TransportNodesOperat
         return true;
     }
 
-    static class Request extends NodesOperationRequest<Request> {
+    static class Request extends BaseNodesRequest<Request> {
 
         private ShardId shardId;
         private String indexUUID;
@@ -186,7 +186,7 @@ public class TransportNodesListGatewayStartedShards extends TransportNodesOperat
         }
     }
 
-    public static class NodesGatewayStartedShards extends NodesOperationResponse<NodeGatewayStartedShards> {
+    public static class NodesGatewayStartedShards extends BaseNodesResponse<NodeGatewayStartedShards> {
 
         private FailedNodeException[] failures;
 
@@ -221,7 +221,7 @@ public class TransportNodesListGatewayStartedShards extends TransportNodesOperat
     }
 
 
-    static class NodeRequest extends NodeOperationRequest {
+    static class NodeRequest extends BaseNodeRequest {
 
         private ShardId shardId;
         private String indexUUID;
@@ -258,7 +258,7 @@ public class TransportNodesListGatewayStartedShards extends TransportNodesOperat
         }
     }
 
-    public static class NodeGatewayStartedShards extends NodeOperationResponse {
+    public static class NodeGatewayStartedShards extends BaseNodeResponse {
 
         private long version = -1;
 
diff --git a/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java b/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java
index 04cfa6bda3d..3490f6d2d8c 100644
--- a/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java
+++ b/src/main/java/org/elasticsearch/indices/store/TransportNodesListShardStoreMetaData.java
@@ -58,7 +58,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
 /**
  *
  */
-public class TransportNodesListShardStoreMetaData extends TransportNodesOperationAction<TransportNodesListShardStoreMetaData.Request, TransportNodesListShardStoreMetaData.NodesStoreFilesMetaData, TransportNodesListShardStoreMetaData.NodeRequest, TransportNodesListShardStoreMetaData.NodeStoreFilesMetaData>
+public class TransportNodesListShardStoreMetaData extends TransportNodesAction<TransportNodesListShardStoreMetaData.Request, TransportNodesListShardStoreMetaData.NodesStoreFilesMetaData, TransportNodesListShardStoreMetaData.NodeRequest, TransportNodesListShardStoreMetaData.NodeStoreFilesMetaData>
         implements AsyncShardFetch.List<TransportNodesListShardStoreMetaData.NodesStoreFilesMetaData, TransportNodesListShardStoreMetaData.NodeStoreFilesMetaData> {
 
     public static final String ACTION_NAME = "internal:cluster/nodes/indices/shard/store";
@@ -241,7 +241,7 @@ public class TransportNodesListShardStoreMetaData extends TransportNodesOperatio
     }
 
 
-    static class Request extends NodesOperationRequest<Request> {
+    static class Request extends BaseNodesRequest<Request> {
 
         private ShardId shardId;
 
@@ -277,7 +277,7 @@ public class TransportNodesListShardStoreMetaData extends TransportNodesOperatio
         }
     }
 
-    public static class NodesStoreFilesMetaData extends NodesOperationResponse<NodeStoreFilesMetaData> {
+    public static class NodesStoreFilesMetaData extends BaseNodesResponse<NodeStoreFilesMetaData> {
 
         private FailedNodeException[] failures;
 
@@ -314,7 +314,7 @@ public class TransportNodesListShardStoreMetaData extends TransportNodesOperatio
     }
 
 
-    static class NodeRequest extends NodeOperationRequest {
+    static class NodeRequest extends BaseNodeRequest {
 
         private ShardId shardId;
 
@@ -344,7 +344,7 @@ public class TransportNodesListShardStoreMetaData extends TransportNodesOperatio
         }
     }
 
-    public static class NodeStoreFilesMetaData extends NodeOperationResponse {
+    public static class NodeStoreFilesMetaData extends BaseNodeResponse {
 
         private StoreFilesMetaData storeFilesMetaData;
 
diff --git a/src/main/java/org/elasticsearch/rest/action/support/RestActions.java b/src/main/java/org/elasticsearch/rest/action/support/RestActions.java
index 67ceb83c33b..bd17c1d5944 100644
--- a/src/main/java/org/elasticsearch/rest/action/support/RestActions.java
+++ b/src/main/java/org/elasticsearch/rest/action/support/RestActions.java
@@ -22,7 +22,7 @@ package org.elasticsearch.rest.action.support;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.ShardOperationFailedException;
 import org.elasticsearch.action.support.QuerySourceBuilder;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastResponse;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.lucene.uid.Versions;
@@ -62,7 +62,7 @@ public class RestActions {
         static final XContentBuilderString FAILURES = new XContentBuilderString("failures");
     }
 
-    public static void buildBroadcastShardsHeader(XContentBuilder builder, ToXContent.Params params, BroadcastOperationResponse response) throws IOException {
+    public static void buildBroadcastShardsHeader(XContentBuilder builder, ToXContent.Params params, BroadcastResponse response) throws IOException {
         buildBroadcastShardsHeader(builder, params, response.getTotalShards(), response.getSuccessfulShards(), response.getFailedShards(), response.getShardFailures());
     }
 
diff --git a/src/main/java/org/elasticsearch/tribe/TribeService.java b/src/main/java/org/elasticsearch/tribe/TribeService.java
index 540d3254e5c..546977c3aca 100644
--- a/src/main/java/org/elasticsearch/tribe/TribeService.java
+++ b/src/main/java/org/elasticsearch/tribe/TribeService.java
@@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.action.support.master.TransportMasterNodeReadOperationAction;
+import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
 import org.elasticsearch.cluster.*;
 import org.elasticsearch.cluster.block.ClusterBlock;
 import org.elasticsearch.cluster.block.ClusterBlockLevel;
@@ -99,7 +99,7 @@ public class TribeService extends AbstractLifecycleComponent<TribeService> {
         if (sb.get("cluster.name") == null) {
             sb.put("cluster.name", "tribe_" + Strings.randomBase64UUID()); // make sure it won't join other tribe nodes in the same JVM
         }
-        sb.put(TransportMasterNodeReadOperationAction.FORCE_LOCAL_SETTING, true);
+        sb.put(TransportMasterNodeReadAction.FORCE_LOCAL_SETTING, true);
         return sb.build();
     }
 
diff --git a/src/test/java/org/elasticsearch/action/admin/HotThreadsTest.java b/src/test/java/org/elasticsearch/action/admin/HotThreadsTest.java
index 2c27101c5d2..4b3ad487495 100644
--- a/src/test/java/org/elasticsearch/action/admin/HotThreadsTest.java
+++ b/src/test/java/org/elasticsearch/action/admin/HotThreadsTest.java
@@ -32,14 +32,9 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static org.elasticsearch.index.query.QueryBuilders.andQuery;
-import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
-import static org.elasticsearch.index.query.QueryBuilders.notQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termQuery;
+import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.Matchers.lessThan;
 
 /**
@@ -90,7 +85,7 @@ public class HotThreadsTest extends ElasticsearchIntegrationTest {
                     boolean success = false;
                     try {
                         assertThat(nodeHotThreads, notNullValue());
-                        Map<String,NodeHotThreads> nodesMap = nodeHotThreads.getNodesMap();
+                        Map<String, NodeHotThreads> nodesMap = nodeHotThreads.getNodesMap();
                         assertThat(nodesMap.size(), equalTo(cluster().size()));
                         for (NodeHotThreads ht : nodeHotThreads) {
                             assertNotNull(ht.getHotThreads());
diff --git a/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java b/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java
index b8e97efe31d..ece5757355b 100644
--- a/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java
+++ b/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java
@@ -22,7 +22,7 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableSet;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.FailedNodeException;
-import org.elasticsearch.action.support.nodes.NodeOperationResponse;
+import org.elasticsearch.action.support.nodes.BaseNodeResponse;
 import org.elasticsearch.cluster.metadata.MetaData;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
@@ -314,7 +314,7 @@ public class AsyncShardFetchTests extends ElasticsearchTestCase {
     }
 
 
-    static class Response extends NodeOperationResponse {
+    static class Response extends BaseNodeResponse {
 
         public Response(DiscoveryNode node) {
             super(node);
diff --git a/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java b/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java
index 3cc47378116..819c1d5ab1d 100644
--- a/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java
+++ b/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java
@@ -50,7 +50,7 @@ import org.elasticsearch.action.search.SearchPhaseExecutionException;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.ShardSearchFailure;
-import org.elasticsearch.action.support.broadcast.BroadcastOperationResponse;
+import org.elasticsearch.action.support.broadcast.BroadcastResponse;
 import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.cluster.block.ClusterBlock;
@@ -152,7 +152,7 @@ public class ElasticsearchAssertions {
         }
     }
 
-    public static String formatShardStatus(BroadcastOperationResponse response) {
+    public static String formatShardStatus(BroadcastResponse response) {
         String msg = " Total shards: " + response.getTotalShards() + " Successful shards: " + response.getSuccessfulShards() + " & "
                 + response.getFailedShards() + " shard failures:";
         for (ShardOperationFailedException failure : response.getShardFailures()) {
@@ -321,12 +321,12 @@ public class ElasticsearchAssertions {
         assertVersionSerializable(percolateResponse);
     }
 
-    public static void assertNoFailures(BroadcastOperationResponse response) {
+    public static void assertNoFailures(BroadcastResponse response) {
         assertThat("Unexpected ShardFailures: " + Arrays.toString(response.getShardFailures()), response.getFailedShards(), equalTo(0));
         assertVersionSerializable(response);
     }
 
-    public static void assertAllSuccessful(BroadcastOperationResponse response) {
+    public static void assertAllSuccessful(BroadcastResponse response) {
         assertNoFailures(response);
         assertThat("Expected all shards successful but got successful [" + response.getSuccessfulShards() + "] total [" + response.getTotalShards() + "]",
                 response.getTotalShards(), equalTo(response.getSuccessfulShards()));

From 6d269cbf4d808f50a4953a0c60e1de08cb911276 Mon Sep 17 00:00:00 2001
From: Boaz Leskes <b.leskes@gmail.com>
Date: Wed, 27 May 2015 10:29:37 +0300
Subject: [PATCH 023/123] feedback

---
 docs/reference/indices/flush.asciidoc         | 19 +++++------
 docs/reference/setup/upgrade.asciidoc         |  6 ++--
 .../flush/IndicesSyncedFlushResult.java       |  5 +++
 .../flush/ShardsSyncedFlushResult.java        | 32 -------------------
 .../indices/flush/SyncedFlushService.java     |  8 +++++
 .../indices/flush/RestSyncedFlushAction.java  |  2 +-
 .../indices/flush/SyncedFlushUnitTests.java   |  2 ++
 7 files changed, 29 insertions(+), 45 deletions(-)

diff --git a/docs/reference/indices/flush.asciidoc b/docs/reference/indices/flush.asciidoc
index 99aa589d866..a1ebfd1d866 100644
--- a/docs/reference/indices/flush.asciidoc
+++ b/docs/reference/indices/flush.asciidoc
@@ -50,7 +50,7 @@ POST /_flush
 === Synced Flush
 
 Elasticsearch tracks the indexing activity of each shards. Shards that have not
-received any indexing operations for, by default, 30m are automatically marked as inactive. This presents
+received any indexing operations for 30 minutes (configurable) are automatically marked as inactive. This presents
 an opportunity for Elasticsearch to reduce shard resources and also perform
 a special kind of flush, called `synced flush`. A synced flush performs normal
 flushing and adds a special uniquely generated marker (`sync_id`) to all shards.
@@ -79,18 +79,18 @@ GET /twitter/_stats/commit?level=shards
 [float]
 === Synced Flush API
 
-The Synced Flush API allows an administrator to initiate a synced flush manually. This can particularly useful for
-a planned (rolling) cluster restart where one can stop indexing and doesn't want to wait for the default 30m to pass
+The Synced Flush API allows an administrator to initiate a synced flush manually. This can be particularly useful for
+a planned (rolling) cluster restart where one can stop indexing and doesn't want to wait for the default 30 minutes to pass
 when the synced flush will be performed automatically.
 
 While handy, there are a couple of caveats for this API:
 
 1. Synced flush is a best effort operation. Any ongoing indexing operations will cause
 the synced flush to fail. This means that some shards may be synced flushed while others aren't. See below for more.
-2. The `sync_id` marker is removed as soon as the shard is flushed again. Uncommitted
-operations in the transaction log do not remove the marker. That is because the marker is store as part
-of a low level lucene commit, representing a point in time snapshot of the segments. In practice, one should consider
-any indexing operation on an index  as removing the marker.
+2. The `sync_id` marker is removed as soon as the shard is flushed again. That is because a flush replaces the low level
+lucene commit point where the marker is stored. Uncommitted operations in the transaction log do not remove the marker.
+In practice, one should consider any indexing operation on an index as removing the marker as a flush can be triggered by Elasticsearch
+at any time.
 
 
 [source,bash]
@@ -99,7 +99,7 @@ POST /twitter/_flush/synced
 --------------------------------------------------
 // AUTOSENSE
 
-The response contains details about how many shards were successfully synced-flushed and information about any failure.
+The response contains details about how many shards were successfully sync-flushed and information about any failure.
 
 Here is what it looks like when all shards of a two shards and one replica index successfully
 sync-flushed:
@@ -146,7 +146,8 @@ Here is what it looks like when one shard group failed due to pending operations
 --------------------------------------------------
 
 
-Sometimes the failures are specific to a shard copy, in which case they will be reported as follows:
+Sometimes the failures are specific to a shard copy. The copies that failed will not be eligible for
+fast recovery but those that succeeded still will be. This case is reported as follows:
 
 [source,js]
 --------------------------------------------------
diff --git a/docs/reference/setup/upgrade.asciidoc b/docs/reference/setup/upgrade.asciidoc
index 61708755006..9f46fbaf059 100644
--- a/docs/reference/setup/upgrade.asciidoc
+++ b/docs/reference/setup/upgrade.asciidoc
@@ -92,10 +92,10 @@ curl -XPUT localhost:9200/_cluster/settings -d '{
 }'
 --------------------------------------------------
 
-* There is no problem to continue indexing while doing the upgrade. However, you can speed the process considerably
-by stopping indexing temporarily to non-essential indices and issuing a manual <<indices-synced-flush, synced flush>>.
+* There is no problem continuing to index while doing the upgrade. However, you can speed the process considerably
+by *temporarily* stopping non-essential indexing and issuing a manual <<indices-synced-flush, synced flush>>.
 A synced flush is special kind of flush which can seriously speed up recovery of shards. Elasticsearch automatically
-uses it when an index has been inactive for a while (default is `30m`) but you can manually trigger it using the following command:
+uses it when an index has been inactive for a while (default is `30m`) but you can manuallky trigger it using the following command:
 
 [source,sh]
 --------------------------------------------------
diff --git a/src/main/java/org/elasticsearch/indices/flush/IndicesSyncedFlushResult.java b/src/main/java/org/elasticsearch/indices/flush/IndicesSyncedFlushResult.java
index 7c0a680b383..f625f04484a 100644
--- a/src/main/java/org/elasticsearch/indices/flush/IndicesSyncedFlushResult.java
+++ b/src/main/java/org/elasticsearch/indices/flush/IndicesSyncedFlushResult.java
@@ -24,6 +24,7 @@ import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentBuilderString;
+import org.elasticsearch.rest.RestStatus;
 
 import java.io.IOException;
 import java.util.List;
@@ -58,6 +59,10 @@ public class IndicesSyncedFlushResult implements ToXContent {
         return shardCounts.successful;
     }
 
+    public RestStatus restStatus() {
+        return failedShards() == 0 ? RestStatus.OK : RestStatus.CONFLICT;
+    }
+
     public Map<String, List<ShardsSyncedFlushResult>> getShardsResultPerIndex() {
         return shardsResultPerIndex;
     }
diff --git a/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java b/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java
index cdf8a2495d8..1388373ff36 100644
--- a/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java
+++ b/src/main/java/org/elasticsearch/indices/flush/ShardsSyncedFlushResult.java
@@ -126,38 +126,6 @@ public class ShardsSyncedFlushResult {
         return shardResponses;
     }
 
-//    @Override
-//    public void writeTo(StreamOutput out) throws IOException {
-//        super.writeTo(out);
-//        out.writeOptionalString(failureReason);
-//        out.writeOptionalString(syncId);
-//        out.writeVInt(totalShards);
-//        out.writeVInt(shardResponses.size());
-//        for (Map.Entry<ShardRouting, SyncedFlushService.SyncedFlushResponse> result : shardResponses.entrySet()) {
-//            result.getKey().writeTo(out);
-//            result.getValue().writeTo(out);
-//        }
-//        shardId.writeTo(out);
-//    }
-
-//    @Override
-//    public void readFrom(StreamInput in) throws IOException {
-//        super.readFrom(in);
-//        failureReason = in.readOptionalString();
-//        syncId = in.readOptionalString();
-//        totalShards = in.readVInt();
-//        int size = in.readVInt();
-//        ImmutableMap.Builder<ShardRouting, SyncedFlushService.SyncedFlushResponse> builder = ImmutableMap.builder();
-//        for (int i = 0; i < size; i++) {
-//            ImmutableShardRouting shardRouting = ImmutableShardRouting.readShardRoutingEntry(in);
-//            SyncedFlushService.SyncedFlushResponse syncedFlushRsponse = new SyncedFlushService.SyncedFlushResponse();
-//            syncedFlushRsponse.readFrom(in);
-//            builder.put(shardRouting, syncedFlushRsponse);
-//        }
-//        shardResponses = builder.build();
-//        shardId = ShardId.readShardId(in);
-//    }
-
     public ShardId shardId() {
         return shardId;
     }
diff --git a/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java b/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java
index b9447ed01f6..537392a9c98 100644
--- a/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java
+++ b/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java
@@ -98,6 +98,10 @@ public class SyncedFlushService extends AbstractComponent {
         });
     }
 
+    /**
+     * a utility method to perform a synced flush for all shards of multiple indices. see {@link #attemptSyncedFlush(ShardId, ActionListener)}
+     * for more details.
+     */
     public void attemptSyncedFlush(final String[] aliasesOrIndices, IndicesOptions indicesOptions, final ActionListener<IndicesSyncedFlushResult> listener) {
         final ClusterState state = clusterService.state();
         final String[] concreteIndices = state.metaData().concreteIndices(indicesOptions, aliasesOrIndices);
@@ -111,6 +115,10 @@ public class SyncedFlushService extends AbstractComponent {
             results.put(index, Collections.synchronizedList(new ArrayList<ShardsSyncedFlushResult>()));
 
         }
+        if (numberOfShards == 0) {
+            listener.onResponse(new IndicesSyncedFlushResult(results));
+            return;
+        }
         final int finalTotalNumberOfShards = totalNumberOfShards;
         final CountDown countDown = new CountDown(numberOfShards);
 
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestSyncedFlushAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestSyncedFlushAction.java
index 82a1d5f8fd3..9a3f844abb1 100644
--- a/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestSyncedFlushAction.java
+++ b/src/main/java/org/elasticsearch/rest/action/admin/indices/flush/RestSyncedFlushAction.java
@@ -62,7 +62,7 @@ public class RestSyncedFlushAction extends BaseRestHandler {
                 builder.startObject();
                 results.toXContent(builder, request);
                 builder.endObject();
-                return new BytesRestResponse(RestStatus.OK, builder);
+                return new BytesRestResponse(results.restStatus(), builder);
             }
         });
     }
diff --git a/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUnitTests.java b/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUnitTests.java
index fcf80c19d67..426ec36d608 100644
--- a/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUnitTests.java
+++ b/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUnitTests.java
@@ -27,6 +27,7 @@ import org.elasticsearch.cluster.routing.ShardRoutingState;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.indices.flush.IndicesSyncedFlushResult.ShardCounts;
 import org.elasticsearch.indices.flush.SyncedFlushService.SyncedFlushResponse;
+import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.test.ElasticsearchTestCase;
 
 import java.io.IOException;
@@ -56,6 +57,7 @@ public class SyncedFlushUnitTests extends ElasticsearchTestCase {
         assertThat(testPlan.result.totalShards(), equalTo(testPlan.totalCounts.total));
         assertThat(testPlan.result.successfulShards(), equalTo(testPlan.totalCounts.successful));
         assertThat(testPlan.result.failedShards(), equalTo(testPlan.totalCounts.failed));
+        assertThat(testPlan.result.restStatus(), equalTo(testPlan.totalCounts.failed > 0 ? RestStatus.CONFLICT : RestStatus.OK));
         Map<String, Object> asMap = convertToMap(testPlan.result);
         assertShardCount("_shards header", (Map<String, Object>) asMap.get("_shards"), testPlan.totalCounts);
 

From 8ec6bf7340c23ae4c24d08ef8ff6538a5304f0ab Mon Sep 17 00:00:00 2001
From: Ryan Schneider <djschny@users.noreply.github.com>
Date: Wed, 1 Apr 2015 13:51:07 -0400
Subject: [PATCH 024/123] [DOCS] Update get.asciidoc

Updated to not mislead the reader that the data is actually gone when a document is updated. For example if you have 100GB of docs and update each one you'll only be able to access 100GB of the data, but there would theoretically be 200GB of doc data.

Closes #10375
---
 docs/reference/docs/get.asciidoc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/reference/docs/get.asciidoc b/docs/reference/docs/get.asciidoc
index cf2db23056c..ea1b6176578 100644
--- a/docs/reference/docs/get.asciidoc
+++ b/docs/reference/docs/get.asciidoc
@@ -228,5 +228,7 @@ it's current version is equal to the specified one. This behavior is the same
 for all version types with the exception of version type `FORCE` which always
 retrieves the document.
 
-Note that Elasticsearch do not store older versions of documents. Only the current version can be retrieved.
-
+Internally, Elasticsearch has marked the old document as deleted and added an
+entirely new document. The old version of the document doesn’t disappear
+immediately, although you won’t be able to access it. Elasticsearch cleans up
+deleted documents in the background as you continue to index more data.

From fc28bc73f8c985669bdcf1b6bd2905b131d2e0ea Mon Sep 17 00:00:00 2001
From: javanna <cavannaluca@gmail.com>
Date: Wed, 27 May 2015 10:28:53 +0200
Subject: [PATCH 025/123] [DOCS] add kopf to site plugins

---
 docs/reference/modules/plugins.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/reference/modules/plugins.asciidoc b/docs/reference/modules/plugins.asciidoc
index 3a9f867a4dd..40c288280cc 100644
--- a/docs/reference/modules/plugins.asciidoc
+++ b/docs/reference/modules/plugins.asciidoc
@@ -293,6 +293,7 @@ deprecated[1.5.0,Rivers have been deprecated.  See https://www.elastic.co/blog/d
 * https://github.com/karmi/elasticsearch-paramedic[Paramedic Plugin] (by Karel Minařík)
 * https://github.com/polyfractal/elasticsearch-segmentspy[SegmentSpy Plugin] (by Zachary Tong)
 * https://github.com/xyu/elasticsearch-whatson[Whatson Plugin] (by Xiao Yu)
+* https://github.com/lmenezes/elasticsearch-kopf[Kopf Plugin] (by lmenezes)
 
 [float]
 [[repository-plugins]]

From ee26ab8bb4258cb90cb101ebd280f18d2a8f42d7 Mon Sep 17 00:00:00 2001
From: javanna <cavannaluca@gmail.com>
Date: Wed, 27 May 2015 11:22:37 +0200
Subject: [PATCH 026/123] Java api: add name setter to delete index template
 request and make default constructor public for AnalyzeRequest and
 DeleteIndexTemplateRequest

Closes #8122
Closes #8123
---
 .../action/admin/indices/analyze/AnalyzeRequest.java   |  5 +----
 .../template/delete/DeleteIndexTemplateRequest.java    | 10 +++++++++-
 .../delete/DeleteIndexTemplateRequestBuilder.java      |  8 ++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java
index d631f8b8d0a..655defeddaf 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequest.java
@@ -18,10 +18,8 @@
  */
 package org.elasticsearch.action.admin.indices.analyze;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.single.custom.SingleCustomOperationRequest;
-import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -48,8 +46,7 @@ public class AnalyzeRequest extends SingleCustomOperationRequest<AnalyzeRequest>
 
     private String field;
 
-    AnalyzeRequest() {
-
+    public AnalyzeRequest() {
     }
 
     /**
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java
index 42907787803..f33d35b66a5 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequest.java
@@ -34,7 +34,7 @@ public class DeleteIndexTemplateRequest extends MasterNodeRequest<DeleteIndexTem
 
     private String name;
 
-    DeleteIndexTemplateRequest() {
+    public DeleteIndexTemplateRequest() {
     }
 
     /**
@@ -44,6 +44,14 @@ public class DeleteIndexTemplateRequest extends MasterNodeRequest<DeleteIndexTem
         this.name = name;
     }
 
+    /**
+     * Set the index template name to delete.
+     */
+    public DeleteIndexTemplateRequest name(String name) {
+        this.name = name;
+        return this;
+    }
+
     @Override
     public ActionRequestValidationException validate() {
         ActionRequestValidationException validationException = null;
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java
index 751e2aa1867..670837e8047 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/template/delete/DeleteIndexTemplateRequestBuilder.java
@@ -33,4 +33,12 @@ public class DeleteIndexTemplateRequestBuilder extends MasterNodeOperationReques
     public DeleteIndexTemplateRequestBuilder(ElasticsearchClient client, DeleteIndexTemplateAction action, String name) {
         super(client, action, new DeleteIndexTemplateRequest(name));
     }
+
+    /**
+     * Sets the name of the index template to delete.
+     */
+    public DeleteIndexTemplateRequestBuilder setName(String name) {
+        request.name(name);
+        return this;
+    }
 }

From 340b7ef6efcc2565f2898a886d0e988690863bcf Mon Sep 17 00:00:00 2001
From: Tanguy Leroux <tlrx.dev@gmail.com>
Date: Wed, 22 Apr 2015 16:02:20 +0200
Subject: [PATCH 027/123] Add common SystemD file for RPM/DEB package

---
 docs/reference/setup/repositories.asciidoc    |  11 +-
 pom.xml                                       |  30 +++-
 .../common/systemd/elasticsearch.conf         |   1 +
 .../common/systemd/elasticsearch.service      |  50 ++++++
 .../common/systemd/sysctl/elasticsearch.conf  |   1 +
 src/packaging/deb/init.d/elasticsearch        |   5 +-
 .../deb/systemd/elasticsearch.service         |  30 ----
 src/packaging/rpm/init.d/elasticsearch        |   3 +-
 src/packaging/rpm/systemd/elasticsearch.conf  |   1 -
 .../rpm/systemd/elasticsearch.service         |  25 ---
 .../rpm/systemd/sysctl.d/elasticsearch.conf   |   1 -
 .../packaging/scripts/50_systemd.bats         | 146 ++++++++++++++++++
 .../scripts/packaging_test_utils.bash         |  11 +-
 13 files changed, 247 insertions(+), 68 deletions(-)
 create mode 100644 src/packaging/common/systemd/elasticsearch.conf
 create mode 100644 src/packaging/common/systemd/elasticsearch.service
 create mode 100644 src/packaging/common/systemd/sysctl/elasticsearch.conf
 delete mode 100644 src/packaging/deb/systemd/elasticsearch.service
 delete mode 100644 src/packaging/rpm/systemd/elasticsearch.conf
 delete mode 100644 src/packaging/rpm/systemd/elasticsearch.service
 delete mode 100644 src/packaging/rpm/systemd/sysctl.d/elasticsearch.conf
 create mode 100644 src/test/resources/packaging/scripts/50_systemd.bats

diff --git a/docs/reference/setup/repositories.asciidoc b/docs/reference/setup/repositories.asciidoc
index 964913be94a..5e1f5eeb671 100644
--- a/docs/reference/setup/repositories.asciidoc
+++ b/docs/reference/setup/repositories.asciidoc
@@ -51,13 +51,22 @@ Run apt-get update and the repository is ready for use. You can install it with:
 sudo apt-get update && sudo apt-get install elasticsearch
 --------------------------------------------------
 
-Configure Elasticsearch to automatically start during bootup:
+Configure Elasticsearch to automatically start during bootup. If your
+distribution is using SysV init, then you will need to run:
 
 [source,sh]
 --------------------------------------------------
 sudo update-rc.d elasticsearch defaults 95 10
 --------------------------------------------------
 
+Otherwise if your distribution is using systemd:
+
+[source,sh]
+--------------------------------------------------
+sudo /bin/systemctl daemon-reload
+sudo /bin/systemctl enable elasticsearch.service
+--------------------------------------------------
+
 [float]
 === YUM
 
diff --git a/pom.xml b/pom.xml
index f644ff91bbf..b6df03658ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,9 @@
         <packaging.elasticsearch.log.dir>/var/log/elasticsearch</packaging.elasticsearch.log.dir>
         <packaging.elasticsearch.plugins.dir>${packaging.elasticsearch.home.dir}/plugins</packaging.elasticsearch.plugins.dir>
         <packaging.elasticsearch.pid.dir>/var/run/elasticsearch</packaging.elasticsearch.pid.dir>
+        <packaging.elasticsearch.systemd.dir>/usr/lib/systemd/system</packaging.elasticsearch.systemd.dir>
+        <packaging.elasticsearch.systemd.sysctl.dir>/usr/lib/sysctl.d</packaging.elasticsearch.systemd.sysctl.dir>
+        <packaging.elasticsearch.tmpfilesd.dir>/usr/lib/tmpfiles.d</packaging.elasticsearch.tmpfilesd.dir>
         <deb.sign>false</deb.sign>
         <deb.sign.method>dpkg-sig</deb.sign.method>
     </properties>
@@ -800,7 +803,19 @@
                                 <!-- Adds systemd file -->
                                 <data>
                                     <src>${project.build.directory}/generated-packaging/deb/systemd/elasticsearch.service</src>
-                                    <dst>/usr/lib/systemd/system/elasticsearch.service</dst>
+                                    <dst>${packaging.elasticsearch.systemd.dir}/elasticsearch.service</dst>
+                                    <type>file</type>
+                                </data>
+                                <!-- Adds systemd/sysctl.d configuration file -->
+                                <data>
+                                    <src>${project.build.directory}/generated-packaging/deb/systemd/sysctl/elasticsearch.conf</src>
+                                    <dst>${packaging.elasticsearch.systemd.sysctl.dir}/elasticsearch.conf</dst>
+                                    <type>file</type>
+                                </data>
+                                <!-- Adds systemd/tmpfiles.d configuration file -->
+                                <data>
+                                    <src>${project.build.directory}/generated-packaging/deb/systemd/elasticsearch.conf</src>
+                                    <dst>${packaging.elasticsearch.tmpfilesd.dir}/elasticsearch.conf</dst>
                                     <type>file</type>
                                 </data>
                                 <!-- Add lintian files  -->
@@ -978,8 +993,8 @@
                         </mapping>
                         <!-- Adds systemd file -->
                         <mapping>
-                            <directory>/usr/lib/systemd/system/</directory>
-                            <filemode>755</filemode>
+                            <directory>${packaging.elasticsearch.systemd.dir}</directory>
+                            <directoryIncluded>false</directoryIncluded>
                             <configuration>true</configuration>
                             <sources>
                                 <source>
@@ -990,21 +1005,22 @@
                                 </source>
                             </sources>
                         </mapping>
+                        <!-- Adds systemd/sysctl.d configuration file -->
                         <mapping>
-                            <directory>/usr/lib/sysctl.d/</directory>
-                            <filemode>755</filemode>
+                            <directory>${packaging.elasticsearch.systemd.sysctl.dir}</directory>
                             <configuration>true</configuration>
                             <sources>
                                 <source>
-                                    <location>${project.build.directory}/generated-packaging/rpm/systemd/sysctl.d</location>
+                                    <location>${project.build.directory}/generated-packaging/rpm/systemd/sysctl</location>
                                     <includes>
                                         <include>elasticsearch.conf</include>
                                     </includes>
                                 </source>
                             </sources>
                         </mapping>
+                        <!-- Adds systemd/tmpfiles.d configuration file -->
                         <mapping>
-                            <directory>/usr/lib/tmpfiles.d/</directory>
+                            <directory>${packaging.elasticsearch.tmpfilesd.dir}</directory>
                             <configuration>true</configuration>
                             <sources>
                                 <source>
diff --git a/src/packaging/common/systemd/elasticsearch.conf b/src/packaging/common/systemd/elasticsearch.conf
new file mode 100644
index 00000000000..98dd5e61c25
--- /dev/null
+++ b/src/packaging/common/systemd/elasticsearch.conf
@@ -0,0 +1 @@
+d    ${packaging.elasticsearch.pid.dir}   0755 ${packaging.elasticsearch.user} ${packaging.elasticsearch.group} - -
diff --git a/src/packaging/common/systemd/elasticsearch.service b/src/packaging/common/systemd/elasticsearch.service
new file mode 100644
index 00000000000..a4c269973bf
--- /dev/null
+++ b/src/packaging/common/systemd/elasticsearch.service
@@ -0,0 +1,50 @@
+[Unit]
+Description=Elasticsearch
+Documentation=http://www.elastic.co
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Environment=ES_HOME=${packaging.elasticsearch.home.dir}
+Environment=CONF_DIR=${packaging.elasticsearch.conf.dir}
+Environment=CONF_FILE=${packaging.elasticsearch.conf.dir}/elasticsearch.yml
+Environment=DATA_DIR=${packaging.elasticsearch.data.dir}
+Environment=LOG_DIR=${packaging.elasticsearch.log.dir}
+Environment=PID_DIR=${packaging.elasticsearch.pid.dir}
+EnvironmentFile=-${packaging.env.file}
+
+User=${packaging.elasticsearch.user}
+Group=${packaging.elasticsearch.group}
+
+ExecStart=${packaging.elasticsearch.bin.dir}/elasticsearch \
+                                                -Des.pidfile=$PID_DIR/elasticsearch.pid \
+                                                -Des.default.path.home=$ES_HOME \
+                                                -Des.default.path.logs=$LOG_DIR \
+                                                -Des.default.path.data=$DATA_DIR \
+                                                -Des.default.config=$CONF_FILE \
+                                                -Des.default.path.conf=$CONF_DIR
+
+# Connects standard output to /dev/null
+StandardOutput=null
+
+# Connects standard error to journal
+StandardError=journal
+
+# When a JVM receives a SIGTERM signal it exits with code 143
+SuccessExitStatus=143
+
+# Specifies the maximum file descriptor number that can be opened by this process
+LimitNOFILE=${packaging.os.max.open.files}
+
+# Specifies the maximum number of bytes of memory that may be locked into RAM
+# Set to "infinity" if you use the 'bootstrap.mlockall: true' option
+# in elasticsearch.yml and 'MAX_LOCKED_MEMORY=unlimited' in ${packaging.env.file}
+#LimitMEMLOCK=infinity
+
+# Shutdown delay in seconds, before process is tried to be killed with KILL (if configured)
+TimeoutStopSec=20
+
+[Install]
+WantedBy=multi-user.target
+
+# Built for ${project.name}-${project.version} (${packaging.type})
diff --git a/src/packaging/common/systemd/sysctl/elasticsearch.conf b/src/packaging/common/systemd/sysctl/elasticsearch.conf
new file mode 100644
index 00000000000..052cd89cf0b
--- /dev/null
+++ b/src/packaging/common/systemd/sysctl/elasticsearch.conf
@@ -0,0 +1 @@
+vm.max_map_count=${packaging.os.max.map.count}
diff --git a/src/packaging/deb/init.d/elasticsearch b/src/packaging/deb/init.d/elasticsearch
index 336030310cc..ad192157231 100755
--- a/src/packaging/deb/init.d/elasticsearch
+++ b/src/packaging/deb/init.d/elasticsearch
@@ -94,6 +94,9 @@ MAX_MAP_COUNT=262144
 # Path to the GC log file
 #ES_GC_LOG_FILE=/var/log/elasticsearch/gc.log
 
+# Elasticsearch PID file directory
+PID_DIR="${packaging.elasticsearch.pid.dir}"
+
 # End of variables that can be overwritten in $DEFAULT
 
 # overwrite settings from default file
@@ -102,7 +105,7 @@ if [ -f "$DEFAULT" ]; then
 fi
 
 # Define other required variables
-PID_FILE=/var/run/$NAME.pid
+PID_FILE="$PID_DIR/$NAME.pid"
 DAEMON=$ES_HOME/bin/elasticsearch
 DAEMON_OPTS="-d -p $PID_FILE --default.config=$CONF_FILE --default.path.home=$ES_HOME --default.path.logs=$LOG_DIR --default.path.data=$DATA_DIR --default.path.conf=$CONF_DIR"
 
diff --git a/src/packaging/deb/systemd/elasticsearch.service b/src/packaging/deb/systemd/elasticsearch.service
deleted file mode 100644
index 1945f9fb12a..00000000000
--- a/src/packaging/deb/systemd/elasticsearch.service
+++ /dev/null
@@ -1,30 +0,0 @@
-[Unit]
-Description=Starts and stops a single elasticsearch instance on this system
-Documentation=http://www.elasticsearch.org
-Wants=network-online.target
-After=network-online.target
-
-[Service]
-Environment=CONF_FILE=${packaging.elasticsearch.conf.dir}/elasticsearch.yml
-Environment=ES_HOME=${packaging.elasticsearch.home.dir}
-Environment=LOG_DIR=${packaging.elasticsearch.log.dir}
-Environment=DATA_DIR=${packaging.elasticsearch.data.dir}
-Environment=CONF_DIR=${packaging.elasticsearch.conf.dir}
-EnvironmentFile=-${packaging.env.file}
-User=elasticsearch
-Group=elasticsearch
-ExecStart=/usr/share/elasticsearch/bin/elasticsearch            \
-                            -Des.default.config=$CONF_FILE      \
-                            -Des.default.path.home=$ES_HOME     \
-                            -Des.default.path.logs=$LOG_DIR     \
-                            -Des.default.path.data=$DATA_DIR    \
-                            -Des.default.path.conf=$CONF_DIR
-# See MAX_OPEN_FILES in sysconfig
-LimitNOFILE=65535
-# See MAX_LOCKED_MEMORY in sysconfig, use "infinity" when MAX_LOCKED_MEMORY=unlimited and using bootstrap.mlockall: true
-#LimitMEMLOCK=infinity
-# Shutdown delay in seconds, before process is tried to be killed with KILL (if configured)
-TimeoutStopSec=20
-
-[Install]
-WantedBy=multi-user.target
diff --git a/src/packaging/rpm/init.d/elasticsearch b/src/packaging/rpm/init.d/elasticsearch
index 1b666c64578..5fe9d748952 100644
--- a/src/packaging/rpm/init.d/elasticsearch
+++ b/src/packaging/rpm/init.d/elasticsearch
@@ -41,6 +41,7 @@ LOG_DIR="${packaging.elasticsearch.log.dir}"
 DATA_DIR="${packaging.elasticsearch.data.dir}"
 CONF_DIR="${packaging.elasticsearch.conf.dir}"
 CONF_FILE="${packaging.elasticsearch.conf.dir}/elasticsearch.yml"
+PID_DIR="${packaging.elasticsearch.pid.dir}"
 
 # Source the default env file
 ES_ENV_FILE="${packaging.env.file}"
@@ -50,7 +51,7 @@ fi
 
 exec="$ES_HOME/bin/elasticsearch"
 prog="elasticsearch"
-pidfile=/var/run/elasticsearch/${prog}.pid
+pidfile="$PID_DIR/${prog}.pid"
 
 export ES_HEAP_SIZE
 export ES_HEAP_NEWSIZE
diff --git a/src/packaging/rpm/systemd/elasticsearch.conf b/src/packaging/rpm/systemd/elasticsearch.conf
deleted file mode 100644
index 9db225e74a7..00000000000
--- a/src/packaging/rpm/systemd/elasticsearch.conf
+++ /dev/null
@@ -1 +0,0 @@
-d    /run/elasticsearch   0755 elasticsearch elasticsearch - -
diff --git a/src/packaging/rpm/systemd/elasticsearch.service b/src/packaging/rpm/systemd/elasticsearch.service
deleted file mode 100644
index f5bb286b8fa..00000000000
--- a/src/packaging/rpm/systemd/elasticsearch.service
+++ /dev/null
@@ -1,25 +0,0 @@
-[Unit]
-Description=Starts and stops a single elasticsearch instance on this system
-Documentation=http://www.elasticsearch.org
-
-[Service]
-Type=forking
-Environment=CONF_FILE=${packaging.elasticsearch.conf.dir}/elasticsearch.yml
-Environment=ES_HOME=${packaging.elasticsearch.home.dir}
-Environment=LOG_DIR=${packaging.elasticsearch.log.dir}
-Environment=DATA_DIR=${packaging.elasticsearch.data.dir}
-Environment=CONF_DIR=${packaging.elasticsearch.conf.dir}
-EnvironmentFile=-${packaging.env.file}
-User=elasticsearch
-Group=elasticsearch
-PIDFile=/var/run/elasticsearch/elasticsearch.pid
-ExecStart=/usr/share/elasticsearch/bin/elasticsearch -d -p /var/run/elasticsearch/elasticsearch.pid -Des.default.config=$CONF_FILE -Des.default.path.home=$ES_HOME -Des.default.path.logs=$LOG_DIR -Des.default.path.data=$DATA_DIR -Des.default.path.conf=$CONF_DIR
-# See MAX_OPEN_FILES in sysconfig
-LimitNOFILE=65535
-# See MAX_LOCKED_MEMORY in sysconfig, use "infinity" when MAX_LOCKED_MEMORY=unlimited and using bootstrap.mlockall: true
-#LimitMEMLOCK=infinity
-# Shutdown delay in seconds, before process is tried to be killed with KILL (if configured)
-TimeoutStopSec=20
-
-[Install]
-WantedBy=multi-user.target
diff --git a/src/packaging/rpm/systemd/sysctl.d/elasticsearch.conf b/src/packaging/rpm/systemd/sysctl.d/elasticsearch.conf
deleted file mode 100644
index 62ea54d8697..00000000000
--- a/src/packaging/rpm/systemd/sysctl.d/elasticsearch.conf
+++ /dev/null
@@ -1 +0,0 @@
-vm.max_map_count=262144
diff --git a/src/test/resources/packaging/scripts/50_systemd.bats b/src/test/resources/packaging/scripts/50_systemd.bats
new file mode 100644
index 00000000000..addd4ff1ac7
--- /dev/null
+++ b/src/test/resources/packaging/scripts/50_systemd.bats
@@ -0,0 +1,146 @@
+#!/usr/bin/env bats
+
+# This file is used to test the elasticsearch Systemd setup.
+
+# WARNING: This testing file must be executed as root and can
+# dramatically change your system. It removes the 'elasticsearch'
+# user/group and also many directories. Do not execute this file
+# unless you know exactly what you are doing.
+
+# The test case can be executed with the Bash Automated
+# Testing System tool available at https://github.com/sstephenson/bats
+# Thanks to Sam Stephenson!
+
+# Licensed to Elasticsearch under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Load test utilities
+load packaging_test_utils
+
+# Cleans everything for the 1st execution
+setup() {
+    if [ "$BATS_TEST_NUMBER" -eq 1 ]; then
+        clean_before_test
+    fi
+
+
+    # Installs a package before test
+    if is_dpkg; then
+        dpkg -i elasticsearch*.deb >&2 || true
+    fi
+    if is_rpm; then
+        rpm -i elasticsearch*.rpm >&2 || true
+    fi
+}
+
+@test "[SYSTEMD] daemon reload" {
+    skip_not_systemd
+
+    run systemctl daemon-reload
+    [ "$status" -eq 0 ]
+}
+
+@test "[SYSTEMD] enable" {
+    skip_not_systemd
+
+    run systemctl enable elasticsearch.service
+    [ "$status" -eq 0 ]
+
+    run systemctl is-enabled elasticsearch.service
+    [ "$status" -eq 0 ]
+}
+
+@test "[SYSTEMD] start" {
+    skip_not_systemd
+
+    run systemctl start elasticsearch.service
+    [ "$status" -eq 0 ]
+
+    wait_for_elasticsearch_status
+
+    assert_file_exist "/var/run/elasticsearch/elasticsearch.pid"
+}
+
+@test "[SYSTEMD] start (running)" {
+    skip_not_systemd
+
+    run systemctl start elasticsearch.service
+    [ "$status" -eq 0 ]
+}
+
+@test "[SYSTEMD] is active (running)" {
+    skip_not_systemd
+
+    run systemctl is-active elasticsearch.service
+    [ "$status" -eq 0 ]
+    [ "$output" = "active" ]
+}
+
+@test "[SYSTEMD] status (running)" {
+    skip_not_systemd
+
+    run systemctl status elasticsearch.service
+    [ "$status" -eq 0 ]
+}
+
+##################################
+# Check that Elasticsearch is working
+##################################
+@test "[SYSTEMD] test elasticsearch" {
+    skip_not_systemd
+
+    run_elasticsearch_tests
+}
+
+@test "[SYSTEMD] restart" {
+    skip_not_systemd
+
+    run systemctl restart elasticsearch.service
+    [ "$status" -eq 0 ]
+
+    wait_for_elasticsearch_status
+
+    run service elasticsearch status
+    [ "$status" -eq 0 ]
+}
+
+@test "[SYSTEMD] stop (running)" {
+    skip_not_systemd
+
+    run systemctl stop elasticsearch.service
+    [ "$status" -eq 0 ]
+
+    run systemctl status elasticsearch.service
+    echo "$output" | grep "Active:" | grep "inactive"
+}
+
+@test "[SYSTEMD] stop (stopped)" {
+    skip_not_systemd
+
+    run systemctl stop elasticsearch.service
+    [ "$status" -eq 0 ]
+
+    run systemctl status elasticsearch.service
+    echo "$output" | grep "Active:" | grep "inactive"
+}
+
+@test "[SYSTEMD] status (stopped)" {
+    skip_not_systemd
+
+    run systemctl status elasticsearch.service
+    echo "$output" | grep "Active:" | grep "inactive"
+}
diff --git a/src/test/resources/packaging/scripts/packaging_test_utils.bash b/src/test/resources/packaging/scripts/packaging_test_utils.bash
index b1058c641da..b5fe262efd1 100644
--- a/src/test/resources/packaging/scripts/packaging_test_utils.bash
+++ b/src/test/resources/packaging/scripts/packaging_test_utils.bash
@@ -217,6 +217,12 @@ verify_package_installation() {
         # License file
         assert_file "/usr/share/elasticsearch/LICENSE.txt" f root 644
     fi
+
+    if is_systemd; then
+        assert_file "/usr/lib/systemd/system/elasticsearch.service" f root 644
+        assert_file "/usr/lib/tmpfiles.d/elasticsearch.conf" f root 644
+        assert_file "/usr/lib/sysctl.d/elasticsearch.conf" f root 644
+    fi
 }
 
 
@@ -294,7 +300,10 @@ clean_before_test() {
                             "/etc/sysconfig/elasticsearch"  \
                             "/var/run/elasticsearch"  \
                             "/usr/share/doc/elasticsearch" \
-                            "/tmp/elasticsearch")
+                            "/tmp/elasticsearch" \
+                            "/usr/lib/systemd/system/elasticsearch.conf" \
+                            "/usr/lib/tmpfiles.d/elasticsearch.conf" \
+                            "/usr/lib/sysctl.d/elasticsearch.conf")
 
     if [ "$ES_CLEAN_BEFORE_TEST" = "true" ]; then
         # Kills all processes of user elasticsearch

From 9bb56c0e001869b4a017e0e4a0d1eefc06262996 Mon Sep 17 00:00:00 2001
From: David Pilato <david@pilato.fr>
Date: Tue, 26 May 2015 16:26:03 +0200
Subject: [PATCH 028/123] Ignore dependency-reduced-pom.xml even if used in
 submodules

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3b0aecc1081..a31eff71e7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,4 @@ eclipse-build
 nb-configuration.xml
 nbactions.xml
 
-/dependency-reduced-pom.xml
+dependency-reduced-pom.xml

From 5384e4712ae6f7c89074e1054dd3f58b8bdb433d Mon Sep 17 00:00:00 2001
From: David Pilato <david@pilato.fr>
Date: Tue, 26 May 2015 16:27:32 +0200
Subject: [PATCH 029/123] Fix maven assembly warning about using root dir

It's a bad practice in Maven to define `/` as the output dir.
It's better to leave it empty.

See also http://stackoverflow.com/questions/28500401/maven-assembly-plugin-warning-the-assembly-descriptor-contains-a-filesystem-roo
---
 src/main/assemblies/common-bin.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/assemblies/common-bin.xml b/src/main/assemblies/common-bin.xml
index f9b0a0ae215..49a00eab4ee 100644
--- a/src/main/assemblies/common-bin.xml
+++ b/src/main/assemblies/common-bin.xml
@@ -74,15 +74,15 @@
     <files>
         <file>
             <source>README.textile</source>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory></outputDirectory>
         </file>
         <file>
             <source>LICENSE.txt</source>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory></outputDirectory>
         </file>
         <file>
             <source>NOTICE.txt</source>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory></outputDirectory>
         </file>
     </files>
 </component>

From 37bdbe074a6f89c1da9e0b58013dad79872580fe Mon Sep 17 00:00:00 2001
From: Boaz Leskes <b.leskes@gmail.com>
Date: Wed, 27 May 2015 15:40:02 +0300
Subject: [PATCH 030/123] doc feedback

---
 docs/reference/indices/flush.asciidoc | 65 ++++++++++++++++++++++-----
 1 file changed, 55 insertions(+), 10 deletions(-)

diff --git a/docs/reference/indices/flush.asciidoc b/docs/reference/indices/flush.asciidoc
index a1ebfd1d866..118a68b7128 100644
--- a/docs/reference/indices/flush.asciidoc
+++ b/docs/reference/indices/flush.asciidoc
@@ -49,25 +49,25 @@ POST /_flush
 [[indices-synced-flush]]
 === Synced Flush
 
-Elasticsearch tracks the indexing activity of each shards. Shards that have not
-received any indexing operations for 30 minutes (configurable) are automatically marked as inactive. This presents
+Elasticsearch tracks the indexing activity of each shard. Shards that have not
+received any indexing operations for 30 minutes are automatically marked as inactive. This presents
 an opportunity for Elasticsearch to reduce shard resources and also perform
-a special kind of flush, called `synced flush`. A synced flush performs normal
-flushing and adds a special uniquely generated marker (`sync_id`) to all shards.
+a special kind of flush, called `synced flush`. A synced flush performs a normal flush, then adds
+a generated unique marker (sync_id) to all shards.
 
 Since the sync id marker was added when there were no ongoing indexing operations, it can
-be used as a quick way to check if two shards indices are identical. This quick sync id
+be used as a quick way to check if the two shards' lucene indices are identical. This quick sync id
 comparison (if present) is used during recovery or restarts to skip the first and
 most costly phase of the process. In that case, no segment files need to be copied and
 the transaction log replay phase of the recovery can start immediately. Note that since the sync id
-marker was applied together with a flush, it is highly likely that the transaction log will be empty,
+marker was applied together with a flush, it is very likely that the transaction log will be empty,
 speeding up recoveries even more.
 
 This is particularly useful for use cases having lots of indices which are
 never or very rarely updated, such as time based data. This use case typically generates lots of indices whose
 recovery without the synced flush marker would take a long time.
 
-To check whether a shard has a marker or not, one can use the `commit` section of shard stats returned by
+To check whether a shard has a marker or not, look for the `commit` section of shard stats returned by
 the <<indices-stats,indices stats>> API:
 
 [source,bash]
@@ -76,23 +76,64 @@ GET /twitter/_stats/commit?level=shards
 --------------------------------------------------
 // AUTOSENSE
 
+
+which returns something similar to:
+
+[source,js]
+--------------------------------------------------
+{
+   ...
+   "indices": {
+      "twitter": {
+         "primaries": {},
+         "total": {},
+         "shards": {
+            "0": [
+               {
+                  "routing": {
+                     ...
+                  },
+                  "commit": {
+                     "id": "te7zF7C4UsirqvL6jp/vUg==",
+                     "generation": 2,
+                     "user_data": {
+                        "sync_id": "AU2VU0meX-VX2aNbEUsD" <1>,
+                        ...
+                     },
+                     "num_docs": 0
+                  }
+               }
+               ...
+            ],
+            ...
+         }
+      }
+   }
+}
+--------------------------------------------------
+<1> the `sync id` marker
+
 [float]
 === Synced Flush API
 
 The Synced Flush API allows an administrator to initiate a synced flush manually. This can be particularly useful for
-a planned (rolling) cluster restart where one can stop indexing and doesn't want to wait for the default 30 minutes to pass
-when the synced flush will be performed automatically.
+a planned (rolling) cluster restart where you can stop indexing and don't want to wait the default 30 minutes for
+idle indices to be sync-flushed automatically.
 
 While handy, there are a couple of caveats for this API:
 
 1. Synced flush is a best effort operation. Any ongoing indexing operations will cause
-the synced flush to fail. This means that some shards may be synced flushed while others aren't. See below for more.
+the synced flush to fail on that shard. This means that some shards may be synced flushed while others aren't. See below for more.
 2. The `sync_id` marker is removed as soon as the shard is flushed again. That is because a flush replaces the low level
 lucene commit point where the marker is stored. Uncommitted operations in the transaction log do not remove the marker.
 In practice, one should consider any indexing operation on an index as removing the marker as a flush can be triggered by Elasticsearch
 at any time.
 
 
+NOTE: It is harmless to request a synced flush while there is ongoing indexing. Shards that are idle will succeed and shards
+ that are not will fail. Any shards that succeeded will have faster recovery times.
+
+
 [source,bash]
 --------------------------------------------------
 POST /twitter/_flush/synced
@@ -145,6 +186,8 @@ Here is what it looks like when one shard group failed due to pending operations
 }
 --------------------------------------------------
 
+NOTE: The above error is shown when the synced flush failes due to concurrent indexing operations. The HTTP
+status code in that case will be `409 CONFLICT`.
 
 Sometimes the failures are specific to a shard copy. The copies that failed will not be eligible for
 fast recovery but those that succeeded still will be. This case is reported as follows:
@@ -180,6 +223,8 @@ fast recovery but those that succeeded still will be. This case is reported as f
 --------------------------------------------------
 
 
+NOTE: When a shard copy fails to sync-flush, the HTTP status code returned will be `409 CONFLICT`.
+
 The synced flush API can be applied to more than one index with a single call,
 or even on `_all` the indices.
 

From fc224a0de8153652ed2d0e409bc2dbd8746068e8 Mon Sep 17 00:00:00 2001
From: Alexander Reelsen <alexander@reelsen.net>
Date: Wed, 27 May 2015 12:05:32 +0200
Subject: [PATCH 031/123] Cat API: Add wildcard support for header names

This adds wildcard support (simple regexes) for specifying header names.
Aliases are supported as well.

Closes #10811
---
 docs/reference/cat.asciidoc                   |  6 +-
 .../test/cat.thread_pool/10_basic.yaml        | 12 +++
 .../rest/action/support/RestTable.java        | 48 +++++++++--
 .../rest/action/support/RestTableTest.java    | 82 +++++++++++++++++++
 4 files changed, 141 insertions(+), 7 deletions(-)
 create mode 100644 src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java

diff --git a/docs/reference/cat.asciidoc b/docs/reference/cat.asciidoc
index d857006d2b1..bc29cc92d64 100644
--- a/docs/reference/cat.asciidoc
+++ b/docs/reference/cat.asciidoc
@@ -66,6 +66,10 @@ only those columns to appear.
 192.168.56.30 9300 43.9 Ramsey, Doug
 --------------------------------------------------
 
+You can also request multiple columns using simple wildcards like
+`/_cat/thread_pool?h=ip,bulk.*` to get all headers (or aliases) starting
+with `bulk.`.
+
 [float]
 [[numeric-formats]]
 === Numeric formats
@@ -120,4 +124,4 @@ include::cat/thread_pool.asciidoc[]
 
 include::cat/shards.asciidoc[]
 
-include::cat/segments.asciidoc[]
\ No newline at end of file
+include::cat/segments.asciidoc[]
diff --git a/rest-api-spec/test/cat.thread_pool/10_basic.yaml b/rest-api-spec/test/cat.thread_pool/10_basic.yaml
index edb87ce27b9..37994201191 100755
--- a/rest-api-spec/test/cat.thread_pool/10_basic.yaml
+++ b/rest-api-spec/test/cat.thread_pool/10_basic.yaml
@@ -29,6 +29,18 @@
                /  #pid       id          host       ip                          port
                ^  (\d+  \s+  \S{4}  \s+  \S+   \s+  (\d{1,3}\.){3}\d{1,3}  \s+  (\d+|-) \s+ \n)+  $/
 
+
+  - do:
+      cat.thread_pool:
+          h: bulk.m*
+
+  - match:
+      $body: |
+               /^ bulk.max  \s+  bulk.min \s+ \n
+                 (\s+  \d+  \s+  \d+  \s+ \n)+  $/
+
+#(\s+  \d+  \s+  \d+ \n)+  $/
+
   - do:
       cat.thread_pool:
           h: id,ba,fa,gea,ga,ia,maa,ma,oa,pa
diff --git a/src/main/java/org/elasticsearch/rest/action/support/RestTable.java b/src/main/java/org/elasticsearch/rest/action/support/RestTable.java
index 27141aa08df..0b5b44112f4 100644
--- a/src/main/java/org/elasticsearch/rest/action/support/RestTable.java
+++ b/src/main/java/org/elasticsearch/rest/action/support/RestTable.java
@@ -24,6 +24,7 @@ import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.Table;
 import org.elasticsearch.common.io.UTF8StreamWriter;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
+import org.elasticsearch.common.regex.Regex;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.unit.SizeValue;
 import org.elasticsearch.common.unit.TimeValue;
@@ -32,8 +33,7 @@ import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.rest.*;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 /**
  */
@@ -96,11 +96,12 @@ public class RestTable {
         return new BytesRestResponse(RestStatus.OK, BytesRestResponse.TEXT_CONTENT_TYPE, bytesOut.bytes());
     }
 
-    private static List<DisplayHeader> buildDisplayHeaders(Table table, RestRequest request) {
-        String pHeaders = request.param("h");
+    static List<DisplayHeader> buildDisplayHeaders(Table table, RestRequest request) {
         List<DisplayHeader> display = new ArrayList<>();
-        if (pHeaders != null) {
-            for (String possibility : Strings.splitStringByCommaToArray(pHeaders)) {
+        if (request.hasParam("h")) {
+            Set<String> headers = expandHeadersFromRequest(table, request);
+
+            for (String possibility : headers) {
                 DisplayHeader dispHeader = null;
 
                 if (table.getAsMap().containsKey(possibility)) {
@@ -147,6 +148,41 @@ public class RestTable {
         return display;
     }
 
+    /**
+     * Extracts all the required fields from the RestRequest 'h' parameter. In order to support wildcards like
+     * 'bulk.*' this needs potentially parse all the configured headers and its aliases and needs to ensure
+     * that everything is only added once to the returned headers, even if 'h=bulk.*.bulk.*' is specified
+     * or some headers are contained twice due to matching aliases
+     */
+    private static Set<String> expandHeadersFromRequest(Table table, RestRequest request) {
+        Set<String> headers = new LinkedHashSet<>(table.getHeaders().size());
+
+        Map<String, Table.Cell> headerMap = table.getHeaderMap();
+        // check headers and aliases
+        for (String header : Strings.splitStringByCommaToArray(request.param("h"))) {
+            if (Regex.isSimpleMatchPattern(header)) {
+                for (Map.Entry<String, Table.Cell> configuredHeaderEntry : headerMap.entrySet()) {
+                    String configuredHeader = configuredHeaderEntry.getKey();
+                    if (Regex.simpleMatch(header, configuredHeader)) {
+                        headers.add(configuredHeader);
+                    } else if (configuredHeaderEntry.getValue().attr.containsKey("alias")) {
+                        String[] aliases = Strings.splitStringByCommaToArray(configuredHeaderEntry.getValue().attr.get("alias"));
+                        for (String alias : aliases) {
+                            if (Regex.simpleMatch(header, alias)) {
+                                headers.add(configuredHeader);
+                                break;
+                            }
+                        }
+                    }
+                }
+            } else {
+                headers.add(header);
+            }
+        }
+
+        return headers;
+    }
+
     public static int[] buildHelpWidths(Table table, RestRequest request) {
         int[] width = new int[3];
         for (Table.Cell cell : table.getHeaders()) {
diff --git a/src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java b/src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java
new file mode 100644
index 00000000000..bdf0a07cbf5
--- /dev/null
+++ b/src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.rest.action.support;
+
+import org.elasticsearch.common.Table;
+import org.elasticsearch.test.ElasticsearchTestCase;
+import org.elasticsearch.test.rest.FakeRestRequest;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.elasticsearch.rest.action.support.RestTable.buildDisplayHeaders;
+import static org.hamcrest.Matchers.*;
+
+public class RestTableTest extends ElasticsearchTestCase {
+
+    private Table table = new Table();
+    private FakeRestRequest restRequest = new FakeRestRequest();
+
+    @Before
+    public void setup() {
+        table.startHeaders();
+        table.addCell("bulk.foo", "alias:f;desc:foo");
+        table.addCell("bulk.bar", "alias:b;desc:bar");
+        // should be matched as well due to the aliases
+        table.addCell("aliasedBulk", "alias:bulkWhatever;desc:bar");
+        table.addCell("aliasedSecondBulk", "alias:foobar,bulkolicious,bulkotastic;desc:bar");
+        // no match
+        table.addCell("unmatched", "alias:un.matched;desc:bar");
+        // invalid alias
+        table.addCell("invalidAliasesBulk", "alias:,,,;desc:bar");
+        table.endHeaders();
+    }
+
+    @Test
+    public void testThatDisplayHeadersSupportWildcards() throws Exception {
+        restRequest.params().put("h", "bulk*");
+        List<RestTable.DisplayHeader> headers = buildDisplayHeaders(table, restRequest);
+
+        List<String> headerNames = getHeaderNames(headers);
+        assertThat(headerNames, containsInAnyOrder("bulk.foo", "bulk.bar", "aliasedBulk", "aliasedSecondBulk"));
+        assertThat(headerNames, not(hasItem("unmatched")));
+    }
+
+    @Test
+    public void testThatDisplayHeadersAreNotAddedTwice() throws Exception {
+        restRequest.params().put("h", "nonexistent,bulk*,bul*");
+        List<RestTable.DisplayHeader> headers = buildDisplayHeaders(table, restRequest);
+
+        List<String> headerNames = getHeaderNames(headers);
+        assertThat(headerNames, containsInAnyOrder("bulk.foo", "bulk.bar", "aliasedBulk", "aliasedSecondBulk"));
+        assertThat(headerNames, not(hasItem("unmatched")));
+    }
+
+    private List<String> getHeaderNames(List<RestTable.DisplayHeader> headers) {
+        List<String> headerNames = new ArrayList<>();
+        for (RestTable.DisplayHeader header : headers) {
+            headerNames.add(header.name);
+        }
+
+        return headerNames;
+    }
+}

From 7fbd86aa97fabf6535f9b1ea3d79035ea4927f42 Mon Sep 17 00:00:00 2001
From: Colin Goodheart-Smithe <colings86@users.noreply.github.com>
Date: Wed, 27 May 2015 14:34:05 +0100
Subject: [PATCH 032/123] Aggregations: Fixed Moving Average prediction to
 calculate the correct keys

The Moving average predict code generated incorrect keys if the key for the first bucket of the histogram was < 0. This fix makes the moving average use the rounding class from the histogram to generate the keys for the new buckets.

Closes #11369
---
 .../movavg/MovAvgPipelineAggregator.java      |  8 +--
 .../pipeline/moving/avg/MovAvgTests.java      | 64 ++++++++++++++++++-
 2 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java
index c6e3d943bb8..cc1e6682e70 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java
@@ -111,7 +111,6 @@ public class MovAvgPipelineAggregator extends PipelineAggregator {
         EvictingQueue<Double> values = EvictingQueue.create(this.window);
 
         long lastKey = 0;
-        long interval = Long.MAX_VALUE;
         Object currentKey;
 
         for (InternalHistogram.Bucket bucket : buckets) {
@@ -135,10 +134,8 @@ public class MovAvgPipelineAggregator extends PipelineAggregator {
 
             if (predict > 0) {
                 if (currentKey instanceof Number) {
-                    interval = Math.min(interval, ((Number) bucket.getKey()).longValue() - lastKey);
                     lastKey  = ((Number) bucket.getKey()).longValue();
                 } else if (currentKey instanceof DateTime) {
-                    interval = Math.min(interval, ((DateTime) bucket.getKey()).getMillis() - lastKey);
                     lastKey = ((DateTime) bucket.getKey()).getMillis();
                 } else {
                     throw new AggregationExecutionException("Expected key of type Number or DateTime but got [" + currentKey + "]");
@@ -147,7 +144,6 @@ public class MovAvgPipelineAggregator extends PipelineAggregator {
 
         }
 
-
         if (buckets.size() > 0 && predict > 0) {
 
             boolean keyed;
@@ -159,9 +155,11 @@ public class MovAvgPipelineAggregator extends PipelineAggregator {
             for (int i = 0; i < predictions.length; i++) {
                 List<InternalAggregation> aggs = new ArrayList<>();
                 aggs.add(new InternalSimpleValue(name(), predictions[i], formatter, new ArrayList<PipelineAggregator>(), metaData()));
-                InternalHistogram.Bucket newBucket = factory.createBucket(lastKey + (interval * (i + 1)), 0, new InternalAggregations(
+                long newKey = histo.getRounding().nextRoundingValue(lastKey);
+                InternalHistogram.Bucket newBucket = factory.createBucket(newKey, 0, new InternalAggregations(
                         aggs), keyed, formatter);
                 newBuckets.add(newBucket);
+                lastKey = newKey;
             }
         }
 
diff --git a/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java b/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java
index 38da141ad5c..0e0eb239ce0 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java
@@ -22,7 +22,6 @@ package org.elasticsearch.search.aggregations.pipeline.moving.avg;
 
 import com.google.common.collect.EvictingQueue;
 
-import org.apache.lucene.util.LuceneTestCase;
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.search.SearchPhaseExecutionException;
 import org.elasticsearch.action.search.SearchResponse;
@@ -32,6 +31,7 @@ import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
 import org.elasticsearch.search.aggregations.bucket.histogram.InternalHistogram;
 import org.elasticsearch.search.aggregations.bucket.histogram.InternalHistogram.Bucket;
 import org.elasticsearch.search.aggregations.metrics.ValuesSourceMetricsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.Avg;
 import org.elasticsearch.search.aggregations.pipeline.BucketHelpers;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregationHelperTests;
 import org.elasticsearch.search.aggregations.pipeline.SimpleValue;
@@ -51,7 +51,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import static org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorBuilders.movingAvg;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.avg;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.filter;
@@ -59,8 +58,12 @@ import static org.elasticsearch.search.aggregations.AggregationBuilders.histogra
 import static org.elasticsearch.search.aggregations.AggregationBuilders.max;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.min;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.range;
+import static org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorBuilders.movingAvg;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.closeTo;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.hamcrest.core.IsNull.notNullValue;
 import static org.hamcrest.core.IsNull.nullValue;
 
@@ -154,6 +157,11 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
                 .field(INTERVAL_FIELD, 49)
                 .field(GAP_FIELD, 1).endObject()));
 
+        for (int i = -10; i < 10; i++) {
+            builders.add(client().prepareIndex("neg_idx", "type").setSource(
+                    jsonBuilder().startObject().field(INTERVAL_FIELD, i).field(VALUE_FIELD, 10).endObject()));
+        }
+
         indexRandom(true, builders);
         ensureSearchable();
     }
@@ -514,6 +522,56 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
         }
     }
 
+    @Test
+    public void testPredictNegativeKeysAtStart() {
+
+        SearchResponse response = client()
+                .prepareSearch("neg_idx")
+                .setTypes("type")
+                .addAggregation(
+                        histogram("histo")
+                                .field(INTERVAL_FIELD)
+                                .interval(1)
+                                .subAggregation(avg("avg").field(VALUE_FIELD))
+                                .subAggregation(
+                                        movingAvg("movavg_values").window(windowSize).modelBuilder(new SimpleModel.SimpleModelBuilder())
+                                                .gapPolicy(gapPolicy).predict(5).setBucketsPaths("avg"))).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        InternalHistogram<Bucket> histo = response.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        assertThat(histo.getName(), equalTo("histo"));
+        List<? extends Bucket> buckets = histo.getBuckets();
+        assertThat("Size of buckets array is not correct.", buckets.size(), equalTo(25));
+
+        for (int i = 0; i < 20; i++) {
+            Bucket bucket = buckets.get(i);
+            assertThat(bucket, notNullValue());
+            assertThat((long) bucket.getKey(), equalTo((long) i - 10));
+            assertThat(bucket.getDocCount(), equalTo(1l));
+            Avg avgAgg = bucket.getAggregations().get("avg");
+            assertThat(avgAgg, notNullValue());
+            assertThat(avgAgg.value(), equalTo(10d));
+            SimpleValue movAvgAgg = bucket.getAggregations().get("movavg_values");
+            assertThat(movAvgAgg, notNullValue());
+            assertThat(movAvgAgg.value(), equalTo(10d));
+        }
+
+        for (int i = 20; i < 25; i++) {
+            System.out.println(i);
+            Bucket bucket = buckets.get(i);
+            assertThat(bucket, notNullValue());
+            assertThat((long) bucket.getKey(), equalTo((long) i - 10));
+            assertThat(bucket.getDocCount(), equalTo(0l));
+            Avg avgAgg = bucket.getAggregations().get("avg");
+            assertThat(avgAgg, nullValue());
+            SimpleValue movAvgAgg = bucket.getAggregations().get("movavg_values");
+            assertThat(movAvgAgg, notNullValue());
+            assertThat(movAvgAgg.value(), equalTo(10d));
+        }
+    }
+
     @Test
     public void testSizeZeroWindow() {
         try {

From 57653df7133d02fa09b67343232f33c096100e16 Mon Sep 17 00:00:00 2001
From: markharwood <markharwood@gmail.com>
Date: Wed, 27 May 2015 12:52:13 +0100
Subject: [PATCH 033/123] Search fix: fielddata_fields query string parameter
 was ignored. The RestSearchAction did not parse the fielddata_fields
 parameter. Added test case and missing parser code.

Closes #11025
---
 rest-api-spec/test/search/10_source_filtering.yaml |  6 ++++++
 .../rest/action/search/RestSearchAction.java       | 14 ++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/rest-api-spec/test/search/10_source_filtering.yaml b/rest-api-spec/test/search/10_source_filtering.yaml
index 40a67ba7e1f..1a2a79a80e4 100644
--- a/rest-api-spec/test/search/10_source_filtering.yaml
+++ b/rest-api-spec/test/search/10_source_filtering.yaml
@@ -89,4 +89,10 @@
             query: { match_all: {} }
   - match: { hits.hits.0.fields: { include.field2 : [v2] }}
   - is_true:  hits.hits.0._source
+  
+  
+  - do:
+      search:
+        fielddata_fields: ["count"]
+  - match: { hits.hits.0.fields.count: [1] }  
 
diff --git a/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java b/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java
index 0d06031a92e..550b0f63978 100644
--- a/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java
+++ b/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java
@@ -195,6 +195,20 @@ public class RestSearchAction extends BaseRestHandler {
                 }
             }
         }
+        String sFieldDataFields = request.param("fielddata_fields");
+        if (sFieldDataFields != null) {
+            if (searchSourceBuilder == null) {
+                searchSourceBuilder = new SearchSourceBuilder();
+            }
+            if (Strings.hasText(sFieldDataFields)) {
+                String[] sFields = Strings.splitStringByCommaToArray(sFieldDataFields);
+                if (sFields != null) {
+                    for (String field : sFields) {
+                        searchSourceBuilder.fieldDataField(field);
+                    }
+                }
+            }
+        }
         FetchSourceContext fetchSourceContext = FetchSourceContext.parseFromRestRequest(request);
         if (fetchSourceContext != null) {
             if (searchSourceBuilder == null) {

From 37610548f88f5975e468dee4cdc7a0e29a5a470e Mon Sep 17 00:00:00 2001
From: Britta Weber <britta.weber@elasticsearch.com>
Date: Tue, 26 May 2015 18:31:18 +0200
Subject: [PATCH 034/123] highlighting: don't fail search request when name of
 highlighted field contains wildcards

When we highlight on fields using wildcards then fields might match that cannot
be highlighted by the specified highlighter. The whole search request then
failed. Instead, check that the field can be highlighted and ignore the field
if it can't.
In addition ignore the exception thrown by plain highlighter if a field conatins
terms larger than 32766.

closes #9881
---
 .../highlight/FastVectorHighlighter.java      |   7 +-
 .../search/highlight/HighlightPhase.java      |  24 ++--
 .../search/highlight/Highlighter.java         |   4 +
 .../search/highlight/PlainHighlighter.java    |  15 ++-
 .../search/highlight/PostingsHighlighter.java |   7 +-
 .../search/highlight/CustomHighlighter.java   |   6 +
 .../highlight/HighlighterSearchTests.java     | 126 ++++++++++++++++--
 7 files changed, 168 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java b/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java
index 715dacae39d..c997624ff60 100644
--- a/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java
+++ b/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java
@@ -63,7 +63,7 @@ public class FastVectorHighlighter implements Highlighter {
         FetchSubPhase.HitContext hitContext = highlighterContext.hitContext;
         FieldMapper mapper = highlighterContext.mapper;
 
-        if (!(mapper.fieldType().storeTermVectors() && mapper.fieldType().storeTermVectorOffsets() && mapper.fieldType().storeTermVectorPositions())) {
+        if (canHighlight(mapper) == false) {
             throw new IllegalArgumentException("the field [" + highlighterContext.fieldName + "] should be indexed with term vector with position offsets to be used with fast vector highlighter");
         }
 
@@ -177,6 +177,11 @@ public class FastVectorHighlighter implements Highlighter {
         }
     }
 
+    @Override
+    public boolean canHighlight(FieldMapper fieldMapper) {
+        return fieldMapper.fieldType().storeTermVectors() && fieldMapper.fieldType().storeTermVectorOffsets() && fieldMapper.fieldType().storeTermVectorPositions();
+    }
+
     private class MapperHighlightEntry {
         public FragListBuilder fragListBuilder;
         public FragmentsBuilder fragmentsBuilder;
diff --git a/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java b/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java
index 10afac729ba..f005f5be7c3 100644
--- a/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java
+++ b/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java
@@ -21,7 +21,6 @@ package org.elasticsearch.search.highlight;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.search.Query;
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;
@@ -45,6 +44,8 @@ import static com.google.common.collect.Maps.newHashMap;
  */
 public class HighlightPhase extends AbstractComponent implements FetchSubPhase {
 
+    private static final ImmutableList<String> STANDARD_HIGHLIGHTERS_BY_PRECEDENCE = ImmutableList.of("fvh", "postings", "plain");
+
     private final Highlighters highlighters;
 
     @Inject
@@ -91,6 +92,7 @@ public class HighlightPhase extends AbstractComponent implements FetchSubPhase {
                 }
             }
 
+            boolean fieldNameContainsWildcards = field.field().contains("*");
             for (String fieldName : fieldNamesToHighlight) {
                 FieldMapper fieldMapper = getMapperForField(fieldName, context, hitContext);
                 if (fieldMapper == null) {
@@ -99,16 +101,14 @@ public class HighlightPhase extends AbstractComponent implements FetchSubPhase {
 
                 String highlighterType = field.fieldOptions().highlighterType();
                 if (highlighterType == null) {
-                    boolean useFastVectorHighlighter = fieldMapper.fieldType().storeTermVectors() && fieldMapper.fieldType().storeTermVectorOffsets() && fieldMapper.fieldType().storeTermVectorPositions();
-                    if (useFastVectorHighlighter) {
-                        highlighterType = "fvh";
-                    } else if (fieldMapper.fieldType().indexOptions() == IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) {
-                        highlighterType = "postings";
-                    } else {
-                        highlighterType = "plain";
+                    for(String highlighterCandidate : STANDARD_HIGHLIGHTERS_BY_PRECEDENCE) {
+                        if (highlighters.get(highlighterCandidate).canHighlight(fieldMapper)) {
+                            highlighterType = highlighterCandidate;
+                            break;
+                        }
                     }
+                    assert highlighterType != null;
                 }
-
                 Highlighter highlighter = highlighters.get(highlighterType);
                 if (highlighter == null) {
                     throw new IllegalArgumentException("unknown highlighter type [" + highlighterType + "] for the field [" + fieldName + "]");
@@ -116,13 +116,17 @@ public class HighlightPhase extends AbstractComponent implements FetchSubPhase {
 
                 Query highlightQuery = field.fieldOptions().highlightQuery() == null ? context.parsedQuery().query() : field.fieldOptions().highlightQuery();
                 HighlighterContext highlighterContext = new HighlighterContext(fieldName, field, fieldMapper, context, hitContext, highlightQuery);
+
+                if ((highlighter.canHighlight(fieldMapper) == false) && fieldNameContainsWildcards) {
+                    // if several fieldnames matched the wildcard then we want to skip those that we cannot highlight
+                    continue;
+                }
                 HighlightField highlightField = highlighter.highlight(highlighterContext);
                 if (highlightField != null) {
                     highlightFields.put(highlightField.name(), highlightField);
                 }
             }
         }
-
         hitContext.hit().highlightFields(highlightFields);
     }
 
diff --git a/src/main/java/org/elasticsearch/search/highlight/Highlighter.java b/src/main/java/org/elasticsearch/search/highlight/Highlighter.java
index 407cdc7b1ae..26c3dc0bf21 100644
--- a/src/main/java/org/elasticsearch/search/highlight/Highlighter.java
+++ b/src/main/java/org/elasticsearch/search/highlight/Highlighter.java
@@ -18,6 +18,8 @@
  */
 package org.elasticsearch.search.highlight;
 
+import org.elasticsearch.index.mapper.FieldMapper;
+
 /**
  *
  */
@@ -26,4 +28,6 @@ public interface Highlighter {
     String[] names();
 
     HighlightField highlight(HighlighterContext highlighterContext);
+
+    boolean canHighlight(FieldMapper fieldMapper);
 }
diff --git a/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java b/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java
index 12d7d08fa8f..460b2df05cd 100644
--- a/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java
+++ b/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java
@@ -24,6 +24,7 @@ import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
 import org.apache.lucene.search.highlight.*;
+import org.apache.lucene.util.BytesRefHash;
 import org.apache.lucene.util.CollectionUtil;
 import org.elasticsearch.common.text.StringText;
 import org.elasticsearch.common.text.Text;
@@ -117,7 +118,14 @@ public class PlainHighlighter implements Highlighter {
                 }
             }
         } catch (Exception e) {
-            throw new FetchPhaseExecutionException(context, "Failed to highlight field [" + highlighterContext.fieldName + "]", e);
+            if (e instanceof BytesRefHash.MaxBytesLengthExceededException) {
+                // this can happen if for example a field is not_analyzed and ignore_above option is set.
+                // the field will be ignored when indexing but the huge term is still in the source and
+                // the plain highlighter will parse the source and try to analyze it.
+                return null;
+            } else {
+                throw new FetchPhaseExecutionException(context, "Failed to highlight field [" + highlighterContext.fieldName + "]", e);
+            }
         }
         if (field.fieldOptions().scoreOrdered()) {
             CollectionUtil.introSort(fragsList, new Comparator<TextFragment>() {
@@ -164,6 +172,11 @@ public class PlainHighlighter implements Highlighter {
         return null;
     }
 
+    @Override
+    public boolean canHighlight(FieldMapper fieldMapper) {
+        return true;
+    }
+
     private static int findGoodEndForNoHighlightExcerpt(int noMatchSize, TokenStream tokenStream) throws IOException {
         try {
             if (!tokenStream.hasAttribute(OffsetAttribute.class)) {
diff --git a/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java b/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java
index 0375ff204f7..dcbb810d4dd 100644
--- a/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java
+++ b/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java
@@ -50,7 +50,7 @@ public class PostingsHighlighter implements Highlighter {
 
         FieldMapper fieldMapper = highlighterContext.mapper;
         SearchContextHighlight.Field field = highlighterContext.field;
-        if (fieldMapper.fieldType().indexOptions() != IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) {
+        if (canHighlight(fieldMapper) == false) {
             throw new IllegalArgumentException("the field [" + highlighterContext.fieldName + "] should be indexed with positions and offsets in the postings list to be used with postings highlighter");
         }
 
@@ -126,6 +126,11 @@ public class PostingsHighlighter implements Highlighter {
         return null;
     }
 
+    @Override
+    public boolean canHighlight(FieldMapper fieldMapper) {
+        return fieldMapper.fieldType().indexOptions() == IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS;
+    }
+
     private static String mergeFieldValues(List<Object> fieldValues, char valuesSeparator) {
         //postings highlighter accepts all values in a single string, as offsets etc. need to match with content
         //loaded from stored fields, we merge all values using a proper separator
diff --git a/src/test/java/org/elasticsearch/search/highlight/CustomHighlighter.java b/src/test/java/org/elasticsearch/search/highlight/CustomHighlighter.java
index 2845af198a2..3a9135cb731 100644
--- a/src/test/java/org/elasticsearch/search/highlight/CustomHighlighter.java
+++ b/src/test/java/org/elasticsearch/search/highlight/CustomHighlighter.java
@@ -21,6 +21,7 @@ package org.elasticsearch.search.highlight;
 import com.google.common.collect.Lists;
 import org.elasticsearch.common.text.StringText;
 import org.elasticsearch.common.text.Text;
+import org.elasticsearch.index.mapper.FieldMapper;
 
 import java.util.List;
 import java.util.Locale;
@@ -68,6 +69,11 @@ public class CustomHighlighter implements Highlighter {
         return new HighlightField(highlighterContext.fieldName, responses.toArray(new Text[]{}));
     }
 
+    @Override
+    public boolean canHighlight(FieldMapper fieldMapper) {
+        return true;
+    }
+
     private static class CacheEntry {
         private int position;
         private int docId;
diff --git a/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java b/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java
index b3e723f213a..7a0ebf57738 100644
--- a/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java
+++ b/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java
@@ -51,12 +51,124 @@ import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.elasticsearch.search.builder.SearchSourceBuilder.highlight;
 import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
 import static org.elasticsearch.test.hamcrest.RegexMatcher.matches;
 import static org.hamcrest.Matchers.*;
 
 @Slow
 public class HighlighterSearchTests extends ElasticsearchIntegrationTest {
 
+    @Test
+    public void testHighlightingWithWildcardName() throws IOException {
+        // test the kibana case with * as fieldname that will try highlight all fields including meta fields
+        XContentBuilder mappings = jsonBuilder();
+        mappings.startObject();
+        mappings.startObject("type")
+                .startObject("properties")
+                .startObject("text")
+                .field("type", "string")
+                .field("analyzer", "keyword")
+                .field("index_options", "offsets")
+                .field("term_vector", "with_positions_offsets")
+                .endObject()
+                .endObject()
+                .endObject();
+        mappings.endObject();
+        assertAcked(prepareCreate("test")
+                .addMapping("type", mappings));
+        ensureYellow();
+        client().prepareIndex("test", "type", "1")
+                .setSource(jsonBuilder().startObject().field("text", "text").endObject())
+                .get();
+        refresh();
+        String highlighter = randomFrom(new String[]{"plain", "postings", "fvh"});
+        SearchResponse search = client().prepareSearch().setQuery(constantScoreQuery(matchQuery("text", "text"))).addHighlightedField(new Field("*").highlighterType(highlighter)).get();
+        assertHighlight(search, 0, "text", 0, equalTo("<em>text</em>"));
+    }
+
+    @Test
+    public void testPlainHighlighterWithLongUnanalyzedStringTerm() throws IOException {
+        XContentBuilder mappings = jsonBuilder();
+        mappings.startObject();
+        mappings.startObject("type")
+                .startObject("properties")
+                .startObject("long_text")
+                .field("type", "string")
+                .field("analyzer", "keyword")
+                .field("index_options", "offsets")
+                .field("term_vector", "with_positions_offsets")
+                .field("ignore_above", 1)
+                .endObject()
+                .startObject("text")
+                .field("type", "string")
+                .field("analyzer", "keyword")
+                .field("index_options", "offsets")
+                .field("term_vector", "with_positions_offsets")
+                .endObject()
+                .endObject()
+                .endObject();
+        mappings.endObject();
+        assertAcked(prepareCreate("test")
+                .addMapping("type", mappings));
+        ensureYellow();
+        // crate a term that is larger than the allowed 32766, index it and then try highlight on it
+        // the search request should still succeed
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < 32767; i++) {
+            builder.append('a');
+        }
+        client().prepareIndex("test", "type", "1")
+                .setSource(jsonBuilder().startObject().field("long_text", builder.toString()).field("text", "text").endObject())
+                .get();
+        refresh();
+        String highlighter = randomFrom(new String[]{"plain", "postings", "fvh"});
+        SearchResponse search = client().prepareSearch().setQuery(constantScoreQuery(matchQuery("text", "text"))).addHighlightedField(new Field("*").highlighterType(highlighter)).get();
+        assertHighlight(search, 0, "text", 0, equalTo("<em>text</em>"));
+        search = client().prepareSearch().setQuery(constantScoreQuery(matchQuery("text", "text"))).addHighlightedField(new Field("long_text").highlighterType(highlighter)).get();
+        assertNoFailures(search);
+        assertThat(search.getHits().getAt(0).getHighlightFields().size(), equalTo(0));
+    }
+
+    @Test
+    public void testHighlightingWhenFieldsAreNotStoredThereIsNoSource() throws IOException {
+        XContentBuilder mappings = jsonBuilder();
+        mappings.startObject();
+        mappings.startObject("type")
+                .startObject("_source")
+                .field("enabled", false)
+                .endObject()
+                .startObject("properties")
+                .startObject("unstored_field")
+                .field("index_options", "offsets")
+                .field("term_vector", "with_positions_offsets")
+                .field("type", "string")
+                .field("store", "no")
+                .endObject()
+                .startObject("text")
+                .field("index_options", "offsets")
+                .field("term_vector", "with_positions_offsets")
+                .field("type", "string")
+                .field("store", "yes")
+                .endObject()
+                .endObject()
+                .endObject();
+        mappings.endObject();
+        assertAcked(prepareCreate("test")
+                .addMapping("type", mappings));
+        ensureYellow();
+        client().prepareIndex("test", "type", "1")
+                .setSource(jsonBuilder().startObject().field("unstored_text", "text").field("text", "text").endObject())
+                .get();
+        refresh();
+        String highlighter = randomFrom(new String[]{"plain", "postings", "fvh"});
+        SearchResponse search = client().prepareSearch().setQuery(constantScoreQuery(matchQuery("text", "text"))).addHighlightedField(new Field("*").highlighterType(highlighter)).get();
+        assertHighlight(search, 0, "text", 0, equalTo("<em>text</em>"));
+        search = client().prepareSearch().setQuery(constantScoreQuery(matchQuery("text", "text"))).addHighlightedField(new Field("unstored_text")).get();
+        assertNoFailures(search);
+        assertThat(search.getHits().getAt(0).getHighlightFields().size(), equalTo(0));
+    }
+
+
     @Test
     // see #3486
     public void testHighTermFrequencyDoc() throws IOException {
@@ -1171,12 +1283,11 @@ public class HighlighterSearchTests extends ElasticsearchIntegrationTest {
                 RestStatus.BAD_REQUEST,
                 containsString("the field [title] should be indexed with term vector with position offsets to be used with fast vector highlighter"));
 
-        assertFailures(client().prepareSearch()
+        //should not fail if there is a wildcard
+        assertNoFailures(client().prepareSearch()
                 .setQuery(matchPhraseQuery("title", "this is a test"))
                 .addHighlightedField("tit*", 50, 1, 10)
-                .setHighlighterType("fast-vector-highlighter"),
-                RestStatus.BAD_REQUEST,
-                containsString("the field [title] should be indexed with term vector with position offsets to be used with fast vector highlighter"));
+                .setHighlighterType("fast-vector-highlighter").get());
     }
 
     @Test
@@ -2169,12 +2280,11 @@ public class HighlighterSearchTests extends ElasticsearchIntegrationTest {
                 RestStatus.BAD_REQUEST,
                 containsString("the field [title] should be indexed with positions and offsets in the postings list to be used with postings highlighter"));
 
-        assertFailures(client().prepareSearch()
+        //should not fail if there is a wildcard
+        assertNoFailures(client().prepareSearch()
                         .setQuery(matchQuery("title", "this is a test"))
                         .addHighlightedField("tit*")
-                        .setHighlighterType("postings"),
-                RestStatus.BAD_REQUEST,
-                containsString("the field [title] should be indexed with positions and offsets in the postings list to be used with postings highlighter"));
+                        .setHighlighterType("postings").get());
     }
 
     @Test

From 9d5e7895080cd186f8cea327f4fa43445476bee6 Mon Sep 17 00:00:00 2001
From: Alexander Reelsen <alexander@reelsen.net>
Date: Wed, 27 May 2015 17:38:31 +0200
Subject: [PATCH 035/123] Cat API: Do not rely on hashmap for sorted entries

The tests for the recently added added wildcard feature were
relying on order of the hashmap being used, which could be
different.

The implementation now ensures, that the header fields are
parsed in the order they have been added.
---
 rest-api-spec/test/cat.thread_pool/10_basic.yaml         | 2 +-
 .../org/elasticsearch/rest/action/support/RestTable.java | 9 ++++-----
 .../elasticsearch/rest/action/support/RestTableTest.java | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/rest-api-spec/test/cat.thread_pool/10_basic.yaml b/rest-api-spec/test/cat.thread_pool/10_basic.yaml
index 37994201191..283e353b7a3 100755
--- a/rest-api-spec/test/cat.thread_pool/10_basic.yaml
+++ b/rest-api-spec/test/cat.thread_pool/10_basic.yaml
@@ -36,7 +36,7 @@
 
   - match:
       $body: |
-               /^ bulk.max  \s+  bulk.min \s+ \n
+               /^ bulk.min  \s+  bulk.max \s+ \n
                  (\s+  \d+  \s+  \d+  \s+ \n)+  $/
 
 #(\s+  \d+  \s+  \d+ \n)+  $/
diff --git a/src/main/java/org/elasticsearch/rest/action/support/RestTable.java b/src/main/java/org/elasticsearch/rest/action/support/RestTable.java
index 0b5b44112f4..3e6eb713529 100644
--- a/src/main/java/org/elasticsearch/rest/action/support/RestTable.java
+++ b/src/main/java/org/elasticsearch/rest/action/support/RestTable.java
@@ -157,16 +157,15 @@ public class RestTable {
     private static Set<String> expandHeadersFromRequest(Table table, RestRequest request) {
         Set<String> headers = new LinkedHashSet<>(table.getHeaders().size());
 
-        Map<String, Table.Cell> headerMap = table.getHeaderMap();
         // check headers and aliases
         for (String header : Strings.splitStringByCommaToArray(request.param("h"))) {
             if (Regex.isSimpleMatchPattern(header)) {
-                for (Map.Entry<String, Table.Cell> configuredHeaderEntry : headerMap.entrySet()) {
-                    String configuredHeader = configuredHeaderEntry.getKey();
+                for (Table.Cell tableHeaderCell : table.getHeaders()) {
+                    String configuredHeader = tableHeaderCell.value.toString();
                     if (Regex.simpleMatch(header, configuredHeader)) {
                         headers.add(configuredHeader);
-                    } else if (configuredHeaderEntry.getValue().attr.containsKey("alias")) {
-                        String[] aliases = Strings.splitStringByCommaToArray(configuredHeaderEntry.getValue().attr.get("alias"));
+                    } else if (tableHeaderCell.attr.containsKey("alias")) {
+                        String[] aliases = Strings.splitStringByCommaToArray(tableHeaderCell.attr.get("alias"));
                         for (String alias : aliases) {
                             if (Regex.simpleMatch(header, alias)) {
                                 headers.add(configuredHeader);
diff --git a/src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java b/src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java
index bdf0a07cbf5..3faa0ea3673 100644
--- a/src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java
+++ b/src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java
@@ -57,7 +57,7 @@ public class RestTableTest extends ElasticsearchTestCase {
         List<RestTable.DisplayHeader> headers = buildDisplayHeaders(table, restRequest);
 
         List<String> headerNames = getHeaderNames(headers);
-        assertThat(headerNames, containsInAnyOrder("bulk.foo", "bulk.bar", "aliasedBulk", "aliasedSecondBulk"));
+        assertThat(headerNames, contains("bulk.foo", "bulk.bar", "aliasedBulk", "aliasedSecondBulk"));
         assertThat(headerNames, not(hasItem("unmatched")));
     }
 
@@ -67,7 +67,7 @@ public class RestTableTest extends ElasticsearchTestCase {
         List<RestTable.DisplayHeader> headers = buildDisplayHeaders(table, restRequest);
 
         List<String> headerNames = getHeaderNames(headers);
-        assertThat(headerNames, containsInAnyOrder("bulk.foo", "bulk.bar", "aliasedBulk", "aliasedSecondBulk"));
+        assertThat(headerNames, contains("bulk.foo", "bulk.bar", "aliasedBulk", "aliasedSecondBulk"));
         assertThat(headerNames, not(hasItem("unmatched")));
     }
 

From acb07c72b9d2fd6e21f9710ffbdf4573c01c9f22 Mon Sep 17 00:00:00 2001
From: Tanguy Leroux <tlrx.dev@gmail.com>
Date: Mon, 25 May 2015 15:06:56 +0200
Subject: [PATCH 036/123] Bulk: throw exception if unrecognized parameter in
 action/metadata line

Closes #10977
---
 .../action/bulk/BulkRequest.java              | 80 +++++++++++--------
 .../action/bulk/BulkRequestTests.java         | 52 ++++++++++++
 .../action/bulk/simple-bulk6.json             |  6 ++
 .../action/bulk/simple-bulk7.json             |  6 ++
 .../action/bulk/simple-bulk8.json             |  6 ++
 .../action/bulk/simple-bulk9.json             |  4 +
 6 files changed, 121 insertions(+), 33 deletions(-)
 create mode 100644 src/test/java/org/elasticsearch/action/bulk/simple-bulk6.json
 create mode 100644 src/test/java/org/elasticsearch/action/bulk/simple-bulk7.json
 create mode 100644 src/test/java/org/elasticsearch/action/bulk/simple-bulk8.json
 create mode 100644 src/test/java/org/elasticsearch/action/bulk/simple-bulk9.json

diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java b/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java
index 617c3fc32bd..715c1d716d9 100644
--- a/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java
+++ b/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java
@@ -246,6 +246,7 @@ public class BulkRequest extends ActionRequest<BulkRequest> implements Composite
 
     public BulkRequest add(BytesReference data, @Nullable String defaultIndex, @Nullable String defaultType, @Nullable String defaultRouting, @Nullable Object payload, boolean allowExplicitIndex) throws Exception {
         XContent xContent = XContentFactory.xContent(data);
+        int line = 0;
         int from = 0;
         int length = data.length();
         byte marker = xContent.streamSeparator();
@@ -254,8 +255,9 @@ public class BulkRequest extends ActionRequest<BulkRequest> implements Composite
             if (nextMarker == -1) {
                 break;
             }
-            // now parse the action
+            line++;
 
+            // now parse the action
             try (XContentParser parser = xContent.createParser(data.slice(from, nextMarker - from))) {
                 // move pointers
                 from = nextMarker + 1;
@@ -285,43 +287,53 @@ public class BulkRequest extends ActionRequest<BulkRequest> implements Composite
 
                 // at this stage, next token can either be END_OBJECT (and use default index and type, with auto generated id)
                 // or START_OBJECT which will have another set of parameters
+                token = parser.nextToken();
 
-                String currentFieldName = null;
-                while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
-                    if (token == XContentParser.Token.FIELD_NAME) {
-                        currentFieldName = parser.currentName();
-                    } else if (token.isValue()) {
-                        if ("_index".equals(currentFieldName)) {
-                            if (!allowExplicitIndex) {
-                                throw new IllegalArgumentException("explicit index in bulk is not allowed");
-                            }
-                            index = parser.text();
-                        } else if ("_type".equals(currentFieldName)) {
-                            type = parser.text();
-                        } else if ("_id".equals(currentFieldName)) {
-                            id = parser.text();
-                        } else if ("_routing".equals(currentFieldName) || "routing".equals(currentFieldName)) {
-                            routing = parser.text();
-                        } else if ("_parent".equals(currentFieldName) || "parent".equals(currentFieldName)) {
-                            parent = parser.text();
-                        } else if ("_timestamp".equals(currentFieldName) || "timestamp".equals(currentFieldName)) {
-                            timestamp = parser.text();
-                        } else if ("_ttl".equals(currentFieldName) || "ttl".equals(currentFieldName)) {
-                            if (parser.currentToken() == XContentParser.Token.VALUE_STRING) {
-                                ttl = TimeValue.parseTimeValue(parser.text(), null).millis();
+                if (token == XContentParser.Token.START_OBJECT) {
+                    String currentFieldName = null;
+                    while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
+                        if (token == XContentParser.Token.FIELD_NAME) {
+                            currentFieldName = parser.currentName();
+                        } else if (token.isValue()) {
+                            if ("_index".equals(currentFieldName)) {
+                                if (!allowExplicitIndex) {
+                                    throw new IllegalArgumentException("explicit index in bulk is not allowed");
+                                }
+                                index = parser.text();
+                            } else if ("_type".equals(currentFieldName)) {
+                                type = parser.text();
+                            } else if ("_id".equals(currentFieldName)) {
+                                id = parser.text();
+                            } else if ("_routing".equals(currentFieldName) || "routing".equals(currentFieldName)) {
+                                routing = parser.text();
+                            } else if ("_parent".equals(currentFieldName) || "parent".equals(currentFieldName)) {
+                                parent = parser.text();
+                            } else if ("_timestamp".equals(currentFieldName) || "timestamp".equals(currentFieldName)) {
+                                timestamp = parser.text();
+                            } else if ("_ttl".equals(currentFieldName) || "ttl".equals(currentFieldName)) {
+                                if (parser.currentToken() == XContentParser.Token.VALUE_STRING) {
+                                    ttl = TimeValue.parseTimeValue(parser.text(), null).millis();
+                                } else {
+                                    ttl = parser.longValue();
+                                }
+                            } else if ("op_type".equals(currentFieldName) || "opType".equals(currentFieldName)) {
+                                opType = parser.text();
+                            } else if ("_version".equals(currentFieldName) || "version".equals(currentFieldName)) {
+                                version = parser.longValue();
+                            } else if ("_version_type".equals(currentFieldName) || "_versionType".equals(currentFieldName) || "version_type".equals(currentFieldName) || "versionType".equals(currentFieldName)) {
+                                versionType = VersionType.fromString(parser.text());
+                            } else if ("_retry_on_conflict".equals(currentFieldName) || "_retryOnConflict".equals(currentFieldName)) {
+                                retryOnConflict = parser.intValue();
                             } else {
-                                ttl = parser.longValue();
+                                throw new IllegalArgumentException("Action/metadata line [" + line + "] contains an unknown parameter [" + currentFieldName + "]");
                             }
-                        } else if ("op_type".equals(currentFieldName) || "opType".equals(currentFieldName)) {
-                            opType = parser.text();
-                        } else if ("_version".equals(currentFieldName) || "version".equals(currentFieldName)) {
-                            version = parser.longValue();
-                        } else if ("_version_type".equals(currentFieldName) || "_versionType".equals(currentFieldName) || "version_type".equals(currentFieldName) || "versionType".equals(currentFieldName)) {
-                            versionType = VersionType.fromString(parser.text());
-                        } else if ("_retry_on_conflict".equals(currentFieldName) || "_retryOnConflict".equals(currentFieldName)) {
-                            retryOnConflict = parser.intValue();
+                        } else {
+                            throw new IllegalArgumentException("Malformed action/metadata line [" + line + "], expected a simple value for field [" + currentFieldName + "] but found [" + token + "]");
                         }
                     }
+                } else if (token != XContentParser.Token.END_OBJECT) {
+                    throw new IllegalArgumentException("Malformed action/metadata line [" + line + "], expected " + XContentParser.Token.START_OBJECT
+                            + " or " + XContentParser.Token.END_OBJECT + " but found [" + token + "]");
                 }
 
                 if ("delete".equals(action)) {
@@ -331,6 +343,8 @@ public class BulkRequest extends ActionRequest<BulkRequest> implements Composite
                     if (nextMarker == -1) {
                         break;
                     }
+                    line++;
+
                     // order is important, we set parent after routing, so routing will be set to parent if not set explicitly
                     // we use internalAdd so we don't fork here, this allows us not to copy over the big byte array to small chunks
                     // of index request.
diff --git a/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java b/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java
index 3e1e762b45c..040bb81ef6b 100644
--- a/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java
+++ b/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java
@@ -117,4 +117,56 @@ public class BulkRequestTests extends ElasticsearchTestCase {
         assertThat(bulkRequest.requests().get(1), instanceOf(UpdateRequest.class));
         assertThat(bulkRequest.requests().get(2), instanceOf(DeleteRequest.class));
     }
+
+    @Test
+    public void testSimpleBulk6() throws Exception {
+        String bulkAction = copyToStringFromClasspath("/org/elasticsearch/action/bulk/simple-bulk6.json");
+        BulkRequest bulkRequest = new BulkRequest();
+        try {
+            bulkRequest.add(bulkAction.getBytes(Charsets.UTF_8), 0, bulkAction.length(), null, null);
+            fail("should have thrown an exception about the wrong format of line 1");
+        } catch (IllegalArgumentException e) {
+            assertThat("message contains error about the wrong format of line 1: " + e.getMessage(),
+                    e.getMessage().contains("Malformed action/metadata line [1], expected a simple value for field [_source] but found [START_OBJECT]"), equalTo(true));
+        }
+    }
+
+    @Test
+    public void testSimpleBulk7() throws Exception {
+        String bulkAction = copyToStringFromClasspath("/org/elasticsearch/action/bulk/simple-bulk7.json");
+        BulkRequest bulkRequest = new BulkRequest();
+        try {
+            bulkRequest.add(bulkAction.getBytes(Charsets.UTF_8), 0, bulkAction.length(), null, null);
+            fail("should have thrown an exception about the wrong format of line 5");
+        } catch (IllegalArgumentException e) {
+            assertThat("message contains error about the wrong format of line 5: " + e.getMessage(),
+                    e.getMessage().contains("Malformed action/metadata line [5], expected a simple value for field [_unkown] but found [START_ARRAY]"), equalTo(true));
+        }
+    }
+
+    @Test
+    public void testSimpleBulk8() throws Exception {
+        String bulkAction = copyToStringFromClasspath("/org/elasticsearch/action/bulk/simple-bulk8.json");
+        BulkRequest bulkRequest = new BulkRequest();
+        try {
+            bulkRequest.add(bulkAction.getBytes(Charsets.UTF_8), 0, bulkAction.length(), null, null);
+            fail("should have thrown an exception about the unknown paramater _foo");
+        } catch (IllegalArgumentException e) {
+            assertThat("message contains error about the unknown paramater _foo: " + e.getMessage(),
+                    e.getMessage().contains("Action/metadata line [3] contains an unknown parameter [_foo]"), equalTo(true));
+        }
+    }
+
+    @Test
+    public void testSimpleBulk9() throws Exception {
+        String bulkAction = copyToStringFromClasspath("/org/elasticsearch/action/bulk/simple-bulk9.json");
+        BulkRequest bulkRequest = new BulkRequest();
+        try {
+            bulkRequest.add(bulkAction.getBytes(Charsets.UTF_8), 0, bulkAction.length(), null, null);
+            fail("should have thrown an exception about the wrong format of line 3");
+        } catch (IllegalArgumentException e) {
+            assertThat("message contains error about the wrong format of line 3: " + e.getMessage(),
+                    e.getMessage().contains("Malformed action/metadata line [3], expected START_OBJECT or END_OBJECT but found [START_ARRAY]"), equalTo(true));
+        }
+    }
 }
diff --git a/src/test/java/org/elasticsearch/action/bulk/simple-bulk6.json b/src/test/java/org/elasticsearch/action/bulk/simple-bulk6.json
new file mode 100644
index 00000000000..e9c97965595
--- /dev/null
+++ b/src/test/java/org/elasticsearch/action/bulk/simple-bulk6.json
@@ -0,0 +1,6 @@
+{"index": {"_index": "test", "_type": "doc", "_source": {"hello": "world"}, "_id": 0}}
+{"field1": "value0"}
+{"index": {"_index": "test", "_type": "doc", "_id": 1}}
+{"field1": "value1"}
+{"index": {"_index": "test", "_type": "doc", "_id": 2}}
+{"field1": "value2"}
diff --git a/src/test/java/org/elasticsearch/action/bulk/simple-bulk7.json b/src/test/java/org/elasticsearch/action/bulk/simple-bulk7.json
new file mode 100644
index 00000000000..a642d9ce4fe
--- /dev/null
+++ b/src/test/java/org/elasticsearch/action/bulk/simple-bulk7.json
@@ -0,0 +1,6 @@
+{"index": {"_index": "test", "_type": "doc", "_id": 0}}
+{"field1": "value0"}
+{"index": {"_index": "test", "_type": "doc", "_id": 1}}
+{"field1": "value1"}
+{"index": {"_index": "test", "_type": "doc", "_id": 2, "_unkown": ["foo", "bar"]}}
+{"field1": "value2"}
diff --git a/src/test/java/org/elasticsearch/action/bulk/simple-bulk8.json b/src/test/java/org/elasticsearch/action/bulk/simple-bulk8.json
new file mode 100644
index 00000000000..c1a94b1d159
--- /dev/null
+++ b/src/test/java/org/elasticsearch/action/bulk/simple-bulk8.json
@@ -0,0 +1,6 @@
+{"index": {"_index": "test", "_type": "doc", "_id": 0}}
+{"field1": "value0"}
+{"index": {"_index": "test", "_type": "doc", "_id": 1, "_foo": "bar"}}
+{"field1": "value1"}
+{"index": {"_index": "test", "_type": "doc", "_id": 2}}
+{"field1": "value2"}
diff --git a/src/test/java/org/elasticsearch/action/bulk/simple-bulk9.json b/src/test/java/org/elasticsearch/action/bulk/simple-bulk9.json
new file mode 100644
index 00000000000..ebdbf750116
--- /dev/null
+++ b/src/test/java/org/elasticsearch/action/bulk/simple-bulk9.json
@@ -0,0 +1,4 @@
+{"index": {}}
+{"field1": "value0"}
+{"index": ["bar"] }
+{"field1": "value1"}

From 098c01d86c5c2fbd28cdcc86db5646fcac9edd69 Mon Sep 17 00:00:00 2001
From: Adrien Grand <jpountz@gmail.com>
Date: Wed, 27 May 2015 18:25:38 +0200
Subject: [PATCH 037/123] Internal: remove unused code.

---
 .../allocator/BalancedShardsAllocator.java    |   3 +-
 .../common/collect/BoundedTreeSet.java        |  63 ---
 .../common/collect/IdentityHashSet.java       | 201 ----------
 .../common/collect/ImmutableOpenLongMap.java  | 376 ------------------
 .../common/collect/Iterators2.java            |  65 ---
 .../common/lucene/HashedBytesRef.java         |  85 ----
 .../ThreadSafeInputStreamIndexInput.java      |  39 --
 .../elasticsearch/common/unit/Percent.java    |  64 ---
 .../common/collect/Iterators2Tests.java       |  50 ---
 9 files changed, 1 insertion(+), 945 deletions(-)
 delete mode 100644 src/main/java/org/elasticsearch/common/collect/BoundedTreeSet.java
 delete mode 100644 src/main/java/org/elasticsearch/common/collect/IdentityHashSet.java
 delete mode 100644 src/main/java/org/elasticsearch/common/collect/ImmutableOpenLongMap.java
 delete mode 100644 src/main/java/org/elasticsearch/common/collect/Iterators2.java
 delete mode 100644 src/main/java/org/elasticsearch/common/lucene/HashedBytesRef.java
 delete mode 100644 src/main/java/org/elasticsearch/common/lucene/store/ThreadSafeInputStreamIndexInput.java
 delete mode 100644 src/main/java/org/elasticsearch/common/unit/Percent.java
 delete mode 100644 src/test/java/org/elasticsearch/common/collect/Iterators2Tests.java

diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
index 11f3e45653f..d4a268d522b 100644
--- a/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
+++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
@@ -33,7 +33,6 @@ import org.elasticsearch.cluster.routing.allocation.StartedRerouteAllocation;
 import org.elasticsearch.cluster.routing.allocation.decider.AllocationDeciders;
 import org.elasticsearch.cluster.routing.allocation.decider.Decision;
 import org.elasticsearch.cluster.routing.allocation.decider.Decision.Type;
-import org.elasticsearch.common.collect.IdentityHashSet;
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.logging.ESLogger;
@@ -597,7 +596,7 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
             int secondaryLength = 0;
             int primaryLength = primary.length;
             ArrayUtil.timSort(primary, comparator);
-            final Set<ModelNode> throttledNodes = new IdentityHashSet<>();
+            final Set<ModelNode> throttledNodes = Collections.newSetFromMap(new IdentityHashMap<ModelNode, Boolean>());
             do {
                 for (int i = 0; i < primaryLength; i++) {
                     MutableShardRouting shard = primary[i];
diff --git a/src/main/java/org/elasticsearch/common/collect/BoundedTreeSet.java b/src/main/java/org/elasticsearch/common/collect/BoundedTreeSet.java
deleted file mode 100644
index 2adec0f283d..00000000000
--- a/src/main/java/org/elasticsearch/common/collect/BoundedTreeSet.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.common.collect;
-
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.TreeSet;
-
-/**
- * A {@link TreeSet} that is bounded by size.
- *
- *
- */
-public class BoundedTreeSet<E> extends TreeSet<E> {
-
-    private final int size;
-
-    public BoundedTreeSet(int size) {
-        this.size = size;
-    }
-
-    public BoundedTreeSet(Comparator<? super E> comparator, int size) {
-        super(comparator);
-        this.size = size;
-    }
-
-    @Override
-    public boolean add(E e) {
-        boolean result = super.add(e);
-        rebound();
-        return result;
-    }
-
-    @Override
-    public boolean addAll(Collection<? extends E> c) {
-        boolean result = super.addAll(c);
-        rebound();
-        return result;
-    }
-
-    private void rebound() {
-        while (size() > size) {
-            remove(last());
-        }
-    }
-}
diff --git a/src/main/java/org/elasticsearch/common/collect/IdentityHashSet.java b/src/main/java/org/elasticsearch/common/collect/IdentityHashSet.java
deleted file mode 100644
index e3e4834519b..00000000000
--- a/src/main/java/org/elasticsearch/common/collect/IdentityHashSet.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.common.collect;
-
-import java.util.*;
-
-/**
- *
- */
-public class IdentityHashSet<E>
-        extends AbstractSet<E>
-        implements Set<E>, Cloneable, java.io.Serializable {
-
-    static final long serialVersionUID = -5024744406713321677L;
-
-    private transient IdentityHashMap<E, Object> map;
-
-    // Dummy value to associate with an Object in the backing Map
-    private static final Object PRESENT = new Object();
-
-    public IdentityHashSet() {
-        map = new IdentityHashMap<>();
-    }
-
-    public IdentityHashSet(Collection<? extends E> c) {
-        map = new IdentityHashMap<>(Math.max((int) (c.size() / .75f) + 1, 16));
-        addAll(c);
-    }
-
-    public IdentityHashSet(int expectedSize) {
-        map = new IdentityHashMap<>(expectedSize);
-    }
-
-    /**
-     * Returns an iterator over the elements in this set.  The elements
-     * are returned in no particular order.
-     *
-     * @return an Iterator over the elements in this set
-     * @see ConcurrentModificationException
-     */
-    @Override
-    public Iterator<E> iterator() {
-        return map.keySet().iterator();
-    }
-
-    /**
-     * Returns the number of elements in this set (its cardinality).
-     *
-     * @return the number of elements in this set (its cardinality)
-     */
-    @Override
-    public int size() {
-        return map.size();
-    }
-
-    /**
-     * Returns <tt>true</tt> if this set contains no elements.
-     *
-     * @return <tt>true</tt> if this set contains no elements
-     */
-    @Override
-    public boolean isEmpty() {
-        return map.isEmpty();
-    }
-
-    /**
-     * Returns <tt>true</tt> if this set contains the specified element.
-     * More formally, returns <tt>true</tt> if and only if this set
-     * contains an element <tt>e</tt> such that
-     * <tt>(o==e)</tt>.
-     *
-     * @param o element whose presence in this set is to be tested
-     * @return <tt>true</tt> if this set contains the specified element
-     */
-    @Override
-    public boolean contains(Object o) {
-        return map.containsKey(o);
-    }
-
-    /**
-     * Adds the specified element to this set if it is not already present.
-     * More formally, adds the specified element <tt>e</tt> to this set if
-     * this set contains no element <tt>e2</tt> such that
-     * <tt>(e==e2)</tt>.
-     * If this set already contains the element, the call leaves the set
-     * unchanged and returns <tt>false</tt>.
-     *
-     * @param e element to be added to this set
-     * @return <tt>true</tt> if this set did not already contain the specified
-     *         element
-     */
-    @Override
-    public boolean add(E e) {
-        return map.put(e, PRESENT) == null;
-    }
-
-    /**
-     * Removes the specified element from this set if it is present.
-     * More formally, removes an element <tt>e</tt> such that
-     * <tt>(o==e)</tt>,
-     * if this set contains such an element.  Returns <tt>true</tt> if
-     * this set contained the element (or equivalently, if this set
-     * changed as a result of the call).  (This set will not contain the
-     * element once the call returns.)
-     *
-     * @param o object to be removed from this set, if present
-     * @return <tt>true</tt> if the set contained the specified element
-     */
-    @Override
-    public boolean remove(Object o) {
-        return map.remove(o) == PRESENT;
-    }
-
-    /**
-     * Removes all of the elements from this set.
-     * The set will be empty after this call returns.
-     */
-    @Override
-    public void clear() {
-        map.clear();
-    }
-
-    /**
-     * Returns a shallow copy of this <tt>HashSet</tt> instance: the elements
-     * themselves are not cloned.
-     *
-     * @return a shallow copy of this set
-     */
-    @Override
-    public Object clone() {
-        try {
-            IdentityHashSet<E> newSet = (IdentityHashSet<E>) super.clone();
-            newSet.map = (IdentityHashMap<E, Object>) map.clone();
-            return newSet;
-        } catch (CloneNotSupportedException e) {
-            throw new InternalError();
-        }
-    }
-
-    /**
-     * Index the state of this <tt>HashSet</tt> instance to a stream (that is,
-     * serialize it).
-     *
-     * @serialData The capacity of the backing <tt>HashMap</tt> instance
-     * (int), and its load factor (float) are emitted, followed by
-     * the size of the set (the number of elements it contains)
-     * (int), followed by all of its elements (each an Object) in
-     * no particular order.
-     */
-    private void writeObject(java.io.ObjectOutputStream s)
-            throws java.io.IOException {
-        // Write out any hidden serialization magic
-        s.defaultWriteObject();
-
-        // Write out size
-        s.writeInt(map.size());
-
-        // Write out all elements in the proper order.
-        for (Iterator i = map.keySet().iterator(); i.hasNext(); )
-            s.writeObject(i.next());
-    }
-
-    /**
-     * Reconstitute the <tt>HashSet</tt> instance from a stream (that is,
-     * deserialize it).
-     */
-    private void readObject(java.io.ObjectInputStream s)
-            throws java.io.IOException, ClassNotFoundException {
-        // Read in any hidden serialization magic
-        s.defaultReadObject();
-
-        // Read in size
-        int size = s.readInt();
-
-        map = new IdentityHashMap<>(size);
-
-        // Read in all elements in the proper order.
-        for (int i = 0; i < size; i++) {
-            E e = (E) s.readObject();
-            map.put(e, PRESENT);
-        }
-    }
-}
-
diff --git a/src/main/java/org/elasticsearch/common/collect/ImmutableOpenLongMap.java b/src/main/java/org/elasticsearch/common/collect/ImmutableOpenLongMap.java
deleted file mode 100644
index 571b54ebeeb..00000000000
--- a/src/main/java/org/elasticsearch/common/collect/ImmutableOpenLongMap.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.common.collect;
-
-import com.carrotsearch.hppc.*;
-import com.carrotsearch.hppc.cursors.LongCursor;
-import com.carrotsearch.hppc.cursors.LongObjectCursor;
-import com.carrotsearch.hppc.cursors.ObjectCursor;
-import com.carrotsearch.hppc.predicates.IntObjectPredicate;
-import com.carrotsearch.hppc.predicates.LongObjectPredicate;
-import com.carrotsearch.hppc.predicates.LongPredicate;
-import com.carrotsearch.hppc.procedures.LongObjectProcedure;
-import com.google.common.collect.UnmodifiableIterator;
-
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * An immutable map implementation based on open hash map.
- * <p/>
- * Can be constructed using a {@link #builder()}, or using {@link #builder(org.elasticsearch.common.collect.ImmutableOpenLongMap)} (which is an optimized
- * option to copy over existing content and modify it).
- */
-public final class ImmutableOpenLongMap<VType> implements Iterable<LongObjectCursor<VType>> {
-
-    private final LongObjectHashMap<VType> map;
-
-    private ImmutableOpenLongMap(LongObjectHashMap<VType> map) {
-        this.map = map;
-    }
-
-    /**
-     * @return Returns the value associated with the given key or the default value
-     * for the key type, if the key is not associated with any value.
-     * <p/>
-     * <b>Important note:</b> For primitive type values, the value returned for a non-existing
-     * key may not be the default value of the primitive type (it may be any value previously
-     * assigned to that slot).
-     */
-    public VType get(long key) {
-        return map.get(key);
-    }
-
-    /**
-     * Returns <code>true</code> if this container has an association to a value for
-     * the given key.
-     */
-    public boolean containsKey(long key) {
-        return map.containsKey(key);
-    }
-
-    /**
-     * @return Returns the current size (number of assigned keys) in the container.
-     */
-    public int size() {
-        return map.size();
-    }
-
-    /**
-     * @return Return <code>true</code> if this hash map contains no assigned keys.
-     */
-    public boolean isEmpty() {
-        return map.isEmpty();
-    }
-
-    /**
-     * Returns a cursor over the entries (key-value pairs) in this map. The iterator is
-     * implemented as a cursor and it returns <b>the same cursor instance</b> on every
-     * call to {@link java.util.Iterator#next()}. To read the current key and value use the cursor's
-     * public fields. An example is shown below.
-     * <pre>
-     * for (IntShortCursor c : intShortMap)
-     * {
-     *     System.out.println(&quot;index=&quot; + c.index
-     *       + &quot; key=&quot; + c.key
-     *       + &quot; value=&quot; + c.value);
-     * }
-     * </pre>
-     * <p/>
-     * <p>The <code>index</code> field inside the cursor gives the internal index inside
-     * the container's implementation. The interpretation of this index depends on
-     * to the container.
-     */
-    @Override
-    public Iterator<LongObjectCursor<VType>> iterator() {
-        return map.iterator();
-    }
-
-    /**
-     * Returns a specialized view of the keys of this associated container.
-     * The view additionally implements {@link com.carrotsearch.hppc.ObjectLookupContainer}.
-     */
-    public LongLookupContainer keys() {
-        return map.keys();
-    }
-
-    /**
-     * Returns a direct iterator over the keys.
-     */
-    public UnmodifiableIterator<Long> keysIt() {
-        final Iterator<LongCursor> iterator = map.keys().iterator();
-        return new UnmodifiableIterator<Long>() {
-            @Override
-            public boolean hasNext() {
-                return iterator.hasNext();
-            }
-
-            @Override
-            public Long next() {
-                return iterator.next().value;
-            }
-        };
-    }
-
-    /**
-     * @return Returns a container with all values stored in this map.
-     */
-    public ObjectContainer<VType> values() {
-        return map.values();
-    }
-
-    /**
-     * Returns a direct iterator over the keys.
-     */
-    public UnmodifiableIterator<VType> valuesIt() {
-        final Iterator<ObjectCursor<VType>> iterator = map.values().iterator();
-        return new UnmodifiableIterator<VType>() {
-            @Override
-            public boolean hasNext() {
-                return iterator.hasNext();
-            }
-
-            @Override
-            public VType next() {
-                return iterator.next().value;
-            }
-        };
-    }
-
-    @Override
-    public String toString() {
-        return map.toString();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        ImmutableOpenLongMap that = (ImmutableOpenLongMap) o;
-
-        if (!map.equals(that.map)) return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return map.hashCode();
-    }
-
-    @SuppressWarnings("unchecked")
-    private static final ImmutableOpenLongMap EMPTY = new ImmutableOpenLongMap(new LongObjectHashMap());
-
-    @SuppressWarnings("unchecked")
-    public static <VType> ImmutableOpenLongMap<VType> of() {
-        return EMPTY;
-    }
-
-    public static <VType> Builder<VType> builder() {
-        return new Builder<>();
-    }
-
-    public static <VType> Builder<VType> builder(int size) {
-        return new Builder<>(size);
-    }
-
-    public static <VType> Builder<VType> builder(ImmutableOpenLongMap<VType> map) {
-        return new Builder<>(map);
-    }
-
-    public static class Builder<VType> implements LongObjectMap<VType> {
-
-        private LongObjectHashMap<VType> map;
-
-        public Builder() {
-            //noinspection unchecked
-            this(EMPTY);
-        }
-
-        public Builder(int size) {
-            this.map = new LongObjectHashMap<>(size);
-        }
-
-        public Builder(ImmutableOpenLongMap<VType> map) {
-            this.map = map.map.clone();
-        }
-
-        /**
-         * Builds a new instance of the
-         */
-        public ImmutableOpenLongMap<VType> build() {
-            LongObjectHashMap<VType> map = this.map;
-            this.map = null; // nullify the map, so any operation post build will fail! (hackish, but safest)
-            return new ImmutableOpenLongMap<>(map);
-        }
-
-        /**
-         * Puts all the entries in the map to the builder.
-         */
-        public Builder<VType> putAll(Map<Long, VType> map) {
-            for (Map.Entry<Long, VType> entry : map.entrySet()) {
-                this.map.put(entry.getKey(), entry.getValue());
-            }
-            return this;
-        }
-
-        /**
-         * A put operation that can be used in the fluent pattern.
-         */
-        public Builder<VType> fPut(long key, VType value) {
-            map.put(key, value);
-            return this;
-        }
-
-        @Override
-        public VType put(long key, VType value) {
-            return map.put(key, value);
-        }
-
-        @Override
-        public VType get(long key) {
-            return map.get(key);
-        }
-
-        @Override
-        public VType getOrDefault(long kType, VType vType) {
-            return map.getOrDefault(kType, vType);
-        }
-
-        /**
-         * Remove that can be used in the fluent pattern.
-         */
-        public Builder<VType> fRemove(long key) {
-            map.remove(key);
-            return this;
-        }
-
-        @Override
-        public VType remove(long key) {
-            return map.remove(key);
-        }
-
-        @Override
-        public Iterator<LongObjectCursor<VType>> iterator() {
-            return map.iterator();
-        }
-
-        @Override
-        public boolean containsKey(long key) {
-            return map.containsKey(key);
-        }
-
-        @Override
-        public int size() {
-            return map.size();
-        }
-
-        @Override
-        public boolean isEmpty() {
-            return map.isEmpty();
-        }
-
-        @Override
-        public void clear() {
-            map.clear();
-        }
-
-        @Override
-        public int putAll(LongObjectAssociativeContainer<? extends VType> container) {
-            return map.putAll(container);
-        }
-
-        @Override
-        public int putAll(Iterable<? extends LongObjectCursor<? extends VType>> iterable) {
-            return map.putAll(iterable);
-        }
-
-        @Override
-        public int removeAll(LongContainer container) {
-            return map.removeAll(container);
-        }
-
-        @Override
-        public int removeAll(LongPredicate predicate) {
-            return map.removeAll(predicate);
-        }
-
-        @Override
-        public LongCollection keys() {
-            return map.keys();
-        }
-
-        @Override
-        public ObjectContainer<VType> values() {
-            return map.values();
-        }
-
-        @Override
-        public <T extends LongObjectProcedure<? super VType>> T forEach(T procedure) {
-            return map.forEach(procedure);
-        }
-
-        @Override
-        public int indexOf(long key) {
-            return map.indexOf(key);
-        }
-
-        @Override
-        public boolean indexExists(int index) {
-            return map.indexExists(index);
-        }
-
-        @Override
-        public VType indexGet(int index) {
-            return map.indexGet(index);
-        }
-
-        @Override
-        public VType indexReplace(int index, VType newValue) {
-            return map.indexReplace(index, newValue);
-        }
-
-        @Override
-        public void indexInsert(int index, long key, VType value) {
-            map.indexInsert(index, key, value);
-        }
-
-        @Override
-        public void release() {
-            map.release();
-        }
-
-        @Override
-        public String visualizeKeyDistribution(int characters) {
-            return map.visualizeKeyDistribution(characters);
-        }
-
-        @Override
-        public int removeAll(LongObjectPredicate<? super VType> predicate) {
-            return map.removeAll(predicate);
-        }
-
-        @Override
-        public <T extends LongObjectPredicate<? super VType>> T forEach(T predicate) {
-            return map.forEach(predicate);
-        }        
-    }
-}
diff --git a/src/main/java/org/elasticsearch/common/collect/Iterators2.java b/src/main/java/org/elasticsearch/common/collect/Iterators2.java
deleted file mode 100644
index 20c0bd46483..00000000000
--- a/src/main/java/org/elasticsearch/common/collect/Iterators2.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.common.collect;
-
-import com.google.common.collect.Iterators;
-import com.google.common.collect.PeekingIterator;
-import com.google.common.collect.UnmodifiableIterator;
-
-import java.util.Comparator;
-import java.util.Iterator;
-
-public enum Iterators2 {
-    ;
-
-    /** Remove duplicated elements from an iterator over sorted content. */
-    public static <T> Iterator<T> deduplicateSorted(Iterator<? extends T> iterator, final Comparator<? super T> comparator) {
-        // TODO: infer type once JI-9019884 is fixed
-        final PeekingIterator<T> it = Iterators.<T>peekingIterator(iterator);
-        return new UnmodifiableIterator<T>() {
-
-            @Override
-            public boolean hasNext() {
-                return it.hasNext();
-            }
-
-            @Override
-            public T next() {
-                final T ret = it.next();
-                while (it.hasNext() && comparator.compare(ret, it.peek()) == 0) {
-                    it.next();
-                }
-                assert !it.hasNext() || comparator.compare(ret, it.peek()) < 0 : "iterator is not sorted: " + ret + " > " + it.peek();
-                return ret;
-            }
-
-        };
-    }
-
-    /** Return a merged view over several iterators, optionally deduplicating equivalent entries. */
-    public static <T> Iterator<T> mergeSorted(Iterable<Iterator<? extends T>> iterators, Comparator<? super T> comparator, boolean deduplicate) {
-        Iterator<T> it = Iterators.mergeSorted(iterators, comparator);
-        if (deduplicate) {
-            it = deduplicateSorted(it, comparator);
-        }
-        return it;
-    }
-
-}
diff --git a/src/main/java/org/elasticsearch/common/lucene/HashedBytesRef.java b/src/main/java/org/elasticsearch/common/lucene/HashedBytesRef.java
deleted file mode 100644
index a85d786bd89..00000000000
--- a/src/main/java/org/elasticsearch/common/lucene/HashedBytesRef.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.common.lucene;
-
-import org.apache.lucene.util.BytesRef;
-
-/**
- * A wrapped to {@link BytesRef} that also caches the hashCode for it.
- */
-public class HashedBytesRef {
-
-    public BytesRef bytes;
-    public int hash;
-
-    public HashedBytesRef() {
-    }
-
-    public HashedBytesRef(String bytes) {
-        this(new BytesRef(bytes));
-    }
-
-    public HashedBytesRef(BytesRef bytes) {
-        this(bytes, bytes.hashCode());
-    }
-
-    public HashedBytesRef(BytesRef bytes, int hash) {
-        this.bytes = bytes;
-        this.hash = hash;
-    }
-
-    public HashedBytesRef resetHashCode() {
-        this.hash = bytes.hashCode();
-        return this;
-    }
-
-    public HashedBytesRef reset(BytesRef bytes, int hash) {
-        this.bytes = bytes;
-        this.hash = hash;
-        return this;
-    }
-
-    @Override
-    public int hashCode() {
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other instanceof HashedBytesRef) {
-            return bytes.equals(((HashedBytesRef) other).bytes);
-        }
-        return false;
-    }
-
-    @Override
-    public String toString() {
-        return bytes.toString();
-    }
-
-    public HashedBytesRef deepCopy() {
-        return deepCopyOf(this);
-    }
-
-    public static HashedBytesRef deepCopyOf(HashedBytesRef other) {
-        BytesRef copy = BytesRef.deepCopyOf(other.bytes);
-        return new HashedBytesRef(copy, other.hash);
-    }
-}
diff --git a/src/main/java/org/elasticsearch/common/lucene/store/ThreadSafeInputStreamIndexInput.java b/src/main/java/org/elasticsearch/common/lucene/store/ThreadSafeInputStreamIndexInput.java
deleted file mode 100644
index 1d3084e0352..00000000000
--- a/src/main/java/org/elasticsearch/common/lucene/store/ThreadSafeInputStreamIndexInput.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.common.lucene.store;
-
-import org.apache.lucene.store.IndexInput;
-
-import java.io.IOException;
-
-/**
- *
- */
-public class ThreadSafeInputStreamIndexInput extends InputStreamIndexInput {
-
-    public ThreadSafeInputStreamIndexInput(IndexInput indexInput, long limit) {
-        super(indexInput, limit);
-    }
-
-    @Override
-    public synchronized int read(byte[] b, int off, int len) throws IOException {
-        return super.read(b, off, len);
-    }
-}
diff --git a/src/main/java/org/elasticsearch/common/unit/Percent.java b/src/main/java/org/elasticsearch/common/unit/Percent.java
deleted file mode 100644
index 8da3eff6ad4..00000000000
--- a/src/main/java/org/elasticsearch/common/unit/Percent.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.common.unit;
-
-import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.io.stream.Streamable;
-
-import java.io.IOException;
-import java.io.Serializable;
-
-/**
- *
- */
-public class Percent implements Streamable, Serializable {
-
-    private double value;
-
-    public Percent(double value) {
-        this.value = value;
-    }
-
-    public double value() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return format(value);
-    }
-
-    public static String format(double value) {
-        String p = String.valueOf(value * 100.0);
-        int ix = p.indexOf(".") + 1;
-        return p.substring(0, ix) + p.substring(ix, ix + 1) + "%";
-    }
-
-    @Override
-    public void readFrom(StreamInput in) throws IOException {
-        value = in.readDouble();
-    }
-
-    @Override
-    public void writeTo(StreamOutput out) throws IOException {
-        out.writeDouble(value);
-    }
-}
diff --git a/src/test/java/org/elasticsearch/common/collect/Iterators2Tests.java b/src/test/java/org/elasticsearch/common/collect/Iterators2Tests.java
deleted file mode 100644
index 65aa51c8ec0..00000000000
--- a/src/test/java/org/elasticsearch/common/collect/Iterators2Tests.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.common.collect;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Ordering;
-import com.google.common.collect.Sets;
-import org.apache.lucene.util.CollectionUtil;
-import org.elasticsearch.test.ElasticsearchTestCase;
-
-import java.util.Iterator;
-import java.util.List;
-
-public class Iterators2Tests extends ElasticsearchTestCase {
-
-    public void testDeduplicateSorted() {
-        final List<String> list = Lists.newArrayList();
-        for (int i = randomInt(100); i >= 0; --i) {
-            final int frequency = randomIntBetween(1, 10);
-            final String s = randomAsciiOfLength(randomIntBetween(2, 20));
-            for (int j = 0; j < frequency; ++j) {
-                list.add(s);
-            }
-        }
-        CollectionUtil.introSort(list);
-        final List<String> deduplicated = Lists.newArrayList();
-        for (Iterator<String> it = Iterators2.deduplicateSorted(list.iterator(), Ordering.natural()); it.hasNext(); ) {
-            deduplicated.add(it.next());
-        }
-        assertEquals(Lists.newArrayList(Sets.newTreeSet(list)), deduplicated);
-    }
-
-}

From 95faa35853bff06d14c9071120988c0cba9aae84 Mon Sep 17 00:00:00 2001
From: Colin Goodheart-Smithe <colings86@users.noreply.github.com>
Date: Wed, 27 May 2015 16:58:29 +0100
Subject: [PATCH 038/123] Aggregations: Sibling Pipeline Aggregations can now
 be nested in SingleBucketAggregations

Closes #11379
---
 .../InternalSingleBucketAggregation.java      | 13 +++++
 .../pipeline/SiblingPipelineAggregator.java   | 41 +++++++++-----
 .../aggregations/pipeline/MaxBucketTests.java | 54 ++++++++++++++++++-
 3 files changed, 94 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java
index eacc7471743..303d6c784e3 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/InternalSingleBucketAggregation.java
@@ -21,6 +21,7 @@ package org.elasticsearch.search.aggregations.bucket;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.InternalAggregation;
 import org.elasticsearch.search.aggregations.InternalAggregations;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
@@ -63,6 +64,18 @@ public abstract class InternalSingleBucketAggregation extends InternalAggregatio
         return aggregations;
     }
 
+    /**
+     * Create a new copy of this {@link Aggregation} with the same settings as
+     * this {@link Aggregation} and contains the provided sub-aggregations.
+     * 
+     * @param subAggregations
+     *            the buckets to use in the new {@link Aggregation}
+     * @return the new {@link Aggregation}
+     */
+    public InternalSingleBucketAggregation create(InternalAggregations subAggregations) {
+        return newAggregation(getName(), getDocCount(), subAggregations);
+    }
+
     /**
      * Create a <b>new</b> empty sub aggregation. This must be a new instance on each call.
      */
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/SiblingPipelineAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/pipeline/SiblingPipelineAggregator.java
index d68660d4c7d..cb14b0df4c2 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/pipeline/SiblingPipelineAggregator.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/pipeline/SiblingPipelineAggregator.java
@@ -26,6 +26,7 @@ import org.elasticsearch.search.aggregations.InternalAggregation;
 import org.elasticsearch.search.aggregations.InternalAggregation.ReduceContext;
 import org.elasticsearch.search.aggregations.InternalAggregations;
 import org.elasticsearch.search.aggregations.InternalMultiBucketAggregation;
+import org.elasticsearch.search.aggregations.bucket.InternalSingleBucketAggregation;
 import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation.Bucket;
 
 import java.util.ArrayList;
@@ -45,20 +46,34 @@ public abstract class SiblingPipelineAggregator extends PipelineAggregator {
     @SuppressWarnings("unchecked")
     @Override
     public InternalAggregation reduce(InternalAggregation aggregation, ReduceContext reduceContext) {
-        @SuppressWarnings("rawtypes")
-        InternalMultiBucketAggregation multiBucketsAgg = (InternalMultiBucketAggregation) aggregation;
-        List<? extends Bucket> buckets = multiBucketsAgg.getBuckets();
-        List<Bucket> newBuckets = new ArrayList<>();
-        for (int i = 0; i < buckets.size(); i++) {
-            InternalMultiBucketAggregation.InternalBucket bucket = (InternalMultiBucketAggregation.InternalBucket) buckets.get(i);
-            InternalAggregation aggToAdd = doReduce(bucket.getAggregations(), reduceContext);
-            List<InternalAggregation> aggs = new ArrayList<>(Lists.transform(bucket.getAggregations().asList(), AGGREGATION_TRANFORM_FUNCTION));
-            aggs.add(aggToAdd);
-            InternalMultiBucketAggregation.InternalBucket newBucket = multiBucketsAgg.createBucket(new InternalAggregations(aggs), bucket);
-            newBuckets.add(newBucket);
-        }
+        if (aggregation instanceof InternalMultiBucketAggregation) {
+            @SuppressWarnings("rawtypes")
+            InternalMultiBucketAggregation multiBucketsAgg = (InternalMultiBucketAggregation) aggregation;
+            List<? extends Bucket> buckets = multiBucketsAgg.getBuckets();
+            List<Bucket> newBuckets = new ArrayList<>();
+            for (int i = 0; i < buckets.size(); i++) {
+                InternalMultiBucketAggregation.InternalBucket bucket = (InternalMultiBucketAggregation.InternalBucket) buckets.get(i);
+                InternalAggregation aggToAdd = doReduce(bucket.getAggregations(), reduceContext);
+                List<InternalAggregation> aggs = new ArrayList<>(Lists.transform(bucket.getAggregations().asList(),
+                        AGGREGATION_TRANFORM_FUNCTION));
+                aggs.add(aggToAdd);
+                InternalMultiBucketAggregation.InternalBucket newBucket = multiBucketsAgg.createBucket(new InternalAggregations(aggs),
+                        bucket);
+                newBuckets.add(newBucket);
+            }
 
-        return multiBucketsAgg.create(newBuckets);
+            return multiBucketsAgg.create(newBuckets);
+        } else if (aggregation instanceof InternalSingleBucketAggregation) {
+            InternalSingleBucketAggregation singleBucketAgg = (InternalSingleBucketAggregation) aggregation;
+            InternalAggregation aggToAdd = doReduce(singleBucketAgg.getAggregations(), reduceContext);
+            List<InternalAggregation> aggs = new ArrayList<>(Lists.transform(singleBucketAgg.getAggregations().asList(),
+                    AGGREGATION_TRANFORM_FUNCTION));
+            aggs.add(aggToAdd);
+            return singleBucketAgg.create(new InternalAggregations(aggs));
+        } else {
+            throw new IllegalStateException("Aggregation [" + aggregation.getName() + "] must be a bucket aggregation ["
+                    + aggregation.type().name() + "]");
+        }
     }
 
     public abstract InternalAggregation doReduce(Aggregations aggregations, ReduceContext context);
diff --git a/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketTests.java b/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketTests.java
index 177f3bca51f..3f12b81325e 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketTests.java
@@ -21,6 +21,7 @@ package org.elasticsearch.search.aggregations.pipeline;
 
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.search.aggregations.bucket.filter.Filter;
 import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
 import org.elasticsearch.search.aggregations.bucket.histogram.Histogram.Bucket;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
@@ -34,11 +35,13 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorBuilders.maxBucket;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static org.elasticsearch.index.query.QueryBuilders.termQuery;
+import static org.elasticsearch.search.aggregations.AggregationBuilders.filter;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.histogram;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.sum;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.terms;
+import static org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorBuilders.maxBucket;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
 import static org.hamcrest.Matchers.equalTo;
@@ -282,6 +285,55 @@ public class MaxBucketTests extends ElasticsearchIntegrationTest {
         }
     }
 
+    @Test
+    public void testMetric_asSubAggOfSingleBucketAgg() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        filter("filter")
+                                .filter(termQuery("tag", "tag0"))
+                                .subAggregation(
+                                        histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval)
+                                                .extendedBounds((long) minRandomValue, (long) maxRandomValue)
+                                                .subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME)))
+                                .subAggregation(maxBucket("max_bucket").setBucketsPaths("histo>sum"))).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Filter filter = response.getAggregations().get("filter");
+        assertThat(filter, notNullValue());
+        assertThat(filter.getName(), equalTo("filter"));
+        Histogram histo = filter.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        assertThat(histo.getName(), equalTo("histo"));
+        List<? extends Bucket> buckets = histo.getBuckets();
+
+        List<String> maxKeys = new ArrayList<>();
+        double maxValue = Double.NEGATIVE_INFINITY;
+        for (int j = 0; j < numValueBuckets; ++j) {
+            Histogram.Bucket bucket = buckets.get(j);
+            assertThat(bucket, notNullValue());
+            assertThat(((Number) bucket.getKey()).longValue(), equalTo((long) j * interval));
+            if (bucket.getDocCount() != 0) {
+                Sum sum = bucket.getAggregations().get("sum");
+                assertThat(sum, notNullValue());
+                if (sum.value() > maxValue) {
+                    maxValue = sum.value();
+                    maxKeys = new ArrayList<>();
+                    maxKeys.add(bucket.getKeyAsString());
+                } else if (sum.value() == maxValue) {
+                    maxKeys.add(bucket.getKeyAsString());
+                }
+            }
+        }
+
+        InternalBucketMetricValue maxBucketValue = filter.getAggregations().get("max_bucket");
+        assertThat(maxBucketValue, notNullValue());
+        assertThat(maxBucketValue.getName(), equalTo("max_bucket"));
+        assertThat(maxBucketValue.value(), equalTo(maxValue));
+        assertThat(maxBucketValue.keys(), equalTo(maxKeys.toArray(new String[maxKeys.size()])));
+    }
+
     @Test
     public void testMetric_asSubAggWithInsertZeros() throws Exception {
         SearchResponse response = client()

From e54dd688a1c5c78a2637b7ab264f6eabc0352985 Mon Sep 17 00:00:00 2001
From: jaymode <jay.modi@elasticsearch.com>
Date: Wed, 27 May 2015 09:14:01 -0400
Subject: [PATCH 039/123] make JNA optional for tests and move classes to
 bootstrap package

Today, JNA is a optional dependency in the build but when running tests or running
with mlockall set to true, JNA must be on the classpath for Windows systems since
we always try to load JNA classes when using mlockall.

The old Natives class was renamed to JNANatives, and a new Natives class is
introduced without any direct imports on JNA classes. The Natives class checks to
see if JNA classes are available at startup. If the classes are available the Natives
class will delegate to the JNANatives class. If the classes are not available the
Natives class will not use the JNANatives class, which results in no additional attempts
to load JNA classes.

Additionally, all of the JNA classes were moved to the bootstrap package and made
package private as this is the only place they should be called from.

Closes #11360
---
 .../elasticsearch/bootstrap/Bootstrap.java    |  9 +-
 .../ConsoleCtrlHandler.java}                  | 22 +++--
 .../JNACLibrary.java}                         | 14 ++--
 .../JNAKernel32Library.java}                  | 54 ++++++------
 .../JNANatives.java}                          | 47 +++++------
 .../org/elasticsearch/bootstrap/Natives.java  | 84 +++++++++++++++++++
 .../monitor/process/ProcessInfo.java          |  4 +-
 .../mapping/ManyMappingsBenchmark.java        |  5 +-
 .../recovery/ReplicaRecoveryBenchmark.java    |  4 +-
 .../aggregations/GlobalOrdinalsBenchmark.java |  4 +-
 ...AggregationSearchCollectModeBenchmark.java |  4 +-
 ...AggregationSearchAndIndexingBenchmark.java |  4 +-
 .../TermsAggregationSearchBenchmark.java      |  4 +-
 .../JNANativesTests.java}                     | 14 ++--
 14 files changed, 176 insertions(+), 97 deletions(-)
 rename src/main/java/org/elasticsearch/{common/jna/SizeT.java => bootstrap/ConsoleCtrlHandler.java} (68%)
 rename src/main/java/org/elasticsearch/{common/jna/CLibrary.java => bootstrap/JNACLibrary.java} (77%)
 rename src/main/java/org/elasticsearch/{common/jna/Kernel32Library.java => bootstrap/JNAKernel32Library.java} (84%)
 rename src/main/java/org/elasticsearch/{common/jna/Natives.java => bootstrap/JNANatives.java} (76%)
 create mode 100644 src/main/java/org/elasticsearch/bootstrap/Natives.java
 rename src/test/java/org/elasticsearch/{common/jna/NativesTests.java => bootstrap/JNANativesTests.java} (73%)

diff --git a/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java b/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
index cc1b7e059ad..15851b9dc18 100644
--- a/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
+++ b/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
@@ -28,8 +28,6 @@ import org.elasticsearch.common.SuppressForbidden;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.inject.CreationException;
 import org.elasticsearch.common.inject.spi.Message;
-import org.elasticsearch.common.jna.Kernel32Library;
-import org.elasticsearch.common.jna.Natives;
 import org.elasticsearch.common.lease.Releasables;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
@@ -48,7 +46,6 @@ import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 
 import static com.google.common.collect.Sets.newHashSet;
-import static org.elasticsearch.common.jna.Kernel32Library.ConsoleCtrlHandler;
 import static org.elasticsearch.common.settings.Settings.Builder.EMPTY_SETTINGS;
 
 /**
@@ -122,7 +119,7 @@ public class Bootstrap {
 
         // force remainder of JNA to be loaded (if available).
         try {
-            Kernel32Library.getInstance();
+            JNAKernel32Library.getInstance();
         } catch (Throwable ignored) {
             // we've already logged this.
         }
@@ -143,6 +140,10 @@ public class Bootstrap {
         StringHelper.randomId();
     }
 
+    public static boolean isMemoryLocked() {
+        return Natives.isMemoryLocked();
+    }
+
     private void setup(boolean addShutdownHook, Settings settings, Environment environment) throws Exception {
         initializeNatives(settings.getAsBoolean("bootstrap.mlockall", false), 
                           settings.getAsBoolean("bootstrap.ctrlhandler", true),
diff --git a/src/main/java/org/elasticsearch/common/jna/SizeT.java b/src/main/java/org/elasticsearch/bootstrap/ConsoleCtrlHandler.java
similarity index 68%
rename from src/main/java/org/elasticsearch/common/jna/SizeT.java
rename to src/main/java/org/elasticsearch/bootstrap/ConsoleCtrlHandler.java
index ab2fcd70552..6433b336d9d 100644
--- a/src/main/java/org/elasticsearch/common/jna/SizeT.java
+++ b/src/main/java/org/elasticsearch/bootstrap/ConsoleCtrlHandler.java
@@ -17,19 +17,17 @@
  * under the License.
  */
 
-package org.elasticsearch.common.jna;
+package org.elasticsearch.bootstrap;
 
-import com.sun.jna.IntegerType;
-import com.sun.jna.Native;
+public interface ConsoleCtrlHandler {
 
-public class SizeT extends IntegerType {
-
-    public SizeT() {
-       this(0);
-    }
-
-    public SizeT(long value) {
-        super(Native.SIZE_T_SIZE, value);
-    }
+    int CTRL_CLOSE_EVENT = 2;
 
+    /**
+     * Handles the Ctrl event.
+     *
+     * @param code the code corresponding to the Ctrl sent.
+     * @return true if the handler processed the event, false otherwise. If false, the next handler will be called.
+     */
+    boolean handle(int code);
 }
diff --git a/src/main/java/org/elasticsearch/common/jna/CLibrary.java b/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java
similarity index 77%
rename from src/main/java/org/elasticsearch/common/jna/CLibrary.java
rename to src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java
index d3e2c19188d..97bf98e60f6 100644
--- a/src/main/java/org/elasticsearch/common/jna/CLibrary.java
+++ b/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.jna;
+package org.elasticsearch.bootstrap;
 
 import com.sun.jna.Native;
 import org.elasticsearch.common.logging.ESLogger;
@@ -27,9 +27,9 @@ import org.elasticsearch.common.logging.Loggers;
 /**
  *
  */
-public class CLibrary {
+class JNACLibrary {
 
-    private static ESLogger logger = Loggers.getLogger(CLibrary.class);
+    private static final ESLogger logger = Loggers.getLogger(JNACLibrary.class);
 
     public static final int MCL_CURRENT = 1;
     public static final int MCL_FUTURE = 2;
@@ -39,17 +39,15 @@ public class CLibrary {
     static {
         try {
             Native.register("c");
-        } catch (NoClassDefFoundError e) {
-            logger.warn("JNA not found. native methods (mlockall) will be disabled.");
         } catch (UnsatisfiedLinkError e) {
             logger.warn("unable to link C library. native methods (mlockall) will be disabled.");
         }
     }
 
-    public static native int mlockall(int flags);
+    static native int mlockall(int flags);
 
-    public static native int geteuid();
+    static native int geteuid();
 
-    private CLibrary() {
+    private JNACLibrary() {
     }
 }
diff --git a/src/main/java/org/elasticsearch/common/jna/Kernel32Library.java b/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java
similarity index 84%
rename from src/main/java/org/elasticsearch/common/jna/Kernel32Library.java
rename to src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java
index d2b634ae768..57af6b145df 100644
--- a/src/main/java/org/elasticsearch/common/jna/Kernel32Library.java
+++ b/src/main/java/org/elasticsearch/bootstrap/JNAKernel32Library.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.jna;
+package org.elasticsearch.bootstrap;
 
 import com.google.common.collect.ImmutableList;
 import com.sun.jna.*;
@@ -35,9 +35,9 @@ import java.util.List;
 /**
  * Library for Windows/Kernel32
  */
-public class Kernel32Library {
+class JNAKernel32Library {
 
-    private static ESLogger logger = Loggers.getLogger(Kernel32Library.class);
+    private static final ESLogger logger = Loggers.getLogger(JNAKernel32Library.class);
 
     // Callbacks must be kept around in order to be able to be called later,
     // when the Windows ConsoleCtrlHandler sends an event.
@@ -45,10 +45,10 @@ public class Kernel32Library {
 
     // Native library instance must be kept around for the same reason.
     private final static class Holder {
-        private final static Kernel32Library instance = new Kernel32Library();
+        private final static JNAKernel32Library instance = new JNAKernel32Library();
     }
 
-    private Kernel32Library() {
+    private JNAKernel32Library() {
         if (Constants.WINDOWS) {
             try {
                 Native.register("kernel32");
@@ -61,7 +61,7 @@ public class Kernel32Library {
         }
     }
 
-    public static Kernel32Library getInstance() {
+    static JNAKernel32Library getInstance() {
         return Holder.instance;
     }
 
@@ -73,7 +73,7 @@ public class Kernel32Library {
      * @throws java.lang.UnsatisfiedLinkError if the Kernel32 library is not loaded or if the native function is not found
      * @throws java.lang.NoClassDefFoundError if the library for native calls is missing
      */
-    public boolean addConsoleCtrlHandler(ConsoleCtrlHandler handler) {
+    boolean addConsoleCtrlHandler(ConsoleCtrlHandler handler) {
         boolean result = false;
         if (handler != null) {
             NativeHandlerCallback callback = new NativeHandlerCallback(handler);
@@ -85,7 +85,7 @@ public class Kernel32Library {
         return result;
     }
 
-    public ImmutableList<Object> getCallbacks() {
+    ImmutableList<Object> getCallbacks() {
         return ImmutableList.builder().addAll(callbacks).build();
     }
 
@@ -98,7 +98,7 @@ public class Kernel32Library {
      * @throws java.lang.UnsatisfiedLinkError if the Kernel32 library is not loaded or if the native function is not found
      * @throws java.lang.NoClassDefFoundError if the library for native calls is missing
      */
-    public native boolean SetConsoleCtrlHandler(StdCallLibrary.StdCallCallback handler, boolean add);
+    native boolean SetConsoleCtrlHandler(StdCallLibrary.StdCallCallback handler, boolean add);
 
     /**
      * Handles consoles event with WIN API
@@ -123,20 +123,6 @@ public class Kernel32Library {
         }
     }
 
-    public interface ConsoleCtrlHandler {
-
-        public static final int CTRL_CLOSE_EVENT = 2;
-
-        /**
-         * Handles the Ctrl event.
-         *
-         * @param code the code corresponding to the Ctrl sent.
-         * @return true if the handler processed the event, false otherwise. If false, the next handler will be called.
-         */
-        boolean handle(int code);
-    }
-
-
     /**
      * Memory protection constraints
      *
@@ -167,6 +153,18 @@ public class Kernel32Library {
         }
     }
 
+    public static class SizeT extends IntegerType {
+
+        public SizeT() {
+            this(0);
+        }
+
+        public SizeT(long value) {
+            super(Native.SIZE_T_SIZE, value);
+        }
+
+    }
+
     /**
      * Locks the specified region of the process's virtual address space into physical
      * memory, ensuring that subsequent access to the region will not incur a page fault.
@@ -177,7 +175,7 @@ public class Kernel32Library {
      * @param size The size of the region to be locked, in bytes.
      * @return true if the function succeeds
      */
-    public native boolean VirtualLock(Pointer address, SizeT size);
+    native boolean VirtualLock(Pointer address, SizeT size);
 
     /**
      * Retrieves information about a range of pages within the virtual address space of a specified process.
@@ -190,7 +188,7 @@ public class Kernel32Library {
      * @param length The size of the buffer pointed to by the memoryInfo parameter, in bytes.
      * @return the actual number of bytes returned in the information buffer.
      */
-    public native int VirtualQueryEx(Pointer handle, Pointer address, MemoryBasicInformation memoryInfo, int length);
+    native int VirtualQueryEx(Pointer handle, Pointer address, MemoryBasicInformation memoryInfo, int length);
 
     /**
      * Sets the minimum and maximum working set sizes for the specified process.
@@ -202,7 +200,7 @@ public class Kernel32Library {
      * @param maxSize The maximum working set size for the process, in bytes.
      * @return true if the function succeeds.
      */
-    public native boolean SetProcessWorkingSetSize(Pointer handle, SizeT minSize, SizeT maxSize);
+    native boolean SetProcessWorkingSetSize(Pointer handle, SizeT minSize, SizeT maxSize);
 
     /**
      * Retrieves a pseudo handle for the current process.
@@ -211,7 +209,7 @@ public class Kernel32Library {
      *
      * @return a pseudo handle to the current process.
      */
-    public native Pointer GetCurrentProcess();
+    native Pointer GetCurrentProcess();
 
     /**
      * Closes an open object handle.
@@ -221,5 +219,5 @@ public class Kernel32Library {
      * @param handle A valid handle to an open object.
      * @return true if the function succeeds.
      */
-    public native boolean CloseHandle(Pointer handle);
+    native boolean CloseHandle(Pointer handle);
 }
diff --git a/src/main/java/org/elasticsearch/common/jna/Natives.java b/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
similarity index 76%
rename from src/main/java/org/elasticsearch/common/jna/Natives.java
rename to src/main/java/org/elasticsearch/bootstrap/JNANatives.java
index fa8e074713a..eb29df85cdb 100644
--- a/src/main/java/org/elasticsearch/common/jna/Natives.java
+++ b/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
@@ -17,32 +17,34 @@
  * under the License.
  */
 
-package org.elasticsearch.common.jna;
+package org.elasticsearch.bootstrap;
 
 import com.sun.jna.Native;
-import com.sun.jna.NativeLong;
 import com.sun.jna.Pointer;
 import org.apache.lucene.util.Constants;
-import org.elasticsearch.common.jna.Kernel32Library.ConsoleCtrlHandler;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.monitor.jvm.JvmInfo;
 
 import java.util.Locale;
 
-/**
- *
- */
-public class Natives {
+import static org.elasticsearch.bootstrap.JNAKernel32Library.SizeT;
+
+/**
+ * This class performs the actual work with JNA and library bindings to call native methods. It should only be used after
+ * we are sure that the JNA classes are available to the JVM
+ */
+class JNANatives {
+
+    private static final ESLogger logger = Loggers.getLogger(JNANatives.class);
 
-    private static ESLogger logger = Loggers.getLogger(Natives.class);
     // Set to true, in case native mlockall call was successful
     public static boolean LOCAL_MLOCKALL = false;
 
-    public static void tryMlockall() {
+    static void tryMlockall() {
         int errno = Integer.MIN_VALUE;
         try {
-            int result = CLibrary.mlockall(CLibrary.MCL_CURRENT);
+            int result = JNACLibrary.mlockall(JNACLibrary.MCL_CURRENT);
             if (result != 0) {
                 errno = Native.getLastError();
             } else {
@@ -54,7 +56,7 @@ public class Natives {
         }
 
         if (errno != Integer.MIN_VALUE) {
-            if (errno == CLibrary.ENOMEM && System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("linux")) {
+            if (errno == JNACLibrary.ENOMEM && System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("linux")) {
                 logger.warn("Unable to lock JVM memory (ENOMEM)."
                         + " This can result in part of the JVM being swapped out."
                         + " Increase RLIMIT_MEMLOCK (ulimit).");
@@ -66,21 +68,20 @@ public class Natives {
     }
     
     /** Returns true if user is root, false if not, or if we don't know */
-    public static boolean definitelyRunningAsRoot() {
+    static boolean definitelyRunningAsRoot() {
         if (Constants.WINDOWS) {
             return false; // don't know
         }
         try {
-            return CLibrary.geteuid() == 0;
+            return JNACLibrary.geteuid() == 0;
         } catch (UnsatisfiedLinkError e) {
             // this will have already been logged by Kernel32Library, no need to repeat it
             return false;
         }
     }
 
-    public static void tryVirtualLock()
-    {
-        Kernel32Library kernel = Kernel32Library.getInstance();
+    static void tryVirtualLock() {
+        JNAKernel32Library kernel = JNAKernel32Library.getInstance();
         Pointer process = null;
         try {
             process = kernel.GetCurrentProcess();
@@ -91,12 +92,12 @@ public class Natives {
             if (!kernel.SetProcessWorkingSetSize(process, size, size)) {
                 logger.warn("Unable to lock JVM memory. Failed to set working set size. Error code " + Native.getLastError());
             } else {
-                Kernel32Library.MemoryBasicInformation memInfo = new Kernel32Library.MemoryBasicInformation();
+                JNAKernel32Library.MemoryBasicInformation memInfo = new JNAKernel32Library.MemoryBasicInformation();
                 long address = 0;
                 while (kernel.VirtualQueryEx(process, new Pointer(address), memInfo, memInfo.size()) != 0) {
-                    boolean lockable = memInfo.State.longValue() == Kernel32Library.MEM_COMMIT
-                            && (memInfo.Protect.longValue() & Kernel32Library.PAGE_NOACCESS) != Kernel32Library.PAGE_NOACCESS
-                            && (memInfo.Protect.longValue() & Kernel32Library.PAGE_GUARD) != Kernel32Library.PAGE_GUARD;
+                    boolean lockable = memInfo.State.longValue() == JNAKernel32Library.MEM_COMMIT
+                            && (memInfo.Protect.longValue() & JNAKernel32Library.PAGE_NOACCESS) != JNAKernel32Library.PAGE_NOACCESS
+                            && (memInfo.Protect.longValue() & JNAKernel32Library.PAGE_GUARD) != JNAKernel32Library.PAGE_GUARD;
                     if (lockable) {
                         kernel.VirtualLock(memInfo.BaseAddress, new SizeT(memInfo.RegionSize.longValue()));
                     }
@@ -114,18 +115,16 @@ public class Natives {
         }
     }
 
-    public static void addConsoleCtrlHandler(ConsoleCtrlHandler handler) {
+    static void addConsoleCtrlHandler(ConsoleCtrlHandler handler) {
         // The console Ctrl handler is necessary on Windows platforms only.
         if (Constants.WINDOWS) {
             try {
-                boolean result = Kernel32Library.getInstance().addConsoleCtrlHandler(handler);
+                boolean result = JNAKernel32Library.getInstance().addConsoleCtrlHandler(handler);
                 if (result) {
                     logger.debug("console ctrl handler correctly set");
                 } else {
                     logger.warn("unknown error " + Native.getLastError() + " when adding console ctrl handler:");
                 }
-            } catch (NoClassDefFoundError e) {
-                logger.warn("JNA not found: native methods and handlers will be disabled.");
             } catch (UnsatisfiedLinkError e) {
                 // this will have already been logged by Kernel32Library, no need to repeat it
             }
diff --git a/src/main/java/org/elasticsearch/bootstrap/Natives.java b/src/main/java/org/elasticsearch/bootstrap/Natives.java
new file mode 100644
index 00000000000..3342cdfd2c0
--- /dev/null
+++ b/src/main/java/org/elasticsearch/bootstrap/Natives.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.bootstrap;
+
+import org.elasticsearch.common.logging.ESLogger;
+import org.elasticsearch.common.logging.Loggers;
+
+/**
+ * The Natives class is a wrapper class that checks if the classes necessary for calling native methods are available on
+ * startup. If they are not available, this class will avoid calling code that loads these classes.
+ */
+class Natives {
+    private static final ESLogger logger = Loggers.getLogger(Natives.class);
+
+    // marker to determine if the JNA class files are available to the JVM
+    private static boolean jnaAvailable = false;
+
+    static {
+        try {
+            // load one of the main JNA classes to see if the classes are available. this does not ensure that native
+            // libraries are available
+            Class.forName("com.sun.jna.Native");
+            jnaAvailable = true;
+        } catch(ClassNotFoundException e) {
+            logger.warn("JNA not found. native methods will be disabled.");
+        }
+    }
+
+    static void tryMlockall() {
+        if (!jnaAvailable) {
+            logger.warn("cannot mlockall because JNA is not available");
+            return;
+        }
+        JNANatives.tryMlockall();
+    }
+
+    static boolean definitelyRunningAsRoot() {
+        if (!jnaAvailable) {
+            logger.warn("cannot check if running as root because JNA is not available");
+            return false;
+        }
+        return JNANatives.definitelyRunningAsRoot();
+    }
+
+    static void tryVirtualLock() {
+        if (!jnaAvailable) {
+            logger.warn("cannot mlockall because JNA is not available");
+            return;
+        }
+        JNANatives.tryVirtualLock();
+    }
+
+    static void addConsoleCtrlHandler(ConsoleCtrlHandler handler) {
+        if (!jnaAvailable) {
+            logger.warn("cannot register console handler because JNA is not available");
+            return;
+        }
+        JNANatives.addConsoleCtrlHandler(handler);
+    }
+
+    static boolean isMemoryLocked() {
+        if (!jnaAvailable) {
+            return false;
+        }
+        return JNANatives.LOCAL_MLOCKALL;
+    }
+}
diff --git a/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java b/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java
index c99c92faccb..49d140e203b 100644
--- a/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java
+++ b/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java
@@ -19,10 +19,10 @@
 
 package org.elasticsearch.monitor.process;
 
+import org.elasticsearch.bootstrap.Bootstrap;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Streamable;
-import org.elasticsearch.common.jna.Natives;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentBuilderString;
@@ -50,7 +50,7 @@ public class ProcessInfo implements Streamable, Serializable, ToXContent {
     public ProcessInfo(long id, long maxFileDescriptors) {
         this.id = id;
         this.maxFileDescriptors = maxFileDescriptors;
-        this.mlockall = Natives.LOCAL_MLOCKALL;
+        this.mlockall = Bootstrap.isMemoryLocked();
     }
 
     public long refreshInterval() {
diff --git a/src/test/java/org/elasticsearch/benchmark/mapping/ManyMappingsBenchmark.java b/src/test/java/org/elasticsearch/benchmark/mapping/ManyMappingsBenchmark.java
index 236c8821b3c..b40d29a948c 100644
--- a/src/test/java/org/elasticsearch/benchmark/mapping/ManyMappingsBenchmark.java
+++ b/src/test/java/org/elasticsearch/benchmark/mapping/ManyMappingsBenchmark.java
@@ -21,8 +21,8 @@ package org.elasticsearch.benchmark.mapping;
 
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.support.IndicesOptions;
+import org.elasticsearch.bootstrap.Bootstrap;
 import org.elasticsearch.client.Client;
-import org.elasticsearch.common.jna.Natives;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentBuilder;
@@ -85,8 +85,9 @@ public class ManyMappingsBenchmark {
 
     public static void main(String[] args) throws Exception {
         System.setProperty("es.logger.prefix", "");
-        Natives.tryMlockall();
+        Bootstrap.initializeNatives(true, false, false);
         Settings settings = settingsBuilder()
+                .put("")
                 .put(SETTING_NUMBER_OF_SHARDS, 5)
                 .put(SETTING_NUMBER_OF_REPLICAS, 0)
                 .build();
diff --git a/src/test/java/org/elasticsearch/benchmark/recovery/ReplicaRecoveryBenchmark.java b/src/test/java/org/elasticsearch/benchmark/recovery/ReplicaRecoveryBenchmark.java
index 66c4e62bdbc..1ac7c433038 100644
--- a/src/test/java/org/elasticsearch/benchmark/recovery/ReplicaRecoveryBenchmark.java
+++ b/src/test/java/org/elasticsearch/benchmark/recovery/ReplicaRecoveryBenchmark.java
@@ -20,10 +20,10 @@ package org.elasticsearch.benchmark.recovery;
 
 import org.elasticsearch.action.admin.indices.recovery.RecoveryResponse;
 import org.elasticsearch.action.admin.indices.recovery.ShardRecoveryResponse;
+import org.elasticsearch.bootstrap.Bootstrap;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.routing.allocation.decider.DiskThresholdDecider;
-import org.elasticsearch.common.jna.Natives;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.ESLoggerFactory;
 import org.elasticsearch.common.settings.Settings;
@@ -57,7 +57,7 @@ public class ReplicaRecoveryBenchmark {
 
     public static void main(String[] args) throws Exception {
         System.setProperty("es.logger.prefix", "");
-        Natives.tryMlockall();
+        Bootstrap.initializeNatives(true, false, false);
 
         Settings settings = settingsBuilder()
                 .put("gateway.type", "local")
diff --git a/src/test/java/org/elasticsearch/benchmark/search/aggregations/GlobalOrdinalsBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/aggregations/GlobalOrdinalsBenchmark.java
index 69eadffb52d..c415dbf9b2b 100644
--- a/src/test/java/org/elasticsearch/benchmark/search/aggregations/GlobalOrdinalsBenchmark.java
+++ b/src/test/java/org/elasticsearch/benchmark/search/aggregations/GlobalOrdinalsBenchmark.java
@@ -26,8 +26,8 @@ import org.elasticsearch.action.admin.cluster.stats.ClusterStatsResponse;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.benchmark.search.aggregations.TermsAggregationSearchBenchmark.StatsResult;
+import org.elasticsearch.bootstrap.Bootstrap;
 import org.elasticsearch.client.Client;
-import org.elasticsearch.common.jna.Natives;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.unit.SizeValue;
@@ -66,7 +66,7 @@ public class GlobalOrdinalsBenchmark {
 
     public static void main(String[] args) throws Exception {
         System.setProperty("es.logger.prefix", "");
-        Natives.tryMlockall();
+        Bootstrap.initializeNatives(true, false, false);
         Random random = new Random();
 
         Settings settings = settingsBuilder()
diff --git a/src/test/java/org/elasticsearch/benchmark/search/aggregations/SubAggregationSearchCollectModeBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/aggregations/SubAggregationSearchCollectModeBenchmark.java
index 96c80b5051c..bf13b774edc 100644
--- a/src/test/java/org/elasticsearch/benchmark/search/aggregations/SubAggregationSearchCollectModeBenchmark.java
+++ b/src/test/java/org/elasticsearch/benchmark/search/aggregations/SubAggregationSearchCollectModeBenchmark.java
@@ -27,10 +27,10 @@ import org.elasticsearch.action.admin.cluster.stats.ClusterStatsResponse;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.bootstrap.Bootstrap;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.common.StopWatch;
-import org.elasticsearch.common.jna.Natives;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.unit.SizeValue;
@@ -71,7 +71,7 @@ public class SubAggregationSearchCollectModeBenchmark {
     static Node[] nodes;
 
     public static void main(String[] args) throws Exception {
-        Natives.tryMlockall();
+        Bootstrap.initializeNatives(true, false, false);
         Random random = new Random();
 
         Settings settings = settingsBuilder()
diff --git a/src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchAndIndexingBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchAndIndexingBenchmark.java
index f57c9848886..45f7dbf9562 100644
--- a/src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchAndIndexingBenchmark.java
+++ b/src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchAndIndexingBenchmark.java
@@ -26,9 +26,9 @@ import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.bootstrap.Bootstrap;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.Requests;
-import org.elasticsearch.common.jna.Natives;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.unit.SizeValue;
@@ -71,7 +71,7 @@ public class TermsAggregationSearchAndIndexingBenchmark {
     static Node[] nodes;
 
     public static void main(String[] args) throws Exception {
-        Natives.tryMlockall();
+        Bootstrap.initializeNatives(true, false, false);
         Settings settings = settingsBuilder()
                 .put("refresh_interval", "-1")
                 .put(SETTING_NUMBER_OF_SHARDS, 1)
diff --git a/src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchBenchmark.java
index 55d3db53dd0..e92a24c1c99 100644
--- a/src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchBenchmark.java
+++ b/src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchBenchmark.java
@@ -28,10 +28,10 @@ import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.bootstrap.Bootstrap;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.common.StopWatch;
-import org.elasticsearch.common.jna.Natives;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.unit.SizeValue;
@@ -99,7 +99,7 @@ public class TermsAggregationSearchBenchmark {
     }
 
     public static void main(String[] args) throws Exception {
-        Natives.tryMlockall();
+        Bootstrap.initializeNatives(true, false, false);
         Random random = new Random();
 
         Settings settings = settingsBuilder()
diff --git a/src/test/java/org/elasticsearch/common/jna/NativesTests.java b/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java
similarity index 73%
rename from src/test/java/org/elasticsearch/common/jna/NativesTests.java
rename to src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java
index 014a2ce5b27..ead01b38cd8 100644
--- a/src/test/java/org/elasticsearch/common/jna/NativesTests.java
+++ b/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.jna;
+package org.elasticsearch.bootstrap;
 
 import org.apache.lucene.util.Constants;
 import org.elasticsearch.test.ElasticsearchTestCase;
@@ -25,23 +25,23 @@ import org.junit.Test;
 
 import static org.hamcrest.Matchers.equalTo;
 
-public class NativesTests extends ElasticsearchTestCase {
+public class JNANativesTests extends ElasticsearchTestCase {
 
     @Test
     public void testMlockall() {
         if (Constants.MAC_OS_X) {
-            assertFalse("Memory locking is not available on OS X platforms", Natives.LOCAL_MLOCKALL);
+            assertFalse("Memory locking is not available on OS X platforms", JNANatives.LOCAL_MLOCKALL);
         }
     }
     
     @Test
     public void testConsoleCtrlHandler() {
         if (Constants.WINDOWS) {
-            assertNotNull(Kernel32Library.getInstance());
-            assertThat(Kernel32Library.getInstance().getCallbacks().size(), equalTo(1));
+            assertNotNull(JNAKernel32Library.getInstance());
+            assertThat(JNAKernel32Library.getInstance().getCallbacks().size(), equalTo(1));
         } else {
-            assertNotNull(Kernel32Library.getInstance());
-            assertThat(Kernel32Library.getInstance().getCallbacks().size(), equalTo(0));
+            assertNotNull(JNAKernel32Library.getInstance());
+            assertThat(JNAKernel32Library.getInstance().getCallbacks().size(), equalTo(0));
         }
     }
 }

From cbb7b633f6807abbff4f9acf20d126f250cc47be Mon Sep 17 00:00:00 2001
From: Clinton Gormley <clint@traveljury.com>
Date: Wed, 27 May 2015 19:34:44 +0200
Subject: [PATCH 040/123] REST tests: Fixed bad YAML in
 search/10_source_filtering

---
 rest-api-spec/test/search/10_source_filtering.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rest-api-spec/test/search/10_source_filtering.yaml b/rest-api-spec/test/search/10_source_filtering.yaml
index 1a2a79a80e4..a78a5a2a28f 100644
--- a/rest-api-spec/test/search/10_source_filtering.yaml
+++ b/rest-api-spec/test/search/10_source_filtering.yaml
@@ -89,10 +89,10 @@
             query: { match_all: {} }
   - match: { hits.hits.0.fields: { include.field2 : [v2] }}
   - is_true:  hits.hits.0._source
-  
-  
+
+
   - do:
       search:
-        fielddata_fields: ["count"]
-  - match: { hits.hits.0.fields.count: [1] }  
+        fielddata_fields: [ "count" ]
+  - match: { hits.hits.0.fields.count: [1] }
 

From 491afbe01ccc0d76099135a283f9c70ef62c901b Mon Sep 17 00:00:00 2001
From: Zachary Tong <zacharyjtong@gmail.com>
Date: Wed, 6 May 2015 16:13:11 -0400
Subject: [PATCH 041/123] Aggregations: Add Holt-Winters model to `moving_avg`
 pipeline aggregation

Closes #11043
---
 .../pipeline/movavg-aggregation.asciidoc      | 115 ++++-
 .../images/reducers_movavg/triple.png         | Bin 0 -> 98397 bytes
 .../reducers_movavg/triple_prediction.png     | Bin 0 -> 93252 bytes
 .../reducers_movavg/triple_untruncated.png    | Bin 0 -> 48762 bytes
 .../pipeline/movavg/MovAvgParser.java         |   5 +-
 .../movavg/MovAvgPipelineAggregator.java      |  23 +-
 .../pipeline/movavg/models/EwmaModel.java     |  11 +-
 .../movavg/models/HoltLinearModel.java        |  18 +-
 .../movavg/models/HoltWintersModel.java       | 422 ++++++++++++++++++
 .../pipeline/movavg/models/LinearModel.java   |   5 +-
 .../pipeline/movavg/models/MovAvgModel.java   | 133 ++++++
 .../movavg/models/MovAvgModelModule.java      |   9 +-
 .../movavg/models/MovAvgModelParser.java      |  34 --
 .../models/MovAvgModelParserMapper.java       |  10 +-
 .../pipeline/movavg/models/SimpleModel.java   |   5 +-
 .../models/TransportMovAvgModelModule.java    |   1 +
 .../pipeline/moving/avg/MovAvgTests.java      | 224 +++++++++-
 .../pipeline/moving/avg/MovAvgUnitTests.java  | 288 +++++++++++-
 18 files changed, 1204 insertions(+), 99 deletions(-)
 create mode 100644 docs/reference/images/reducers_movavg/triple.png
 create mode 100644 docs/reference/images/reducers_movavg/triple_prediction.png
 create mode 100644 docs/reference/images/reducers_movavg/triple_untruncated.png
 create mode 100644 src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java
 delete mode 100644 src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelParser.java

diff --git a/docs/reference/aggregations/pipeline/movavg-aggregation.asciidoc b/docs/reference/aggregations/pipeline/movavg-aggregation.asciidoc
index a4e20793849..6f998ffca98 100644
--- a/docs/reference/aggregations/pipeline/movavg-aggregation.asciidoc
+++ b/docs/reference/aggregations/pipeline/movavg-aggregation.asciidoc
@@ -180,11 +180,11 @@ The default value of `alpha` is `0.5`, and the setting accepts any float from 0-
 
 
 [[single_0.2alpha]]
-.Single Exponential moving average with window of size 10, alpha = 0.2
+.EWMA with window of size 10, alpha = 0.2
 image::images/pipeline_movavg/single_0.2alpha.png[]
 
 [[single_0.7alpha]]
-.Single Exponential moving average with window of size 10, alpha = 0.7
+.EWMA with window of size 10, alpha = 0.7
 image::images/pipeline_movavg/single_0.7alpha.png[]
 
 ==== Holt-Linear
@@ -223,13 +223,111 @@ to see.  Small values emphasize long-term trends (such as a constant linear tren
 values emphasize short-term trends.  This will become more apparently when you are predicting values.
 
 [[double_0.2beta]]
-.Double Exponential moving average with window of size 100, alpha = 0.5, beta = 0.2
+.Holt-Linear moving average with window of size 100, alpha = 0.5, beta = 0.2
 image::images/pipeline_movavg/double_0.2beta.png[]
 
 [[double_0.7beta]]
-.Double Exponential moving average with window of size 100, alpha = 0.5, beta = 0.7
+.Holt-Linear moving average with window of size 100, alpha = 0.5, beta = 0.7
 image::images/pipeline_movavg/double_0.7beta.png[]
 
+==== Holt-Winters
+
+The `holt_winters` model (aka "triple exponential") incorporates a third exponential term which
+tracks the seasonal aspect of your data.  This aggregation therefore smooths based on three components: "level", "trend"
+and "seasonality".
+
+The level and trend calculation is identical to `holt` The seasonal calculation looks at the difference between
+the current point, and the point one period earlier.
+
+Holt-Winters requires a little more handholding than the other moving averages.  You need to specify the "periodicity"
+of your data: e.g. if your data has cyclic trends every 7 days, you would set `period: 7`.  Similarly if there was
+a monthly trend, you would set it to `30`.  There is currently no periodicity detection, although that is planned
+for future enhancements.
+
+There are two varieties of Holt-Winters: additive and multiplicative.
+
+===== "Cold Start"
+
+Unfortunately, due to the nature of Holt-Winters, it requires two periods of data to "bootstrap" the algorithm.  This
+means that your `window` must always be *at least* twice the size of your period.  An exception will be thrown if it
+isn't.  It also means that Holt-Winters will not emit a value for the first `2 * period` buckets; the current algorithm
+does not backcast.
+
+[[holt_winters_cold_start]]
+.Holt-Winters showing a "cold" start where no values are emitted
+image::images/reducers_movavg/triple_untruncated.png[]
+
+Because the "cold start" obscures what the moving average looks like, the rest of the Holt-Winters images are truncated
+to not show the "cold start".  Just be aware this will always be present at the beginning of your moving averages!
+
+===== Additive Holt-Winters
+
+Additive seasonality is the default; it can also be specified by setting `"type": "add"`.  This variety is preferred
+when the seasonal affect is additive to your data. E.g. you could simply subtract the seasonal effect to "de-seasonalize"
+your data into a flat trend.
+
+The default value of `alpha`, `beta` and `gamma` is `0.5`, and the settings accept any float from 0-1 inclusive.
+The default value of `period` is `1`.
+
+[source,js]
+--------------------------------------------------
+{
+    "the_movavg":{
+        "moving_avg":{
+            "buckets_path": "the_sum",
+            "model" : "holt_winters",
+            "settings" : {
+                "type" : "add",
+                "alpha" : 0.5,
+                "beta" : 0.5,
+                "gamma" : 0.5,
+                "period" : 7
+            }
+        }
+}
+--------------------------------------------------
+
+
+[[holt_winters_add]]
+.Holt-Winters moving average with window of size 120, alpha = 0.5, beta = 0.7, gamma = 0.3, period = 30
+image::images/reducers_movavg/triple.png[]
+
+===== Multiplicative Holt-Winters
+
+Multiplicative is specified by setting `"type": "mult"`.  This variety is preferred when the seasonal affect is
+multiplied against your data. E.g. if the seasonal affect is x5 the data, rather than simply adding to it.
+
+The default value of `alpha`, `beta` and `gamma` is `0.5`, and the settings accept any float from 0-1 inclusive.
+The default value of `period` is `1`.
+
+[WARNING]
+======
+Multiplicative Holt-Winters works by dividing each data point by the seasonal value.  This is problematic if any of
+your data is zero, or if there are gaps in the data (since this results in a divid-by-zero).  To combat this, the
+`mult` Holt-Winters pads all values by a very small amount (1*10^-10^) so that all values are non-zero.  This affects
+the result, but only minimally.  If your data is non-zero, or you prefer to see `NaN` when zero's are encountered,
+you can disable this behavior with `pad: false`
+======
+
+[source,js]
+--------------------------------------------------
+{
+    "the_movavg":{
+        "moving_avg":{
+            "buckets_path": "the_sum",
+            "model" : "holt_winters",
+            "settings" : {
+                "type" : "mult",
+                "alpha" : 0.5,
+                "beta" : 0.5,
+                "gamma" : 0.5,
+                "period" : 7,
+                "pad" : true
+            }
+        }
+}
+--------------------------------------------------
+
 ==== Prediction
 
 All the moving average model support a "prediction" mode, which will attempt to extrapolate into the future given the
@@ -263,7 +361,7 @@ value, we can extrapolate based on local constant trends (in this case the predi
 of the series was heading in a downward direction):
 
 [[double_prediction_local]]
-.Double Exponential moving average with window of size 100, predict = 20, alpha = 0.5, beta = 0.8
+.Holt-Linear moving average with window of size 100, predict = 20, alpha = 0.5, beta = 0.8
 image::images/pipeline_movavg/double_prediction_local.png[]
 
 In contrast, if we choose a small `beta`, the predictions are based on the global constant trend.  In this series, the
@@ -272,3 +370,10 @@ global trend is slightly positive, so the prediction makes a sharp u-turn and be
 [[double_prediction_global]]
 .Double Exponential moving average with window of size 100, predict = 20, alpha = 0.5, beta = 0.1
 image::images/pipeline_movavg/double_prediction_global.png[]
+
+The `holt_winters` model has the potential to deliver the best predictions, since it also incorporates seasonal
+fluctuations into the model:
+
+[[holt_winters_prediction_global]]
+.Holt-Winters moving average with window of size 120, predict = 25, alpha = 0.8, beta = 0.2, gamma = 0.7, period = 30
+image::images/pipeline_movavg/triple_prediction.png[]
diff --git a/docs/reference/images/reducers_movavg/triple.png b/docs/reference/images/reducers_movavg/triple.png
new file mode 100644
index 0000000000000000000000000000000000000000..8aaf281c1bfef6a17d9b4be7d9e8135f0cfee0ce
GIT binary patch
literal 98397
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

literal 0
HcmV?d00001

diff --git a/docs/reference/images/reducers_movavg/triple_prediction.png b/docs/reference/images/reducers_movavg/triple_prediction.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb34881d1e3238d4abee430c503848abd7b12b8c
GIT binary patch
literal 93252
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
YBU!Zn!I<@vi|G8(QhT8KUfDkUKWO)rb^rhX

literal 0
HcmV?d00001

diff --git a/docs/reference/images/reducers_movavg/triple_untruncated.png b/docs/reference/images/reducers_movavg/triple_untruncated.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f7528ea5fe875bfa00baf54995a8889b3364e79
GIT binary patch
literal 48762
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
F@ITtfD=z>5

literal 0
HcmV?d00001

diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgParser.java b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgParser.java
index b4f54fd4957..261f811a751 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgParser.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgParser.java
@@ -27,7 +27,6 @@ import org.elasticsearch.search.aggregations.pipeline.BucketHelpers.GapPolicy;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorFactory;
 import org.elasticsearch.search.aggregations.pipeline.movavg.models.MovAvgModel;
-import org.elasticsearch.search.aggregations.pipeline.movavg.models.MovAvgModelParser;
 import org.elasticsearch.search.aggregations.pipeline.movavg.models.MovAvgModelParserMapper;
 import org.elasticsearch.search.aggregations.support.format.ValueFormat;
 import org.elasticsearch.search.aggregations.support.format.ValueFormatter;
@@ -140,12 +139,12 @@ public class MovAvgParser implements PipelineAggregator.Parser {
             formatter = ValueFormat.Patternable.Number.format(format).formatter();
         }
 
-        MovAvgModelParser modelParser = movAvgModelParserMapper.get(model);
+        MovAvgModel.AbstractModelParser modelParser = movAvgModelParserMapper.get(model);
         if (modelParser == null) {
             throw new SearchParseException(context, "Unknown model [" + model + "] specified.  Valid options are:"
                     + movAvgModelParserMapper.getAllNames().toString(), parser.getTokenLocation());
         }
-        MovAvgModel movAvgModel = modelParser.parse(settings);
+        MovAvgModel movAvgModel = modelParser.parse(settings, pipelineAggregatorName, context, window);
 
         return new MovAvgPipelineAggregator.Factory(pipelineAggregatorName, bucketsPaths, formatter, gapPolicy, window, predict,
                 movAvgModel);
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java
index cc1e6682e70..af2db718846 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java
@@ -117,21 +117,26 @@ public class MovAvgPipelineAggregator extends PipelineAggregator {
             Double thisBucketValue = resolveBucketValue(histo, bucket, bucketsPaths()[0], gapPolicy);
             currentKey = bucket.getKey();
 
+            // Default is to reuse existing bucket.  Simplifies the rest of the logic,
+            // since we only change newBucket if we can add to it
+            InternalHistogram.Bucket newBucket = bucket;
+
             if (!(thisBucketValue == null || thisBucketValue.equals(Double.NaN))) {
                 values.offer(thisBucketValue);
 
-                double movavg = model.next(values);
+                // Some models (e.g. HoltWinters) have certain preconditions that must be met
+                if (model.hasValue(values.size())) {
+                    double movavg = model.next(values);
 
-                List<InternalAggregation> aggs = new ArrayList<>(Lists.transform(bucket.getAggregations().asList(), FUNCTION));
-                aggs.add(new InternalSimpleValue(name(), movavg, formatter, new ArrayList<PipelineAggregator>(), metaData()));
-                InternalHistogram.Bucket newBucket = factory.createBucket(currentKey, bucket.getDocCount(), new InternalAggregations(
-                        aggs), bucket.getKeyed(), bucket.getFormatter());
-                newBuckets.add(newBucket);
-
-            } else {
-                newBuckets.add(bucket);
+                    List<InternalAggregation> aggs = new ArrayList<>(Lists.transform(bucket.getAggregations().asList(), AGGREGATION_TRANFORM_FUNCTION));
+                    aggs.add(new InternalSimpleValue(name(), movavg, formatter, new ArrayList<PipelineAggregator>(), metaData()));
+                    newBucket = factory.createBucket(currentKey, bucket.getDocCount(), new InternalAggregations(
+                            aggs), bucket.getKeyed(), bucket.getFormatter());
+                }
             }
 
+            newBuckets.add(newBucket);
+
             if (predict > 0) {
                 if (currentKey instanceof Number) {
                     lastKey  = ((Number) bucket.getKey()).longValue();
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/EwmaModel.java b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/EwmaModel.java
index b6ee7f8ddb6..2f33855d50e 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/EwmaModel.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/EwmaModel.java
@@ -25,6 +25,7 @@ import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.search.aggregations.pipeline.movavg.MovAvgParser;
+import org.elasticsearch.search.internal.SearchContext;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -83,7 +84,7 @@ public class EwmaModel extends MovAvgModel {
         out.writeDouble(alpha);
     }
 
-    public static class SingleExpModelParser implements MovAvgModelParser {
+    public static class SingleExpModelParser extends AbstractModelParser {
 
         @Override
         public String getName() {
@@ -91,15 +92,13 @@ public class EwmaModel extends MovAvgModel {
         }
 
         @Override
-        public MovAvgModel parse(@Nullable Map<String, Object> settings) {
+        public MovAvgModel parse(@Nullable Map<String, Object> settings, String pipelineName,  SearchContext context, int windowSize) {
 
-            Double alpha;
-            if (settings == null || (alpha = (Double)settings.get("alpha")) == null) {
-                alpha = 0.5;
-            }
+            double alpha = parseDoubleParam(context, settings, "alpha", 0.5);
 
             return new EwmaModel(alpha);
         }
+
     }
 
     public static class EWMAModelBuilder implements MovAvgModelBuilder {
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltLinearModel.java b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltLinearModel.java
index a78a5486460..3a7fd963c43 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltLinearModel.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltLinearModel.java
@@ -25,6 +25,7 @@ import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.search.aggregations.pipeline.movavg.MovAvgParser;
+import org.elasticsearch.search.internal.SearchContext;
 
 import java.io.IOException;
 import java.util.*;
@@ -142,7 +143,7 @@ public class HoltLinearModel extends MovAvgModel {
         out.writeDouble(beta);
     }
 
-    public static class DoubleExpModelParser implements MovAvgModelParser {
+    public static class DoubleExpModelParser extends AbstractModelParser {
 
         @Override
         public String getName() {
@@ -150,19 +151,10 @@ public class HoltLinearModel extends MovAvgModel {
         }
 
         @Override
-        public MovAvgModel parse(@Nullable Map<String, Object> settings) {
-
-            Double alpha;
-            Double beta;
-
-            if (settings == null || (alpha = (Double)settings.get("alpha")) == null) {
-                alpha = 0.5;
-            }
-
-            if (settings == null || (beta = (Double)settings.get("beta")) == null) {
-                beta = 0.5;
-            }
+        public MovAvgModel parse(@Nullable Map<String, Object> settings, String pipelineName, SearchContext context, int windowSize) {
 
+            double alpha = parseDoubleParam(context, settings, "alpha", 0.5);
+            double beta = parseDoubleParam(context, settings, "beta", 0.5);
             return new HoltLinearModel(alpha, beta);
         }
     }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java
new file mode 100644
index 00000000000..ef3c7354500
--- /dev/null
+++ b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java
@@ -0,0 +1,422 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.search.aggregations.pipeline.movavg.models;
+
+
+import org.elasticsearch.ElasticsearchParseException;
+import org.elasticsearch.common.Nullable;
+import org.elasticsearch.common.ParseField;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.search.SearchParseException;
+import org.elasticsearch.search.aggregations.AggregationExecutionException;
+import org.elasticsearch.search.aggregations.pipeline.movavg.MovAvgParser;
+import org.elasticsearch.search.internal.SearchContext;
+
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * Calculate a triple exponential weighted moving average
+ */
+public class HoltWintersModel extends MovAvgModel {
+
+    protected static final ParseField NAME_FIELD = new ParseField("holt_winters");
+
+    public enum SeasonalityType {
+        ADDITIVE((byte) 0, "add"), MULTIPLICATIVE((byte) 1, "mult");
+
+        /**
+         * Parse a string SeasonalityType into the byte enum
+         *
+         * @param text    SeasonalityType in string format (e.g. "add")
+         * @return        SeasonalityType enum
+         */
+        @Nullable
+        public static SeasonalityType parse(String text) {
+            if (text == null) {
+                return null;
+            }
+            SeasonalityType result = null;
+            for (SeasonalityType policy : values()) {
+                if (policy.parseField.match(text)) {
+                    if (result == null) {
+                        result = policy;
+                    } else {
+                        throw new IllegalStateException("Text can be parsed to 2 different seasonality types: text=[" + text
+                                + "], " + "policies=" + Arrays.asList(result, policy));
+                    }
+                }
+            }
+            if (result == null) {
+                final List<String> validNames = new ArrayList<>();
+                for (SeasonalityType policy : values()) {
+                    validNames.add(policy.getName());
+                }
+                throw new ElasticsearchParseException("Invalid seasonality type: [" + text + "], accepted values: " + validNames);
+            }
+            return result;
+        }
+
+        private final byte id;
+        private final ParseField parseField;
+
+        SeasonalityType(byte id, String name) {
+            this.id = id;
+            this.parseField = new ParseField(name);
+        }
+
+        /**
+         * Serialize the SeasonalityType to the output stream
+         *
+         * @param out
+         * @throws IOException
+         */
+        public void writeTo(StreamOutput out) throws IOException {
+            out.writeByte(id);
+        }
+
+        /**
+         * Deserialize the SeasonalityType from the input stream
+         *
+         * @param in
+         * @return    SeasonalityType Enum
+         * @throws IOException
+         */
+        public static SeasonalityType readFrom(StreamInput in) throws IOException {
+            byte id = in.readByte();
+            for (SeasonalityType seasonalityType : values()) {
+                if (id == seasonalityType.id) {
+                    return seasonalityType;
+                }
+            }
+            throw new IllegalStateException("Unknown Seasonality Type with id [" + id + "]");
+        }
+
+        /**
+         * Return the english-formatted name of the SeasonalityType
+         *
+         * @return English representation of SeasonalityType
+         */
+        public String getName() {
+            return parseField.getPreferredName();
+        }
+    }
+
+
+    /**
+     * Controls smoothing of data. Alpha = 1 retains no memory of past values
+     * (e.g. random walk), while alpha = 0 retains infinite memory of past values (e.g.
+     * mean of the series).  Useful values are somewhere in between
+     */
+    private double alpha;
+
+    /**
+     * Equivalent to <code>alpha</code>, but controls the smoothing of the trend instead of the data
+     */
+    private double beta;
+
+    private double gamma;
+
+    private int period;
+
+    private SeasonalityType seasonalityType;
+
+    private boolean pad;
+    private double padding;
+
+    public HoltWintersModel(double alpha, double beta, double gamma, int period, SeasonalityType seasonalityType, boolean pad) {
+        this.alpha = alpha;
+        this.beta = beta;
+        this.gamma = gamma;
+        this.period = period;
+        this.seasonalityType = seasonalityType;
+        this.pad = pad;
+
+        // Only pad if we are multiplicative and padding is enabled
+        // The padding amount is not currently user-configurable...i dont see a reason to expose it?
+        this.padding = seasonalityType.equals(SeasonalityType.MULTIPLICATIVE) && pad ? 0.0000000001 : 0;
+    }
+
+
+    @Override
+    public boolean hasValue(int windowLength) {
+        // We need at least (period * 2) data-points (e.g. two "seasons")
+        return windowLength >= period * 2;
+    }
+
+    /**
+     * Predicts the next `n` values in the series, using the smoothing model to generate new values.
+     * Unlike the other moving averages, HoltWinters has forecasting/prediction built into the algorithm.
+     * Prediction is more than simply adding the next prediction to the window and repeating.  HoltWinters
+     * will extrapolate into the future by applying the trend and seasonal information to the smoothed data.
+     *
+     * @param values            Collection of numerics to movingAvg, usually windowed
+     * @param numPredictions    Number of newly generated predictions to return
+     * @param <T>               Type of numeric
+     * @return                  Returns an array of doubles, since most smoothing methods operate on floating points
+     */
+    @Override
+    public <T extends Number> double[] predict(Collection<T> values, int numPredictions) {
+        return next(values, numPredictions);
+    }
+
+    @Override
+    public <T extends Number> double next(Collection<T> values) {
+        return next(values, 1)[0];
+    }
+
+    /**
+     * Calculate a doubly exponential weighted moving average
+     *
+     * @param values Collection of values to calculate avg for
+     * @param numForecasts number of forecasts into the future to return
+     *
+     * @param <T>    Type T extending Number
+     * @return       Returns a Double containing the moving avg for the window
+     */
+    public <T extends Number> double[] next(Collection<T> values, int numForecasts) {
+
+        if (values.size() < period * 2) {
+            // We need at least two full "seasons" to use HW
+            // This should have been caught earlier, we can't do anything now...bail
+            throw new AggregationExecutionException("Holt-Winters aggregation requires at least (2 * period == 2 * "
+                    + period + " == "+(2 * period)+") data-points to function.  Only [" + values.size() + "] were provided.");
+        }
+
+        // Smoothed value
+        double s = 0;
+        double last_s = 0;
+
+        // Trend value
+        double b = 0;
+        double last_b = 0;
+
+        // Seasonal value
+        double[] seasonal = new double[values.size()];
+
+        int counter = 0;
+        double[] vs = new double[values.size()];
+        for (T v : values) {
+            vs[counter] = v.doubleValue() + padding;
+            counter += 1;
+        }
+
+        // Initial level value is average of first season
+        // Calculate the slopes between first and second season for each period
+        for (int i = 0; i < period; i++) {
+            s += vs[i];
+            b += (vs[i] - vs[i + period]) / 2;
+        }
+        s /= (double) period;
+        b /= (double) period;
+        last_s = s;
+        last_b = b;
+
+        // Calculate first seasonal
+        if (Double.compare(s, 0.0) == 0 || Double.compare(s, -0.0) == 0) {
+            Arrays.fill(seasonal, 0.0);
+        } else {
+            for (int i = 0; i < period; i++) {
+                seasonal[i] = vs[i] / s;
+            }
+        }
+
+        for (int i = period; i < vs.length; i++) {
+            // TODO if perf is a problem, we can specialize a subclass to avoid conditionals on each iteration
+            if (seasonalityType.equals(SeasonalityType.MULTIPLICATIVE)) {
+                s = alpha * (vs[i] / seasonal[i - period]) + (1.0d - alpha) * (last_s + last_b);
+            } else {
+                s = alpha * (vs[i] - seasonal[i - period]) + (1.0d - alpha) * (last_s + last_b);
+            }
+
+            b = beta * (s - last_s) + (1 - beta) * last_b;
+
+            if (seasonalityType.equals(SeasonalityType.MULTIPLICATIVE)) {
+                seasonal[i] = gamma * (vs[i] / (last_s + last_b )) + (1 - gamma) * seasonal[i - period];
+            } else {
+                seasonal[i] = gamma * (vs[i] - (last_s + last_b )) + (1 - gamma) * seasonal[i - period];
+            }
+
+            last_s = s;
+            last_b = b;
+        }
+
+        double[] forecastValues = new double[numForecasts];
+        int seasonCounter = (values.size() - 1) - period;
+
+        for (int i = 0; i < numForecasts; i++) {
+
+            // TODO perhaps pad out seasonal to a power of 2 and use a mask instead of modulo?
+            if (seasonalityType.equals(SeasonalityType.MULTIPLICATIVE)) {
+                forecastValues[i] = s + (i * b) * seasonal[seasonCounter % values.size()];
+            } else {
+                forecastValues[i] = s + (i * b) + seasonal[seasonCounter % values.size()];
+            }
+
+            seasonCounter += 1;
+        }
+
+        return forecastValues;
+    }
+
+    public static final MovAvgModelStreams.Stream STREAM = new MovAvgModelStreams.Stream() {
+        @Override
+        public MovAvgModel readResult(StreamInput in) throws IOException {
+            double alpha = in.readDouble();
+            double beta = in.readDouble();
+            double gamma = in.readDouble();
+            int period = in.readVInt();
+            SeasonalityType type = SeasonalityType.readFrom(in);
+            boolean pad = in.readBoolean();
+
+            return new HoltWintersModel(alpha, beta, gamma, period, type, pad);
+        }
+
+        @Override
+        public String getName() {
+            return NAME_FIELD.getPreferredName();
+        }
+    };
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        out.writeString(STREAM.getName());
+        out.writeDouble(alpha);
+        out.writeDouble(beta);
+        out.writeDouble(gamma);
+        out.writeVInt(period);
+        seasonalityType.writeTo(out);
+        out.writeBoolean(pad);
+    }
+
+    public static class HoltWintersModelParser extends AbstractModelParser {
+
+        @Override
+        public String getName() {
+            return NAME_FIELD.getPreferredName();
+        }
+
+        @Override
+        public MovAvgModel parse(@Nullable Map<String, Object> settings, String pipelineName, SearchContext context, int windowSize) {
+
+            double alpha = parseDoubleParam(context, settings, "alpha", 0.5);
+            double beta = parseDoubleParam(context, settings, "beta", 0.5);
+            double gamma = parseDoubleParam(context, settings, "gamma", 0.5);
+            int period = parseIntegerParam(context, settings, "period", 1);
+
+            if (windowSize < 2 * period) {
+                throw new SearchParseException(context, "Field [window] must be at least twice as large as the period when " +
+                        "using Holt-Winters.  Value provided was [" + windowSize + "], which is less than (2*period) == "
+                        + (2 * period), null);
+            }
+
+            SeasonalityType seasonalityType = SeasonalityType.ADDITIVE;
+
+            if (settings != null) {
+                Object value = settings.get("type");
+                if (value != null) {
+                    if (value instanceof String) {
+                        seasonalityType = SeasonalityType.parse((String)value);
+                    } else {
+                        throw new SearchParseException(context, "Parameter [type] must be a String, type `"
+                                + value.getClass().getSimpleName() + "` provided instead", null);
+                    }
+                }
+            }
+
+            boolean pad = parseBoolParam(context, settings, "pad", seasonalityType.equals(SeasonalityType.MULTIPLICATIVE));
+
+            return new HoltWintersModel(alpha, beta, gamma, period, seasonalityType, pad);
+        }
+    }
+
+    public static class HoltWintersModelBuilder implements MovAvgModelBuilder {
+
+        private double alpha = 0.5;
+        private double beta = 0.5;
+        private double gamma = 0.5;
+        private int period = 1;
+        private SeasonalityType seasonalityType = SeasonalityType.ADDITIVE;
+        private boolean pad = true;
+
+        /**
+         * Alpha controls the smoothing of the data.  Alpha = 1 retains no memory of past values
+         * (e.g. a random walk), while alpha = 0 retains infinite memory of past values (e.g.
+         * the series mean).  Useful values are somewhere in between.  Defaults to 0.5.
+         *
+         * @param alpha A double between 0-1 inclusive, controls data smoothing
+         *
+         * @return The builder to continue chaining
+         */
+        public HoltWintersModelBuilder alpha(double alpha) {
+            this.alpha = alpha;
+            return this;
+        }
+
+        /**
+         * Equivalent to <code>alpha</code>, but controls the smoothing of the trend instead of the data
+         *
+         * @param beta a double between 0-1 inclusive, controls trend smoothing
+         *
+         * @return The builder to continue chaining
+         */
+        public HoltWintersModelBuilder beta(double beta) {
+            this.beta = beta;
+            return this;
+        }
+
+        public HoltWintersModelBuilder gamma(double gamma) {
+            this.gamma = gamma;
+            return this;
+        }
+
+        public HoltWintersModelBuilder period(int period) {
+            this.period = period;
+            return this;
+        }
+
+        public HoltWintersModelBuilder seasonalityType(SeasonalityType type) {
+            this.seasonalityType = type;
+            return this;
+        }
+
+        public HoltWintersModelBuilder pad(boolean pad) {
+            this.pad = pad;
+            return this;
+        }
+
+        @Override
+        public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+            builder.field(MovAvgParser.MODEL.getPreferredName(), NAME_FIELD.getPreferredName());
+            builder.startObject(MovAvgParser.SETTINGS.getPreferredName());
+            builder.field("alpha", alpha);
+            builder.field("beta", beta);
+            builder.field("gamma", gamma);
+            builder.field("period", period);
+            builder.field("type", seasonalityType.getName());
+            builder.field("pad", pad);
+            builder.endObject();
+            return builder;
+        }
+    }
+}
+
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/LinearModel.java b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/LinearModel.java
index 24780a345c7..c894f776ed4 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/LinearModel.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/LinearModel.java
@@ -26,6 +26,7 @@ import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.search.aggregations.pipeline.movavg.MovAvgParser;
+import org.elasticsearch.search.internal.SearchContext;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -70,7 +71,7 @@ public class LinearModel extends MovAvgModel {
         out.writeString(STREAM.getName());
     }
 
-    public static class LinearModelParser implements MovAvgModelParser {
+    public static class LinearModelParser extends AbstractModelParser {
 
         @Override
         public String getName() {
@@ -78,7 +79,7 @@ public class LinearModel extends MovAvgModel {
         }
 
         @Override
-        public MovAvgModel parse(@Nullable Map<String, Object> settings) {
+        public MovAvgModel parse(@Nullable Map<String, Object> settings, String pipelineName,  SearchContext context, int windowSize) {
             return new LinearModel();
         }
     }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java
index 1fa30811f9c..5f41b24531b 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModel.java
@@ -21,14 +21,31 @@ package org.elasticsearch.search.aggregations.pipeline.movavg.models;
 
 import com.google.common.collect.EvictingQueue;
 
+import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.search.SearchParseException;
+import org.elasticsearch.search.internal.SearchContext;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Map;
 
 public abstract class MovAvgModel {
 
+    /**
+     * Checks to see this model can produce a new value, without actually running the algo.
+     * This can be used for models that have certain preconditions that need to be met in order
+     * to short-circuit execution
+     *
+     * @param windowLength  Length of current window
+     * @return              Returns `true` if calling next() will produce a value, `false` otherwise
+     */
+    public boolean hasValue(int windowLength) {
+        // Default implementation can always provide a next() value
+        return true;
+    }
+
     /**
      * Returns the next value in the series, according to the underlying smoothing model
      *
@@ -90,6 +107,122 @@ public abstract class MovAvgModel {
      * @throws IOException
      */
     public abstract void writeTo(StreamOutput out) throws IOException;
+
+    /**
+     * Abstract class which also provides some concrete parsing functionality.
+     */
+    public abstract static class AbstractModelParser {
+
+        /**
+         * Returns the name of the model
+         *
+         * @return The model's name
+         */
+        public abstract String getName();
+
+        /**
+         * Parse a settings hash that is specific to this model
+         *
+         * @param settings      Map of settings, extracted from the request
+         * @param pipelineName   Name of the parent pipeline agg
+         * @param context       The parser context that we are in
+         * @param windowSize    Size of the window for this moving avg
+         * @return              A fully built moving average model
+         */
+        public abstract MovAvgModel parse(@Nullable Map<String, Object> settings, String pipelineName, SearchContext context, int windowSize);
+
+
+        /**
+         * Extracts a 0-1 inclusive double from the settings map, otherwise throws an exception
+         *
+         * @param context       Search query context
+         * @param settings      Map of settings provided to this model
+         * @param name          Name of parameter we are attempting to extract
+         * @param defaultValue  Default value to be used if value does not exist in map
+         *
+         * @throws SearchParseException
+         *
+         * @return Double value extracted from settings map
+         */
+        protected double parseDoubleParam(SearchContext context, @Nullable Map<String, Object> settings, String name, double defaultValue) {
+            if (settings == null) {
+                return defaultValue;
+            }
+
+            Object value = settings.get(name);
+            if (value == null) {
+                return defaultValue;
+            } else if (value instanceof Double) {
+                double v = (Double)value;
+                if (v >= 0 && v <= 1) {
+                    return v;
+                }
+
+                throw new SearchParseException(context, "Parameter [" + name + "] must be between 0-1 inclusive.  Provided"
+                        + "value was [" + v + "]", null);
+            }
+
+            throw new SearchParseException(context, "Parameter [" + name + "] must be a double, type `"
+                    + value.getClass().getSimpleName() + "` provided instead", null);
+        }
+
+        /**
+         * Extracts an integer from the settings map, otherwise throws an exception
+         *
+         * @param context       Search query context
+         * @param settings      Map of settings provided to this model
+         * @param name          Name of parameter we are attempting to extract
+         * @param defaultValue  Default value to be used if value does not exist in map
+         *
+         * @throws SearchParseException
+         *
+         * @return Integer value extracted from settings map
+         */
+        protected int parseIntegerParam(SearchContext context, @Nullable Map<String, Object> settings, String name, int defaultValue) {
+            if (settings == null) {
+                return defaultValue;
+            }
+
+            Object value = settings.get(name);
+            if (value == null) {
+                return defaultValue;
+            } else if (value instanceof Integer) {
+                return (Integer)value;
+            }
+
+            throw new SearchParseException(context, "Parameter [" + name + "] must be an integer, type `"
+                    + value.getClass().getSimpleName() + "` provided instead", null);
+        }
+
+        /**
+         * Extracts a boolean from the settings map, otherwise throws an exception
+         *
+         * @param context       Search query context
+         * @param settings      Map of settings provided to this model
+         * @param name          Name of parameter we are attempting to extract
+         * @param defaultValue  Default value to be used if value does not exist in map
+         *
+         * @throws SearchParseException
+         *
+         * @return Boolean value extracted from settings map
+         */
+        protected boolean parseBoolParam(SearchContext context, @Nullable Map<String, Object> settings, String name, boolean defaultValue) {
+            if (settings == null) {
+                return defaultValue;
+            }
+
+            Object value = settings.get(name);
+            if (value == null) {
+                return defaultValue;
+            } else if (value instanceof Boolean) {
+                return (Boolean)value;
+            }
+
+            throw new SearchParseException(context, "Parameter [" + name + "] must be a boolean, type `"
+                    + value.getClass().getSimpleName() + "` provided instead", null);
+        }
+    }
+
 }
 
 
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelModule.java b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelModule.java
index 12a61d42d2a..6233270edf7 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelModule.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelModule.java
@@ -31,23 +31,24 @@ import java.util.List;
  */
 public class MovAvgModelModule extends AbstractModule {
 
-    private List<Class<? extends MovAvgModelParser>> parsers = Lists.newArrayList();
+    private List<Class<? extends MovAvgModel.AbstractModelParser>> parsers = Lists.newArrayList();
 
     public MovAvgModelModule() {
         registerParser(SimpleModel.SimpleModelParser.class);
         registerParser(LinearModel.LinearModelParser.class);
         registerParser(EwmaModel.SingleExpModelParser.class);
         registerParser(HoltLinearModel.DoubleExpModelParser.class);
+        registerParser(HoltWintersModel.HoltWintersModelParser.class);
     }
 
-    public void registerParser(Class<? extends MovAvgModelParser> parser) {
+    public void registerParser(Class<? extends MovAvgModel.AbstractModelParser> parser) {
         parsers.add(parser);
     }
 
     @Override
     protected void configure() {
-        Multibinder<MovAvgModelParser> parserMapBinder = Multibinder.newSetBinder(binder(), MovAvgModelParser.class);
-        for (Class<? extends MovAvgModelParser> clazz : parsers) {
+        Multibinder<MovAvgModel.AbstractModelParser> parserMapBinder = Multibinder.newSetBinder(binder(), MovAvgModel.AbstractModelParser.class);
+        for (Class<? extends MovAvgModel.AbstractModelParser> clazz : parsers) {
             parserMapBinder.addBinding().to(clazz);
         }
         bind(MovAvgModelParserMapper.class);
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelParser.java b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelParser.java
deleted file mode 100644
index 43721e37309..00000000000
--- a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelParser.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.search.aggregations.pipeline.movavg.models;
-
-
-import org.elasticsearch.common.Nullable;
-
-import java.util.Map;
-
-/**
- * Common interface for parsers used by the various Moving Average models
- */
-public interface MovAvgModelParser {
-    public MovAvgModel parse(@Nullable Map<String, Object> settings);
-
-    public String getName();
-}
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelParserMapper.java b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelParserMapper.java
index 2115f7e047b..bfd0c15c1c0 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelParserMapper.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/MovAvgModelParserMapper.java
@@ -32,19 +32,19 @@ import java.util.Set;
  */
 public class MovAvgModelParserMapper {
 
-    protected ImmutableMap<String, MovAvgModelParser> movAvgParsers;
+    protected ImmutableMap<String, MovAvgModel.AbstractModelParser> movAvgParsers;
 
     @Inject
-    public MovAvgModelParserMapper(Set<MovAvgModelParser> parsers) {
-        MapBuilder<String, MovAvgModelParser> builder = MapBuilder.newMapBuilder();
-        for (MovAvgModelParser parser : parsers) {
+    public MovAvgModelParserMapper(Set<MovAvgModel.AbstractModelParser> parsers) {
+        MapBuilder<String, MovAvgModel.AbstractModelParser> builder = MapBuilder.newMapBuilder();
+        for (MovAvgModel.AbstractModelParser parser : parsers) {
             builder.put(parser.getName(), parser);
         }
         movAvgParsers = builder.immutableMap();
     }
 
     public @Nullable
-    MovAvgModelParser get(String parserName) {
+    MovAvgModel.AbstractModelParser get(String parserName) {
         return movAvgParsers.get(parserName);
     }
 
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/SimpleModel.java b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/SimpleModel.java
index 68ffc3dd9aa..78055b063eb 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/SimpleModel.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/SimpleModel.java
@@ -25,6 +25,7 @@ import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.search.aggregations.pipeline.movavg.MovAvgParser;
+import org.elasticsearch.search.internal.SearchContext;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -63,7 +64,7 @@ public class SimpleModel extends MovAvgModel {
         out.writeString(STREAM.getName());
     }
 
-    public static class SimpleModelParser implements MovAvgModelParser {
+    public static class SimpleModelParser extends AbstractModelParser {
 
         @Override
         public String getName() {
@@ -71,7 +72,7 @@ public class SimpleModel extends MovAvgModel {
         }
 
         @Override
-        public MovAvgModel parse(@Nullable Map<String, Object> settings) {
+        public MovAvgModel parse(@Nullable Map<String, Object> settings, String pipelineName,  SearchContext context, int windowSize) {
             return new SimpleModel();
         }
     }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/TransportMovAvgModelModule.java b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/TransportMovAvgModelModule.java
index 41f90b94d84..7f5dd14005c 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/TransportMovAvgModelModule.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/TransportMovAvgModelModule.java
@@ -36,6 +36,7 @@ public class TransportMovAvgModelModule extends AbstractModule {
         registerStream(LinearModel.STREAM);
         registerStream(EwmaModel.STREAM);
         registerStream(HoltLinearModel.STREAM);
+        registerStream(HoltWintersModel.STREAM);
     }
 
     public void registerStream(MovAvgModelStreams.Stream stream) {
diff --git a/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java b/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java
index 0e0eb239ce0..3db9531a537 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java
@@ -35,21 +35,12 @@ import org.elasticsearch.search.aggregations.metrics.avg.Avg;
 import org.elasticsearch.search.aggregations.pipeline.BucketHelpers;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregationHelperTests;
 import org.elasticsearch.search.aggregations.pipeline.SimpleValue;
-import org.elasticsearch.search.aggregations.pipeline.movavg.models.EwmaModel;
-import org.elasticsearch.search.aggregations.pipeline.movavg.models.HoltLinearModel;
-import org.elasticsearch.search.aggregations.pipeline.movavg.models.LinearModel;
-import org.elasticsearch.search.aggregations.pipeline.movavg.models.MovAvgModelBuilder;
-import org.elasticsearch.search.aggregations.pipeline.movavg.models.SimpleModel;
+import org.elasticsearch.search.aggregations.pipeline.movavg.models.*;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.avg;
@@ -79,6 +70,9 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
     static int windowSize;
     static double alpha;
     static double beta;
+    static double gamma;
+    static int period;
+    static HoltWintersModel.SeasonalityType seasonalityType;
     static BucketHelpers.GapPolicy gapPolicy;
     static ValuesSourceMetricsAggregationBuilder metric;
     static List<PipelineAggregationHelperTests.MockBucket> mockHisto;
@@ -87,7 +81,7 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
 
 
     enum MovAvgType {
-        SIMPLE ("simple"), LINEAR("linear"), EWMA("ewma"), HOLT("holt");
+        SIMPLE ("simple"), LINEAR("linear"), EWMA("ewma"), HOLT("holt"), HOLT_WINTERS("holt_winters");
 
         private final String name;
 
@@ -124,9 +118,13 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
 
         interval = 5;
         numBuckets = randomIntBetween(6, 80);
-        windowSize = randomIntBetween(3, 10);
+        period = randomIntBetween(1, 5);
+        windowSize = randomIntBetween(period * 2, 10);  // start must be 2*period to play nice with HW
         alpha = randomDouble();
         beta = randomDouble();
+        gamma = randomDouble();
+        seasonalityType = randomBoolean() ? HoltWintersModel.SeasonalityType.ADDITIVE : HoltWintersModel.SeasonalityType.MULTIPLICATIVE;
+
 
         gapPolicy = randomBoolean() ? BucketHelpers.GapPolicy.SKIP : BucketHelpers.GapPolicy.INSERT_ZEROS;
         metric = randomMetric("the_metric", VALUE_FIELD);
@@ -212,6 +210,15 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
                     break;
                 case HOLT:
                     values.add(holt(window));
+                    break;
+                case HOLT_WINTERS:
+                    // HW needs at least 2 periods of data to start
+                    if (window.size() >= period * 2) {
+                        values.add(holtWinters(window));
+                    } else {
+                        values.add(null);
+                    }
+
                     break;
             }
 
@@ -308,7 +315,79 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
         return s + (0 * b) ;
     }
 
+    /**
+     * Holt winters (triple exponential) moving avg
+     * @param window Window of values to compute movavg for
+     * @return
+     */
+    private double holtWinters(Collection<Double> window) {
+        // Smoothed value
+        double s = 0;
+        double last_s = 0;
 
+        // Trend value
+        double b = 0;
+        double last_b = 0;
+
+        // Seasonal value
+        double[] seasonal = new double[window.size()];
+
+        double padding = seasonalityType.equals(HoltWintersModel.SeasonalityType.MULTIPLICATIVE) ? 0.0000000001 : 0;
+
+        int counter = 0;
+        double[] vs = new double[window.size()];
+        for (double v : window) {
+            vs[counter] = v + padding;
+            counter += 1;
+        }
+
+
+        // Initial level value is average of first season
+        // Calculate the slopes between first and second season for each period
+        for (int i = 0; i < period; i++) {
+            s += vs[i];
+            b += (vs[i] - vs[i + period]) / 2;
+        }
+        s /= (double) period;
+        b /= (double) period;
+        last_s = s;
+        last_b = b;
+
+        // Calculate first seasonal
+        if (Double.compare(s, 0.0) == 0 || Double.compare(s, -0.0) == 0) {
+            Arrays.fill(seasonal, 0.0);
+        } else {
+            for (int i = 0; i < period; i++) {
+                seasonal[i] = vs[i] / s;
+            }
+        }
+
+        for (int i = period; i < vs.length; i++) {
+            if (seasonalityType.equals(HoltWintersModel.SeasonalityType.MULTIPLICATIVE)) {
+                s = alpha * (vs[i] / seasonal[i - period]) + (1.0d - alpha) * (last_s + last_b);
+            } else {
+                s = alpha * (vs[i] - seasonal[i - period]) + (1.0d - alpha) * (last_s + last_b);
+            }
+
+            b = beta * (s - last_s) + (1 - beta) * last_b;
+
+            if (seasonalityType.equals(HoltWintersModel.SeasonalityType.MULTIPLICATIVE)) {
+                seasonal[i] = gamma * (vs[i] / (last_s + last_b )) + (1 - gamma) * seasonal[i - period];
+            } else {
+                seasonal[i] = gamma * (vs[i] - (last_s + last_b )) + (1 - gamma) * seasonal[i - period];
+            }
+
+            last_s = s;
+            last_b = b;
+        }
+
+        int seasonCounter = (window.size() - 1) - period;
+        if (seasonalityType.equals(HoltWintersModel.SeasonalityType.MULTIPLICATIVE)) {
+            return s + (0 * b) * seasonal[seasonCounter % window.size()];
+        } else {
+            return s + (0 * b) + seasonal[seasonCounter % window.size()];
+        }
+    }
 
 
     /**
@@ -522,6 +601,60 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
         }
     }
 
+    @Test
+    public void HoltWintersValuedField() {
+
+        SearchResponse response = client()
+                .prepareSearch("idx").setTypes("type")
+                .addAggregation(
+                        histogram("histo").field(INTERVAL_FIELD).interval(interval)
+                                .extendedBounds(0L, (long) (interval * (numBuckets - 1)))
+                                .subAggregation(metric)
+                                .subAggregation(movingAvg("movavg_counts")
+                                        .window(windowSize)
+                                        .modelBuilder(new HoltWintersModel.HoltWintersModelBuilder()
+                                                .alpha(alpha).beta(beta).gamma(gamma).period(period).seasonalityType(seasonalityType))
+                                        .gapPolicy(gapPolicy)
+                                        .setBucketsPaths("_count"))
+                                .subAggregation(movingAvg("movavg_values")
+                                        .window(windowSize)
+                                        .modelBuilder(new HoltWintersModel.HoltWintersModelBuilder()
+                                                .alpha(alpha).beta(beta).gamma(gamma).period(period).seasonalityType(seasonalityType))
+                                        .gapPolicy(gapPolicy)
+                                        .setBucketsPaths("the_metric"))
+                ).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        InternalHistogram<Bucket> histo = response.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        assertThat(histo.getName(), equalTo("histo"));
+        List<? extends Bucket> buckets = histo.getBuckets();
+        assertThat("Size of buckets array is not correct.", buckets.size(), equalTo(mockHisto.size()));
+
+        List<Double> expectedCounts = testValues.get(MovAvgType.HOLT_WINTERS.toString() + "_" + MetricTarget.COUNT.toString());
+        List<Double> expectedValues = testValues.get(MovAvgType.HOLT_WINTERS.toString() + "_" + MetricTarget.VALUE.toString());
+
+        Iterator<? extends Histogram.Bucket> actualIter = buckets.iterator();
+        Iterator<PipelineAggregationHelperTests.MockBucket> expectedBucketIter = mockHisto.iterator();
+        Iterator<Double> expectedCountsIter = expectedCounts.iterator();
+        Iterator<Double> expectedValuesIter = expectedValues.iterator();
+
+        while (actualIter.hasNext()) {
+            assertValidIterators(expectedBucketIter, expectedCountsIter, expectedValuesIter);
+
+            Histogram.Bucket actual = actualIter.next();
+            PipelineAggregationHelperTests.MockBucket expected = expectedBucketIter.next();
+            Double expectedCount = expectedCountsIter.next();
+            Double expectedValue = expectedValuesIter.next();
+
+            assertThat("keys do not match", ((Number) actual.getKey()).longValue(), equalTo(expected.key));
+            assertThat("doc counts do not match", actual.getDocCount(), equalTo((long)expected.count));
+
+            assertBucketContents(actual, expectedCount, expectedValue);
+        }
+    }
+
     @Test
     public void testPredictNegativeKeysAtStart() {
 
@@ -572,6 +705,7 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
         }
     }
 
+
     @Test
     public void testSizeZeroWindow() {
         try {
@@ -1070,6 +1204,55 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
         }
     }
 
+    @Test
+    public void testHoltWintersNotEnoughData() {
+        try {
+            SearchResponse response = client()
+                    .prepareSearch("idx").setTypes("type")
+                    .addAggregation(
+                            histogram("histo").field(INTERVAL_FIELD).interval(interval)
+                                    .extendedBounds(0L, (long) (interval * (numBuckets - 1)))
+                                    .subAggregation(metric)
+                                    .subAggregation(movingAvg("movavg_counts")
+                                            .window(10)
+                                            .modelBuilder(new HoltWintersModel.HoltWintersModelBuilder()
+                                                    .alpha(alpha).beta(beta).gamma(gamma).period(20).seasonalityType(seasonalityType))
+                                            .gapPolicy(gapPolicy)
+                                            .setBucketsPaths("_count"))
+                                    .subAggregation(movingAvg("movavg_values")
+                                            .window(windowSize)
+                                            .modelBuilder(new HoltWintersModel.HoltWintersModelBuilder()
+                                                    .alpha(alpha).beta(beta).gamma(gamma).period(20).seasonalityType(seasonalityType))
+                                            .gapPolicy(gapPolicy)
+                                            .setBucketsPaths("the_metric"))
+                    ).execute().actionGet();
+        } catch (SearchPhaseExecutionException e) {
+            // All good
+        }
+
+    }
+
+    @Test
+    public void testBadModelParams() {
+        try {
+            SearchResponse response = client()
+                    .prepareSearch("idx").setTypes("type")
+                    .addAggregation(
+                            histogram("histo").field(INTERVAL_FIELD).interval(interval)
+                                    .extendedBounds(0L, (long) (interval * (numBuckets - 1)))
+                                    .subAggregation(metric)
+                                    .subAggregation(movingAvg("movavg_counts")
+                                            .window(10)
+                                            .modelBuilder(randomModelBuilder(100))
+                                            .gapPolicy(gapPolicy)
+                                            .setBucketsPaths("_count"))
+                    ).execute().actionGet();
+        } catch (SearchPhaseExecutionException e) {
+            // All good
+        }
+
+    }
+
 
     private void assertValidIterators(Iterator expectedBucketIter, Iterator expectedCountsIter, Iterator expectedValuesIter) {
         if (!expectedBucketIter.hasNext()) {
@@ -1088,6 +1271,8 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
         SimpleValue countMovAvg = actual.getAggregations().get("movavg_counts");
         if (expectedCount == null) {
             assertThat("[_count] movavg is not null", countMovAvg, nullValue());
+        } else if (Double.isNaN(expectedCount)) {
+            assertThat("[_count] movavg should be NaN, but is ["+countMovAvg.value()+"] instead", countMovAvg.value(), equalTo(Double.NaN));
         } else {
             assertThat("[_count] movavg is null", countMovAvg, notNullValue());
             assertThat("[_count] movavg does not match expected ["+countMovAvg.value()+" vs "+expectedCount+"]",
@@ -1098,6 +1283,8 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
         SimpleValue valuesMovAvg = actual.getAggregations().get("movavg_values");
         if (expectedValue == null) {
             assertThat("[value] movavg is not null", valuesMovAvg, Matchers.nullValue());
+        } else if (Double.isNaN(expectedValue)) {
+            assertThat("[value] movavg should be NaN, but is ["+valuesMovAvg.value()+"] instead", valuesMovAvg.value(), equalTo(Double.NaN));
         } else {
             assertThat("[value] movavg is null", valuesMovAvg, notNullValue());
             assertThat("[value] movavg does not match expected ["+valuesMovAvg.value()+" vs "+expectedValue+"]",
@@ -1106,17 +1293,24 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
     }
 
     private MovAvgModelBuilder randomModelBuilder() {
+        return randomModelBuilder(0);
+    }
+
+    private MovAvgModelBuilder randomModelBuilder(double padding) {
         int rand = randomIntBetween(0,3);
 
+        // HoltWinters is excluded from random generation, because it's "cold start" behavior makes
+        // randomized testing too tricky.  Should probably add dedicated, randomized tests just for HoltWinters,
+        // which can compensate for the idiosyncrasies
         switch (rand) {
             case 0:
                 return new SimpleModel.SimpleModelBuilder();
             case 1:
                 return new LinearModel.LinearModelBuilder();
             case 2:
-                return new EwmaModel.EWMAModelBuilder().alpha(alpha);
+                return new EwmaModel.EWMAModelBuilder().alpha(alpha + padding);
             case 3:
-                return new HoltLinearModel.HoltLinearModelBuilder().alpha(alpha).beta(beta);
+                return new HoltLinearModel.HoltLinearModelBuilder().alpha(alpha + padding).beta(beta + padding);
             default:
                 return new SimpleModel.SimpleModelBuilder();
         }
diff --git a/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java b/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java
index a25f84d1902..0bd9711c7ef 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java
@@ -28,6 +28,8 @@ import static org.hamcrest.Matchers.equalTo;
 
 import org.junit.Test;
 
+import java.util.Arrays;
+
 public class MovAvgUnitTests extends ElasticsearchTestCase {
 
     @Test
@@ -259,7 +261,7 @@ public class MovAvgUnitTests extends ElasticsearchTestCase {
         MovAvgModel model = new HoltLinearModel(alpha, beta);
 
         int windowSize = randomIntBetween(1, 50);
-        int numPredictions = randomIntBetween(1,50);
+        int numPredictions = randomIntBetween(1, 50);
 
         EvictingQueue<Double> window = EvictingQueue.create(windowSize);
         for (int i = 0; i < windowSize; i++) {
@@ -297,4 +299,288 @@ public class MovAvgUnitTests extends ElasticsearchTestCase {
             assertThat(Double.compare(expected[i], actual[i]), equalTo(0));
         }
     }
+
+    @Test
+    public void testHoltWintersMultiplicativePadModel() {
+        double alpha = randomDouble();
+        double beta = randomDouble();
+        double gamma = randomDouble();
+        int period = randomIntBetween(1,10);
+        MovAvgModel model = new HoltWintersModel(alpha, beta, gamma, period, HoltWintersModel.SeasonalityType.MULTIPLICATIVE, true);
+
+        int windowSize = randomIntBetween(period * 2, 50); // HW requires at least two periods of data
+
+        EvictingQueue<Double> window = EvictingQueue.create(windowSize);
+        for (int i = 0; i < windowSize; i++) {
+            window.offer(randomDouble());
+        }
+
+        // Smoothed value
+        double s = 0;
+        double last_s = 0;
+
+        // Trend value
+        double b = 0;
+        double last_b = 0;
+
+        // Seasonal value
+        double[] seasonal = new double[windowSize];
+
+        int counter = 0;
+        double[] vs = new double[windowSize];
+        for (double v : window) {
+            vs[counter] = v + 0.0000000001;
+            counter += 1;
+        }
+
+
+        // Initial level value is average of first season
+        // Calculate the slopes between first and second season for each period
+        for (int i = 0; i < period; i++) {
+            s += vs[i];
+            b += (vs[i] - vs[i + period]) / 2;
+        }
+        s /= (double) period;
+        b /= (double) period;
+        last_s = s;
+        last_b = b;
+
+        // Calculate first seasonal
+        if (Double.compare(s, 0.0) == 0 || Double.compare(s, -0.0) == 0) {
+            Arrays.fill(seasonal, 0.0);
+        } else {
+            for (int i = 0; i < period; i++) {
+                seasonal[i] = vs[i] / s;
+            }
+        }
+
+        for (int i = period; i < vs.length; i++) {
+            s = alpha * (vs[i] / seasonal[i - period]) + (1.0d - alpha) * (last_s + last_b);
+            b = beta * (s - last_s) + (1 - beta) * last_b;
+
+            //seasonal[i] = gamma * (vs[i] / s) + ((1 - gamma) * seasonal[i - period]);
+            seasonal[i] = gamma * (vs[i] / (last_s + last_b )) + (1 - gamma) * seasonal[i - period];
+            last_s = s;
+            last_b = b;
+        }
+
+        int seasonCounter = (windowSize - 1) - period;
+        double expected = s + (0 * b) * seasonal[seasonCounter % windowSize];;
+        double actual = model.next(window);
+        assertThat(Double.compare(expected, actual), equalTo(0));
+    }
+
+    @Test
+    public void testHoltWintersMultiplicativePadPredictionModel() {
+        double alpha = randomDouble();
+        double beta = randomDouble();
+        double gamma = randomDouble();
+        int period = randomIntBetween(1,10);
+        MovAvgModel model = new HoltWintersModel(alpha, beta, gamma, period, HoltWintersModel.SeasonalityType.MULTIPLICATIVE, true);
+
+        int windowSize = randomIntBetween(period * 2, 50); // HW requires at least two periods of data
+        int numPredictions = randomIntBetween(1, 50);
+
+        EvictingQueue<Double> window = EvictingQueue.create(windowSize);
+        for (int i = 0; i < windowSize; i++) {
+            window.offer(randomDouble());
+        }
+        double actual[] = model.predict(window, numPredictions);
+        double expected[] = new double[numPredictions];
+
+        // Smoothed value
+        double s = 0;
+        double last_s = 0;
+
+        // Trend value
+        double b = 0;
+        double last_b = 0;
+
+        // Seasonal value
+        double[] seasonal = new double[windowSize];
+
+        int counter = 0;
+        double[] vs = new double[windowSize];
+        for (double v : window) {
+            vs[counter] = v + 0.0000000001;
+            counter += 1;
+        }
+
+
+        // Initial level value is average of first season
+        // Calculate the slopes between first and second season for each period
+        for (int i = 0; i < period; i++) {
+            s += vs[i];
+            b += (vs[i] - vs[i + period]) / 2;
+        }
+        s /= (double) period;
+        b /= (double) period;
+        last_s = s;
+        last_b = b;
+
+        for (int i = 0; i < period; i++) {
+            // Calculate first seasonal
+            seasonal[i] = vs[i] / s;
+        }
+
+        for (int i = period; i < vs.length; i++) {
+            s = alpha * (vs[i] / seasonal[i - period]) + (1.0d - alpha) * (last_s + last_b);
+            b = beta * (s - last_s) + (1 - beta) * last_b;
+
+            //seasonal[i] = gamma * (vs[i] / s) + ((1 - gamma) * seasonal[i - period]);
+            seasonal[i] = gamma * (vs[i] / (last_s + last_b )) + (1 - gamma) * seasonal[i - period];
+            last_s = s;
+            last_b = b;
+        }
+
+        int seasonCounter = (windowSize - 1) - period;
+
+        for (int i = 0; i < numPredictions; i++) {
+
+            expected[i] = s + (i * b) * seasonal[seasonCounter % windowSize];
+            assertThat(Double.compare(expected[i], actual[i]), equalTo(0));
+            seasonCounter += 1;
+        }
+
+    }
+
+    @Test
+    public void testHoltWintersAdditiveModel() {
+        double alpha = randomDouble();
+        double beta = randomDouble();
+        double gamma = randomDouble();
+        int period = randomIntBetween(1,10);
+        MovAvgModel model = new HoltWintersModel(alpha, beta, gamma, period, HoltWintersModel.SeasonalityType.ADDITIVE, false);
+
+        int windowSize = randomIntBetween(period * 2, 50); // HW requires at least two periods of data
+
+        EvictingQueue<Double> window = EvictingQueue.create(windowSize);
+        for (int i = 0; i < windowSize; i++) {
+            window.offer(randomDouble());
+        }
+
+        // Smoothed value
+        double s = 0;
+        double last_s = 0;
+
+        // Trend value
+        double b = 0;
+        double last_b = 0;
+
+        // Seasonal value
+        double[] seasonal = new double[windowSize];
+
+        int counter = 0;
+        double[] vs = new double[windowSize];
+        for (double v : window) {
+            vs[counter] = v;
+            counter += 1;
+        }
+
+
+        // Initial level value is average of first season
+        // Calculate the slopes between first and second season for each period
+        for (int i = 0; i < period; i++) {
+            s += vs[i];
+            b += (vs[i] - vs[i + period]) / 2;
+        }
+        s /= (double) period;
+        b /= (double) period;
+        last_s = s;
+        last_b = b;
+
+        for (int i = 0; i < period; i++) {
+            // Calculate first seasonal
+            seasonal[i] = vs[i] / s;
+        }
+
+        for (int i = period; i < vs.length; i++) {
+            s = alpha * (vs[i] - seasonal[i - period]) + (1.0d - alpha) * (last_s + last_b);
+            b = beta * (s - last_s) + (1 - beta) * last_b;
+
+            //seasonal[i] = gamma * (vs[i] / s) + ((1 - gamma) * seasonal[i - period]);
+            seasonal[i] = gamma * (vs[i] - (last_s + last_b )) + (1 - gamma) * seasonal[i - period];
+            last_s = s;
+            last_b = b;
+        }
+
+        int seasonCounter = (windowSize - 1) - period;
+        double expected = s + (0 * b) + seasonal[seasonCounter % windowSize];;
+        double actual = model.next(window);
+        assertThat(Double.compare(expected, actual), equalTo(0));
+    }
+
+    @Test
+    public void testHoltWintersAdditivePredictionModel() {
+        double alpha = randomDouble();
+        double beta = randomDouble();
+        double gamma = randomDouble();
+        int period = randomIntBetween(1,10);
+        MovAvgModel model = new HoltWintersModel(alpha, beta, gamma, period, HoltWintersModel.SeasonalityType.ADDITIVE, false);
+
+        int windowSize = randomIntBetween(period * 2, 50); // HW requires at least two periods of data
+        int numPredictions = randomIntBetween(1, 50);
+
+        EvictingQueue<Double> window = EvictingQueue.create(windowSize);
+        for (int i = 0; i < windowSize; i++) {
+            window.offer(randomDouble());
+        }
+        double actual[] = model.predict(window, numPredictions);
+        double expected[] = new double[numPredictions];
+
+        // Smoothed value
+        double s = 0;
+        double last_s = 0;
+
+        // Trend value
+        double b = 0;
+        double last_b = 0;
+
+        // Seasonal value
+        double[] seasonal = new double[windowSize];
+
+        int counter = 0;
+        double[] vs = new double[windowSize];
+        for (double v : window) {
+            vs[counter] = v;
+            counter += 1;
+        }
+
+
+        // Initial level value is average of first season
+        // Calculate the slopes between first and second season for each period
+        for (int i = 0; i < period; i++) {
+            s += vs[i];
+            b += (vs[i] - vs[i + period]) / 2;
+        }
+        s /= (double) period;
+        b /= (double) period;
+        last_s = s;
+        last_b = b;
+
+        for (int i = 0; i < period; i++) {
+            // Calculate first seasonal
+            seasonal[i] = vs[i] / s;
+        }
+
+        for (int i = period; i < vs.length; i++) {
+            s = alpha * (vs[i] - seasonal[i - period]) + (1.0d - alpha) * (last_s + last_b);
+            b = beta * (s - last_s) + (1 - beta) * last_b;
+
+            //seasonal[i] = gamma * (vs[i] / s) + ((1 - gamma) * seasonal[i - period]);
+            seasonal[i] = gamma * (vs[i] - (last_s + last_b )) + (1 - gamma) * seasonal[i - period];
+            last_s = s;
+            last_b = b;
+        }
+
+        int seasonCounter = (windowSize - 1) - period;
+
+        for (int i = 0; i < numPredictions; i++) {
+
+            expected[i] = s + (i * b) + seasonal[seasonCounter % windowSize];
+            assertThat(Double.compare(expected[i], actual[i]), equalTo(0));
+            seasonCounter += 1;
+        }
+
+    }
 }

From 6d96bfc98b981f1e5776da7c5c3cc50eef73cd42 Mon Sep 17 00:00:00 2001
From: jaymode <jay.modi@elasticsearch.com>
Date: Wed, 27 May 2015 15:15:38 -0400
Subject: [PATCH 042/123] catch UnsatisfiedLinkError on JNA load

This catches UnsatifiedLinkError when attempting to load the JNA Native
class, in cases where there are error loading the native libraries that JNA
needs to function.
---
 src/main/java/org/elasticsearch/bootstrap/Natives.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/elasticsearch/bootstrap/Natives.java b/src/main/java/org/elasticsearch/bootstrap/Natives.java
index 3342cdfd2c0..2048895f59e 100644
--- a/src/main/java/org/elasticsearch/bootstrap/Natives.java
+++ b/src/main/java/org/elasticsearch/bootstrap/Natives.java
@@ -34,12 +34,14 @@ class Natives {
 
     static {
         try {
-            // load one of the main JNA classes to see if the classes are available. this does not ensure that native
-            // libraries are available
+            // load one of the main JNA classes to see if the classes are available. this does not ensure that all native
+            // libraries are available, only the ones necessary by JNA to function
             Class.forName("com.sun.jna.Native");
             jnaAvailable = true;
-        } catch(ClassNotFoundException e) {
-            logger.warn("JNA not found. native methods will be disabled.");
+        } catch (ClassNotFoundException e) {
+            logger.warn("JNA not found. native methods will be disabled.", e);
+        } catch (UnsatisfiedLinkError e) {
+            logger.warn("unable to load JNA native support library, native methods will be disabled.", e);
         }
     }
 

From d32a80f37b1e09d37b1556ba5cce74d0b76bb8c4 Mon Sep 17 00:00:00 2001
From: Zachary Tong <zacharyjtong@gmail.com>
Date: Wed, 27 May 2015 16:13:36 -0400
Subject: [PATCH 043/123] Docs:  Fix misplaced images in moving_avg docs

---
 .../pipeline/movavg-aggregation.asciidoc            |   4 ++--
 .../{reducers_movavg => pipeline_movavg}/triple.png | Bin
 .../triple_prediction.png                           | Bin
 .../triple_untruncated.png                          | Bin
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename docs/reference/images/{reducers_movavg => pipeline_movavg}/triple.png (100%)
 rename docs/reference/images/{reducers_movavg => pipeline_movavg}/triple_prediction.png (100%)
 rename docs/reference/images/{reducers_movavg => pipeline_movavg}/triple_untruncated.png (100%)

diff --git a/docs/reference/aggregations/pipeline/movavg-aggregation.asciidoc b/docs/reference/aggregations/pipeline/movavg-aggregation.asciidoc
index 6f998ffca98..20677b404af 100644
--- a/docs/reference/aggregations/pipeline/movavg-aggregation.asciidoc
+++ b/docs/reference/aggregations/pipeline/movavg-aggregation.asciidoc
@@ -255,7 +255,7 @@ does not backcast.
 
 [[holt_winters_cold_start]]
 .Holt-Winters showing a "cold" start where no values are emitted
-image::images/reducers_movavg/triple_untruncated.png[]
+image::images/pipeline_movavg/triple_untruncated.png[]
 
 Because the "cold start" obscures what the moving average looks like, the rest of the Holt-Winters images are truncated
 to not show the "cold start".  Just be aware this will always be present at the beginning of your moving averages!
@@ -290,7 +290,7 @@ The default value of `period` is `1`.
 
 [[holt_winters_add]]
 .Holt-Winters moving average with window of size 120, alpha = 0.5, beta = 0.7, gamma = 0.3, period = 30
-image::images/reducers_movavg/triple.png[]
+image::images/pipeline_movavg/triple.png[]
 
 ===== Multiplicative Holt-Winters
 
diff --git a/docs/reference/images/reducers_movavg/triple.png b/docs/reference/images/pipeline_movavg/triple.png
similarity index 100%
rename from docs/reference/images/reducers_movavg/triple.png
rename to docs/reference/images/pipeline_movavg/triple.png
diff --git a/docs/reference/images/reducers_movavg/triple_prediction.png b/docs/reference/images/pipeline_movavg/triple_prediction.png
similarity index 100%
rename from docs/reference/images/reducers_movavg/triple_prediction.png
rename to docs/reference/images/pipeline_movavg/triple_prediction.png
diff --git a/docs/reference/images/reducers_movavg/triple_untruncated.png b/docs/reference/images/pipeline_movavg/triple_untruncated.png
similarity index 100%
rename from docs/reference/images/reducers_movavg/triple_untruncated.png
rename to docs/reference/images/pipeline_movavg/triple_untruncated.png

From 2f57ae93454f2bd2ef6a6bf90feafe5ec4aa01f7 Mon Sep 17 00:00:00 2001
From: javanna <cavannaluca@gmail.com>
Date: Wed, 27 May 2015 16:53:35 +0200
Subject: [PATCH 044/123] Internal: deduplicate field names returned by
 `simpleMatchToFullName` & `simpleMatchToIndexNames` in FieldMappersLookup

Relates to #10916
Closes #11377
---
 .../index/mapper/DocumentFieldMappers.java       |  5 ++---
 .../index/mapper/FieldMappersLookup.java         | 12 ++++++------
 .../index/mapper/MapperService.java              |  4 ++--
 .../index/query/ExistsQueryParser.java           | 10 +++-------
 .../index/query/MissingQueryParser.java          | 10 +++-------
 .../index/query/QueryParseContext.java           | 16 +++-------------
 .../search/highlight/HighlightPhase.java         |  4 ++--
 .../index/mapper/FieldMappersLookupTests.java    |  7 ++++---
 .../test/ElasticsearchIntegrationTest.java       | 12 ++----------
 9 files changed, 27 insertions(+), 53 deletions(-)

diff --git a/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java b/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java
index c5387cf3459..e4f61db2df1 100644
--- a/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java
+++ b/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java
@@ -28,7 +28,6 @@ import org.elasticsearch.index.analysis.FieldNameAnalyzer;
 
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -98,11 +97,11 @@ public final class DocumentFieldMappers implements Iterable<FieldMapper> {
         return fieldMappers.get(field);
     }
 
-    List<String> simpleMatchToIndexNames(String pattern) {
+    Collection<String> simpleMatchToIndexNames(String pattern) {
         return fieldMappers.simpleMatchToIndexNames(pattern);
     }
 
-    public List<String> simpleMatchToFullName(String pattern) {
+    public Collection<String> simpleMatchToFullName(String pattern) {
         return fieldMappers.simpleMatchToFullName(pattern);
     }
 
diff --git a/src/main/java/org/elasticsearch/index/mapper/FieldMappersLookup.java b/src/main/java/org/elasticsearch/index/mapper/FieldMappersLookup.java
index 18f71d142db..d751c95910e 100644
--- a/src/main/java/org/elasticsearch/index/mapper/FieldMappersLookup.java
+++ b/src/main/java/org/elasticsearch/index/mapper/FieldMappersLookup.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.index.mapper;
 
-import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.collect.CopyOnWriteHashMap;
 import org.elasticsearch.common.regex.Regex;
@@ -27,7 +27,7 @@ import org.elasticsearch.common.regex.Regex;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
-import java.util.List;
+import java.util.Set;
 
 /**
  * A class that holds a map of field mappers from name, index name, and full name.
@@ -114,8 +114,8 @@ class FieldMappersLookup implements Iterable<FieldMapper> {
     /**
      * Returns a list of the index names of a simple match regex like pattern against full name and index name.
      */
-    public List<String> simpleMatchToIndexNames(String pattern) {
-        List<String> fields = Lists.newArrayList();
+    public Collection<String> simpleMatchToIndexNames(String pattern) {
+        Set<String> fields = Sets.newHashSet();
         for (FieldMapper fieldMapper : this) {
             if (Regex.simpleMatch(pattern, fieldMapper.names().fullName())) {
                 fields.add(fieldMapper.names().indexName());
@@ -129,8 +129,8 @@ class FieldMappersLookup implements Iterable<FieldMapper> {
     /**
      * Returns a list of the full names of a simple match regex like pattern against full name and index name.
      */
-    public List<String> simpleMatchToFullName(String pattern) {
-        List<String> fields = Lists.newArrayList();
+    public Collection<String> simpleMatchToFullName(String pattern) {
+        Set<String> fields = Sets.newHashSet();
         for (FieldMapper fieldMapper : this) {
             if (Regex.simpleMatch(pattern, fieldMapper.names().fullName())) {
                 fields.add(fieldMapper.names().fullName());
diff --git a/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/src/main/java/org/elasticsearch/index/mapper/MapperService.java
index 8a6e5264f8f..85a3aae5bd4 100755
--- a/src/main/java/org/elasticsearch/index/mapper/MapperService.java
+++ b/src/main/java/org/elasticsearch/index/mapper/MapperService.java
@@ -481,14 +481,14 @@ public class MapperService extends AbstractIndexComponent  {
      * Returns all the fields that match the given pattern. If the pattern is prefixed with a type
      * then the fields will be returned with a type prefix.
      */
-    public List<String> simpleMatchToIndexNames(String pattern) {
+    public Collection<String> simpleMatchToIndexNames(String pattern) {
         return simpleMatchToIndexNames(pattern, null);
     }
     /**
      * Returns all the fields that match the given pattern, with an optional narrowing
      * based on a list of types.
      */
-    public List<String> simpleMatchToIndexNames(String pattern, @Nullable String[] types) {
+    public Collection<String> simpleMatchToIndexNames(String pattern, @Nullable String[] types) {
         if (Regex.isSimpleMatchPattern(pattern) == false) {
             // no wildcards
             return ImmutableList.of(pattern);
diff --git a/src/main/java/org/elasticsearch/index/query/ExistsQueryParser.java b/src/main/java/org/elasticsearch/index/query/ExistsQueryParser.java
index 3d049d98e7c..fe981193805 100644
--- a/src/main/java/org/elasticsearch/index/query/ExistsQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/ExistsQueryParser.java
@@ -19,11 +19,7 @@
 
 package org.elasticsearch.index.query;
 
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.ConstantScoreQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TermRangeQuery;
+import org.apache.lucene.search.*;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.lucene.search.Queries;
 import org.elasticsearch.common.xcontent.XContentParser;
@@ -32,7 +28,7 @@ import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.internal.FieldNamesFieldMapper;
 
 import java.io.IOException;
-import java.util.List;
+import java.util.Collection;
 
 /**
  *
@@ -89,7 +85,7 @@ public class ExistsQueryParser implements QueryParser {
             fieldPattern = fieldPattern + ".*";
         }
 
-        List<String> fields = parseContext.simpleMatchToIndexNames(fieldPattern);
+        Collection<String> fields = parseContext.simpleMatchToIndexNames(fieldPattern);
         if (fields.isEmpty()) {
             // no fields exists, so we should not match anything
             return Queries.newMatchNoDocsQuery();
diff --git a/src/main/java/org/elasticsearch/index/query/MissingQueryParser.java b/src/main/java/org/elasticsearch/index/query/MissingQueryParser.java
index 8767e0b3a51..16596b6bdfb 100644
--- a/src/main/java/org/elasticsearch/index/query/MissingQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/MissingQueryParser.java
@@ -19,11 +19,7 @@
 
 package org.elasticsearch.index.query;
 
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.ConstantScoreQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TermRangeQuery;
+import org.apache.lucene.search.*;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.lucene.search.Queries;
 import org.elasticsearch.common.xcontent.XContentParser;
@@ -32,7 +28,7 @@ import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.internal.FieldNamesFieldMapper;
 
 import java.io.IOException;
-import java.util.List;
+import java.util.Collection;
 
 /**
  *
@@ -100,7 +96,7 @@ public class MissingQueryParser implements QueryParser {
             fieldPattern = fieldPattern + ".*";
         }
 
-        List<String> fields = parseContext.simpleMatchToIndexNames(fieldPattern);
+        Collection<String> fields = parseContext.simpleMatchToIndexNames(fieldPattern);
         if (fields.isEmpty()) {
             if (existence) {
                 // if we ask for existence of fields, and we found none, then we should match on all
diff --git a/src/main/java/org/elasticsearch/index/query/QueryParseContext.java b/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
index e3ee40c3ae5..e2be1229fa6 100644
--- a/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
+++ b/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
@@ -21,7 +21,6 @@ package org.elasticsearch.index.query;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
-
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.queryparser.classic.MapperQueryParser;
 import org.apache.lucene.queryparser.classic.QueryParserSettings;
@@ -38,11 +37,7 @@ import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.analysis.AnalysisService;
 import org.elasticsearch.index.fielddata.IndexFieldData;
-import org.elasticsearch.index.mapper.ContentPath;
-import org.elasticsearch.index.mapper.FieldMapper;
-import org.elasticsearch.index.mapper.Mapper;
-import org.elasticsearch.index.mapper.MapperBuilders;
-import org.elasticsearch.index.mapper.MapperService;
+import org.elasticsearch.index.mapper.*;
 import org.elasticsearch.index.mapper.core.StringFieldMapper;
 import org.elasticsearch.index.query.support.NestedScope;
 import org.elasticsearch.index.similarity.SimilarityService;
@@ -52,12 +47,7 @@ import org.elasticsearch.search.internal.SearchContext;
 import org.elasticsearch.search.lookup.SearchLookup;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  *
@@ -281,7 +271,7 @@ public class QueryParseContext {
         }
     }
 
-    public List<String> simpleMatchToIndexNames(String pattern) {
+    public Collection<String> simpleMatchToIndexNames(String pattern) {
         return indexQueryParser.mapperService.simpleMatchToIndexNames(pattern, getTypes());
     }
 
diff --git a/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java b/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java
index f005f5be7c3..5b9ab72641a 100644
--- a/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java
+++ b/src/main/java/org/elasticsearch/search/highlight/HighlightPhase.java
@@ -34,7 +34,7 @@ import org.elasticsearch.search.fetch.FetchSubPhase;
 import org.elasticsearch.search.internal.InternalSearchHit;
 import org.elasticsearch.search.internal.SearchContext;
 
-import java.util.List;
+import java.util.Collection;
 import java.util.Map;
 
 import static com.google.common.collect.Maps.newHashMap;
@@ -77,7 +77,7 @@ public class HighlightPhase extends AbstractComponent implements FetchSubPhase {
     public void hitExecute(SearchContext context, HitContext hitContext) {
         Map<String, HighlightField> highlightFields = newHashMap();
         for (SearchContextHighlight.Field field : context.highlight().fields()) {
-            List<String> fieldNamesToHighlight;
+            Collection<String> fieldNamesToHighlight;
             if (Regex.isSimpleMatchPattern(field.field())) {
                 DocumentMapper documentMapper = context.mapperService().documentMapper(hitContext.hit().type());
                 fieldNamesToHighlight = documentMapper.mappers().simpleMatchToFullName(field.field());
diff --git a/src/test/java/org/elasticsearch/index/mapper/FieldMappersLookupTests.java b/src/test/java/org/elasticsearch/index/mapper/FieldMappersLookupTests.java
index 1ec854c4c65..75c8e18fc91 100644
--- a/src/test/java/org/elasticsearch/index/mapper/FieldMappersLookupTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/FieldMappersLookupTests.java
@@ -30,6 +30,7 @@ import org.elasticsearch.index.mapper.core.AbstractFieldMapper;
 import org.elasticsearch.test.ElasticsearchTestCase;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
@@ -39,7 +40,7 @@ public class FieldMappersLookupTests extends ElasticsearchTestCase {
         FieldMappersLookup lookup = new FieldMappersLookup();
         assertNull(lookup.fullName("foo"));
         assertNull(lookup.indexName("foo"));
-        List<String> names = lookup.simpleMatchToFullName("foo");
+        Collection<String> names = lookup.simpleMatchToFullName("foo");
         assertNotNull(names);
         assertTrue(names.isEmpty());
         names = lookup.simpleMatchToFullName("foo");
@@ -105,7 +106,7 @@ public class FieldMappersLookupTests extends ElasticsearchTestCase {
         FakeFieldMapper f2 = new FakeFieldMapper("bar", "boo");
         FieldMappersLookup lookup = new FieldMappersLookup();
         lookup = lookup.copyAndAddAll(newList(f1, f2));
-        List<String> names = lookup.simpleMatchToIndexNames("b*");
+        Collection<String> names = lookup.simpleMatchToIndexNames("b*");
         assertTrue(names.contains("baz"));
         assertTrue(names.contains("boo"));
     }
@@ -115,7 +116,7 @@ public class FieldMappersLookupTests extends ElasticsearchTestCase {
         FakeFieldMapper f2 = new FakeFieldMapper("bar", "boo");
         FieldMappersLookup lookup = new FieldMappersLookup();
         lookup = lookup.copyAndAddAll(newList(f1, f2));
-        List<String> names = lookup.simpleMatchToFullName("b*");
+        Collection<String> names = lookup.simpleMatchToFullName("b*");
         assertTrue(names.contains("foo"));
         assertTrue(names.contains("bar"));
     }
diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
index d046a2f05ad..0655588e35d 100644
--- a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
+++ b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
@@ -145,15 +145,7 @@ import java.net.InetSocketAddress;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
@@ -906,7 +898,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
                     DocumentMapper documentMapper = indexService.mapperService().documentMapper(type);
                     assertThat("document mapper doesn't exists on " + node, documentMapper, notNullValue());
                     for (String fieldName : fieldNames) {
-                        List<String> matches = documentMapper.mappers().simpleMatchToFullName(fieldName);
+                        Collection<String> matches = documentMapper.mappers().simpleMatchToFullName(fieldName);
                         assertThat("field " + fieldName + " doesn't exists on " + node, matches, Matchers.not(emptyIterable()));
                     }
                 }

From 91e9caabd7139e0fa48687d49fb5f35916a41d78 Mon Sep 17 00:00:00 2001
From: Britta Weber <britta.weber@elasticsearch.com>
Date: Thu, 28 May 2015 11:54:56 +0200
Subject: [PATCH 045/123] [TEST] add path.home to settings

---
 .../node/internal/InternalSettingsPreparerTests.java             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java b/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java
index 77cd1aebfcb..315a5f7f2bd 100644
--- a/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java
+++ b/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java
@@ -67,6 +67,7 @@ public class InternalSettingsPreparerTests extends ElasticsearchTestCase {
         // test that we can read config files with .yaml, .json, and .properties suffixes
         Tuple<Settings, Environment> tuple = InternalSettingsPreparer.prepareSettings(settingsBuilder()
                 .put("config.ignore_system_properties", true)
+                .put("path.home", createTempDir().toString())
                 .build(), true);
 
         assertThat(tuple.v1().get("yaml.config.exists"), equalTo("true"));

From 105f4dd512115d0a802319af02c5f68f789bcdfc Mon Sep 17 00:00:00 2001
From: jaymode <jay.modi@elasticsearch.com>
Date: Thu, 28 May 2015 06:39:51 -0400
Subject: [PATCH 046/123] Test: filter out colons in test section names

On Windows, colons ':' are illegal in file names and since we use a Path to
check if the test is blacklisted, tests with a colon in the test section name
will fail. This change simply removes the colon from the name when matching
against the blacklist.
---
 .../org/elasticsearch/test/rest/ElasticsearchRestTestCase.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java b/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java
index 5951a9a5815..ee217ae1e8f 100644
--- a/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java
+++ b/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java
@@ -312,7 +312,7 @@ public abstract class ElasticsearchRestTestCase extends ElasticsearchIntegration
         //skip test if it matches one of the blacklist globs
         for (PathMatcher blacklistedPathMatcher : blacklistPathMatchers) {
             //we need to replace a few characters otherwise the test section name can't be parsed as a path on windows
-            String testSection = testCandidate.getTestSection().getName().replace("*", "").replace("\\", "/").replaceAll("\\s+/", "/").trim();
+            String testSection = testCandidate.getTestSection().getName().replace("*", "").replace("\\", "/").replaceAll("\\s+/", "/").replace(":", "").trim();
             String testPath = testCandidate.getSuitePath() + "/" + testSection;
             assumeFalse("[" + testCandidate.getTestPath() + "] skipped, reason: blacklisted", blacklistedPathMatcher.matches(PathUtils.get(testPath)));
         }

From 283b0931ff7de13b1e35ad8646bec1dba63b8112 Mon Sep 17 00:00:00 2001
From: markharwood <markharwood@gmail.com>
Date: Tue, 26 May 2015 17:32:48 +0100
Subject: [PATCH 047/123] Aggregations fix: queries with size=0 broke
 aggregations that require scores. Aggregations like Sampler and TopHits that
 require access to scores did not work if the query has size param set to
 zero. The assumption was that the Lucene query scoring logic was not required
 in these cases. Added a Junit test to demonstrate the issue and a fix which
 relies on earlier creation of Collector wrappers so that
 Collector.needsScores() calls work for all search operations.

Closes #11119
---
 .../search/internal/ContextIndexSearcher.java | 12 ++-
 .../aggregations/bucket/TopHitsTests.java     | 73 ++++++++++++++++++-
 2 files changed, 81 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java b/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java
index 388ed8e8ae9..e4c61209825 100644
--- a/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java
+++ b/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java
@@ -133,8 +133,11 @@ public class ContextIndexSearcher extends IndexSearcher implements Releasable {
         }
     }
 
+
     @Override
-    public void search(List<LeafReaderContext> leaves, Weight weight, Collector collector) throws IOException {
+    public void search(Query query, Collector collector) throws IOException {
+        // Wrap the caller's collector with various wrappers e.g. those used to siphon
+        // matches off for aggregation or to impose a time-limit on collection.
         final boolean timeoutSet = searchContext.timeoutInMillis() != -1;
         final boolean terminateAfterSet = searchContext.terminateAfter() != SearchContext.DEFAULT_TERMINATE_AFTER;
 
@@ -166,8 +169,13 @@ public class ContextIndexSearcher extends IndexSearcher implements Releasable {
                 collector = new MinimumScoreCollector(collector, searchContext.minimumScore());
             }
         }
+        super.search(query, collector);
+    }
 
-        // we only compute the doc id set once since within a context, we execute the same query always...
+    @Override
+    public void search(List<LeafReaderContext> leaves, Weight weight, Collector collector) throws IOException {
+        final boolean timeoutSet = searchContext.timeoutInMillis() != -1;
+        final boolean terminateAfterSet = searchContext.terminateAfter() != SearchContext.DEFAULT_TERMINATE_AFTER;
         try {
             if (timeoutSet || terminateAfterSet) {
                 try {
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsTests.java
index ba927efd641..a592ec18b95 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsTests.java
@@ -63,7 +63,15 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.arrayContaining;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.sameInstance;
 
 /**
  *
@@ -228,7 +236,9 @@ public class TopHitsTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void testBasics() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
                 .addAggregation(terms("terms")
                         .executionHint(randomExecutionHint())
                         .field(TERMS_AGGS_FIELD)
@@ -264,6 +274,65 @@ public class TopHitsTests extends ElasticsearchIntegrationTest {
         }
     }
 
+    @Test
+    public void testIssue11119() throws Exception {
+        // Test that top_hits aggregation is fed scores if query results size=0
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("field-collapsing")
+                .setSize(0)
+                .setQuery(matchQuery("text", "x y z"))
+                .addAggregation(terms("terms").executionHint(randomExecutionHint()).field("group").subAggregation(topHits("hits")))
+                .get();
+
+        assertSearchResponse(response);
+
+        assertThat(response.getHits().getTotalHits(), equalTo(8l));
+        assertThat(response.getHits().hits().length, equalTo(0));
+        assertThat(response.getHits().maxScore(), equalTo(0f));
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(3));
+
+        for (Terms.Bucket bucket : terms.getBuckets()) {
+            assertThat(bucket, notNullValue());
+            TopHits topHits = bucket.getAggregations().get("hits");
+            SearchHits hits = topHits.getHits();
+            float bestScore = Float.MAX_VALUE;
+            for (int h = 0; h < hits.getHits().length; h++) {
+                float score=hits.getAt(h).getScore();
+                assertThat(score, lessThanOrEqualTo(bestScore));
+                assertThat(score, greaterThan(0f));
+                bestScore = hits.getAt(h).getScore();
+            }
+        }
+
+        // Also check that min_score setting works when size=0
+        // (technically not a test of top_hits but implementation details are
+        // tied up with the need to feed scores into the agg tree even when
+        // users don't want ranked set of query results.)
+        response = client()
+                .prepareSearch("idx")
+                .setTypes("field-collapsing")
+                .setSize(0)
+                .setMinScore(0.0001f)
+                .setQuery(matchQuery("text", "x y z"))
+                .addAggregation(terms("terms").executionHint(randomExecutionHint()).field("group"))
+                .get();
+
+        assertSearchResponse(response);
+
+        assertThat(response.getHits().getTotalHits(), equalTo(8l));
+        assertThat(response.getHits().hits().length, equalTo(0));
+        assertThat(response.getHits().maxScore(), equalTo(0f));
+        terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(3));
+    }
+
+
     @Test
     public void testBreadthFirst() throws Exception {
         // breadth_first will be ignored since we need scores

From a4c88b723304bb0d2be0f587a71d3dacf3b0289e Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Thu, 28 May 2015 12:42:18 +0200
Subject: [PATCH 048/123] Consolidate directory lock obtain code

The Directory#makeLock API is trappy and can easily lead to unexpected
lock release if native locks are used. see LUCENE-6507 for details.
This commit consolidates the lock lock into one place and only returns
the lock instance if we actually acquired it.
---
 .../elasticsearch/common/lucene/Lucene.java   | 32 ++++++++++++++-----
 .../common/util/MultiDataPathUpgrader.java    | 13 ++++----
 .../elasticsearch/env/NodeEnvironment.java    | 15 +++++----
 .../org/elasticsearch/index/store/Store.java  | 10 ++----
 4 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/src/main/java/org/elasticsearch/common/lucene/Lucene.java
index 385607d89ba..e3d787779c7 100644
--- a/src/main/java/org/elasticsearch/common/lucene/Lucene.java
+++ b/src/main/java/org/elasticsearch/common/lucene/Lucene.java
@@ -173,6 +173,28 @@ public class Lucene {
         return SegmentInfos.readCommit(directory, segmentsFileName);
     }
 
+    /**
+     * Tries to acquire the {@link IndexWriter#WRITE_LOCK_NAME} on the given directory. The returned lock must be closed once
+     * the lock is released. If the lock can't be obtained a {@link LockObtainFailedException} is thrown.
+     * This method uses the {@link IndexWriterConfig#getDefaultWriteLockTimeout()} as the lock timeout.
+     */
+    public static Lock acquireWriteLock(Directory directory) throws IOException {
+        return acquireLock(directory, IndexWriter.WRITE_LOCK_NAME, IndexWriterConfig.getDefaultWriteLockTimeout());
+    }
+
+    /**
+     * Tries to acquire a lock on the given directory. The returned lock must be closed once
+     * the lock is released. If the lock can't be obtained a {@link LockObtainFailedException} is thrown.
+     */
+    @SuppressForbidden(reason = "this method uses trappy Directory#makeLock API")
+    public static Lock acquireLock(Directory directory, String lockName, long timeout) throws IOException {
+        final Lock writeLock = directory.makeLock(lockName);
+        if (writeLock.obtain(timeout) == false) {
+            throw new LockObtainFailedException("failed to obtain lock: " + writeLock);
+        }
+        return writeLock;
+    }
+
     /**
      * This method removes all files from the given directory that are not referenced by the given segments file.
      * This method will open an IndexWriter and relies on index file deleter to remove all unreferenced files. Segment files
@@ -184,10 +206,7 @@ public class Lucene {
      */
     public static SegmentInfos pruneUnreferencedFiles(String segmentsFileName, Directory directory) throws IOException {
         final SegmentInfos si = readSegmentInfos(segmentsFileName, directory);
-        try (Lock writeLock = directory.makeLock(IndexWriter.WRITE_LOCK_NAME)) {
-            if (!writeLock.obtain(IndexWriterConfig.getDefaultWriteLockTimeout())) { // obtain write lock
-                throw new LockObtainFailedException("Index locked for write: " + writeLock);
-            }
+        try (Lock writeLock = acquireWriteLock(directory)) {
             int foundSegmentFiles = 0;
             for (final String file : directory.listAll()) {
                 /**
@@ -226,10 +245,7 @@ public class Lucene {
      * this operation fails.
      */
     public static void cleanLuceneIndex(Directory directory) throws IOException {
-        try (Lock writeLock = directory.makeLock(IndexWriter.WRITE_LOCK_NAME)) {
-            if (!writeLock.obtain(IndexWriterConfig.getDefaultWriteLockTimeout())) { // obtain write lock
-                throw new LockObtainFailedException("Index locked for write: " + writeLock);
-            }
+        try (Lock writeLock = acquireWriteLock(directory)) {
             for (final String file : directory.listAll()) {
                 if (file.startsWith(IndexFileNames.SEGMENTS) || file.equals(IndexFileNames.OLD_SEGMENTS_GEN)) {
                     directory.deleteFile(file); // remove all segment_N files
diff --git a/src/main/java/org/elasticsearch/common/util/MultiDataPathUpgrader.java b/src/main/java/org/elasticsearch/common/util/MultiDataPathUpgrader.java
index 1cb700cff60..3425d151c34 100644
--- a/src/main/java/org/elasticsearch/common/util/MultiDataPathUpgrader.java
+++ b/src/main/java/org/elasticsearch/common/util/MultiDataPathUpgrader.java
@@ -25,6 +25,7 @@ import org.apache.lucene.index.CheckIndex;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.Lock;
+import org.apache.lucene.store.LockObtainFailedException;
 import org.apache.lucene.store.SimpleFSDirectory;
 import org.apache.lucene.util.IOUtils;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
@@ -32,6 +33,7 @@ import org.elasticsearch.common.io.FileSystemUtils;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
+import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.env.NodeEnvironment;
 import org.elasticsearch.env.ShardLock;
@@ -84,13 +86,12 @@ public class MultiDataPathUpgrader {
         ShardStateMetaData.FORMAT.write(loaded, loaded.version, targetPath.getShardStatePath());
         Files.createDirectories(targetPath.resolveIndex());
         try (SimpleFSDirectory directory = new SimpleFSDirectory(targetPath.resolveIndex())) {
-            try (final Lock lock = directory.makeLock(IndexWriter.WRITE_LOCK_NAME)) {
-                if (lock.obtain(5000)) {
-                    upgradeFiles(shard, targetPath, targetPath.resolveIndex(), ShardPath.INDEX_FOLDER_NAME, paths);
-                } else {
-                    throw new IllegalStateException("Can't obtain lock on " + targetPath.resolveIndex());
-                }
+            try (final Lock lock = Lucene.acquireWriteLock(directory)) {
+                upgradeFiles(shard, targetPath, targetPath.resolveIndex(), ShardPath.INDEX_FOLDER_NAME, paths);
+            } catch (LockObtainFailedException ex) {
+                throw new IllegalStateException("Can't obtain lock on " + targetPath.resolveIndex(), ex);
             }
+
         }
 
 
diff --git a/src/main/java/org/elasticsearch/env/NodeEnvironment.java b/src/main/java/org/elasticsearch/env/NodeEnvironment.java
index 26a725f9072..75ef6914eae 100644
--- a/src/main/java/org/elasticsearch/env/NodeEnvironment.java
+++ b/src/main/java/org/elasticsearch/env/NodeEnvironment.java
@@ -32,6 +32,7 @@ import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.io.FileSystemUtils;
 import org.elasticsearch.common.io.PathUtils;
+import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.index.Index;
@@ -146,18 +147,17 @@ public class NodeEnvironment extends AbstractComponent implements Closeable {
                 
                 try (Directory luceneDir = FSDirectory.open(dir, NativeFSLockFactory.INSTANCE)) {
                     logger.trace("obtaining node lock on {} ...", dir.toAbsolutePath());
-                    Lock tmpLock = luceneDir.makeLock(NODE_LOCK_FILENAME);
-                    boolean obtained = tmpLock.obtain();
-                    if (obtained) {
+                    try {
+                        locks[dirIndex] = Lucene.acquireLock(luceneDir, NODE_LOCK_FILENAME, 0);
                         nodePaths[dirIndex] = new NodePath(dir, environment);
-                        locks[dirIndex] = tmpLock;
                         localNodeId = possibleLockId;
-                    } else {
+                    } catch (LockObtainFailedException ex) {
                         logger.trace("failed to obtain node lock on {}", dir.toAbsolutePath());
                         // release all the ones that were obtained up until now
                         releaseAndNullLocks(locks);
                         break;
                     }
+
                 } catch (IOException e) {
                     logger.trace("failed to obtain node lock on {}", e, dir.toAbsolutePath());
                     lastException = new IOException("failed to obtain lock on " + dir.toAbsolutePath(), e);
@@ -314,8 +314,9 @@ public class NodeEnvironment extends AbstractComponent implements Closeable {
                 // open a directory (will be immediately closed) on the shard's location
                 dirs[i] = new SimpleFSDirectory(p, FsDirectoryService.buildLockFactory(indexSettings));
                 // create a lock for the "write.lock" file
-                locks[i] = dirs[i].makeLock(IndexWriter.WRITE_LOCK_NAME);
-                if (locks[i].obtain() == false) {
+                try {
+                    locks[i] = Lucene.acquireWriteLock(dirs[i]);
+                } catch (IOException ex) {
                     throw new ElasticsearchException("unable to acquire " +
                             IndexWriter.WRITE_LOCK_NAME + " for " + p);
                 }
diff --git a/src/main/java/org/elasticsearch/index/store/Store.java b/src/main/java/org/elasticsearch/index/store/Store.java
index c889dd16c20..d92128a319c 100644
--- a/src/main/java/org/elasticsearch/index/store/Store.java
+++ b/src/main/java/org/elasticsearch/index/store/Store.java
@@ -259,10 +259,7 @@ public class Store extends AbstractIndexShardComponent implements Closeable, Ref
         metadataLock.writeLock().lock();
         // we make sure that nobody fetches the metadata while we do this rename operation here to ensure we don't
         // get exceptions if files are still open.
-        try (Lock writeLock = directory.makeLock(IndexWriter.WRITE_LOCK_NAME)) {
-            if (!writeLock.obtain(IndexWriterConfig.getDefaultWriteLockTimeout())) { // obtain write lock
-                throw new LockObtainFailedException("Index locked for write: " + writeLock);
-            }
+        try (Lock writeLock = Lucene.acquireWriteLock(directory())) {
             for (Map.Entry<String, String> entry : entries) {
                 String tempFile = entry.getKey();
                 String origFile = entry.getValue();
@@ -586,10 +583,7 @@ public class Store extends AbstractIndexShardComponent implements Closeable, Ref
      */
     public void cleanupAndVerify(String reason, MetadataSnapshot sourceMetaData) throws IOException {
         metadataLock.writeLock().lock();
-        try (Lock writeLock = directory.makeLock(IndexWriter.WRITE_LOCK_NAME)) {
-            if (!writeLock.obtain(IndexWriterConfig.getDefaultWriteLockTimeout())) { // obtain write lock
-                throw new LockObtainFailedException("Index locked for write: " + writeLock);
-            }
+        try (Lock writeLock = Lucene.acquireWriteLock(directory)) {
             final StoreDirectory dir = directory;
             for (String existingFile : dir.listAll()) {
                 if (existingFile.equals(IndexWriter.WRITE_LOCK_NAME) || Store.isChecksum(existingFile) || sourceMetaData.contains(existingFile)) {

From 38639074b4d8a7fe19076b31dd2207b6b31412e4 Mon Sep 17 00:00:00 2001
From: Alexander Reelsen <alexander@reelsen.net>
Date: Thu, 28 May 2015 16:24:41 +0200
Subject: [PATCH 049/123] Testing: Ensure cat API REST tests are unaffected by
 randomization

The wildcard cat API REST tests relied on bulk.max and bulk.min in
the thread_pool response. However due to the thread pool types being
randomized in InternalTestCluster, the min/max values were not guaranteed
to exist (the cached thread pool type is unbounded and thus does not have a
max value).

In order to prevent this, the test has been removed and now the cat
nodes test is used for wildcard testing, which always returns stats
about the heap.
---
 rest-api-spec/test/cat.nodes/10_basic.yaml       | 10 ++++++++++
 rest-api-spec/test/cat.thread_pool/10_basic.yaml | 12 ------------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/rest-api-spec/test/cat.nodes/10_basic.yaml b/rest-api-spec/test/cat.nodes/10_basic.yaml
index f7e9bedcd0b..5b2ddb7fc38 100755
--- a/rest-api-spec/test/cat.nodes/10_basic.yaml
+++ b/rest-api-spec/test/cat.nodes/10_basic.yaml
@@ -29,6 +29,16 @@
                /^      heap\.current          \s+  heap\.percent  \s+  heap\.max             \s+ \n
                   (\s+ \d+(\.\d+)?[ptgmk]?b   \s+  \d+            \s+  \d+(\.\d+)?[ptgmk]?b  \s+ \n)+  $/
 
+  - do:
+      cat.nodes:
+          h: heap.*
+          v: true
+
+  - match:
+      $body: |
+               /^      heap\.current          \s+  heap\.percent  \s+  heap\.max             \s+ \n
+                  (\s+ \d+(\.\d+)?[ptgmk]?b   \s+  \d+            \s+  \d+(\.\d+)?[ptgmk]?b  \s+ \n)+  $/
+
   - do:
       cat.nodes:
           h: file_desc.current,file_desc.percent,file_desc.max
diff --git a/rest-api-spec/test/cat.thread_pool/10_basic.yaml b/rest-api-spec/test/cat.thread_pool/10_basic.yaml
index 283e353b7a3..edb87ce27b9 100755
--- a/rest-api-spec/test/cat.thread_pool/10_basic.yaml
+++ b/rest-api-spec/test/cat.thread_pool/10_basic.yaml
@@ -29,18 +29,6 @@
                /  #pid       id          host       ip                          port
                ^  (\d+  \s+  \S{4}  \s+  \S+   \s+  (\d{1,3}\.){3}\d{1,3}  \s+  (\d+|-) \s+ \n)+  $/
 
-
-  - do:
-      cat.thread_pool:
-          h: bulk.m*
-
-  - match:
-      $body: |
-               /^ bulk.min  \s+  bulk.max \s+ \n
-                 (\s+  \d+  \s+  \d+  \s+ \n)+  $/
-
-#(\s+  \d+  \s+  \d+ \n)+  $/
-
   - do:
       cat.thread_pool:
           h: id,ba,fa,gea,ga,ia,maa,ma,oa,pa

From 55fc3a727b0d0ba18ba2852e7e630b07beee29a8 Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Sun, 24 May 2015 15:22:06 -0700
Subject: [PATCH 050/123] Core: refactor upgrade API to use transport and write
 minimum compatible version that the index was upgraded to

In #11072 we are adding a check that will prevent opening of old indices. However, this check doesn't take into consideration the fact that indices can be made compatible with the current version through upgrade API. In order to make compatibility check aware of the upgrade, the upgrade API should write a new setting `index.version.minimum_compatible` that will indicate the minimum compatible version of lucene this index is compatible with and `index.version.upgraded` that will indicate the version of elasticsearch that performed the upgrade.

Closes #11095
---
 docs/reference/indices/upgrade.asciidoc       |  17 +-
 .../elasticsearch/action/ActionModule.java    |   9 +
 .../indices/optimize/OptimizeRequest.java     |  42 ----
 .../upgrade/get/IndexShardUpgradeStatus.java  |  78 +++++++
 .../upgrade/get/IndexUpgradeStatus.java       |  95 ++++++++
 .../upgrade/get/ShardUpgradeStatus.java       |  92 ++++++++
 .../get/TransportUpgradeStatusAction.java     | 152 +++++++++++++
 .../upgrade/get/UpgradeStatusAction.java      |  45 ++++
 .../upgrade/get/UpgradeStatusRequest.java     |  39 ++++
 .../get/UpgradeStatusRequestBuilder.java      |  33 +++
 .../upgrade/get/UpgradeStatusResponse.java    | 191 ++++++++++++++++
 .../upgrade/post/ShardUpgradeRequest.java     |  60 +++++
 .../upgrade/post/ShardUpgradeResponse.java    |  76 +++++++
 .../upgrade/post/TransportUpgradeAction.java  | 214 ++++++++++++++++++
 .../post/TransportUpgradeSettingsAction.java  |  86 +++++++
 .../indices/upgrade/post/UpgradeAction.java   |  46 ++++
 .../indices/upgrade/post/UpgradeRequest.java  |  91 ++++++++
 .../upgrade/post/UpgradeRequestBuilder.java   |  42 ++++
 .../indices/upgrade/post/UpgradeResponse.java |  76 +++++++
 .../upgrade/post/UpgradeSettingsAction.java   |  45 ++++
 ...radeSettingsClusterStateUpdateRequest.java |  51 +++++
 .../upgrade/post/UpgradeSettingsRequest.java  |  98 ++++++++
 .../post/UpgradeSettingsRequestBuilder.java   |  43 ++++
 .../upgrade/post/UpgradeSettingsResponse.java |  51 +++++
 .../client/IndicesAdminClient.java            |  53 +++++
 .../org/elasticsearch/client/Requests.java    |  12 +
 .../client/support/AbstractClient.java        |  38 ++++
 .../cluster/metadata/IndexMetaData.java       |  40 +++-
 .../metadata/MetaDataIndexUpgradeService.java |  18 +-
 .../MetaDataUpdateSettingsService.java        |  37 +++
 .../elasticsearch/index/shard/IndexShard.java |  35 ++-
 .../indices/upgrade/RestUpgradeAction.java    |  90 +++-----
 .../snapshots/RestoreService.java             |   2 +
 .../OldIndexBackwardsCompatibilityTests.java  |  13 +-
 .../upgrade/UpgradeReallyOldIndexTest.java    |  18 +-
 .../admin/indices/upgrade/UpgradeTest.java    | 136 ++++-------
 36 files changed, 2030 insertions(+), 234 deletions(-)
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexShardUpgradeStatus.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexUpgradeStatus.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/ShardUpgradeStatus.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/TransportUpgradeStatusAction.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResponse.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequest.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java
 create mode 100644 src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsResponse.java

diff --git a/docs/reference/indices/upgrade.asciidoc b/docs/reference/indices/upgrade.asciidoc
index 295a407f979..046dde2fe8a 100644
--- a/docs/reference/indices/upgrade.asciidoc
+++ b/docs/reference/indices/upgrade.asciidoc
@@ -54,13 +54,26 @@ curl 'http://localhost:9200/twitter/_upgrade?pretty&human'
 [source,js]
 --------------------------------------------------
 {
-   "twitter": {
+  "size": "21gb",
+  "size_in_bytes": "21000000000",
+  "size_to_upgrade": "10gb",
+  "size_to_upgrade_in_bytes": "10000000000"
+  "size_to_upgrade_ancient": "1gb",
+  "size_to_upgrade_ancient_in_bytes": "1000000000"
+  "indices": {
+    "twitter": {
       "size": "21gb",
       "size_in_bytes": "21000000000",
       "size_to_upgrade": "10gb",
       "size_to_upgrade_in_bytes": "10000000000"
       "size_to_upgrade_ancient": "1gb",
       "size_to_upgrade_ancient_in_bytes": "1000000000"
-   }
+    }
+  }
 }
 --------------------------------------------------
+
+The level of details in the upgrade status command can be controlled by
+setting `level` parameter to `cluster`, `index` (default) or `shard` levels.
+For example, you can run the upgrade status command with `level=shard` to
+get detailed upgrade information of each individual shard.
\ No newline at end of file
diff --git a/src/main/java/org/elasticsearch/action/ActionModule.java b/src/main/java/org/elasticsearch/action/ActionModule.java
index 0decb393405..7bb66260a58 100644
--- a/src/main/java/org/elasticsearch/action/ActionModule.java
+++ b/src/main/java/org/elasticsearch/action/ActionModule.java
@@ -111,6 +111,12 @@ import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesActi
 import org.elasticsearch.action.admin.indices.template.get.TransportGetIndexTemplatesAction;
 import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateAction;
 import org.elasticsearch.action.admin.indices.template.put.TransportPutIndexTemplateAction;
+import org.elasticsearch.action.admin.indices.upgrade.get.TransportUpgradeStatusAction;
+import org.elasticsearch.action.admin.indices.upgrade.get.UpgradeStatusAction;
+import org.elasticsearch.action.admin.indices.upgrade.post.TransportUpgradeAction;
+import org.elasticsearch.action.admin.indices.upgrade.post.TransportUpgradeSettingsAction;
+import org.elasticsearch.action.admin.indices.upgrade.post.UpgradeAction;
+import org.elasticsearch.action.admin.indices.upgrade.post.UpgradeSettingsAction;
 import org.elasticsearch.action.admin.indices.validate.query.TransportValidateQueryAction;
 import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryAction;
 import org.elasticsearch.action.admin.indices.warmer.delete.DeleteWarmerAction;
@@ -256,6 +262,9 @@ public class ActionModule extends AbstractModule {
         registerAction(FlushAction.INSTANCE, TransportFlushAction.class);
         registerAction(SealIndicesAction.INSTANCE, TransportSealIndicesAction.class);
         registerAction(OptimizeAction.INSTANCE, TransportOptimizeAction.class);
+        registerAction(UpgradeAction.INSTANCE, TransportUpgradeAction.class);
+        registerAction(UpgradeStatusAction.INSTANCE, TransportUpgradeStatusAction.class);
+        registerAction(UpgradeSettingsAction.INSTANCE, TransportUpgradeSettingsAction.class);
         registerAction(ClearIndicesCacheAction.INSTANCE, TransportClearIndicesCacheAction.class);
         registerAction(PutWarmerAction.INSTANCE, TransportPutWarmerAction.class);
         registerAction(DeleteWarmerAction.INSTANCE, TransportDeleteWarmerAction.class);
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java
index 3510a3b7f96..08f322a1154 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/optimize/OptimizeRequest.java
@@ -42,15 +42,11 @@ public class OptimizeRequest extends BroadcastRequest<OptimizeRequest> {
         public static final int MAX_NUM_SEGMENTS = -1;
         public static final boolean ONLY_EXPUNGE_DELETES = false;
         public static final boolean FLUSH = true;
-        public static final boolean UPGRADE = false;
-        public static final boolean UPGRADE_ONLY_ANCIENT_SEGMENTS = false;
     }
     
     private int maxNumSegments = Defaults.MAX_NUM_SEGMENTS;
     private boolean onlyExpungeDeletes = Defaults.ONLY_EXPUNGE_DELETES;
     private boolean flush = Defaults.FLUSH;
-    private boolean upgrade = Defaults.UPGRADE;
-    private boolean upgradeOnlyAncientSegments = Defaults.UPGRADE_ONLY_ANCIENT_SEGMENTS;
 
     /**
      * Constructs an optimization request over one or more indices.
@@ -114,30 +110,12 @@ public class OptimizeRequest extends BroadcastRequest<OptimizeRequest> {
         return this;
     }
 
-    /**
-     * Should the merge upgrade all old segments to the current index format.
-     * Defaults to <tt>false</tt>.
-     */
-    public boolean upgrade() {
-        return upgrade;
-    }
-
-    /**
-     * See {@link #upgrade()}
-     */
-    public OptimizeRequest upgrade(boolean upgrade) {
-        this.upgrade = upgrade;
-        return this;
-    }
-
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
         maxNumSegments = in.readInt();
         onlyExpungeDeletes = in.readBoolean();
         flush = in.readBoolean();
-        upgrade = in.readBoolean();
-        upgradeOnlyAncientSegments = in.readBoolean();
     }
 
     @Override
@@ -146,24 +124,6 @@ public class OptimizeRequest extends BroadcastRequest<OptimizeRequest> {
         out.writeInt(maxNumSegments);
         out.writeBoolean(onlyExpungeDeletes);
         out.writeBoolean(flush);
-        out.writeBoolean(upgrade);
-        out.writeBoolean(upgradeOnlyAncientSegments);
-    }
-
-    /**
-     * Should the merge upgrade only the ancient (older major version of Lucene) segments?
-     * Defaults to <tt>false</tt>.
-     */
-    public boolean upgradeOnlyAncientSegments() {
-        return upgradeOnlyAncientSegments;
-    }
-
-    /**
-     * See {@link #upgradeOnlyAncientSegments()}
-     */
-    public OptimizeRequest upgradeOnlyAncientSegments(boolean upgradeOnlyAncientSegments) {
-        this.upgradeOnlyAncientSegments = upgradeOnlyAncientSegments;
-        return this;
     }
 
     @Override
@@ -172,8 +132,6 @@ public class OptimizeRequest extends BroadcastRequest<OptimizeRequest> {
                 "maxNumSegments=" + maxNumSegments +
                 ", onlyExpungeDeletes=" + onlyExpungeDeletes +
                 ", flush=" + flush +
-                ", upgrade=" + upgrade +
-                ", upgradeOnlyAncientSegments=" + upgradeOnlyAncientSegments +
                 '}';
     }
 }
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexShardUpgradeStatus.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexShardUpgradeStatus.java
new file mode 100644
index 00000000000..e1cd16370c3
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexShardUpgradeStatus.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.get;
+
+import com.google.common.collect.Iterators;
+import org.elasticsearch.index.shard.ShardId;
+
+import java.util.Iterator;
+
+public class IndexShardUpgradeStatus implements Iterable<ShardUpgradeStatus> {
+
+    private final ShardId shardId;
+
+    private final ShardUpgradeStatus[] shards;
+
+    IndexShardUpgradeStatus(ShardId shardId, ShardUpgradeStatus[] shards) {
+        this.shardId = shardId;
+        this.shards = shards;
+    }
+
+    public ShardId getShardId() {
+        return this.shardId;
+    }
+
+    public ShardUpgradeStatus getAt(int i) {
+        return shards[i];
+    }
+
+    public ShardUpgradeStatus[] getShards() {
+        return this.shards;
+    }
+
+    @Override
+    public Iterator<ShardUpgradeStatus> iterator() {
+        return Iterators.forArray(shards);
+    }
+
+    public long getTotalBytes() {
+        long totalBytes = 0;
+        for (ShardUpgradeStatus indexShardUpgradeStatus : shards) {
+            totalBytes += indexShardUpgradeStatus.getTotalBytes();
+        }
+        return totalBytes;
+    }
+
+    public long getToUpgradeBytes() {
+        long upgradeBytes = 0;
+        for (ShardUpgradeStatus indexShardUpgradeStatus : shards) {
+            upgradeBytes += indexShardUpgradeStatus.getToUpgradeBytes();
+        }
+        return upgradeBytes;
+    }
+
+    public long getToUpgradeBytesAncient() {
+        long upgradeBytesAncient = 0;
+        for (ShardUpgradeStatus indexShardUpgradeStatus : shards) {
+            upgradeBytesAncient += indexShardUpgradeStatus.getToUpgradeBytesAncient();
+        }
+        return upgradeBytesAncient;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexUpgradeStatus.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexUpgradeStatus.java
new file mode 100644
index 00000000000..33a60328951
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/IndexUpgradeStatus.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.get;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class IndexUpgradeStatus implements Iterable<IndexShardUpgradeStatus> {
+
+    private final String index;
+
+    private final Map<Integer, IndexShardUpgradeStatus> indexShards;
+
+    IndexUpgradeStatus(String index, ShardUpgradeStatus[] shards) {
+        this.index = index;
+
+        Map<Integer, List<ShardUpgradeStatus>> tmpIndexShards = Maps.newHashMap();
+        for (ShardUpgradeStatus shard : shards) {
+            List<ShardUpgradeStatus> lst = tmpIndexShards.get(shard.getShardRouting().id());
+            if (lst == null) {
+                lst = Lists.newArrayList();
+                tmpIndexShards.put(shard.getShardRouting().id(), lst);
+            }
+            lst.add(shard);
+        }
+        indexShards = Maps.newHashMap();
+        for (Map.Entry<Integer, List<ShardUpgradeStatus>> entry : tmpIndexShards.entrySet()) {
+            indexShards.put(entry.getKey(), new IndexShardUpgradeStatus(entry.getValue().get(0).getShardRouting().shardId(), entry.getValue().toArray(new ShardUpgradeStatus[entry.getValue().size()])));
+        }
+    }
+
+    public String getIndex() {
+        return this.index;
+    }
+
+    /**
+     * A shard id to index shard upgrade status map (note, index shard upgrade status is the replication shard group that maps
+     * to the shard id).
+     */
+    public Map<Integer, IndexShardUpgradeStatus> getShards() {
+        return this.indexShards;
+    }
+
+    @Override
+    public Iterator<IndexShardUpgradeStatus> iterator() {
+        return indexShards.values().iterator();
+    }
+
+    public long getTotalBytes() {
+        long totalBytes = 0;
+        for (IndexShardUpgradeStatus indexShardUpgradeStatus : indexShards.values()) {
+            totalBytes += indexShardUpgradeStatus.getTotalBytes();
+        }
+        return totalBytes;
+    }
+
+    public long getToUpgradeBytes() {
+        long upgradeBytes = 0;
+        for (IndexShardUpgradeStatus indexShardUpgradeStatus : indexShards.values()) {
+            upgradeBytes += indexShardUpgradeStatus.getToUpgradeBytes();
+        }
+        return upgradeBytes;
+    }
+
+    public long getToUpgradeBytesAncient() {
+        long upgradeBytesAncient = 0;
+        for (IndexShardUpgradeStatus indexShardUpgradeStatus : indexShards.values()) {
+            upgradeBytesAncient += indexShardUpgradeStatus.getToUpgradeBytesAncient();
+        }
+        return upgradeBytesAncient;
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/ShardUpgradeStatus.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/ShardUpgradeStatus.java
new file mode 100644
index 00000000000..e5f0261932c
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/ShardUpgradeStatus.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.get;
+
+import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
+import org.elasticsearch.cluster.routing.ShardRouting;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+
+import java.io.IOException;
+
+import static org.elasticsearch.cluster.routing.ImmutableShardRouting.readShardRoutingEntry;
+
+public class ShardUpgradeStatus extends BroadcastShardResponse {
+
+    private ShardRouting shardRouting;
+
+    private long totalBytes;
+
+    private long toUpgradeBytes;
+
+    private long toUpgradeBytesAncient;
+
+    ShardUpgradeStatus() {
+    }
+
+    ShardUpgradeStatus(ShardRouting shardRouting, long totalBytes, long toUpgradeBytes, long upgradeBytesAncient) {
+        super(shardRouting.shardId());
+        this.shardRouting = shardRouting;
+        this.totalBytes = totalBytes;
+        this.toUpgradeBytes = toUpgradeBytes;
+        this.toUpgradeBytesAncient = upgradeBytesAncient;
+
+    }
+
+    public ShardRouting getShardRouting() {
+        return this.shardRouting;
+    }
+
+    public long getTotalBytes() {
+        return totalBytes;
+    }
+
+    public long getToUpgradeBytes() {
+        return toUpgradeBytes;
+    }
+
+    public long getToUpgradeBytesAncient() {
+        return toUpgradeBytesAncient;
+    }
+
+    public static ShardUpgradeStatus readShardUpgradeStatus(StreamInput in) throws IOException {
+        ShardUpgradeStatus shard = new ShardUpgradeStatus();
+        shard.readFrom(in);
+        return shard;
+    }
+
+    @Override
+    public void readFrom(StreamInput in) throws IOException {
+        super.readFrom(in);
+        shardRouting = readShardRoutingEntry(in);
+        totalBytes = in.readLong();
+        toUpgradeBytes = in.readLong();
+        toUpgradeBytesAncient = in.readLong();
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        super.writeTo(out);
+        shardRouting.writeTo(out);
+        out.writeLong(totalBytes);
+        out.writeLong(toUpgradeBytes);
+        out.writeLong(toUpgradeBytesAncient);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/TransportUpgradeStatusAction.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/TransportUpgradeStatusAction.java
new file mode 100644
index 00000000000..370dce6e41f
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/TransportUpgradeStatusAction.java
@@ -0,0 +1,152 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.get;
+
+import org.elasticsearch.Version;
+import org.elasticsearch.action.ShardOperationFailedException;
+import org.elasticsearch.action.support.ActionFilters;
+import org.elasticsearch.action.support.DefaultShardOperationFailedException;
+import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
+import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
+import org.elasticsearch.action.support.broadcast.TransportBroadcastAction;
+import org.elasticsearch.cluster.ClusterService;
+import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.cluster.block.ClusterBlockException;
+import org.elasticsearch.cluster.block.ClusterBlockLevel;
+import org.elasticsearch.cluster.routing.GroupShardsIterator;
+import org.elasticsearch.cluster.routing.ShardRouting;
+import org.elasticsearch.common.inject.Inject;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.index.IndexService;
+import org.elasticsearch.index.engine.Segment;
+import org.elasticsearch.index.shard.IndexShard;
+import org.elasticsearch.index.shard.ShardId;
+import org.elasticsearch.indices.IndicesService;
+import org.elasticsearch.threadpool.ThreadPool;
+import org.elasticsearch.transport.TransportService;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReferenceArray;
+
+import static com.google.common.collect.Lists.newArrayList;
+
+/**
+ *
+ */
+public class TransportUpgradeStatusAction extends TransportBroadcastAction<UpgradeStatusRequest, UpgradeStatusResponse, TransportUpgradeStatusAction.IndexShardUpgradeStatusRequest, ShardUpgradeStatus> {
+
+    private final IndicesService indicesService;
+
+    @Inject
+    public TransportUpgradeStatusAction(Settings settings, ThreadPool threadPool, ClusterService clusterService, TransportService transportService,
+                                        IndicesService indicesService, ActionFilters actionFilters) {
+        super(settings, UpgradeStatusAction.NAME, threadPool, clusterService, transportService, actionFilters,
+                UpgradeStatusRequest.class, IndexShardUpgradeStatusRequest.class, ThreadPool.Names.MANAGEMENT);
+        this.indicesService = indicesService;
+    }
+
+    /**
+     * Getting upgrade stats from *all* active shards.
+     */
+    @Override
+    protected GroupShardsIterator shards(ClusterState clusterState, UpgradeStatusRequest request, String[] concreteIndices) {
+        return clusterState.routingTable().allActiveShardsGrouped(concreteIndices, true);
+    }
+
+    @Override
+    protected ClusterBlockException checkGlobalBlock(ClusterState state, UpgradeStatusRequest request) {
+        return state.blocks().globalBlockedException(ClusterBlockLevel.METADATA_READ);
+    }
+
+    @Override
+    protected ClusterBlockException checkRequestBlock(ClusterState state, UpgradeStatusRequest countRequest, String[] concreteIndices) {
+        return state.blocks().indicesBlockedException(ClusterBlockLevel.METADATA_READ, concreteIndices);
+    }
+
+    @Override
+    protected UpgradeStatusResponse newResponse(UpgradeStatusRequest request, AtomicReferenceArray shardsResponses, ClusterState clusterState) {
+        int successfulShards = 0;
+        int failedShards = 0;
+        List<ShardOperationFailedException> shardFailures = null;
+        final List<ShardUpgradeStatus> shards = newArrayList();
+        for (int i = 0; i < shardsResponses.length(); i++) {
+            Object shardResponse = shardsResponses.get(i);
+            if (shardResponse == null) {
+                // simply ignore non active shards
+            } else if (shardResponse instanceof BroadcastShardOperationFailedException) {
+                failedShards++;
+                if (shardFailures == null) {
+                    shardFailures = newArrayList();
+                }
+                shardFailures.add(new DefaultShardOperationFailedException((BroadcastShardOperationFailedException) shardResponse));
+            } else {
+                shards.add((ShardUpgradeStatus) shardResponse);
+                successfulShards++;
+            }
+        }
+        return new UpgradeStatusResponse(shards.toArray(new ShardUpgradeStatus[shards.size()]), shardsResponses.length(), successfulShards, failedShards, shardFailures);
+    }
+
+    @Override
+    protected IndexShardUpgradeStatusRequest newShardRequest(int numShards, ShardRouting shard, UpgradeStatusRequest request) {
+        return new IndexShardUpgradeStatusRequest(shard.shardId(), request);
+    }
+
+    @Override
+    protected ShardUpgradeStatus newShardResponse() {
+        return new ShardUpgradeStatus();
+    }
+
+    @Override
+    protected ShardUpgradeStatus shardOperation(IndexShardUpgradeStatusRequest request) {
+        IndexService indexService = indicesService.indexServiceSafe(request.shardId().getIndex());
+        IndexShard indexShard = indexService.shardSafe(request.shardId().id());
+        List<Segment> segments = indexShard.engine().segments(false);
+        long total_bytes = 0;
+        long to_upgrade_bytes = 0;
+        long to_upgrade_bytes_ancient = 0;
+        for (Segment seg : segments) {
+            total_bytes += seg.sizeInBytes;
+            if (seg.version.major != Version.CURRENT.luceneVersion.major) {
+                to_upgrade_bytes_ancient += seg.sizeInBytes;
+                to_upgrade_bytes += seg.sizeInBytes;
+            } else if (seg.version.minor != Version.CURRENT.luceneVersion.minor) {
+                // TODO: this comparison is bogus! it would cause us to upgrade even with the same format
+                // instead, we should check if the codec has changed
+                to_upgrade_bytes += seg.sizeInBytes;
+            }
+        }
+
+        return new ShardUpgradeStatus(indexShard.routingEntry(), total_bytes, to_upgrade_bytes, to_upgrade_bytes_ancient);
+    }
+
+    static class IndexShardUpgradeStatusRequest extends BroadcastShardRequest {
+
+        IndexShardUpgradeStatusRequest() {
+
+        }
+
+        IndexShardUpgradeStatusRequest(ShardId shardId, UpgradeStatusRequest request) {
+            super(shardId, request);
+        }
+
+    }
+}
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java
new file mode 100644
index 00000000000..e0318b13b97
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusAction.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.get;
+
+import org.elasticsearch.action.Action;
+import org.elasticsearch.client.ElasticsearchClient;
+
+/**
+ */
+public class UpgradeStatusAction extends Action<UpgradeStatusRequest, UpgradeStatusResponse, UpgradeStatusRequestBuilder> {
+
+    public static final UpgradeStatusAction INSTANCE = new UpgradeStatusAction();
+    public static final String NAME = "indices:monitor/upgrade";
+
+    private UpgradeStatusAction() {
+        super(NAME);
+    }
+
+    @Override
+    public UpgradeStatusResponse newResponse() {
+        return new UpgradeStatusResponse();
+    }
+
+    @Override
+    public UpgradeStatusRequestBuilder newRequestBuilder(ElasticsearchClient client) {
+        return new UpgradeStatusRequestBuilder(client, this);
+    }
+}
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java
new file mode 100644
index 00000000000..a951924720d
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.get;
+
+import org.elasticsearch.action.support.broadcast.BroadcastRequest;
+import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+
+import java.io.IOException;
+
+public class UpgradeStatusRequest extends BroadcastRequest<UpgradeStatusRequest> {
+
+    public UpgradeStatusRequest() {
+        this(Strings.EMPTY_ARRAY);
+    }
+
+    public UpgradeStatusRequest(String... indices) {
+        super(indices);
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java
new file mode 100644
index 00000000000..98dd1c1828d
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusRequestBuilder.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.get;
+
+import org.elasticsearch.action.support.broadcast.BroadcastOperationRequestBuilder;
+import org.elasticsearch.client.ElasticsearchClient;
+
+/**
+ *
+ */
+public class UpgradeStatusRequestBuilder extends BroadcastOperationRequestBuilder<UpgradeStatusRequest, UpgradeStatusResponse, UpgradeStatusRequestBuilder> {
+
+    public UpgradeStatusRequestBuilder(ElasticsearchClient client, UpgradeStatusAction action) {
+        super(client, action, new UpgradeStatusRequest());
+    }
+}
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java
new file mode 100644
index 00000000000..89520704049
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java
@@ -0,0 +1,191 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.get;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import org.elasticsearch.action.ShardOperationFailedException;
+import org.elasticsearch.action.support.broadcast.BroadcastResponse;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentBuilderString;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class UpgradeStatusResponse extends BroadcastResponse implements ToXContent {
+
+
+    private ShardUpgradeStatus[] shards;
+
+    private Map<String, IndexUpgradeStatus> indicesUpgradeStatus;
+
+    UpgradeStatusResponse() {
+
+    }
+
+    UpgradeStatusResponse(ShardUpgradeStatus[] shards, int totalShards, int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures) {
+        super(totalShards, successfulShards, failedShards, shardFailures);
+        this.shards = shards;
+    }
+
+    public Map<String, IndexUpgradeStatus> getIndices() {
+        if (indicesUpgradeStatus != null) {
+            return indicesUpgradeStatus;
+        }
+        Map<String, IndexUpgradeStatus> indicesUpgradeStats = Maps.newHashMap();
+
+        Set<String> indices = Sets.newHashSet();
+        for (ShardUpgradeStatus shard : shards) {
+            indices.add(shard.getIndex());
+        }
+
+        for (String index : indices) {
+            List<ShardUpgradeStatus> shards = Lists.newArrayList();
+            for (ShardUpgradeStatus shard : this.shards) {
+                if (shard.getShardRouting().index().equals(index)) {
+                    shards.add(shard);
+                }
+            }
+            indicesUpgradeStats.put(index, new IndexUpgradeStatus(index, shards.toArray(new ShardUpgradeStatus[shards.size()])));
+        }
+        this.indicesUpgradeStatus = indicesUpgradeStats;
+        return indicesUpgradeStats;
+    }
+
+
+    @Override
+    public void readFrom(StreamInput in) throws IOException {
+        super.readFrom(in);
+        shards = new ShardUpgradeStatus[in.readVInt()];
+        for (int i = 0; i < shards.length; i++) {
+            shards[i] = ShardUpgradeStatus.readShardUpgradeStatus(in);
+        }
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        super.writeTo(out);
+        out.writeVInt(shards.length);
+        for (ShardUpgradeStatus shard : shards) {
+            shard.writeTo(out);
+        }
+    }
+
+    public long getTotalBytes() {
+        long totalBytes = 0;
+        for (IndexUpgradeStatus indexShardUpgradeStatus : getIndices().values()) {
+            totalBytes += indexShardUpgradeStatus.getTotalBytes();
+        }
+        return totalBytes;
+    }
+
+    public long getToUpgradeBytes() {
+        long upgradeBytes = 0;
+        for (IndexUpgradeStatus indexShardUpgradeStatus : getIndices().values()) {
+            upgradeBytes += indexShardUpgradeStatus.getToUpgradeBytes();
+        }
+        return upgradeBytes;
+    }
+
+    public long getToUpgradeBytesAncient() {
+        long upgradeBytesAncient = 0;
+        for (IndexUpgradeStatus indexShardUpgradeStatus : getIndices().values()) {
+            upgradeBytesAncient += indexShardUpgradeStatus.getToUpgradeBytesAncient();
+        }
+        return upgradeBytesAncient;
+    }
+
+    @Override
+    public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+
+
+        builder.byteSizeField(Fields.SIZE_IN_BYTES, Fields.SIZE, getTotalBytes());
+        builder.byteSizeField(Fields.SIZE_TO_UPGRADE_IN_BYTES, Fields.SIZE_TO_UPGRADE, getToUpgradeBytes());
+        builder.byteSizeField(Fields.SIZE_TO_UPGRADE_ANCIENT_IN_BYTES, Fields.SIZE_TO_UPGRADE_ANCIENT, getToUpgradeBytesAncient());
+
+        String level = params.param("level", "indices");
+        boolean outputShards = "shards".equals(level);
+        boolean outputIndices = "indices".equals(level) || outputShards;
+        if (outputIndices) {
+            builder.startObject(Fields.INDICES);
+            for (IndexUpgradeStatus indexUpgradeStatus : getIndices().values()) {
+                builder.startObject(indexUpgradeStatus.getIndex(), XContentBuilder.FieldCaseConversion.NONE);
+
+                builder.byteSizeField(Fields.SIZE_IN_BYTES, Fields.SIZE, indexUpgradeStatus.getTotalBytes());
+                builder.byteSizeField(Fields.SIZE_TO_UPGRADE_IN_BYTES, Fields.SIZE_TO_UPGRADE, indexUpgradeStatus.getToUpgradeBytes());
+                builder.byteSizeField(Fields.SIZE_TO_UPGRADE_ANCIENT_IN_BYTES, Fields.SIZE_TO_UPGRADE_ANCIENT, indexUpgradeStatus.getToUpgradeBytesAncient());
+                if (outputShards) {
+                    builder.startObject(Fields.SHARDS);
+                    for (IndexShardUpgradeStatus indexShardUpgradeStatus : indexUpgradeStatus) {
+                        builder.startArray(Integer.toString(indexShardUpgradeStatus.getShardId().id()));
+                        for (ShardUpgradeStatus shardUpgradeStatus : indexShardUpgradeStatus) {
+                            builder.startObject();
+
+                            builder.byteSizeField(Fields.SIZE_IN_BYTES, Fields.SIZE, getTotalBytes());
+                            builder.byteSizeField(Fields.SIZE_TO_UPGRADE_IN_BYTES, Fields.SIZE_TO_UPGRADE, getToUpgradeBytes());
+                            builder.byteSizeField(Fields.SIZE_TO_UPGRADE_ANCIENT_IN_BYTES, Fields.SIZE_TO_UPGRADE_ANCIENT, getToUpgradeBytesAncient());
+
+                            builder.startObject(Fields.ROUTING);
+                            builder.field(Fields.STATE, shardUpgradeStatus.getShardRouting().state());
+                            builder.field(Fields.PRIMARY, shardUpgradeStatus.getShardRouting().primary());
+                            builder.field(Fields.NODE, shardUpgradeStatus.getShardRouting().currentNodeId());
+                            if (shardUpgradeStatus.getShardRouting().relocatingNodeId() != null) {
+                                builder.field(Fields.RELOCATING_NODE, shardUpgradeStatus.getShardRouting().relocatingNodeId());
+                            }
+                            builder.endObject();
+
+                            builder.endObject();
+                        }
+                        builder.endArray();
+                    }
+                    builder.endObject();
+                }
+
+                builder.endObject();
+            }
+
+            builder.endObject();
+        }
+        return builder;
+    }
+
+    static final class Fields {
+        static final XContentBuilderString INDICES = new XContentBuilderString("indices");
+        static final XContentBuilderString SHARDS = new XContentBuilderString("shards");
+        static final XContentBuilderString ROUTING = new XContentBuilderString("routing");
+        static final XContentBuilderString STATE = new XContentBuilderString("state");
+        static final XContentBuilderString PRIMARY = new XContentBuilderString("primary");
+        static final XContentBuilderString NODE = new XContentBuilderString("node");
+        static final XContentBuilderString RELOCATING_NODE = new XContentBuilderString("relocating_node");
+        static final XContentBuilderString SIZE = new XContentBuilderString("size");
+        static final XContentBuilderString SIZE_IN_BYTES = new XContentBuilderString("size_in_bytes");
+        static final XContentBuilderString SIZE_TO_UPGRADE = new XContentBuilderString("size_to_upgrade");
+        static final XContentBuilderString SIZE_TO_UPGRADE_ANCIENT = new XContentBuilderString("size_to_upgrade_ancient");
+        static final XContentBuilderString SIZE_TO_UPGRADE_IN_BYTES = new XContentBuilderString("size_to_upgrade_in_bytes");
+        static final XContentBuilderString SIZE_TO_UPGRADE_ANCIENT_IN_BYTES = new XContentBuilderString("size_to_upgrade_ancient_in_bytes");
+
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java
new file mode 100644
index 00000000000..9731a983c38
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeRequest.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.post;
+
+
+import org.elasticsearch.action.support.broadcast.BroadcastShardRequest;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.index.shard.ShardId;
+
+import java.io.IOException;
+
+/**
+ *
+ */
+final class ShardUpgradeRequest extends BroadcastShardRequest {
+
+    private UpgradeRequest request = new UpgradeRequest();
+
+    ShardUpgradeRequest() {
+    }
+
+    ShardUpgradeRequest(ShardId shardId, UpgradeRequest request) {
+        super(shardId, request);
+        this.request = request;
+    }
+
+    @Override
+    public void readFrom(StreamInput in) throws IOException {
+        super.readFrom(in);
+        request.readFrom(in);
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        super.writeTo(out);
+        request.writeTo(out);
+    }
+
+    public UpgradeRequest upgradeRequest() {
+        return this.request;
+    }
+}
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResponse.java
new file mode 100644
index 00000000000..efbb19142c3
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/ShardUpgradeResponse.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.post;
+
+import org.elasticsearch.action.support.broadcast.BroadcastShardResponse;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.index.shard.ShardId;
+
+import java.io.IOException;
+import java.text.ParseException;
+
+/**
+ *
+ */
+class ShardUpgradeResponse extends BroadcastShardResponse {
+
+    private org.apache.lucene.util.Version version;
+
+    private boolean primary;
+
+
+    ShardUpgradeResponse() {
+    }
+
+    ShardUpgradeResponse(ShardId shardId, boolean primary, org.apache.lucene.util.Version version) {
+        super(shardId);
+        this.primary = primary;
+        this.version = version;
+    }
+
+    public org.apache.lucene.util.Version version() {
+        return this.version;
+    }
+
+    public boolean primary() {
+        return primary;
+    }
+
+
+    @Override
+    public void readFrom(StreamInput in) throws IOException {
+        super.readFrom(in);
+        primary = in.readBoolean();
+        try {
+            version = org.apache.lucene.util.Version.parse(in.readString());
+        } catch (ParseException ex) {
+            throw new IOException("failed to parse lucene version [" + version + "]", ex);
+        }
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        super.writeTo(out);
+        out.writeBoolean(primary);
+        out.writeString(version.toString());
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java
new file mode 100644
index 00000000000..c5dc59ee634
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java
@@ -0,0 +1,214 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.post;
+
+import org.apache.lucene.util.Version;
+import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.PrimaryMissingActionException;
+import org.elasticsearch.action.ShardOperationFailedException;
+import org.elasticsearch.action.support.ActionFilters;
+import org.elasticsearch.action.support.DefaultShardOperationFailedException;
+import org.elasticsearch.action.support.broadcast.BroadcastShardOperationFailedException;
+import org.elasticsearch.action.support.broadcast.TransportBroadcastAction;
+import org.elasticsearch.cluster.ClusterService;
+import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.cluster.block.ClusterBlockException;
+import org.elasticsearch.cluster.block.ClusterBlockLevel;
+import org.elasticsearch.cluster.metadata.MetaData;
+import org.elasticsearch.cluster.routing.*;
+import org.elasticsearch.common.inject.Inject;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.index.shard.IndexShard;
+import org.elasticsearch.indices.IndicesService;
+import org.elasticsearch.threadpool.ThreadPool;
+import org.elasticsearch.transport.TransportService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReferenceArray;
+
+import static com.google.common.collect.Lists.newArrayList;
+import static com.google.common.collect.Maps.newHashMap;
+import static com.google.common.collect.Sets.newHashSet;
+
+/**
+ * Upgrade index/indices action.
+ */
+public class TransportUpgradeAction extends TransportBroadcastAction<UpgradeRequest, UpgradeResponse, ShardUpgradeRequest, ShardUpgradeResponse> {
+
+    private final IndicesService indicesService;
+
+    private final TransportUpgradeSettingsAction upgradeSettingsAction;
+
+    @Inject
+    public TransportUpgradeAction(Settings settings, ThreadPool threadPool, ClusterService clusterService,
+                                  TransportService transportService, IndicesService indicesService, ActionFilters actionFilters,
+                                  TransportUpgradeSettingsAction upgradeSettingsAction) {
+        super(settings, UpgradeAction.NAME, threadPool, clusterService, transportService, actionFilters,
+                UpgradeRequest.class, ShardUpgradeRequest.class, ThreadPool.Names.OPTIMIZE);
+        this.indicesService = indicesService;
+        this.upgradeSettingsAction = upgradeSettingsAction;
+    }
+
+    @Override
+    protected UpgradeResponse newResponse(UpgradeRequest request, AtomicReferenceArray shardsResponses, ClusterState clusterState) {
+        int successfulShards = 0;
+        int failedShards = 0;
+        List<ShardOperationFailedException> shardFailures = null;
+        Map<String, Integer> successfulPrimaryShards = newHashMap();
+        Map<String, Version> versions = newHashMap();
+        for (int i = 0; i < shardsResponses.length(); i++) {
+            Object shardResponse = shardsResponses.get(i);
+            if (shardResponse == null) {
+                // a non active shard, ignore...
+            } else if (shardResponse instanceof BroadcastShardOperationFailedException) {
+                failedShards++;
+                if (shardFailures == null) {
+                    shardFailures = newArrayList();
+                }
+                shardFailures.add(new DefaultShardOperationFailedException((BroadcastShardOperationFailedException) shardResponse));
+            } else {
+                successfulShards++;
+                ShardUpgradeResponse shardUpgradeResponse = (ShardUpgradeResponse) shardResponse;
+                String index = shardUpgradeResponse.getIndex();
+                if (shardUpgradeResponse.primary()) {
+                    Integer count = successfulPrimaryShards.get(index);
+                    successfulPrimaryShards.put(index, count == null ? 1 : count + 1);
+                }
+                Version version = versions.get(index);
+                if (version == null || shardUpgradeResponse.version().onOrAfter(version) == false) {
+                    versions.put(index, shardUpgradeResponse.version());
+                }
+            }
+        }
+        Map<String, String> updatedVersions = newHashMap();
+        MetaData metaData = clusterState.metaData();
+        for (Map.Entry<String, Version> versionEntry : versions.entrySet()) {
+            String index = versionEntry.getKey();
+            Integer primaryCount = successfulPrimaryShards.get(index);
+            int expectedPrimaryCount = metaData.index(index).getNumberOfShards();
+            if (primaryCount == metaData.index(index).getNumberOfShards()) {
+                updatedVersions.put(index, versionEntry.getValue().toString());
+            } else {
+                logger.warn("Not updating settings for the index [{}] because upgraded of some primary shards failed - expected[{}], received[{}]", index,
+                        expectedPrimaryCount, primaryCount == null ? 0 : primaryCount);
+            }
+        }
+
+        return new UpgradeResponse(updatedVersions, shardsResponses.length(), successfulShards, failedShards, shardFailures);
+    }
+
+    @Override
+    protected ShardUpgradeRequest newShardRequest(int numShards, ShardRouting shard, UpgradeRequest request) {
+        return new ShardUpgradeRequest(shard.shardId(), request);
+    }
+
+    @Override
+    protected ShardUpgradeResponse newShardResponse() {
+        return new ShardUpgradeResponse();
+    }
+
+    @Override
+    protected ShardUpgradeResponse shardOperation(ShardUpgradeRequest request) {
+        IndexShard indexShard = indicesService.indexServiceSafe(request.shardId().getIndex()).shardSafe(request.shardId().id());
+        org.apache.lucene.util.Version version = indexShard.upgrade(request.upgradeRequest());
+        return new ShardUpgradeResponse(request.shardId(), indexShard.routingEntry().primary(), version);
+    }
+
+    /**
+     * The upgrade request works against *all* shards.
+     */
+    @Override
+    protected GroupShardsIterator shards(ClusterState clusterState, UpgradeRequest request, String[] concreteIndices) {
+        GroupShardsIterator iterator = clusterState.routingTable().allActiveShardsGrouped(concreteIndices, true);
+        Set<String> indicesWithMissingPrimaries = indicesWithMissingPrimaries(clusterState, concreteIndices);
+        if (indicesWithMissingPrimaries.isEmpty()) {
+            return iterator;
+        }
+        // If some primary shards are not available the request should fail.
+        throw new PrimaryMissingActionException("Cannot upgrade indices because the following indices are missing primary shards " + indicesWithMissingPrimaries);
+    }
+
+    /**
+     * Finds all indices that have not all primaries available
+     */
+    private Set<String> indicesWithMissingPrimaries(ClusterState clusterState, String[] concreteIndices) {
+        Set<String> indices = newHashSet();
+        RoutingTable routingTable = clusterState.routingTable();
+        for (String index : concreteIndices) {
+            IndexRoutingTable indexRoutingTable = routingTable.index(index);
+            if (indexRoutingTable.allPrimaryShardsActive() == false) {
+                indices.add(index);
+            }
+        }
+        return indices;
+    }
+
+    @Override
+    protected ClusterBlockException checkGlobalBlock(ClusterState state, UpgradeRequest request) {
+        return state.blocks().globalBlockedException(ClusterBlockLevel.METADATA_WRITE);
+    }
+
+    @Override
+    protected ClusterBlockException checkRequestBlock(ClusterState state, UpgradeRequest request, String[] concreteIndices) {
+        return state.blocks().indicesBlockedException(ClusterBlockLevel.METADATA_WRITE, concreteIndices);
+    }
+
+    @Override
+    protected void doExecute(UpgradeRequest request, final ActionListener<UpgradeResponse> listener) {
+        ActionListener<UpgradeResponse> settingsUpdateListener = new ActionListener<UpgradeResponse>() {
+            @Override
+            public void onResponse(UpgradeResponse upgradeResponse) {
+                try {
+                    if (upgradeResponse.versions().isEmpty()) {
+                        listener.onResponse(upgradeResponse);
+                    } else {
+                        updateSettings(upgradeResponse, listener);
+                    }
+                } catch (Throwable t) {
+                    listener.onFailure(t);
+                }
+            }
+
+            @Override
+            public void onFailure(Throwable e) {
+                listener.onFailure(e);
+            }
+        };
+        super.doExecute(request, settingsUpdateListener);
+    }
+
+    private void updateSettings(final UpgradeResponse upgradeResponse, final ActionListener<UpgradeResponse> listener) {
+        UpgradeSettingsRequest upgradeSettingsRequest = new UpgradeSettingsRequest(upgradeResponse.versions());
+        upgradeSettingsAction.execute(upgradeSettingsRequest, new ActionListener<UpgradeSettingsResponse>() {
+            @Override
+            public void onResponse(UpgradeSettingsResponse updateSettingsResponse) {
+                listener.onResponse(upgradeResponse);
+            }
+
+            @Override
+            public void onFailure(Throwable e) {
+                listener.onFailure(e);
+            }
+        });
+    }
+
+}
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java
new file mode 100644
index 00000000000..26c3731697d
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.post;
+
+import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.support.ActionFilters;
+import org.elasticsearch.action.support.master.TransportMasterNodeAction;
+import org.elasticsearch.cluster.ClusterService;
+import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
+import org.elasticsearch.cluster.block.ClusterBlockException;
+import org.elasticsearch.cluster.block.ClusterBlockLevel;
+import org.elasticsearch.cluster.metadata.MetaDataUpdateSettingsService;
+import org.elasticsearch.common.inject.Inject;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.threadpool.ThreadPool;
+import org.elasticsearch.transport.TransportService;
+
+/**
+ *
+ */
+public class TransportUpgradeSettingsAction extends TransportMasterNodeAction<UpgradeSettingsRequest, UpgradeSettingsResponse> {
+
+    private final MetaDataUpdateSettingsService updateSettingsService;
+
+    @Inject
+    public TransportUpgradeSettingsAction(Settings settings, TransportService transportService, ClusterService clusterService, ThreadPool threadPool,
+                                          MetaDataUpdateSettingsService updateSettingsService, ActionFilters actionFilters) {
+        super(settings, UpgradeSettingsAction.NAME, transportService, clusterService, threadPool, actionFilters, UpgradeSettingsRequest.class);
+        this.updateSettingsService = updateSettingsService;
+    }
+
+    @Override
+    protected String executor() {
+        // we go async right away....
+        return ThreadPool.Names.SAME;
+    }
+
+    @Override
+    protected ClusterBlockException checkBlock(UpgradeSettingsRequest request, ClusterState state) {
+        return state.blocks().globalBlockedException(ClusterBlockLevel.METADATA_WRITE);
+    }
+
+    @Override
+    protected UpgradeSettingsResponse newResponse() {
+        return new UpgradeSettingsResponse();
+    }
+
+    @Override
+    protected void masterOperation(final UpgradeSettingsRequest request, final ClusterState state, final ActionListener<UpgradeSettingsResponse> listener) {
+        UpgradeSettingsClusterStateUpdateRequest clusterStateUpdateRequest = new UpgradeSettingsClusterStateUpdateRequest()
+                .ackTimeout(request.timeout())
+                .versions(request.versions())
+                .masterNodeTimeout(request.masterNodeTimeout());
+
+        updateSettingsService.upgradeIndexSettings(clusterStateUpdateRequest, new ActionListener<ClusterStateUpdateResponse>() {
+            @Override
+            public void onResponse(ClusterStateUpdateResponse response) {
+                listener.onResponse(new UpgradeSettingsResponse(response.isAcknowledged()));
+            }
+
+            @Override
+            public void onFailure(Throwable t) {
+                logger.debug("failed to upgrade minimum compatibility version settings on indices [{}]", t, request.versions().keySet());
+                listener.onFailure(t);
+            }
+        });
+    }
+}
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java
new file mode 100644
index 00000000000..908a8a0d283
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeAction.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.post;
+
+import org.elasticsearch.action.Action;
+import org.elasticsearch.client.ElasticsearchClient;
+
+/**
+ * Upgrade index/indices action.
+ */
+public class UpgradeAction extends Action<UpgradeRequest, UpgradeResponse, UpgradeRequestBuilder> {
+
+    public static final UpgradeAction INSTANCE = new UpgradeAction();
+    public static final String NAME = "indices:admin/upgrade";
+
+    private UpgradeAction() {
+        super(NAME);
+    }
+
+    @Override
+    public UpgradeResponse newResponse() {
+        return new UpgradeResponse();
+    }
+
+    @Override
+    public UpgradeRequestBuilder newRequestBuilder(ElasticsearchClient client) {
+        return new UpgradeRequestBuilder(client, this);
+    }
+}
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequest.java
new file mode 100644
index 00000000000..af328ce21ad
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequest.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.post;
+
+import org.elasticsearch.action.support.broadcast.BroadcastRequest;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+
+import java.io.IOException;
+
+/**
+ * A request to upgrade one or more indices. In order to optimize on all the indices, pass an empty array or
+ * <tt>null</tt> for the indices.
+ * <p/>
+ * @see org.elasticsearch.client.Requests#upgradeRequest(String...)
+ * @see org.elasticsearch.client.IndicesAdminClient#upgrade(UpgradeRequest)
+ * @see UpgradeResponse
+ */
+public class UpgradeRequest extends BroadcastRequest<UpgradeRequest> {
+
+    public static final class Defaults {
+        public static final boolean UPGRADE_ONLY_ANCIENT_SEGMENTS = false;
+    }
+    
+    private boolean upgradeOnlyAncientSegments = Defaults.UPGRADE_ONLY_ANCIENT_SEGMENTS;
+
+    /**
+     * Constructs an optimization request over one or more indices.
+     *
+     * @param indices The indices to optimize, no indices passed means all indices will be optimized.
+     */
+    public UpgradeRequest(String... indices) {
+        super(indices);
+    }
+
+    public UpgradeRequest() {
+
+    }
+
+    @Override
+    public void readFrom(StreamInput in) throws IOException {
+        super.readFrom(in);
+        upgradeOnlyAncientSegments = in.readBoolean();
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        super.writeTo(out);
+        out.writeBoolean(upgradeOnlyAncientSegments);
+    }
+
+    /**
+     * Should the upgrade only the ancient (older major version of Lucene) segments?
+     * Defaults to <tt>false</tt>.
+     */
+    public boolean upgradeOnlyAncientSegments() {
+        return upgradeOnlyAncientSegments;
+    }
+
+    /**
+     * See {@link #upgradeOnlyAncientSegments()}
+     */
+    public UpgradeRequest upgradeOnlyAncientSegments(boolean upgradeOnlyAncientSegments) {
+        this.upgradeOnlyAncientSegments = upgradeOnlyAncientSegments;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "UpgradeRequest{" +
+                "upgradeOnlyAncientSegments=" + upgradeOnlyAncientSegments +
+                '}';
+    }
+}
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java
new file mode 100644
index 00000000000..adc8ea5510a
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeRequestBuilder.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.post;
+
+import org.elasticsearch.action.support.broadcast.BroadcastOperationRequestBuilder;
+import org.elasticsearch.client.ElasticsearchClient;
+
+/**
+ * A request to upgrade one or more indices. In order to optimize on all the indices, pass an empty array or
+ * <tt>null</tt> for the indices.
+ */
+public class UpgradeRequestBuilder extends BroadcastOperationRequestBuilder<UpgradeRequest, UpgradeResponse, UpgradeRequestBuilder> {
+
+    public UpgradeRequestBuilder(ElasticsearchClient client, UpgradeAction action) {
+        super(client, action, new UpgradeRequest());
+    }
+
+    /**
+     *  Should the upgrade only the ancient (older major version of Lucene) segments?
+     */
+    public UpgradeRequestBuilder setUpgradeOnlyAncientSegments(boolean upgradeOnlyAncientSegments) {
+        request.upgradeOnlyAncientSegments(upgradeOnlyAncientSegments);
+        return this;
+    }
+}
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java
new file mode 100644
index 00000000000..04e377dd75d
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.post;
+
+import org.elasticsearch.action.ShardOperationFailedException;
+import org.elasticsearch.action.support.broadcast.BroadcastResponse;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import static com.google.common.collect.Maps.newHashMap;
+
+/**
+ * A response for optimize action.
+ *
+ *
+ */
+public class UpgradeResponse extends BroadcastResponse {
+
+    private Map<String, String> versions;
+
+    UpgradeResponse() {
+
+    }
+
+    UpgradeResponse(Map<String, String> versions, int totalShards, int successfulShards, int failedShards, List<ShardOperationFailedException> shardFailures) {
+        super(totalShards, successfulShards, failedShards, shardFailures);
+        this.versions = versions;
+    }
+
+    @Override
+    public void readFrom(StreamInput in) throws IOException {
+        super.readFrom(in);
+        int size = in.readVInt();
+        versions = newHashMap();
+        for (int i=0; i<size; i++) {
+            String index = in.readString();
+            String version = in.readString();
+            versions.put(index, version);
+        }
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        super.writeTo(out);
+        out.writeVInt(versions.size());
+        for(Map.Entry<String, String> entry : versions.entrySet()) {
+            out.writeString(entry.getKey());
+            out.writeString(entry.getValue());
+        }
+    }
+
+    public Map<String, String> versions() {
+        return versions;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java
new file mode 100644
index 00000000000..5257b50132d
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsAction.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.post;
+
+import org.elasticsearch.action.Action;
+import org.elasticsearch.client.ElasticsearchClient;
+
+/**
+ */
+public class UpgradeSettingsAction extends Action<UpgradeSettingsRequest, UpgradeSettingsResponse, UpgradeSettingsRequestBuilder> {
+
+    public static final UpgradeSettingsAction INSTANCE = new UpgradeSettingsAction();
+    public static final String NAME = "internal:indices/admin/upgrade";
+
+    private UpgradeSettingsAction() {
+        super(NAME);
+    }
+
+    @Override
+    public UpgradeSettingsResponse newResponse() {
+        return new UpgradeSettingsResponse();
+    }
+
+    @Override
+    public UpgradeSettingsRequestBuilder newRequestBuilder(ElasticsearchClient client) {
+        return new UpgradeSettingsRequestBuilder(client, this);
+    }
+}
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java
new file mode 100644
index 00000000000..7067f2f61ec
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.post;
+
+import org.elasticsearch.cluster.ack.ClusterStateUpdateRequest;
+
+import java.util.Map;
+
+/**
+ * Cluster state update request that allows to change minimum compatibility settings for some indices
+ */
+public class UpgradeSettingsClusterStateUpdateRequest extends ClusterStateUpdateRequest<UpgradeSettingsClusterStateUpdateRequest> {
+
+    private Map<String, String> versions;
+
+    public UpgradeSettingsClusterStateUpdateRequest() {
+
+    }
+
+    /**
+     * Returns the index to version map for indices that should be updated
+     */
+    public Map<String, String> versions() {
+        return versions;
+    }
+
+    /**
+     * Sets the index to version map for indices that should be updated
+     */
+    public UpgradeSettingsClusterStateUpdateRequest versions(Map<String, String> versions) {
+        this.versions = versions;
+        return this;
+    }
+}
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java
new file mode 100644
index 00000000000..b191fa53539
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.post;
+
+import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.action.support.master.AcknowledgedRequest;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+
+import java.io.IOException;
+import java.util.Map;
+
+import static com.google.common.collect.Maps.newHashMap;
+import static org.elasticsearch.action.ValidateActions.addValidationError;
+
+/**
+ * Request for an update index settings action
+ */
+public class UpgradeSettingsRequest extends AcknowledgedRequest<UpgradeSettingsRequest> {
+
+
+    private Map<String, String> versions;
+
+    UpgradeSettingsRequest() {
+    }
+
+    /**
+     * Constructs a new request to update minimum compatible version settings for one or more indices
+     */
+    public UpgradeSettingsRequest(Map<String, String> versions) {
+        this.versions = versions;
+    }
+
+
+    @Override
+    public ActionRequestValidationException validate() {
+        ActionRequestValidationException validationException = null;
+        if (versions.isEmpty()) {
+            validationException = addValidationError("no indices to update", validationException);
+        }
+        return validationException;
+    }
+
+
+    Map<String, String> versions() {
+        return versions;
+    }
+
+    /**
+     * Sets the index versions to be updated
+     */
+    public UpgradeSettingsRequest versions(Map<String, String> versions) {
+        this.versions = versions;
+        return this;
+    }
+
+
+    @Override
+    public void readFrom(StreamInput in) throws IOException {
+        super.readFrom(in);
+        int size = in.readVInt();
+        versions = newHashMap();
+        for (int i=0; i<size; i++) {
+            String index = in.readString();
+            String version = in.readString();
+            versions.put(index, version);
+        }
+        readTimeout(in);
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        super.writeTo(out);
+        out.writeVInt(versions.size());
+        for(Map.Entry<String, String> entry : versions.entrySet()) {
+            out.writeString(entry.getKey());
+            out.writeString(entry.getValue());
+        }
+        writeTimeout(out);
+    }
+}
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java
new file mode 100644
index 00000000000..74c42a5fe80
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.post;
+
+import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder;
+import org.elasticsearch.client.ElasticsearchClient;
+
+import java.util.Map;
+
+/**
+ * Builder for an update index settings request
+ */
+public class UpgradeSettingsRequestBuilder extends AcknowledgedRequestBuilder<UpgradeSettingsRequest, UpgradeSettingsResponse, UpgradeSettingsRequestBuilder> {
+
+    public UpgradeSettingsRequestBuilder(ElasticsearchClient client, UpgradeSettingsAction action) {
+        super(client, action, new UpgradeSettingsRequest());
+    }
+
+    /**
+     * Sets the index versions to be updated
+     */
+    public UpgradeSettingsRequestBuilder setVersions(Map<String, String> versions) {
+        request.versions(versions);
+        return this;
+    }
+}
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsResponse.java b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsResponse.java
new file mode 100644
index 00000000000..0918af6f418
--- /dev/null
+++ b/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsResponse.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.upgrade.post;
+
+import org.elasticsearch.action.support.master.AcknowledgedResponse;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+
+import java.io.IOException;
+
+/**
+ * A response for an update index settings action
+ */
+public class UpgradeSettingsResponse extends AcknowledgedResponse {
+
+    UpgradeSettingsResponse() {
+    }
+
+    UpgradeSettingsResponse(boolean acknowledged) {
+        super(acknowledged);
+    }
+
+    @Override
+    public void readFrom(StreamInput in) throws IOException {
+        super.readFrom(in);
+        readAcknowledged(in);
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        super.writeTo(out);
+        writeAcknowledged(out);
+    }
+}
diff --git a/src/main/java/org/elasticsearch/client/IndicesAdminClient.java b/src/main/java/org/elasticsearch/client/IndicesAdminClient.java
index c54aaece7f4..ae16d7b36d2 100644
--- a/src/main/java/org/elasticsearch/client/IndicesAdminClient.java
+++ b/src/main/java/org/elasticsearch/client/IndicesAdminClient.java
@@ -96,6 +96,12 @@ import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesResp
 import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequest;
 import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequestBuilder;
 import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateResponse;
+import org.elasticsearch.action.admin.indices.upgrade.get.UpgradeStatusRequest;
+import org.elasticsearch.action.admin.indices.upgrade.get.UpgradeStatusRequestBuilder;
+import org.elasticsearch.action.admin.indices.upgrade.get.UpgradeStatusResponse;
+import org.elasticsearch.action.admin.indices.upgrade.post.UpgradeRequest;
+import org.elasticsearch.action.admin.indices.upgrade.post.UpgradeRequestBuilder;
+import org.elasticsearch.action.admin.indices.upgrade.post.UpgradeResponse;
 import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryRequest;
 import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryRequestBuilder;
 import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryResponse;
@@ -406,6 +412,53 @@ public interface IndicesAdminClient extends ElasticsearchClient {
      */
     OptimizeRequestBuilder prepareOptimize(String... indices);
 
+
+    /**
+     * Explicitly upgrade one or more indices
+     *
+     * @param request The upgrade request
+     * @return A result future
+     * @see org.elasticsearch.client.Requests#upgradeRequest(String...)
+     */
+    ActionFuture<UpgradeResponse> upgrade(UpgradeRequest request);
+
+    /**
+     * Explicitly upgrade one or more indices
+     *
+     * @param request  The upgrade request
+     * @param listener A listener to be notified with a result
+     * @see org.elasticsearch.client.Requests#upgradeRequest(String...)
+     */
+    void upgrade(UpgradeRequest request, ActionListener<UpgradeResponse> listener);
+
+    /**
+     *  Explicitly upgrade one or more indices
+     */
+    UpgradeStatusRequestBuilder prepareUpgradeStatus(String... indices);
+
+    /**
+     * Check upgrade status of one or more indices
+     *
+     * @param request The upgrade request
+     * @return A result future
+     * @see org.elasticsearch.client.Requests#upgradeRequest(String...)
+     */
+    ActionFuture<UpgradeStatusResponse> upgradeStatus(UpgradeStatusRequest request);
+
+    /**
+     * Check upgrade status of one or more indices
+     *
+     * @param request  The upgrade request
+     * @param listener A listener to be notified with a result
+     * @see org.elasticsearch.client.Requests#upgradeRequest(String...)
+     */
+    void upgradeStatus(UpgradeStatusRequest request, ActionListener<UpgradeStatusResponse> listener);
+
+    /**
+     * Check upgrade status of one or more indices
+     */
+    UpgradeRequestBuilder prepareUpgrade(String... indices);
+
     /**
      * Get the complete mappings of one or more types
      */
diff --git a/src/main/java/org/elasticsearch/client/Requests.java b/src/main/java/org/elasticsearch/client/Requests.java
index bc2a778f570..8a70c18b374 100644
--- a/src/main/java/org/elasticsearch/client/Requests.java
+++ b/src/main/java/org/elasticsearch/client/Requests.java
@@ -49,6 +49,7 @@ import org.elasticsearch.action.admin.indices.optimize.OptimizeRequest;
 import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
 import org.elasticsearch.action.admin.indices.segments.IndicesSegmentsRequest;
 import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsRequest;
+import org.elasticsearch.action.admin.indices.upgrade.post.UpgradeRequest;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.count.CountRequest;
 import org.elasticsearch.action.delete.DeleteRequest;
@@ -291,6 +292,17 @@ public class Requests {
         return new OptimizeRequest(indices);
     }
 
+    /**
+     * Creates an upgrade request.
+     *
+     * @param indices The indices to upgrade. Use <tt>null</tt> or <tt>_all</tt> to execute against all indices
+     * @return The upgrade request
+     * @see org.elasticsearch.client.IndicesAdminClient#upgrade(UpgradeRequest)
+     */
+    public static UpgradeRequest upgradeRequest(String... indices) {
+        return new UpgradeRequest(indices);
+    }
+
     /**
      * Creates a clean indices cache request.
      *
diff --git a/src/main/java/org/elasticsearch/client/support/AbstractClient.java b/src/main/java/org/elasticsearch/client/support/AbstractClient.java
index 75e8ada560b..625a469470d 100644
--- a/src/main/java/org/elasticsearch/client/support/AbstractClient.java
+++ b/src/main/java/org/elasticsearch/client/support/AbstractClient.java
@@ -196,6 +196,14 @@ import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateActio
 import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequest;
 import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateRequestBuilder;
 import org.elasticsearch.action.admin.indices.template.put.PutIndexTemplateResponse;
+import org.elasticsearch.action.admin.indices.upgrade.get.UpgradeStatusAction;
+import org.elasticsearch.action.admin.indices.upgrade.get.UpgradeStatusRequest;
+import org.elasticsearch.action.admin.indices.upgrade.get.UpgradeStatusRequestBuilder;
+import org.elasticsearch.action.admin.indices.upgrade.get.UpgradeStatusResponse;
+import org.elasticsearch.action.admin.indices.upgrade.post.UpgradeAction;
+import org.elasticsearch.action.admin.indices.upgrade.post.UpgradeRequest;
+import org.elasticsearch.action.admin.indices.upgrade.post.UpgradeRequestBuilder;
+import org.elasticsearch.action.admin.indices.upgrade.post.UpgradeResponse;
 import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryAction;
 import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryRequest;
 import org.elasticsearch.action.admin.indices.validate.query.ValidateQueryRequestBuilder;
@@ -1415,6 +1423,36 @@ public abstract class AbstractClient extends AbstractComponent implements Client
             return new OptimizeRequestBuilder(this, OptimizeAction.INSTANCE).setIndices(indices);
         }
 
+        @Override
+        public ActionFuture<UpgradeResponse> upgrade(final UpgradeRequest request) {
+            return execute(UpgradeAction.INSTANCE, request);
+        }
+
+        @Override
+        public void upgrade(final UpgradeRequest request, final ActionListener<UpgradeResponse> listener) {
+            execute(UpgradeAction.INSTANCE, request, listener);
+        }
+
+        @Override
+        public UpgradeRequestBuilder prepareUpgrade(String... indices) {
+            return new UpgradeRequestBuilder(this, UpgradeAction.INSTANCE).setIndices(indices);
+        }
+
+
+        @Override
+        public ActionFuture<UpgradeStatusResponse> upgradeStatus(final UpgradeStatusRequest request) {
+            return execute(UpgradeStatusAction.INSTANCE, request);
+        }
+
+        @Override
+        public void upgradeStatus(final UpgradeStatusRequest request, final ActionListener<UpgradeStatusResponse> listener) {
+            execute(UpgradeStatusAction.INSTANCE, request, listener);
+        }
+
+        @Override
+        public UpgradeStatusRequestBuilder prepareUpgradeStatus(String... indices) {
+            return new UpgradeStatusRequestBuilder(this, UpgradeStatusAction.INSTANCE).setIndices(indices);
+        }
         @Override
         public ActionFuture<RefreshResponse> refresh(final RefreshRequest request) {
             return execute(RefreshAction.INSTANCE, request);
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java
index c9c7bbabb00..07703bca591 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java
@@ -49,6 +49,7 @@ import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.search.warmer.IndexWarmersMetaData;
 
 import java.io.IOException;
+import java.text.ParseException;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Locale;
@@ -159,6 +160,7 @@ public class IndexMetaData implements Diffable<IndexMetaData> {
     public static final String SETTING_BLOCKS_WRITE = "index.blocks.write";
     public static final String SETTING_BLOCKS_METADATA = "index.blocks.metadata";
     public static final String SETTING_VERSION_CREATED = "index.version.created";
+    public static final String SETTING_VERSION_UPGRADED = "index.version.upgraded";
     public static final String SETTING_VERSION_MINIMUM_COMPATIBLE = "index.version.minimum_compatible";
     public static final String SETTING_CREATION_DATE = "index.creation_date";
     public static final String SETTING_UUID = "index.uuid";
@@ -192,7 +194,8 @@ public class IndexMetaData implements Diffable<IndexMetaData> {
     private final DiscoveryNodeFilters excludeFilters;
 
     private final Version indexCreatedVersion;
-    private final Version indexMinimumCompatibleVersion;
+    private final Version indexUpgradedVersion;
+    private final org.apache.lucene.util.Version minimumCompatibleLuceneVersion;
     private final HashFunction routingHashFunction;
     private final boolean useTypeForRouting;
 
@@ -227,7 +230,17 @@ public class IndexMetaData implements Diffable<IndexMetaData> {
             excludeFilters = DiscoveryNodeFilters.buildFromKeyValue(OR, excludeMap);
         }
         indexCreatedVersion = Version.indexCreated(settings);
-        indexMinimumCompatibleVersion = settings.getAsVersion(SETTING_VERSION_MINIMUM_COMPATIBLE, indexCreatedVersion);
+        indexUpgradedVersion = settings.getAsVersion(IndexMetaData.SETTING_VERSION_UPGRADED, indexCreatedVersion);
+        String stringLuceneVersion = settings.get(SETTING_VERSION_MINIMUM_COMPATIBLE);
+        if (stringLuceneVersion != null) {
+            try {
+                this.minimumCompatibleLuceneVersion = org.apache.lucene.util.Version.parse(stringLuceneVersion);
+            } catch (ParseException ex) {
+                throw new IllegalStateException("Cannot parse lucene version [" + stringLuceneVersion + "] in the [" + SETTING_VERSION_MINIMUM_COMPATIBLE +"] setting", ex);
+            }
+        } else {
+            this.minimumCompatibleLuceneVersion = null;
+        }
         final Class<? extends HashFunction> hashFunctionClass = settings.getAsClass(SETTING_LEGACY_ROUTING_HASH_FUNCTION, null);
         if (hashFunctionClass == null) {
             routingHashFunction = MURMUR3_HASH_FUNCTION;
@@ -280,8 +293,6 @@ public class IndexMetaData implements Diffable<IndexMetaData> {
     /**
      * Return the {@link Version} on which this index has been created. This
      * information is typically useful for backward compatibility.
-     *
-     * Returns null if the index was created before 0.19.0.RC1.
      */
     public Version creationVersion() {
         return indexCreatedVersion;
@@ -292,17 +303,22 @@ public class IndexMetaData implements Diffable<IndexMetaData> {
     }
 
     /**
-     * Return the {@link Version} of that created the oldest segment in the index.
-     *
-     * If the index was created before v1.6 and didn't go through upgrade API the creation verion is returned.
-     * Returns null if the index was created before 0.19.0.RC1.
+     * Return the {@link Version} on which this index has been upgraded. This
+     * information is typically useful for backward compatibility.
      */
-    public Version minimumCompatibleVersion() {
-        return indexMinimumCompatibleVersion;
+    public Version upgradeVersion() {
+        return indexUpgradedVersion;
     }
 
-    public Version getMinimumCompatibleVersion() {
-        return minimumCompatibleVersion();
+    public Version getUpgradeVersion() {
+        return upgradeVersion();
+    }
+
+    /**
+     * Return the {@link org.apache.lucene.util.Version} of the oldest lucene segment in the index
+     */
+    public org.apache.lucene.util.Version getMinimumCompatibleVersion() {
+        return minimumCompatibleLuceneVersion;
     }
 
     /**
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java
index 5265cfabd5d..ea9f7f7a611 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java
@@ -28,7 +28,7 @@ import org.elasticsearch.common.settings.Settings;
 
 /**
  * This service is responsible for upgrading legacy index metadata to the current version
- *
+ * <p/>
  * Every time an existing index is introduced into cluster this service should be used
  * to upgrade the existing index metadata to the latest version of the cluster. It typically
  * occurs during cluster upgrade, when dangling indices are imported into the cluster or indices
@@ -64,7 +64,7 @@ public class MetaDataIndexUpgradeService extends AbstractComponent {
             pre20HashFunction = DjbHashFunction.class;
         }
         pre20UseType = settings.getAsBoolean(DEPRECATED_SETTING_ROUTING_USE_TYPE, null);
-        if (hasCustomPre20HashFunction|| pre20UseType != null) {
+        if (hasCustomPre20HashFunction || pre20UseType != null) {
             logger.warn("Settings [{}] and [{}] are deprecated. Index settings from your old indices have been updated to record the fact that they "
                     + "used some custom routing logic, you can now remove these settings from your `elasticsearch.yml` file", DEPRECATED_SETTING_ROUTING_HASH_FUNCTION, DEPRECATED_SETTING_ROUTING_USE_TYPE);
         }
@@ -72,7 +72,7 @@ public class MetaDataIndexUpgradeService extends AbstractComponent {
 
     /**
      * Checks that the index can be upgraded to the current version of the master node.
-     *
+     * <p/>
      * If the index does need upgrade it returns the index metadata unchanged, otherwise it returns a modified index metadata. If index cannot be
      * updated the method throws an exception.
      */
@@ -101,8 +101,16 @@ public class MetaDataIndexUpgradeService extends AbstractComponent {
      * Returns true if this index can be supported by the current version of elasticsearch
      */
     private static boolean isSupportedVersion(IndexMetaData indexMetaData) {
-        return indexMetaData.minimumCompatibleVersion() != null &&
-                indexMetaData.minimumCompatibleVersion().luceneVersion.onOrAfter(Version.V_0_90_0_Beta1.luceneVersion);
+        if (indexMetaData.creationVersion().onOrAfter(Version.V_0_90_0_Beta1)) {
+            // The index was created with elasticsearch that was using Lucene 4.0
+            return true;
+        }
+        if (indexMetaData.getMinimumCompatibleVersion() != null &&
+                indexMetaData.getMinimumCompatibleVersion().onOrAfter(org.apache.lucene.util.Version.LUCENE_4_0_0)) {
+            //The index was upgraded we can work with it
+            return true;
+        }
+        return false;
     }
 
     /**
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java
index 4b5d793356d..2f40335116e 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java
@@ -20,8 +20,10 @@
 package org.elasticsearch.cluster.metadata;
 
 import com.google.common.collect.Sets;
+import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsClusterStateUpdateRequest;
+import org.elasticsearch.action.admin.indices.upgrade.post.UpgradeSettingsClusterStateUpdateRequest;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.cluster.*;
 import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
@@ -40,6 +42,8 @@ import org.elasticsearch.index.settings.IndexDynamicSettings;
 
 import java.util.*;
 
+import static org.elasticsearch.common.settings.Settings.settingsBuilder;
+
 /**
  * Service responsible for submitting update index settings requests
  */
@@ -307,4 +311,37 @@ public class MetaDataUpdateSettingsService extends AbstractComponent implements
             }
         });
     }
+
+    public void upgradeIndexSettings(final UpgradeSettingsClusterStateUpdateRequest request, final ActionListener<ClusterStateUpdateResponse> listener) {
+
+
+        clusterService.submitStateUpdateTask("update-index-compatibility-versions", Priority.URGENT, new AckedClusterStateUpdateTask<ClusterStateUpdateResponse>(request, listener) {
+
+            @Override
+            protected ClusterStateUpdateResponse newResponse(boolean acknowledged) {
+                return new ClusterStateUpdateResponse(acknowledged);
+            }
+
+            @Override
+            public ClusterState execute(ClusterState currentState) {
+                MetaData.Builder metaDataBuilder = MetaData.builder(currentState.metaData());
+                for (Map.Entry<String, String> entry : request.versions().entrySet()) {
+                    String index = entry.getKey();
+                    IndexMetaData indexMetaData = metaDataBuilder.get(index);
+                    if (indexMetaData != null) {
+                        if (Version.CURRENT.equals(indexMetaData.creationVersion()) == false) {
+                            // No reason to pollute the settings, we didn't really upgrade anything
+                            metaDataBuilder.put(IndexMetaData.builder(indexMetaData)
+                                            .settings(settingsBuilder().put(indexMetaData.settings())
+                                                            .put(IndexMetaData.SETTING_VERSION_MINIMUM_COMPATIBLE, entry.getValue())
+                                                            .put(IndexMetaData.SETTING_VERSION_UPGRADED, Version.CURRENT)
+                                            )
+                            );
+                        }
+                    }
+                }
+                return ClusterState.builder(currentState).metaData(metaDataBuilder).build();
+            }
+        });
+    }
 }
diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/src/main/java/org/elasticsearch/index/shard/IndexShard.java
index acac1c07794..e6222003651 100644
--- a/src/main/java/org/elasticsearch/index/shard/IndexShard.java
+++ b/src/main/java/org/elasticsearch/index/shard/IndexShard.java
@@ -33,6 +33,7 @@ import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.admin.indices.flush.FlushRequest;
 import org.elasticsearch.action.admin.indices.optimize.OptimizeRequest;
+import org.elasticsearch.action.admin.indices.upgrade.post.UpgradeRequest;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.node.DiscoveryNode;
@@ -717,8 +718,38 @@ public class IndexShard extends AbstractIndexShardComponent {
         if (logger.isTraceEnabled()) {
             logger.trace("optimize with {}", optimize);
         }
-        engine().forceMerge(optimize.flush(), optimize.maxNumSegments(), optimize.onlyExpungeDeletes(),
-                optimize.upgrade(), optimize.upgradeOnlyAncientSegments());
+        engine().forceMerge(optimize.flush(), optimize.maxNumSegments(), optimize.onlyExpungeDeletes(), false, false);
+    }
+
+    /**
+     * Upgrades the shard to the current version of Lucene and returns the minimum segment version
+     */
+    public org.apache.lucene.util.Version upgrade(UpgradeRequest upgrade) {
+        verifyStarted();
+        if (logger.isTraceEnabled()) {
+            logger.trace("upgrade with {}", upgrade);
+        }
+        org.apache.lucene.util.Version previousVersion = minimumCompatibleVersion();
+        // we just want to upgrade the segments, not actually optimize to a single segment
+        engine().forceMerge(true,  // we need to flush at the end to make sure the upgrade is durable
+                Integer.MAX_VALUE, // we just want to upgrade the segments, not actually optimize to a single segment
+                false, true, upgrade.upgradeOnlyAncientSegments());
+        org.apache.lucene.util.Version version = minimumCompatibleVersion();
+        if (logger.isTraceEnabled()) {
+            logger.trace("upgraded segment {} from version {} to version {}", previousVersion, version);
+        }
+
+        return version;
+    }
+
+    public org.apache.lucene.util.Version minimumCompatibleVersion() {
+        org.apache.lucene.util.Version luceneVersion = Version.LUCENE_3_EMULATION_VERSION;
+        for(Segment segment : engine().segments(false)) {
+            if (luceneVersion.onOrAfter(segment.getVersion())) {
+                luceneVersion = segment.getVersion();
+            }
+        }
+        return luceneVersion;
     }
 
     public SnapshotIndexCommit snapshotIndex(boolean flushFirst) throws EngineException {
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/upgrade/RestUpgradeAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/upgrade/RestUpgradeAction.java
index 6ea428bc31a..8c1b1c0458a 100644
--- a/src/main/java/org/elasticsearch/rest/action/admin/indices/upgrade/RestUpgradeAction.java
+++ b/src/main/java/org/elasticsearch/rest/action/admin/indices/upgrade/RestUpgradeAction.java
@@ -19,17 +19,14 @@
 
 package org.elasticsearch.rest.action.admin.indices.upgrade;
 
-import org.elasticsearch.Version;
-import org.elasticsearch.action.admin.indices.optimize.OptimizeRequest;
-import org.elasticsearch.action.admin.indices.optimize.OptimizeResponse;
-import org.elasticsearch.action.admin.indices.segments.*;
+import org.elasticsearch.action.admin.indices.upgrade.get.UpgradeStatusResponse;
+import org.elasticsearch.action.admin.indices.upgrade.post.UpgradeRequest;
+import org.elasticsearch.action.admin.indices.upgrade.post.UpgradeResponse;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentBuilderString;
-import org.elasticsearch.index.engine.Segment;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.BytesRestResponse;
 import org.elasticsearch.rest.RestChannel;
@@ -37,7 +34,8 @@ import org.elasticsearch.rest.RestController;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.RestResponse;
 import org.elasticsearch.rest.action.support.RestBuilderListener;
-import java.io.IOException;
+
+import java.util.Map;
 
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestRequest.Method.POST;
@@ -66,72 +64,36 @@ public class RestUpgradeAction extends BaseRestHandler {
         }
     }
 
-    void handleGet(RestRequest request, RestChannel channel, Client client) {
-        IndicesSegmentsRequest segsReq = new IndicesSegmentsRequest(Strings.splitStringByCommaToArray(request.param("index")));
-        client.admin().indices().segments(segsReq, new RestBuilderListener<IndicesSegmentResponse>(channel) {
-            @Override
-            public RestResponse buildResponse(IndicesSegmentResponse response, XContentBuilder builder) throws Exception {
-                builder.startObject();
-                
-                // TODO: getIndices().values() is what IndicesSegmentsResponse uses, but this will produce different orders with jdk8?
-                for (IndexSegments indexSegments : response.getIndices().values()) {
-                    builder.startObject(indexSegments.getIndex());
-                    buildUpgradeStatus(indexSegments, builder);
-                    builder.endObject();
-                }
-                
-                builder.endObject();
-                return new BytesRestResponse(OK, builder);
-            }
-        });
+    void handleGet(final RestRequest request, RestChannel channel, Client client) {
+        client.admin().indices().prepareUpgradeStatus(Strings.splitStringByCommaToArray(request.param("index")))
+                .execute(new RestBuilderListener<UpgradeStatusResponse>(channel) {
+                    @Override
+                    public RestResponse buildResponse(UpgradeStatusResponse response, XContentBuilder builder) throws Exception {
+                        builder.startObject();
+                        response.toXContent(builder, request);
+                        builder.endObject();
+                        return new BytesRestResponse(OK, builder);
+                    }
+                });
     }
-    
+
     void handlePost(final RestRequest request, RestChannel channel, Client client) {
-        OptimizeRequest optimizeReq = new OptimizeRequest(Strings.splitStringByCommaToArray(request.param("index")));
-        optimizeReq.flush(true);
-        optimizeReq.upgrade(true);
-        optimizeReq.upgradeOnlyAncientSegments(request.paramAsBoolean("only_ancient_segments", false));
-        optimizeReq.maxNumSegments(Integer.MAX_VALUE); // we just want to upgrade the segments, not actually optimize to a single segment
-        client.admin().indices().optimize(optimizeReq, new RestBuilderListener<OptimizeResponse>(channel) {
+        UpgradeRequest upgradeReq = new UpgradeRequest(Strings.splitStringByCommaToArray(request.param("index")));
+        upgradeReq.upgradeOnlyAncientSegments(request.paramAsBoolean("only_ancient_segments", false));
+        client.admin().indices().upgrade(upgradeReq, new RestBuilderListener<UpgradeResponse>(channel) {
             @Override
-            public RestResponse buildResponse(OptimizeResponse response, XContentBuilder builder) throws Exception {
+            public RestResponse buildResponse(UpgradeResponse response, XContentBuilder builder) throws Exception {
                 builder.startObject();
                 buildBroadcastShardsHeader(builder, request, response);
+                builder.startArray("upgraded_indices");
+                for (Map.Entry<String, String> entry : response.versions().entrySet()) {
+                    builder.field(entry.getKey(), entry.getValue(), XContentBuilder.FieldCaseConversion.NONE);
+                }
+                builder.endObject();
                 builder.endObject();
                 return new BytesRestResponse(OK, builder);
             }
         });
     }
-    
-    void buildUpgradeStatus(IndexSegments indexSegments, XContentBuilder builder) throws IOException {
-        long total_bytes = 0;
-        long to_upgrade_bytes = 0;
-        long to_upgrade_bytes_ancient = 0;
-        for (IndexShardSegments shard : indexSegments) {
-            for (ShardSegments segs : shard.getShards()) {
-                for (Segment seg : segs.getSegments()) {
-                    total_bytes += seg.sizeInBytes;
-                    if (seg.version.major != Version.CURRENT.luceneVersion.major) {
-                        to_upgrade_bytes_ancient += seg.sizeInBytes;
-                        to_upgrade_bytes += seg.sizeInBytes;
-                    } else if (seg.version.minor != Version.CURRENT.luceneVersion.minor) {
-                        // TODO: this comparison is bogus! it would cause us to upgrade even with the same format
-                        // instead, we should check if the codec has changed
-                        to_upgrade_bytes += seg.sizeInBytes;
-                    }
-                }
-            }
-        }
 
-        builder.byteSizeField(SIZE_IN_BYTES, SIZE, total_bytes);
-        builder.byteSizeField(SIZE_TO_UPGRADE_IN_BYTES, SIZE_TO_UPGRADE, to_upgrade_bytes);
-        builder.byteSizeField(SIZE_TO_UPGRADE_ANCIENT_IN_BYTES, SIZE_TO_UPGRADE_ANCIENT, to_upgrade_bytes_ancient);
-    }
-
-    static final XContentBuilderString SIZE = new XContentBuilderString("size");
-    static final XContentBuilderString SIZE_IN_BYTES = new XContentBuilderString("size_in_bytes");
-    static final XContentBuilderString SIZE_TO_UPGRADE = new XContentBuilderString("size_to_upgrade");
-    static final XContentBuilderString SIZE_TO_UPGRADE_ANCIENT = new XContentBuilderString("size_to_upgrade_ancient");
-    static final XContentBuilderString SIZE_TO_UPGRADE_IN_BYTES = new XContentBuilderString("size_to_upgrade_in_bytes");
-    static final XContentBuilderString SIZE_TO_UPGRADE_ANCIENT_IN_BYTES = new XContentBuilderString("size_to_upgrade_ancient_in_bytes");
 }
diff --git a/src/main/java/org/elasticsearch/snapshots/RestoreService.java b/src/main/java/org/elasticsearch/snapshots/RestoreService.java
index 9aabab8580b..5f10e5217a6 100644
--- a/src/main/java/org/elasticsearch/snapshots/RestoreService.java
+++ b/src/main/java/org/elasticsearch/snapshots/RestoreService.java
@@ -106,6 +106,8 @@ public class RestoreService extends AbstractComponent implements ClusterStateLis
             .addAll(UNMODIFIABLE_SETTINGS)
             .add(SETTING_NUMBER_OF_REPLICAS)
             .add(SETTING_AUTO_EXPAND_REPLICAS)
+            .add(SETTING_VERSION_UPGRADED)
+            .add(SETTING_VERSION_MINIMUM_COMPATIBLE)
             .build();
 
     private final ClusterService clusterService;
diff --git a/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityTests.java b/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityTests.java
index 32fef09363e..ac59615f902 100644
--- a/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityTests.java
+++ b/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityTests.java
@@ -54,7 +54,6 @@ import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.elasticsearch.test.VersionUtils;
 import org.elasticsearch.test.hamcrest.ElasticsearchAssertions;
 import org.elasticsearch.test.index.merge.NoMergePolicyProvider;
-import org.elasticsearch.test.rest.client.http.HttpRequestBuilder;
 import org.hamcrest.Matchers;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -67,8 +66,9 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.*;
 
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
-import static org.junit.matchers.JUnitMatchers.containsString;
 
 // needs at least 2 nodes since it bumps replicas to 1
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0)
@@ -110,7 +110,6 @@ public class OldIndexBackwardsCompatibilityTests extends ElasticsearchIntegratio
     @Override
     public Settings nodeSettings(int ord) {
         return Settings.builder()
-                .put(Node.HTTP_ENABLED, true) // for _upgrade
                 .put(MergePolicyModule.MERGE_POLICY_TYPE_KEY, NoMergePolicyProvider.class) // disable merging so no segments will be upgraded
                 .put(RecoverySettings.INDICES_RECOVERY_CONCURRENT_SMALL_FILE_STREAMS, 30) // increase recovery speed for small files
                 .build();
@@ -438,13 +437,11 @@ public class OldIndexBackwardsCompatibilityTests extends ElasticsearchIntegratio
     }
 
     void assertUpgradeWorks(String indexName, boolean alreadyLatest) throws Exception {
-        HttpRequestBuilder httpClient = httpClient();
-
         if (alreadyLatest == false) {
-            UpgradeTest.assertNotUpgraded(httpClient, indexName);
+            UpgradeTest.assertNotUpgraded(client(), indexName);
         }
-        UpgradeTest.runUpgrade(httpClient, indexName);
-        UpgradeTest.assertUpgraded(httpClient, indexName);
+        assertNoFailures(client().admin().indices().prepareUpgrade(indexName).get());
+        UpgradeTest.assertUpgraded(client(), indexName);
     }
 
 }
diff --git a/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeReallyOldIndexTest.java b/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeReallyOldIndexTest.java
index 10416d44868..ce2d54bb30f 100644
--- a/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeReallyOldIndexTest.java
+++ b/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeReallyOldIndexTest.java
@@ -20,20 +20,22 @@
 package org.elasticsearch.rest.action.admin.indices.upgrade;
 
 import org.elasticsearch.bwcompat.StaticIndexBackwardCompatibilityTest;
-import org.elasticsearch.node.Node;
+
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
 
 public class UpgradeReallyOldIndexTest extends StaticIndexBackwardCompatibilityTest {
 
     public void testUpgrade_0_90_6() throws Exception {
         String indexName = "index-0.90.6";
-        loadIndex(indexName, Node.HTTP_ENABLED, true);
-        
-        UpgradeTest.assertNotUpgraded(httpClient(), indexName);
-        assertTrue(UpgradeTest.hasAncientSegments(httpClient(), indexName));
-        UpgradeTest.runUpgrade(httpClient(), indexName, "wait_for_completion", "true", "only_ancient_segments", "true");
-        assertFalse(UpgradeTest.hasAncientSegments(httpClient(), "index-0.90.6"));
+
+        loadIndex(indexName);
+        UpgradeTest.assertNotUpgraded(client(), indexName);
+        assertTrue(UpgradeTest.hasAncientSegments(client(), indexName));
+        assertNoFailures(client().admin().indices().prepareUpgrade(indexName).setUpgradeOnlyAncientSegments(true).get());
+
+        assertFalse(UpgradeTest.hasAncientSegments(client(), "index-0.90.6"));
         // This index has only ancient segments, so it should now be fully upgraded:
-        UpgradeTest.assertUpgraded(httpClient(), indexName);
+        UpgradeTest.assertUpgraded(client(), indexName);
     }
 
 }
diff --git a/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeTest.java b/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeTest.java
index 3ea5747899c..ddf4bbe2057 100644
--- a/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeTest.java
+++ b/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeTest.java
@@ -26,26 +26,26 @@ import org.elasticsearch.action.admin.indices.segments.IndexSegments;
 import org.elasticsearch.action.admin.indices.segments.IndexShardSegments;
 import org.elasticsearch.action.admin.indices.segments.IndicesSegmentResponse;
 import org.elasticsearch.action.admin.indices.segments.ShardSegments;
+import org.elasticsearch.action.admin.indices.upgrade.get.IndexUpgradeStatus;
+import org.elasticsearch.action.admin.indices.upgrade.get.UpgradeStatusResponse;
 import org.elasticsearch.action.index.IndexRequestBuilder;
+import org.elasticsearch.client.Client;
 import org.elasticsearch.cluster.routing.allocation.decider.ConcurrentRebalanceAllocationDecider;
 import org.elasticsearch.cluster.routing.allocation.decider.EnableAllocationDecider;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.engine.Segment;
-import org.elasticsearch.node.Node;
 import org.elasticsearch.test.ElasticsearchBackwardsCompatIntegrationTest;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
-import org.elasticsearch.test.rest.client.http.HttpRequestBuilder;
-import org.elasticsearch.test.rest.client.http.HttpResponse;
-import org.elasticsearch.test.rest.json.JsonPath;
 import org.junit.BeforeClass;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
 
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST)   // test scope since we set cluster wide settings
 public class UpgradeTest extends ElasticsearchBackwardsCompatIntegrationTest {
@@ -134,20 +134,20 @@ public class UpgradeTest extends ElasticsearchBackwardsCompatIntegrationTest {
         logger.info("--> Nodes upgrade complete");
         logSegmentsState();
         
-        assertNotUpgraded(httpClient(), null);
+        assertNotUpgraded(client(), null);
         final String indexToUpgrade = "test" + randomInt(numIndexes - 1);
 
         // This test fires up another node running an older version of ES, but because wire protocol changes across major ES versions, it
         // means we can never generate ancient segments in this test (unless Lucene major version bumps but ES major version does not):
-        assertFalse(hasAncientSegments(httpClient(), indexToUpgrade));
+        assertFalse(hasAncientSegments(client(), indexToUpgrade));
         
         logger.info("--> Running upgrade on index " + indexToUpgrade);
-        runUpgrade(httpClient(), indexToUpgrade);
+        assertNoFailures(client().admin().indices().prepareUpgrade(indexToUpgrade).get());
         awaitBusy(new Predicate<Object>() {
             @Override
             public boolean apply(Object o) {
                 try {
-                    return isUpgraded(httpClient(), indexToUpgrade);
+                    return isUpgraded(client(), indexToUpgrade);
                 } catch (Exception e) {
                     throw ExceptionsHelper.convertToRuntime(e);
                 }
@@ -156,48 +156,40 @@ public class UpgradeTest extends ElasticsearchBackwardsCompatIntegrationTest {
         logger.info("--> Single index upgrade complete");
 
         logger.info("--> Running upgrade on the rest of the indexes");
-        runUpgrade(httpClient(), null);
+        assertNoFailures(client().admin().indices().prepareUpgrade().get());
         logSegmentsState();
         logger.info("--> Full upgrade complete");
-        assertUpgraded(httpClient(), null);
+        assertUpgraded(client(), null);
     }
 
-    static String upgradePath(String index) {
-        String path = "/_upgrade";
-        if (index != null) {
-            path = "/" + index + path;
-        }
-        return path;
-    }
-    
-    public static void assertNotUpgraded(HttpRequestBuilder httpClient, String index) throws Exception {
-        for (UpgradeStatus status : getUpgradeStatus(httpClient, upgradePath(index))) {
-            assertTrue("index " + status.indexName + " should not be zero sized", status.totalBytes != 0);
+    public static void assertNotUpgraded(Client client, String index) throws Exception {
+        for (IndexUpgradeStatus status : getUpgradeStatus(client, index)) {
+            assertTrue("index " + status.getIndex() + " should not be zero sized", status.getTotalBytes() != 0);
             // TODO: it would be better for this to be strictly greater, but sometimes an extra flush
             // mysteriously happens after the second round of docs are indexed
-            assertTrue("index " + status.indexName + " should have recovered some segments from transaction log",
-                       status.totalBytes >= status.toUpgradeBytes);
-            assertTrue("index " + status.indexName + " should need upgrading", status.toUpgradeBytes != 0);
+            assertTrue("index " + status.getIndex() + " should have recovered some segments from transaction log",
+                       status.getTotalBytes() >= status.getToUpgradeBytes());
+            assertTrue("index " + status.getIndex() + " should need upgrading", status.getToUpgradeBytes() != 0);
         }
     }
 
-    public static void assertNoAncientSegments(HttpRequestBuilder httpClient, String index) throws Exception {
-        for (UpgradeStatus status : getUpgradeStatus(httpClient, upgradePath(index))) {
-            assertTrue("index " + status.indexName + " should not be zero sized", status.totalBytes != 0);
+    public static void assertNoAncientSegments(Client client, String index) throws Exception {
+        for (IndexUpgradeStatus status : getUpgradeStatus(client, index)) {
+            assertTrue("index " + status.getIndex() + " should not be zero sized", status.getTotalBytes() != 0);
             // TODO: it would be better for this to be strictly greater, but sometimes an extra flush
             // mysteriously happens after the second round of docs are indexed
-            assertTrue("index " + status.indexName + " should not have any ancient segments",
-                       status.toUpgradeBytesAncient == 0);
-            assertTrue("index " + status.indexName + " should have recovered some segments from transaction log",
-                       status.totalBytes >= status.toUpgradeBytes);
-            assertTrue("index " + status.indexName + " should need upgrading", status.toUpgradeBytes != 0);
+            assertTrue("index " + status.getIndex() + " should not have any ancient segments",
+                       status.getToUpgradeBytesAncient() == 0);
+            assertTrue("index " + status.getIndex() + " should have recovered some segments from transaction log",
+                       status.getTotalBytes() >= status.getToUpgradeBytes());
+            assertTrue("index " + status.getIndex() + " should need upgrading", status.getToUpgradeBytes() != 0);
         }
     }
 
     /** Returns true if there are any ancient segments. */
-    public static boolean hasAncientSegments(HttpRequestBuilder httpClient, String index) throws Exception {
-        for (UpgradeStatus status : getUpgradeStatus(httpClient, upgradePath(index))) {
-            if (status.toUpgradeBytesAncient != 0) {
+    public static boolean hasAncientSegments(Client client, String index) throws Exception {
+        for (IndexUpgradeStatus status : getUpgradeStatus(client, index)) {
+            if (status.getToUpgradeBytesAncient() != 0) {
                 return true;
             }
         }
@@ -205,20 +197,20 @@ public class UpgradeTest extends ElasticsearchBackwardsCompatIntegrationTest {
     }
 
     /** Returns true if there are any old but not ancient segments. */
-    public static boolean hasOldButNotAncientSegments(HttpRequestBuilder httpClient, String index) throws Exception {
-        for (UpgradeStatus status : getUpgradeStatus(httpClient, upgradePath(index))) {
-            if (status.toUpgradeBytes > status.toUpgradeBytesAncient) {
+    public static boolean hasOldButNotAncientSegments(Client client, String index) throws Exception {
+        for (IndexUpgradeStatus status : getUpgradeStatus(client, index)) {
+            if (status.getToUpgradeBytes() > status.getToUpgradeBytesAncient()) {
                 return true;
             }
         }
         return false;
     }
 
-    public static void assertUpgraded(HttpRequestBuilder httpClient, String index) throws Exception {
-        for (UpgradeStatus status : getUpgradeStatus(httpClient, upgradePath(index))) {
-            assertTrue("index " + status.indexName + " should not be zero sized", status.totalBytes != 0);
-            assertEquals("index " + status.indexName + " should be upgraded",
-                0, status.toUpgradeBytes);
+    public static void assertUpgraded(Client client, String index) throws Exception {
+        for (IndexUpgradeStatus status : getUpgradeStatus(client, index)) {
+            assertTrue("index " + status.getIndex() + " should not be zero sized", status.getTotalBytes() != 0);
+            assertEquals("index " + status.getIndex() + " should be upgraded",
+                0, status.getToUpgradeBytes());
         }
         
         // double check using the segments api that all segments are actually upgraded
@@ -242,12 +234,12 @@ public class UpgradeTest extends ElasticsearchBackwardsCompatIntegrationTest {
         }
     }
 
-    static boolean isUpgraded(HttpRequestBuilder httpClient, String index) throws Exception {
+    static boolean isUpgraded(Client client, String index) throws Exception {
         ESLogger logger = Loggers.getLogger(UpgradeTest.class);
         int toUpgrade = 0;
-        for (UpgradeStatus status : getUpgradeStatus(httpClient, upgradePath(index))) {
-            logger.info("Index: " + status.indexName + ", total: " + status.totalBytes + ", toUpgrade: " + status.toUpgradeBytes);
-            toUpgrade += status.toUpgradeBytes;
+        for (IndexUpgradeStatus status : getUpgradeStatus(client, index)) {
+            logger.info("Index: " + status.getIndex() + ", total: " + status.getTotalBytes() + ", toUpgrade: " + status.getToUpgradeBytes());
+            toUpgrade += status.getToUpgradeBytes();
         }
         return toUpgrade == 0;
     }
@@ -257,7 +249,7 @@ public class UpgradeTest extends ElasticsearchBackwardsCompatIntegrationTest {
         public final int totalBytes;
         public final int toUpgradeBytes;
         public final int toUpgradeBytesAncient;
-        
+
         public UpgradeStatus(String indexName, int totalBytes, int toUpgradeBytes, int toUpgradeBytesAncient) {
             this.indexName = indexName;
             this.totalBytes = totalBytes;
@@ -266,49 +258,11 @@ public class UpgradeTest extends ElasticsearchBackwardsCompatIntegrationTest {
             assert toUpgradeBytesAncient <= toUpgradeBytes;
         }
     }
-    
-    public static void runUpgrade(HttpRequestBuilder httpClient, String index, String... params) throws Exception {
-        assert params.length % 2 == 0;
-        HttpRequestBuilder builder = httpClient.method("POST").path(upgradePath(index));
-        for (int i = 0; i < params.length; i += 2) {
-            builder.addParam(params[i], params[i + 1]);
-        }
-        HttpResponse rsp = builder.execute();
-        assertNotNull(rsp);
-        assertEquals(200, rsp.getStatusCode());
-    }
 
     @SuppressWarnings("unchecked")
-    static List<UpgradeStatus> getUpgradeStatus(HttpRequestBuilder httpClient, String path) throws Exception {
-        HttpResponse rsp = httpClient.method("GET").path(path).execute();
-        Map<String,Object> data = validateAndParse(rsp);
-        List<UpgradeStatus> ret = new ArrayList<>();
-        for (String index : data.keySet()) {
-            Map<String, Object> status = (Map<String,Object>)data.get(index);
-            assertTrue("missing key size_in_bytes for index " + index, status.containsKey("size_in_bytes"));
-            Object totalBytes = status.get("size_in_bytes");
-            assertTrue("size_in_bytes for index " + index + " is not an integer", totalBytes instanceof Integer);
-            assertTrue("missing key size_to_upgrade_in_bytes for index " + index, status.containsKey("size_to_upgrade_in_bytes"));
-            Object toUpgradeBytes = status.get("size_to_upgrade_in_bytes");
-            assertTrue("size_to_upgrade_in_bytes for index " + index + " is not an integer", toUpgradeBytes instanceof Integer);
-            Object toUpgradeBytesAncient = status.get("size_to_upgrade_ancient_in_bytes");
-            assertTrue("size_to_upgrade_ancient_in_bytes for index " + index + " is not an integer", toUpgradeBytesAncient instanceof Integer);
-            ret.add(new UpgradeStatus(index, (Integer) totalBytes, (Integer) toUpgradeBytes, (Integer) toUpgradeBytesAncient));
-        }
-        return ret;
-    }
-
-    @SuppressWarnings("unchecked")
-    static Map<String, Object> validateAndParse(HttpResponse rsp) throws Exception {
-        assertNotNull(rsp);
-        assertEquals(200, rsp.getStatusCode());
-        assertTrue(rsp.hasBody());
-        return (Map<String,Object>)new JsonPath(rsp.getBody()).evaluate("");
-    }
-
-    @Override
-    protected Settings nodeSettings(int nodeOrdinal) {
-        return Settings.builder().put(super.nodeSettings(nodeOrdinal))
-            .put(Node.HTTP_ENABLED, true).build();
+    static Collection<IndexUpgradeStatus> getUpgradeStatus(Client client, String... indices) throws Exception {
+        UpgradeStatusResponse upgradeStatusResponse = client.admin().indices().prepareUpgradeStatus(indices).get();
+        assertNoFailures(upgradeStatusResponse);
+        return upgradeStatusResponse.getIndices().values();
     }
 }

From f732900111ec310900b3f8d92ff76c77c19e2898 Mon Sep 17 00:00:00 2001
From: jaymode <jay.modi@elasticsearch.com>
Date: Thu, 28 May 2015 11:56:09 -0400
Subject: [PATCH 051/123] Export hostname as environment variable for plugin
 manager

In #9474, we exported the hostname in the bin/elasticsearch scripts so that it
could be used as a variable in the elasticsearch.yml file but did not do the same
for plugin manager. When using the hostname variable in elasticsearch.yml and
trying to use the plugin manager, initialization will fail because the property could
not be resolved. This change will allow the hostname to be resolved in the same
manner as the service scripts.

Closes #10902
---
 bin/plugin     | 2 ++
 bin/plugin.bat | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/bin/plugin b/bin/plugin
index 80d3e7d2906..c1b5a777042 100755
--- a/bin/plugin
+++ b/bin/plugin
@@ -103,4 +103,6 @@ if [ -e "$CONF_FILE" ]; then
   esac
 fi
 
+export HOSTNAME=`hostname -s`
+
 exec "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginManager $args
diff --git a/bin/plugin.bat b/bin/plugin.bat
index 462c2d78a07..1addc161323 100644
--- a/bin/plugin.bat
+++ b/bin/plugin.bat
@@ -9,6 +9,8 @@ for %%I in ("%SCRIPT_DIR%..") do set ES_HOME=%%~dpfI
 
 TITLE Elasticsearch Plugin Manager ${project.version}
 
+SET HOSTNAME=%COMPUTERNAME%
+
 "%JAVA_HOME%\bin\java" %JAVA_OPTS% %ES_JAVA_OPTS% -Xmx64m -Xms16m -Des.path.home="%ES_HOME%" -cp "%ES_HOME%/lib/*;" "org.elasticsearch.plugins.PluginManager" %*
 goto finally
 

From d955461f580f0874863b1a97ddcaddbd96cbd6c6 Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Thu, 28 May 2015 07:13:32 -1000
Subject: [PATCH 052/123] Tests: fix NPE in UpgradeTest

---
 .../rest/action/admin/indices/upgrade/UpgradeTest.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeTest.java b/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeTest.java
index ddf4bbe2057..3b9f8c19b5a 100644
--- a/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeTest.java
+++ b/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeTest.java
@@ -134,7 +134,7 @@ public class UpgradeTest extends ElasticsearchBackwardsCompatIntegrationTest {
         logger.info("--> Nodes upgrade complete");
         logSegmentsState();
         
-        assertNotUpgraded(client(), null);
+        assertNotUpgraded(client());
         final String indexToUpgrade = "test" + randomInt(numIndexes - 1);
 
         // This test fires up another node running an older version of ES, but because wire protocol changes across major ES versions, it
@@ -159,10 +159,10 @@ public class UpgradeTest extends ElasticsearchBackwardsCompatIntegrationTest {
         assertNoFailures(client().admin().indices().prepareUpgrade().get());
         logSegmentsState();
         logger.info("--> Full upgrade complete");
-        assertUpgraded(client(), null);
+        assertUpgraded(client());
     }
 
-    public static void assertNotUpgraded(Client client, String index) throws Exception {
+    public static void assertNotUpgraded(Client client, String... index) throws Exception {
         for (IndexUpgradeStatus status : getUpgradeStatus(client, index)) {
             assertTrue("index " + status.getIndex() + " should not be zero sized", status.getTotalBytes() != 0);
             // TODO: it would be better for this to be strictly greater, but sometimes an extra flush
@@ -173,7 +173,7 @@ public class UpgradeTest extends ElasticsearchBackwardsCompatIntegrationTest {
         }
     }
 
-    public static void assertNoAncientSegments(Client client, String index) throws Exception {
+    public static void assertNoAncientSegments(Client client, String... index) throws Exception {
         for (IndexUpgradeStatus status : getUpgradeStatus(client, index)) {
             assertTrue("index " + status.getIndex() + " should not be zero sized", status.getTotalBytes() != 0);
             // TODO: it would be better for this to be strictly greater, but sometimes an extra flush
@@ -206,7 +206,7 @@ public class UpgradeTest extends ElasticsearchBackwardsCompatIntegrationTest {
         return false;
     }
 
-    public static void assertUpgraded(Client client, String index) throws Exception {
+    public static void assertUpgraded(Client client, String... index) throws Exception {
         for (IndexUpgradeStatus status : getUpgradeStatus(client, index)) {
             assertTrue("index " + status.getIndex() + " should not be zero sized", status.getTotalBytes() != 0);
             assertEquals("index " + status.getIndex() + " should be upgraded",

From 3db9caf7a1647d3179e0fa0665d1bc19f3b9a827 Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Thu, 28 May 2015 08:54:38 -1000
Subject: [PATCH 053/123] Tests: Increase timeout waiting for snapshot to
 complete in batchingShardUpdateTaskTest

When this test picks a large number of shards, the snapshot doesn't always manage to complete in 10 seconds.
---
 .../snapshots/SharedClusterSnapshotRestoreTests.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java b/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java
index d4651e87174..1e8d45d3699 100644
--- a/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java
+++ b/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java
@@ -1907,7 +1907,7 @@ public class SharedClusterSnapshotRestoreTests extends AbstractSnapshotTests {
                 }
                 assertThat(count, equalTo(expectedCount));
             }
-        });
+        }, 1, TimeUnit.MINUTES);
     }
 
     /**

From 6980286ba46bb2f9e74494609c29c2ecbab62331 Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Thu, 28 May 2015 09:19:13 -1000
Subject: [PATCH 054/123] Core: fix upgrade response serialization

---
 rest-api-spec/test/indices.upgrade/10_basic.yaml | 16 ++++++++++++++++
 .../admin/indices/upgrade/RestUpgradeAction.java |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 rest-api-spec/test/indices.upgrade/10_basic.yaml

diff --git a/rest-api-spec/test/indices.upgrade/10_basic.yaml b/rest-api-spec/test/indices.upgrade/10_basic.yaml
new file mode 100644
index 00000000000..f4844839c41
--- /dev/null
+++ b/rest-api-spec/test/indices.upgrade/10_basic.yaml
@@ -0,0 +1,16 @@
+---
+"Basic test for upgrade indices":
+
+  - do:
+      indices.create:
+        index: test_index
+
+  - do:
+      cluster.health:
+        wait_for_status: yellow
+
+  - do:
+      indices.upgrade:
+        index: test_index
+
+  - match: {upgraded_indices.test_index: '/(\d\.)+\d/'}
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/indices/upgrade/RestUpgradeAction.java b/src/main/java/org/elasticsearch/rest/action/admin/indices/upgrade/RestUpgradeAction.java
index 8c1b1c0458a..a1c9c0b3ed6 100644
--- a/src/main/java/org/elasticsearch/rest/action/admin/indices/upgrade/RestUpgradeAction.java
+++ b/src/main/java/org/elasticsearch/rest/action/admin/indices/upgrade/RestUpgradeAction.java
@@ -85,7 +85,7 @@ public class RestUpgradeAction extends BaseRestHandler {
             public RestResponse buildResponse(UpgradeResponse response, XContentBuilder builder) throws Exception {
                 builder.startObject();
                 buildBroadcastShardsHeader(builder, request, response);
-                builder.startArray("upgraded_indices");
+                builder.startObject("upgraded_indices");
                 for (Map.Entry<String, String> entry : response.versions().entrySet()) {
                     builder.field(entry.getKey(), entry.getValue(), XContentBuilder.FieldCaseConversion.NONE);
                 }

From 790baed7551ba005732d530b1a6ccaad253ebb4c Mon Sep 17 00:00:00 2001
From: Lee Hinman <lee@writequit.org>
Date: Thu, 28 May 2015 10:00:36 -0600
Subject: [PATCH 055/123] Fall back to reading SegmentInfos from Store if
 reading from commit fails

In the event that reading from the latest commit fails, we should fall
back to reading from the `Store` using the traditional
`Directory.listAll()`

Related to #11361
---
 .../java/org/elasticsearch/index/engine/Engine.java    | 10 +++++++++-
 .../org/elasticsearch/index/engine/InternalEngine.java |  2 +-
 .../org/elasticsearch/index/engine/ShadowEngine.java   |  4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/elasticsearch/index/engine/Engine.java b/src/main/java/org/elasticsearch/index/engine/Engine.java
index e2811bb0698..41adf2b3b45 100644
--- a/src/main/java/org/elasticsearch/index/engine/Engine.java
+++ b/src/main/java/org/elasticsearch/index/engine/Engine.java
@@ -319,11 +319,19 @@ public abstract class Engine implements Closeable {
     /**
      * Read the last segments info from the commit pointed to by the searcher manager
      */
-    protected static SegmentInfos readLastCommittedSegmentInfos(SearcherManager sm) throws IOException {
+    protected static SegmentInfos readLastCommittedSegmentInfos(final SearcherManager sm, final Store store) throws IOException {
         IndexSearcher searcher = sm.acquire();
         try {
             IndexCommit latestCommit = ((DirectoryReader) searcher.getIndexReader()).getIndexCommit();
             return Lucene.readSegmentInfos(latestCommit);
+        } catch (IOException e) {
+            // Fall back to reading from the store if reading from the commit fails
+            try {
+                return store. readLastCommittedSegmentsInfo();
+            } catch (IOException e2) {
+                e2.addSuppressed(e);
+                throw e2;
+            }
         } finally {
             sm.release(searcher);
         }
diff --git a/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
index 393dff33907..42bab8ca7fe 100644
--- a/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
+++ b/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
@@ -275,7 +275,7 @@ public class InternalEngine extends Engine {
             try {
                 final DirectoryReader directoryReader = ElasticsearchDirectoryReader.wrap(DirectoryReader.open(indexWriter, true), shardId);
                 searcherManager = new SearcherManager(directoryReader, searcherFactory);
-                lastCommittedSegmentInfos = readLastCommittedSegmentInfos(searcherManager);
+                lastCommittedSegmentInfos = readLastCommittedSegmentInfos(searcherManager, store);
                 success = true;
                 return searcherManager;
             } catch (IOException e) {
diff --git a/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java b/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java
index 301f6176a00..95b3810d330 100644
--- a/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java
+++ b/src/main/java/org/elasticsearch/index/engine/ShadowEngine.java
@@ -79,7 +79,7 @@ public class ShadowEngine extends Engine {
                 if (Lucene.waitForIndex(store.directory(), nonexistentRetryTime)) {
                     reader = ElasticsearchDirectoryReader.wrap(DirectoryReader.open(store.directory()), shardId);
                     this.searcherManager = new SearcherManager(reader, searcherFactory);
-                    this.lastCommittedSegmentInfos = readLastCommittedSegmentInfos(searcherManager);
+                    this.lastCommittedSegmentInfos = readLastCommittedSegmentInfos(searcherManager, store);
                     success = true;
                 } else {
                     throw new IndexShardException(shardId, "failed to open a shadow engine after" +
@@ -148,7 +148,7 @@ public class ShadowEngine extends Engine {
         store.incRef();
         try (ReleasableLock lock = readLock.acquire()) {
             // reread the last committed segment infos
-            lastCommittedSegmentInfos = readLastCommittedSegmentInfos(searcherManager);
+            lastCommittedSegmentInfos = readLastCommittedSegmentInfos(searcherManager, store);
         } catch (Throwable e) {
             if (isClosed.get() == false) {
                 logger.warn("failed to read latest segment infos on flush", e);

From 503f844a05c02112c852cc7a6b4ee4b52c99497a Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Thu, 28 May 2015 10:51:18 -1000
Subject: [PATCH 056/123] Tests: make randomRepoPath work with bwc tests

---
 .../elasticsearch/test/ElasticsearchIntegrationTest.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
index 0655588e35d..0e146d37ae1 100644
--- a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
+++ b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
@@ -1847,7 +1847,12 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
      * Returns path to a random directory that can be used to create a temporary file system repo
      */
     public Path randomRepoPath() {
-        return randomRepoPath(internalCluster().getDefaultSettings());
+        if (currentCluster instanceof InternalTestCluster) {
+            return randomRepoPath(((InternalTestCluster) currentCluster).getDefaultSettings());
+        } else if (currentCluster instanceof CompositeTestCluster) {
+            return randomRepoPath(((CompositeTestCluster) currentCluster).internalCluster().getDefaultSettings());
+        }
+        throw new UnsupportedOperationException("unsupported cluster type");
     }
 
     /**

From c695f35bcabc57223ef8480aa2d1b24f14310f33 Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Thu, 28 May 2015 12:08:28 -1000
Subject: [PATCH 057/123] Tests: make REST upgrade test more reliable

 Make sure that all shards are started to avoid flush conflicts.
---
 rest-api-spec/test/indices.upgrade/10_basic.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rest-api-spec/test/indices.upgrade/10_basic.yaml b/rest-api-spec/test/indices.upgrade/10_basic.yaml
index f4844839c41..d6a38b4c168 100644
--- a/rest-api-spec/test/indices.upgrade/10_basic.yaml
+++ b/rest-api-spec/test/indices.upgrade/10_basic.yaml
@@ -4,10 +4,15 @@
   - do:
       indices.create:
         index: test_index
+        body:
+          settings:
+            index:
+              number_of_replicas: 0
+
 
   - do:
       cluster.health:
-        wait_for_status: yellow
+        wait_for_status: green
 
   - do:
       indices.upgrade:

From 5600757f3eb505bf22162c1190914d86a57dda53 Mon Sep 17 00:00:00 2001
From: Alexander Reelsen <alexander@reelsen.net>
Date: Thu, 28 May 2015 17:09:43 +0200
Subject: [PATCH 058/123] Serialization: Remove old version checks

As the 2.x release does not need to be backwards compatible in terms of
serialization, we can remove a fair share of the serialization checks.
---
 .../cluster/health/ClusterHealthResponse.java |  9 ++----
 .../hotthreads/NodesHotThreadsRequest.java    | 12 ++------
 .../restore/RestoreSnapshotRequest.java       | 25 +++-------------
 .../get/GetIndexedScriptRequest.java          | 30 -------------------
 .../cluster/metadata/MappingMetaData.java     | 14 ++-------
 .../org/elasticsearch/common/Priority.java    |  4 ---
 .../zen/fd/MasterFaultDetection.java          |  9 ------
 .../percolator/stats/PercolateStats.java      | 11 -------
 .../AbstractInternalPercentiles.java          | 10 -------
 9 files changed, 10 insertions(+), 114 deletions(-)

diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java
index 1e1a363d906..fc4567a5b53 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthResponse.java
@@ -21,7 +21,6 @@ package org.elasticsearch.action.admin.cluster.health;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
@@ -229,9 +228,7 @@ public class ClusterHealthResponse extends ActionResponse implements Iterable<Cl
             }
         }
 
-        if (in.getVersion().onOrAfter(Version.V_1_6_0)) {
-            numberOfInFlightFetch = in.readInt();
-        }
+        numberOfInFlightFetch = in.readInt();
     }
 
     @Override
@@ -258,9 +255,7 @@ public class ClusterHealthResponse extends ActionResponse implements Iterable<Cl
             out.writeString(failure);
         }
 
-        if (out.getVersion().onOrAfter(Version.V_1_6_0)) {
-            out.writeInt(numberOfInFlightFetch);
-        }
+        out.writeInt(numberOfInFlightFetch);
     }
 
 
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java
index f7ab360c59f..f57903f1196 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java
@@ -19,7 +19,6 @@
 
 package org.elasticsearch.action.admin.cluster.node.hotthreads;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.support.nodes.BaseNodesRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -100,12 +99,7 @@ public class NodesHotThreadsRequest extends BaseNodesRequest<NodesHotThreadsRequ
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
         threads = in.readInt();
-        if (in.getVersion().before(Version.V_1_5_0)) {
-            // Pre-1.5.0 did not filter hot threads, so we shouldn't:
-            ignoreIdleThreads = false;
-        } else {
-            ignoreIdleThreads = in.readBoolean();
-        }
+        ignoreIdleThreads = in.readBoolean();
         type = in.readString();
         interval = TimeValue.readTimeValue(in);
         snapshots = in.readInt();
@@ -115,9 +109,7 @@ public class NodesHotThreadsRequest extends BaseNodesRequest<NodesHotThreadsRequ
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeInt(threads);
-        if (out.getVersion().onOrAfter(Version.V_1_5_0)) {
-            out.writeBoolean(ignoreIdleThreads);
-        }
+        out.writeBoolean(ignoreIdleThreads);
         out.writeString(type);
         interval.writeTo(out);
         out.writeInt(snapshots);
diff --git a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
index ddb177e273b..b1c60bb7334 100644
--- a/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.action.admin.cluster.snapshots.restore;
 
 import org.elasticsearch.ElasticsearchGenerationException;
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.master.MasterNodeRequest;
@@ -51,29 +50,17 @@ import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeBo
 public class RestoreSnapshotRequest extends MasterNodeRequest<RestoreSnapshotRequest> {
 
     private String snapshot;
-
     private String repository;
-
     private String[] indices = Strings.EMPTY_ARRAY;
-
     private IndicesOptions indicesOptions = IndicesOptions.strictExpandOpen();
-
     private String renamePattern;
-
     private String renameReplacement;
-
     private boolean waitForCompletion;
-
     private boolean includeGlobalState = true;
-
     private boolean partial = false;
-
     private boolean includeAliases = true;
-
     private Settings settings = EMPTY_SETTINGS;
-
     private Settings indexSettings = EMPTY_SETTINGS;
-
     private String[] ignoreIndexSettings = Strings.EMPTY_ARRAY;
 
     RestoreSnapshotRequest() {
@@ -638,10 +625,8 @@ public class RestoreSnapshotRequest extends MasterNodeRequest<RestoreSnapshotReq
         partial = in.readBoolean();
         includeAliases = in.readBoolean();
         settings = readSettingsFromStream(in);
-        if (in.getVersion().onOrAfter(Version.V_1_5_0)) {
-            indexSettings = readSettingsFromStream(in);
-            ignoreIndexSettings = in.readStringArray();
-        }
+        indexSettings = readSettingsFromStream(in);
+        ignoreIndexSettings = in.readStringArray();
     }
 
     @Override
@@ -658,9 +643,7 @@ public class RestoreSnapshotRequest extends MasterNodeRequest<RestoreSnapshotReq
         out.writeBoolean(partial);
         out.writeBoolean(includeAliases);
         writeSettingsToStream(settings, out);
-        if (out.getVersion().onOrAfter(Version.V_1_5_0)) {
-            writeSettingsToStream(indexSettings, out);
-            out.writeStringArray(ignoreIndexSettings);
-        }
+        writeSettingsToStream(indexSettings, out);
+        out.writeStringArray(ignoreIndexSettings);
     }
 }
diff --git a/src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequest.java b/src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequest.java
index a26ce9c756d..df7a8f95b84 100644
--- a/src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequest.java
+++ b/src/main/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequest.java
@@ -19,7 +19,6 @@
 
 package org.elasticsearch.action.indexedscripts.get;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
@@ -31,7 +30,6 @@ import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.lucene.uid.Versions;
 import org.elasticsearch.index.VersionType;
 import org.elasticsearch.script.ScriptService;
-import org.elasticsearch.search.fetch.source.FetchSourceContext;
 
 import java.io.IOException;
 
@@ -147,47 +145,19 @@ public class GetIndexedScriptRequest extends ActionRequest<GetIndexedScriptReque
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
-        if (in.getVersion().before(Version.V_1_4_0_Beta1)) {
-            //the index was previously serialized although not needed
-            in.readString();
-        }
         scriptLang = in.readString();
         id = in.readString();
-        if (in.getVersion().before(Version.V_1_5_0)) {
-            in.readOptionalString(); //Preference
-            in.readBoolean(); //Refresh
-            in.readByte(); //Realtime
-        }
         this.versionType = VersionType.fromValue(in.readByte());
         this.version = in.readLong();
-
-        if (in.getVersion().before(Version.V_1_5_0)) {
-            FetchSourceContext.optionalReadFromStream(in);
-        }
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        if (out.getVersion().before(Version.V_1_4_0_Beta1)) {
-            //the index was previously serialized although not needed
-            out.writeString(ScriptService.SCRIPT_INDEX);
-        }
         out.writeString(scriptLang);
         out.writeString(id);
-        if (out.getVersion().before(Version.V_1_5_0)) {
-            out.writeOptionalString("_local"); //Preference
-            out.writeBoolean(true); //Refresh
-            out.writeByte((byte) -1); //Realtime
-        }
-
         out.writeByte(versionType.getValue());
         out.writeLong(version);
-
-        if (out.getVersion().before(Version.V_1_5_0)) {
-            FetchSourceContext.optionalWriteToStream(null, out);
-        }
-
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
index 7225a43d5ef..e6067c46817 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
@@ -19,8 +19,6 @@
 
 package org.elasticsearch.cluster.metadata;
 
-import com.google.common.collect.Maps;
-import org.elasticsearch.Version;
 import org.elasticsearch.action.TimestampParsingException;
 import org.elasticsearch.cluster.AbstractDiffable;
 import org.elasticsearch.common.Nullable;
@@ -40,10 +38,8 @@ import org.elasticsearch.index.mapper.internal.TimestampFieldMapper;
 
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Map;
 
-import static com.google.common.collect.Maps.newHashMap;
 import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeBooleanValue;
 
 /**
@@ -571,10 +567,7 @@ public class MappingMetaData extends AbstractDiffable<MappingMetaData> {
         out.writeOptionalString(timestamp().path());
         out.writeString(timestamp().format());
         out.writeOptionalString(timestamp().defaultTimestamp());
-        // TODO Remove the test in elasticsearch 2.0.0
-        if (out.getVersion().onOrAfter(Version.V_1_5_0)) {
-            out.writeOptionalBoolean(timestamp().ignoreMissing());
-        }
+        out.writeOptionalBoolean(timestamp().ignoreMissing());
         out.writeBoolean(hasParentField());
     }
 
@@ -619,10 +612,7 @@ public class MappingMetaData extends AbstractDiffable<MappingMetaData> {
         String defaultTimestamp = in.readOptionalString();
         Boolean ignoreMissing = null;
 
-        // TODO Remove the test in elasticsearch 2.0.0
-        if (in.getVersion().onOrAfter(Version.V_1_5_0)) {
-            ignoreMissing = in.readOptionalBoolean();
-        }
+        ignoreMissing = in.readOptionalBoolean();
 
         final Timestamp timestamp = new Timestamp(enabled, path, format, defaultTimestamp, ignoreMissing);
         final boolean hasParentField = in.readBoolean();
diff --git a/src/main/java/org/elasticsearch/common/Priority.java b/src/main/java/org/elasticsearch/common/Priority.java
index 658a7e5e9e2..19c2024555d 100644
--- a/src/main/java/org/elasticsearch/common/Priority.java
+++ b/src/main/java/org/elasticsearch/common/Priority.java
@@ -18,7 +18,6 @@
  */
 package org.elasticsearch.common;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -35,9 +34,6 @@ public final class Priority implements Comparable<Priority> {
 
     public static void writeTo(Priority priority, StreamOutput output) throws IOException {
         byte b = priority.value;
-        if (output.getVersion().before(Version.V_1_1_0)) {
-            b = (byte) Math.max(URGENT.value, b);
-        }
         output.writeByte(b);
     }
 
diff --git a/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java b/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java
index 1159f1c4e6a..9dfaef728b3 100644
--- a/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java
+++ b/src/main/java/org/elasticsearch/discovery/zen/fd/MasterFaultDetection.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.discovery.zen.fd;
 
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.Version;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
@@ -428,19 +427,11 @@ public class MasterFaultDetection extends FaultDetection {
         @Override
         public void readFrom(StreamInput in) throws IOException {
             super.readFrom(in);
-            if (in.getVersion().onOrBefore(Version.V_1_4_0_Beta1)) {
-                // old listedOnMaster
-                in.readBoolean();
-            }
         }
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
-            if (out.getVersion().onOrBefore(Version.V_1_4_0_Beta1)) {
-                // old listedOnMaster
-                out.writeBoolean(true);
-            }
         }
     }
 }
diff --git a/src/main/java/org/elasticsearch/index/percolator/stats/PercolateStats.java b/src/main/java/org/elasticsearch/index/percolator/stats/PercolateStats.java
index e75813772de..4ae854a4c40 100644
--- a/src/main/java/org/elasticsearch/index/percolator/stats/PercolateStats.java
+++ b/src/main/java/org/elasticsearch/index/percolator/stats/PercolateStats.java
@@ -18,7 +18,6 @@
  */
 package org.elasticsearch.index.percolator.stats;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Streamable;
@@ -152,11 +151,6 @@ public class PercolateStats implements Streamable, ToXContent {
         percolateCount = in.readVLong();
         percolateTimeInMillis = in.readVLong();
         current = in.readVLong();
-        if (in.getVersion().before(Version.V_1_1_0)) {
-            in.readVLong();
-        } else {
-            in.readLong();
-        }
         numQueries = in.readVLong();
     }
 
@@ -165,11 +159,6 @@ public class PercolateStats implements Streamable, ToXContent {
         out.writeVLong(percolateCount);
         out.writeVLong(percolateTimeInMillis);
         out.writeVLong(current);
-        if (out.getVersion().before(Version.V_1_1_0)) {
-            out.writeVLong(0);
-        } else {
-            out.writeLong(-1);
-        }
         out.writeVLong(numQueries);
     }
 }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractInternalPercentiles.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractInternalPercentiles.java
index 05bc0f95683..6d6de6b4346 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractInternalPercentiles.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractInternalPercentiles.java
@@ -19,7 +19,6 @@
 
 package org.elasticsearch.search.aggregations.metrics.percentiles;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.common.inject.internal.Nullable;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -79,12 +78,6 @@ abstract class AbstractInternalPercentiles extends InternalNumericMetricsAggrega
     @Override
     protected void doReadFrom(StreamInput in) throws IOException {
         valueFormatter = ValueFormatterStreams.readOptional(in);
-        if (in.getVersion().before(Version.V_1_2_0)) {
-            final byte id = in.readByte();
-            if (id != 0) {
-                throw new IllegalArgumentException("Unexpected percentiles aggregator id [" + id + "]");
-            }
-        }
         keys = new double[in.readInt()];
         for (int i = 0; i < keys.length; ++i) {
             keys[i] = in.readDouble();
@@ -96,9 +89,6 @@ abstract class AbstractInternalPercentiles extends InternalNumericMetricsAggrega
     @Override
     protected void doWriteTo(StreamOutput out) throws IOException {
         ValueFormatterStreams.writeOptional(valueFormatter, out);
-        if (out.getVersion().before(Version.V_1_2_0)) {
-            out.writeByte((byte) 0);
-        }
         out.writeInt(keys.length);
         for (int i = 0 ; i < keys.length; ++i) {
             out.writeDouble(keys[i]);

From 5cd6ced7eefaea10882ea510d9b1f473c7f45860 Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Fri, 29 May 2015 09:44:41 +0200
Subject: [PATCH 059/123] Close ShardFilterCache after Store is closed

The ShardFilterCache relies on the fact that it's
closed once the last reader on the shard is closed.
This is only guaranteed once the Store and all its
references are closed. This commit moves the closing
into the internal callback mechanism we use for deleting
shard data etc. to close the cache once we have all
searchers released.
---
 .../org/elasticsearch/index/IndexService.java | 25 ++++++++++++++-----
 .../index/cache/filter/ShardFilterCache.java  | 11 ++++----
 .../cache/filter/ShardFilterCacheModule.java  |  8 +++++-
 .../elasticsearch/index/shard/IndexShard.java |  4 +--
 .../test/InternalTestCluster.java             |  9 +++----
 5 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/elasticsearch/index/IndexService.java b/src/main/java/org/elasticsearch/index/IndexService.java
index 6276e682123..09335126c73 100644
--- a/src/main/java/org/elasticsearch/index/IndexService.java
+++ b/src/main/java/org/elasticsearch/index/IndexService.java
@@ -37,6 +37,7 @@ import org.elasticsearch.index.analysis.AnalysisService;
 import org.elasticsearch.index.cache.IndexCache;
 import org.elasticsearch.index.cache.bitset.BitsetFilterCache;
 import org.elasticsearch.index.cache.bitset.ShardBitsetFilterCacheModule;
+import org.elasticsearch.index.cache.filter.ShardFilterCache;
 import org.elasticsearch.index.cache.filter.ShardFilterCacheModule;
 import org.elasticsearch.index.cache.query.ShardQueryCacheModule;
 import org.elasticsearch.index.deletionpolicy.DeletionPolicyModule;
@@ -69,6 +70,7 @@ import org.elasticsearch.index.translog.TranslogService;
 import org.elasticsearch.indices.IndicesLifecycle;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.indices.InternalIndicesLifecycle;
+import org.elasticsearch.indices.cache.filter.IndicesFilterCache;
 import org.elasticsearch.plugins.PluginsService;
 import org.elasticsearch.plugins.ShardsPluginsModule;
 
@@ -298,11 +300,11 @@ public class IndexService extends AbstractIndexComponent implements IndexCompone
             }
 
             indicesLifecycle.beforeIndexShardCreated(shardId, indexSettings);
-
             logger.debug("creating shard_id {}", shardId);
             // if we are on a shared FS we only own the shard (ie. we can safely delete it) if we are the primary.
             final boolean canDeleteShardContent = IndexMetaData.isOnSharedFilesystem(indexSettings) == false ||
                     (primary && IndexMetaData.isOnSharedFilesystem(indexSettings));
+            final ShardFilterCache shardFilterCache = new ShardFilterCache(shardId, injector.getInstance(IndicesFilterCache.class));
             ModulesBuilder modules = new ModulesBuilder();
             modules.add(new ShardsPluginsModule(indexSettings, pluginsService));
             modules.add(new IndexShardModule(shardId, primary, indexSettings));
@@ -310,11 +312,11 @@ public class IndexService extends AbstractIndexComponent implements IndexCompone
             modules.add(new ShardSearchModule());
             modules.add(new ShardGetModule());
             modules.add(new StoreModule(injector.getInstance(IndexStore.class).shardDirectory(), lock,
-                    new StoreCloseListener(shardId, canDeleteShardContent), path));
+                    new StoreCloseListener(shardId, canDeleteShardContent, shardFilterCache), path));
             modules.add(new DeletionPolicyModule(indexSettings));
             modules.add(new MergePolicyModule(indexSettings));
             modules.add(new MergeSchedulerModule(indexSettings));
-            modules.add(new ShardFilterCacheModule());
+            modules.add(new ShardFilterCacheModule(shardFilterCache));
             modules.add(new ShardQueryCacheModule());
             modules.add(new ShardBitsetFilterCacheModule());
             modules.add(new ShardFieldDataModule());
@@ -465,16 +467,27 @@ public class IndexService extends AbstractIndexComponent implements IndexCompone
     private class StoreCloseListener implements Store.OnClose {
         private final ShardId shardId;
         private final boolean ownsShard;
+        private final Closeable[] toClose;
 
-        public StoreCloseListener(ShardId shardId, boolean ownsShard) {
+        public StoreCloseListener(ShardId shardId, boolean ownsShard, Closeable... toClose) {
             this.shardId = shardId;
             this.ownsShard = ownsShard;
+            this.toClose = toClose;
         }
 
         @Override
         public void handle(ShardLock lock) {
-            assert lock.getShardId().equals(shardId) : "shard id mismatch, expected: " + shardId + " but got: " + lock.getShardId();
-            onShardClose(lock, ownsShard);
+            try {
+                assert lock.getShardId().equals(shardId) : "shard id mismatch, expected: " + shardId + " but got: " + lock.getShardId();
+                onShardClose(lock, ownsShard);
+            } finally {
+                try {
+                    IOUtils.close(toClose);
+                } catch (IOException ex) {
+                    logger.debug("failed to close resource", ex);
+                }
+            }
+
         }
     }
 
diff --git a/src/main/java/org/elasticsearch/index/cache/filter/ShardFilterCache.java b/src/main/java/org/elasticsearch/index/cache/filter/ShardFilterCache.java
index 97f75094580..550c25bdbf6 100644
--- a/src/main/java/org/elasticsearch/index/cache/filter/ShardFilterCache.java
+++ b/src/main/java/org/elasticsearch/index/cache/filter/ShardFilterCache.java
@@ -28,17 +28,18 @@ import org.elasticsearch.indices.cache.filter.IndicesFilterCache;
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
  */
-public class ShardFilterCache extends AbstractIndexShardComponent implements Closeable {
-
+public class ShardFilterCache  implements Closeable {
     final IndicesFilterCache cache;
+    final ShardId shardId;
 
-    @Inject
-    public ShardFilterCache(ShardId shardId, @IndexSettings Settings indexSettings, IndicesFilterCache cache) {
-        super(shardId, indexSettings);
+    public ShardFilterCache(ShardId shardId, IndicesFilterCache cache) {
         this.cache = cache;
+        this.shardId = shardId;
     }
 
     public FilterCacheStats stats() {
diff --git a/src/main/java/org/elasticsearch/index/cache/filter/ShardFilterCacheModule.java b/src/main/java/org/elasticsearch/index/cache/filter/ShardFilterCacheModule.java
index 749fd8e392c..37bcb805768 100644
--- a/src/main/java/org/elasticsearch/index/cache/filter/ShardFilterCacheModule.java
+++ b/src/main/java/org/elasticsearch/index/cache/filter/ShardFilterCacheModule.java
@@ -25,8 +25,14 @@ import org.elasticsearch.common.inject.AbstractModule;
  */
 public class ShardFilterCacheModule extends AbstractModule {
 
+    private final ShardFilterCache shardFilterCache;
+
+    public ShardFilterCacheModule(ShardFilterCache shardFilterCache) {
+        this.shardFilterCache = shardFilterCache;
+    }
+
     @Override
     protected void configure() {
-        bind(ShardFilterCache.class).asEagerSingleton();
+        bind(ShardFilterCache.class).toInstance(shardFilterCache);
     }
 }
diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/src/main/java/org/elasticsearch/index/shard/IndexShard.java
index 07b4bf1f940..06400a3bf82 100644
--- a/src/main/java/org/elasticsearch/index/shard/IndexShard.java
+++ b/src/main/java/org/elasticsearch/index/shard/IndexShard.java
@@ -161,7 +161,6 @@ public class IndexShard extends AbstractIndexShardComponent {
     private final SnapshotDeletionPolicy deletionPolicy;
     private final SimilarityService similarityService;
     private final MergePolicyProvider mergePolicyProvider;
-    private final BigArrays bigArrays;
     private final EngineConfig engineConfig;
     private final TranslogConfig translogConfig;
 
@@ -212,7 +211,6 @@ public class IndexShard extends AbstractIndexShardComponent {
         this.deletionPolicy = deletionPolicy;
         this.similarityService = similarityService;
         this.mergePolicyProvider = mergePolicyProvider;
-        this.bigArrays = bigArrays;
         Preconditions.checkNotNull(store, "Store must be provided to the index shard");
         Preconditions.checkNotNull(deletionPolicy, "Snapshot deletion policy must be provided to the index shard");
         this.engineFactory = factory;
@@ -794,7 +792,7 @@ public class IndexShard extends AbstractIndexShardComponent {
                         engine.flushAndClose();
                     }
                 } finally { // playing safe here and close the engine even if the above succeeds - close can be called multiple times
-                    IOUtils.close(engine, shardFilterCache);
+                    IOUtils.close(engine);
                 }
             }
         }
diff --git a/src/test/java/org/elasticsearch/test/InternalTestCluster.java b/src/test/java/org/elasticsearch/test/InternalTestCluster.java
index 079008ef8cb..285463a176b 100644
--- a/src/test/java/org/elasticsearch/test/InternalTestCluster.java
+++ b/src/test/java/org/elasticsearch/test/InternalTestCluster.java
@@ -801,12 +801,11 @@ public final class InternalTestCluster extends TestCluster {
         }
 
         void resetClient() throws IOException {
-            if (closed.get()) {
-                throw new RuntimeException("already closed");
+            if (closed.get() == false) {
+                Releasables.close(nodeClient, transportClient);
+                nodeClient = null;
+                transportClient = null;
             }
-            Releasables.close(nodeClient, transportClient);
-            nodeClient = null;
-            transportClient = null;
         }
 
         void closeNode() {

From e98b68a665c6c236dc5721c13b4df85f1da34f47 Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Fri, 29 May 2015 10:29:28 +0200
Subject: [PATCH 060/123] Prevent changing the number of replicas on a closed
 index

Setting the number of replicas on a closed index can leave the index
in an unopenable state since we might not be able to recover a quorum.
This commit simply prevents updating this setting on a closed index.

Closes #9566
---
 .../metadata/MetaDataUpdateSettingsService.java       |  8 +++++++-
 .../indices/IndicesOptionsIntegrationTests.java       |  2 +-
 .../indices/settings/UpdateSettingsTests.java         | 11 +++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java
index 2f40335116e..07e67f11e54 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java
@@ -231,9 +231,15 @@ public class MetaDataUpdateSettingsService extends AbstractComponent implements
                     }
                 }
 
+                if (closeIndices.size() > 0 && closeSettings.get(IndexMetaData.SETTING_NUMBER_OF_REPLICAS) != null) {
+                    throw new IllegalArgumentException(String.format(Locale.ROOT,
+                            "Can't update [%s] on closed indices [%s] - can leave index in an unopenable state", IndexMetaData.SETTING_NUMBER_OF_REPLICAS,
+                            closeIndices
+                    ));
+                }
                 if (!removedSettings.isEmpty() && !openIndices.isEmpty()) {
                     throw new IllegalArgumentException(String.format(Locale.ROOT,
-                            "Can't update non dynamic settings[%s] for open indices[%s]",
+                            "Can't update non dynamic settings[%s] for open indices [%s]",
                             removedSettings,
                             openIndices
                     ));
diff --git a/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java b/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java
index 253aad86a4a..baec5760b7b 100644
--- a/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java
+++ b/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationTests.java
@@ -773,7 +773,7 @@ public class IndicesOptionsIntegrationTests extends ElasticsearchIntegrationTest
         try {
             verify(client().admin().indices().prepareUpdateSettings("barbaz").setSettings(Settings.builder().put("e", "f")), false);
         } catch (IllegalArgumentException e) {
-            assertThat(e.getMessage(), equalTo("Can't update non dynamic settings[[index.e]] for open indices[[barbaz]]"));
+            assertThat(e.getMessage(), equalTo("Can't update non dynamic settings[[index.e]] for open indices [[barbaz]]"));
         }
         verify(client().admin().indices().prepareUpdateSettings("baz*").setSettings(Settings.builder().put("a", "b")), true);
     }
diff --git a/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java b/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java
index a1b2fde2955..e1ca345b68d 100644
--- a/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java
+++ b/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java
@@ -92,6 +92,17 @@ public class UpdateSettingsTests extends ElasticsearchIntegrationTest {
 
         client().admin().indices().prepareClose("test").execute().actionGet();
 
+        try {
+            client().admin().indices().prepareUpdateSettings("test")
+                    .setSettings(Settings.settingsBuilder()
+                                    .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 1)
+                    )
+                    .execute().actionGet();
+            fail("can't change number of replicas on a closed index");
+        } catch (IllegalArgumentException ex) {
+            assertEquals(ex.getMessage(), "Can't update [index.number_of_replicas] on closed indices [[test]] - can leave index in an unopenable state");
+            // expected
+        }
         client().admin().indices().prepareUpdateSettings("test")
                 .setSettings(Settings.settingsBuilder()
                         .put("index.refresh_interval", "1s") // this one can change

From 521f804c7dcb3173efca2abbeabedb901b2bd2d7 Mon Sep 17 00:00:00 2001
From: Boaz Leskes <b.leskes@gmail.com>
Date: Thu, 2 Apr 2015 13:30:25 +0200
Subject: [PATCH 061/123] Mapping: add an assertion to verify consistent
 serialization

We recently run into two issues where mapping weren't serialized in a consistent manner (#10302 and #10318). We rely on this consistency to do a byte level checl that mappings we get from the master are indentical to the one we have locally. Mistakes here can cause endless refresh mapping loops.

This commit adds an assert that verifies this upon every update from the master.
---
 .../elasticsearch/index/mapper/MapperService.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/src/main/java/org/elasticsearch/index/mapper/MapperService.java
index 85a3aae5bd4..b63df2d6cc4 100755
--- a/src/main/java/org/elasticsearch/index/mapper/MapperService.java
+++ b/src/main/java/org/elasticsearch/index/mapper/MapperService.java
@@ -267,6 +267,7 @@ public class MapperService extends AbstractIndexComponent  {
                     }
                 }
                 fieldDataService.onMappingUpdate();
+                assert assertSerialization(oldMapper);
                 return oldMapper;
             } else {
                 List<ObjectMapper> newObjectMappers = new ArrayList<>();
@@ -284,11 +285,25 @@ public class MapperService extends AbstractIndexComponent  {
                     typeListener.beforeCreate(mapper);
                 }
                 mappers = newMapBuilder(mappers).put(mapper.type(), mapper).map();
+                assert assertSerialization(mapper);
                 return mapper;
             }
         }
     }
 
+    private boolean assertSerialization(DocumentMapper mapper) {
+        // capture the source now, it may change due to concurrent parsing
+        final CompressedString mappingSource = mapper.mappingSource();
+        DocumentMapper newMapper = parse(mapper.type(), mappingSource, false);
+
+        if (newMapper.mappingSource().equals(mappingSource) == false) {
+            throw new IllegalStateException("DocumentMapper serialization result is different from source. \n--> Source ["
+                + mappingSource + "]\n--> Result ["
+                + newMapper.mappingSource() + "]");
+        }
+        return true;
+    }
+
     protected void addObjectMappers(Collection<ObjectMapper> objectMappers) {
         assert mappingLock.isWriteLockedByCurrentThread();
         ImmutableOpenMap.Builder<String, ObjectMappers> fullPathObjectMappers = ImmutableOpenMap.builder(this.fullPathObjectMappers);

From a031232c484542c0a61362e650f9e61d120aa6af Mon Sep 17 00:00:00 2001
From: Britta Weber <britta.weber@elasticsearch.com>
Date: Fri, 29 May 2015 11:39:20 +0200
Subject: [PATCH 062/123] [doc] remove reference to seal, was removed in #11336

---
 docs/reference/indices.asciidoc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/reference/indices.asciidoc b/docs/reference/indices.asciidoc
index 06a24821440..c9af8c12271 100644
--- a/docs/reference/indices.asciidoc
+++ b/docs/reference/indices.asciidoc
@@ -107,8 +107,6 @@ include::indices/refresh.asciidoc[]
 
 include::indices/optimize.asciidoc[]
 
-include::indices/seal.asciidoc[]
-
 include::indices/shadow-replicas.asciidoc[]
 
 include::indices/upgrade.asciidoc[]

From c3c79290c6f99fb7ba956f5b733a4a89dff6ceaf Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Fri, 29 May 2015 11:59:27 +0200
Subject: [PATCH 063/123] Close lock even if we fail to obtain

---
 .../java/org/elasticsearch/common/lucene/Lucene.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/src/main/java/org/elasticsearch/common/lucene/Lucene.java
index e3d787779c7..7154f83c71d 100644
--- a/src/main/java/org/elasticsearch/common/lucene/Lucene.java
+++ b/src/main/java/org/elasticsearch/common/lucene/Lucene.java
@@ -189,8 +189,16 @@ public class Lucene {
     @SuppressForbidden(reason = "this method uses trappy Directory#makeLock API")
     public static Lock acquireLock(Directory directory, String lockName, long timeout) throws IOException {
         final Lock writeLock = directory.makeLock(lockName);
-        if (writeLock.obtain(timeout) == false) {
-            throw new LockObtainFailedException("failed to obtain lock: " + writeLock);
+        boolean success = false;
+        try {
+            if (writeLock.obtain(timeout) == false) {
+                throw new LockObtainFailedException("failed to obtain lock: " + writeLock);
+            }
+            success = true;
+        } finally {
+            if (success == false) {
+                writeLock.close();
+            }
         }
         return writeLock;
     }

From 08ee4a87b3b4cc7fff1204623014b359861628a7 Mon Sep 17 00:00:00 2001
From: Adrien Grand <jpountz@gmail.com>
Date: Thu, 21 May 2015 12:36:44 +0200
Subject: [PATCH 064/123] Internal: tighten up our compression framework.

We have a compression framework that we use internally, mainly to compress some
xcontent bytes. However it is quite lenient: for instance it relies on the
assumption that detection of the compression format can only be called on either
some compressed xcontent bytes or some raw xcontent bytes, but nothing checks
this. By the way, we are misusing it in BinaryFieldMapper so that if someone
indexes a binary field which happens to have the same header as a LZF stream,
then at read time, we will try to decompress it.

It also simplifies the API by removing block compression (only streaming) and
some code duplication caused by some methods accepting a byte[] and other
methods a BytesReference.
---
 .../TransportReplicationAction.java           |   4 +-
 .../elasticsearch/cluster/ClusterState.java   |   4 +-
 .../cluster/metadata/AliasMetaData.java       |  22 ++--
 .../cluster/metadata/IndexMetaData.java       |   4 +-
 .../metadata/IndexTemplateMetaData.java       |  24 ++--
 .../cluster/metadata/MappingMetaData.java     |  20 +--
 .../metadata/MetaDataCreateIndexService.java  |   8 +-
 .../metadata/MetaDataMappingService.java      |  16 +--
 .../common/bytes/PagedBytesReference.java     |  13 +-
 .../common/compress/CompressedIndexInput.java |   6 +-
 .../compress/CompressedStreamInput.java       |  13 +-
 .../compress/CompressedStreamOutput.java      |   6 +-
 ...sedString.java => CompressedXContent.java} |  39 +++---
 .../common/compress/Compressor.java           |  24 ++--
 .../common/compress/CompressorFactory.java    |  68 +++++-----
 ...ntext.java => NotCompressedException.java} |  12 +-
 ...Context.java => NotXContentException.java} |  14 +-
 .../compress/lzf/LZFCompressedIndexInput.java |   4 +-
 .../lzf/LZFCompressedStreamInput.java         |   4 +-
 .../lzf/LZFCompressedStreamOutput.java        |   4 +-
 .../common/compress/lzf/LZFCompressor.java    |  19 ---
 .../io/stream/InputStreamStreamInput.java     |  10 ++
 .../common/xcontent/XContentFactory.java      | 121 ++++++++++--------
 .../common/xcontent/XContentHelper.java       |  75 +++--------
 .../gateway/MetaDataStateFormat.java          |  16 ++-
 .../index/aliases/IndexAlias.java             |   8 +-
 .../index/aliases/IndexAliasesService.java    |   8 +-
 .../index/mapper/DocumentMapper.java          |   8 +-
 .../index/mapper/DocumentMapperParser.java    |   8 +-
 .../index/mapper/MapperService.java           |   8 +-
 .../index/mapper/core/BinaryFieldMapper.java  |  15 ++-
 .../mapper/internal/SourceFieldMapper.java    |  10 +-
 .../cluster/IndicesClusterStateService.java   |   8 +-
 .../blobstore/BlobStoreRepository.java        |  11 +-
 .../search/lookup/SourceLookup.java           |   8 --
 .../netty/MessageChannelHandler.java          |   7 +-
 .../metadata/MappingMetaDataParserTests.java  |  36 +++---
 ...ests.java => CompressedXContentTests.java} |  34 ++---
 .../common/xcontent/XContentFactoryTests.java |   2 +-
 .../aliases/IndexAliasesServiceTests.java     |   7 +-
 .../fielddata/ParentChildFieldDataTests.java  |   6 +-
 .../mapper/binary/BinaryMappingTests.java     |   4 +-
 .../mapper/merge/TestMergeMapperTests.java    |   6 +-
 .../mapper/multifield/MultiFieldTests.java    |   2 +-
 .../source/CompressSourceMappingTests.java    |   9 +-
 .../source/DefaultSourceMappingTests.java     |   8 +-
 .../timestamp/TimestampMappingTests.java      |  10 +-
 .../index/mapper/ttl/TTLMappingTests.java     |  43 ++++---
 .../mapper/update/UpdateMappingTests.java     |  28 ++--
 ...QueryParserFilterDateRangeFormatTests.java |   4 +-
 ...eryParserFilterDateRangeTimezoneTests.java |   4 +-
 .../query/SimpleIndexQueryParserTests.java    |   4 +-
 .../search/child/AbstractChildTests.java      |   6 +-
 .../template/SimpleIndexTemplateTests.java    |   4 +
 .../bucket/nested/NestedAggregatorTest.java   |   4 +-
 55 files changed, 436 insertions(+), 434 deletions(-)
 rename src/main/java/org/elasticsearch/common/compress/{CompressedString.java => CompressedXContent.java} (74%)
 rename src/main/java/org/elasticsearch/common/compress/{CompressorContext.java => NotCompressedException.java} (73%)
 rename src/main/java/org/elasticsearch/common/compress/{lzf/LZFCompressorContext.java => NotXContentException.java} (69%)
 rename src/test/java/org/elasticsearch/common/compress/{CompressedStringTests.java => CompressedXContentTests.java} (72%)

diff --git a/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java b/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
index 2e2a9e7abf3..d3f7a5b9356 100644
--- a/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
+++ b/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
@@ -43,7 +43,7 @@ import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.cluster.routing.*;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.collect.Tuple;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.lease.Releasable;
 import org.elasticsearch.common.lease.Releasables;
 import org.elasticsearch.common.settings.Settings;
@@ -1080,7 +1080,7 @@ public abstract class TransportReplicationAction<Request extends ReplicationRequ
                 // to find a _meta document
                 // So we have no choice but to index first and send mappings afterwards
                 MapperService mapperService = indexShard.indexService().mapperService();
-                mapperService.merge(request.type(), new CompressedString(update.toBytes()), true);
+                mapperService.merge(request.type(), new CompressedXContent(update.toBytes()), true);
                 created = operation.execute(indexShard);
                 mappingUpdatedAction.updateMappingOnMasterAsynchronously(indexName, request.type(), update);
             } else {
diff --git a/src/main/java/org/elasticsearch/cluster/ClusterState.java b/src/main/java/org/elasticsearch/cluster/ClusterState.java
index 85a2313daeb..cb16fd8dc7b 100644
--- a/src/main/java/org/elasticsearch/cluster/ClusterState.java
+++ b/src/main/java/org/elasticsearch/cluster/ClusterState.java
@@ -37,7 +37,7 @@ import org.elasticsearch.cluster.service.InternalClusterService;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.collect.ImmutableOpenMap;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -422,7 +422,7 @@ public class ClusterState implements ToXContent, Diffable<ClusterState> {
                 builder.endObject();
 
                 builder.startObject("mappings");
-                for (ObjectObjectCursor<String, CompressedString> cursor1 : templateMetaData.mappings()) {
+                for (ObjectObjectCursor<String, CompressedXContent> cursor1 : templateMetaData.mappings()) {
                     byte[] mappingSource = cursor1.value.uncompressed();
                     XContentParser parser = XContentFactory.xContent(mappingSource).createParser(mappingSource);
                     Map<String, Object> mapping = parser.map();
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java
index 0f7e55c8087..fb640eedc5a 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/AliasMetaData.java
@@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableSet;
 import org.elasticsearch.ElasticsearchGenerationException;
 import org.elasticsearch.cluster.AbstractDiffable;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.ToXContent;
@@ -45,7 +45,7 @@ public class AliasMetaData extends AbstractDiffable<AliasMetaData> {
 
     private final String alias;
 
-    private final CompressedString filter;
+    private final CompressedXContent filter;
 
     private final String indexRouting;
 
@@ -53,7 +53,7 @@ public class AliasMetaData extends AbstractDiffable<AliasMetaData> {
 
     private final Set<String> searchRoutingValues;
 
-    private AliasMetaData(String alias, CompressedString filter, String indexRouting, String searchRouting) {
+    private AliasMetaData(String alias, CompressedXContent filter, String indexRouting, String searchRouting) {
         this.alias = alias;
         this.filter = filter;
         this.indexRouting = indexRouting;
@@ -77,11 +77,11 @@ public class AliasMetaData extends AbstractDiffable<AliasMetaData> {
         return alias();
     }
 
-    public CompressedString filter() {
+    public CompressedXContent filter() {
         return filter;
     }
 
-    public CompressedString getFilter() {
+    public CompressedXContent getFilter() {
         return filter();
     }
 
@@ -176,9 +176,9 @@ public class AliasMetaData extends AbstractDiffable<AliasMetaData> {
     @Override
     public AliasMetaData readFrom(StreamInput in) throws IOException {
         String alias = in.readString();
-        CompressedString filter = null;
+        CompressedXContent filter = null;
         if (in.readBoolean()) {
-            filter = CompressedString.readCompressedString(in);
+            filter = CompressedXContent.readCompressedString(in);
         }
         String indexRouting = null;
         if (in.readBoolean()) {
@@ -195,7 +195,7 @@ public class AliasMetaData extends AbstractDiffable<AliasMetaData> {
 
         private final String alias;
 
-        private CompressedString filter;
+        private CompressedXContent filter;
 
         private String indexRouting;
 
@@ -217,7 +217,7 @@ public class AliasMetaData extends AbstractDiffable<AliasMetaData> {
             return alias;
         }
 
-        public Builder filter(CompressedString filter) {
+        public Builder filter(CompressedXContent filter) {
             this.filter = filter;
             return this;
         }
@@ -244,7 +244,7 @@ public class AliasMetaData extends AbstractDiffable<AliasMetaData> {
             }
             try {
                 XContentBuilder builder = XContentFactory.jsonBuilder().map(filter);
-                this.filter = new CompressedString(builder.bytes());
+                this.filter = new CompressedXContent(builder.bytes());
                 return this;
             } catch (IOException e) {
                 throw new ElasticsearchGenerationException("Failed to build json for alias request", e);
@@ -324,7 +324,7 @@ public class AliasMetaData extends AbstractDiffable<AliasMetaData> {
                     }
                 } else if (token == XContentParser.Token.VALUE_EMBEDDED_OBJECT) {
                     if ("filter".equals(currentFieldName)) {
-                        builder.filter(new CompressedString(parser.binaryValue()));
+                        builder.filter(new CompressedXContent(parser.binaryValue()));
                     }
                 } else if (token == XContentParser.Token.VALUE_STRING) {
                     if ("routing".equals(currentFieldName)) {
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java
index 07703bca591..2f3f6c889f8 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java
@@ -35,7 +35,7 @@ import org.elasticsearch.cluster.routing.Murmur3HashFunction;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.collect.ImmutableOpenMap;
 import org.elasticsearch.common.collect.MapBuilder;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.settings.Settings;
@@ -874,7 +874,7 @@ public class IndexMetaData implements Diffable<IndexMetaData> {
                     if ("mappings".equals(currentFieldName)) {
                         while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) {
                             if (token == XContentParser.Token.VALUE_EMBEDDED_OBJECT) {
-                                builder.putMapping(new MappingMetaData(new CompressedString(parser.binaryValue())));
+                                builder.putMapping(new MappingMetaData(new CompressedXContent(parser.binaryValue())));
                             } else {
                                 Map<String, Object> mapping = parser.mapOrdered();
                                 if (mapping.size() == 1) {
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java
index ae555a54e75..d91d0817cfc 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/IndexTemplateMetaData.java
@@ -24,7 +24,7 @@ import com.google.common.collect.Sets;
 import org.elasticsearch.cluster.AbstractDiffable;
 import org.elasticsearch.common.collect.ImmutableOpenMap;
 import org.elasticsearch.common.collect.MapBuilder;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.settings.Settings;
@@ -54,13 +54,13 @@ public class IndexTemplateMetaData extends AbstractDiffable<IndexTemplateMetaDat
     private final Settings settings;
 
     // the mapping source should always include the type as top level
-    private final ImmutableOpenMap<String, CompressedString> mappings;
+    private final ImmutableOpenMap<String, CompressedXContent> mappings;
 
     private final ImmutableOpenMap<String, AliasMetaData> aliases;
 
     private final ImmutableOpenMap<String, IndexMetaData.Custom> customs;
 
-    public IndexTemplateMetaData(String name, int order, String template, Settings settings, ImmutableOpenMap<String, CompressedString> mappings,
+    public IndexTemplateMetaData(String name, int order, String template, Settings settings, ImmutableOpenMap<String, CompressedXContent> mappings,
                                  ImmutableOpenMap<String, AliasMetaData> aliases, ImmutableOpenMap<String, IndexMetaData.Custom> customs) {
         this.name = name;
         this.order = order;
@@ -103,11 +103,11 @@ public class IndexTemplateMetaData extends AbstractDiffable<IndexTemplateMetaDat
         return settings();
     }
 
-    public ImmutableOpenMap<String, CompressedString> mappings() {
+    public ImmutableOpenMap<String, CompressedXContent> mappings() {
         return this.mappings;
     }
 
-    public ImmutableOpenMap<String, CompressedString> getMappings() {
+    public ImmutableOpenMap<String, CompressedXContent> getMappings() {
         return this.mappings;
     }
 
@@ -170,7 +170,7 @@ public class IndexTemplateMetaData extends AbstractDiffable<IndexTemplateMetaDat
         builder.settings(Settings.readSettingsFromStream(in));
         int mappingsSize = in.readVInt();
         for (int i = 0; i < mappingsSize; i++) {
-            builder.putMapping(in.readString(), CompressedString.readCompressedString(in));
+            builder.putMapping(in.readString(), CompressedXContent.readCompressedString(in));
         }
         int aliasesSize = in.readVInt();
         for (int i = 0; i < aliasesSize; i++) {
@@ -193,7 +193,7 @@ public class IndexTemplateMetaData extends AbstractDiffable<IndexTemplateMetaDat
         out.writeString(template);
         Settings.writeSettingsToStream(settings, out);
         out.writeVInt(mappings.size());
-        for (ObjectObjectCursor<String, CompressedString> cursor : mappings) {
+        for (ObjectObjectCursor<String, CompressedXContent> cursor : mappings) {
             out.writeString(cursor.key);
             cursor.value.writeTo(out);
         }
@@ -223,7 +223,7 @@ public class IndexTemplateMetaData extends AbstractDiffable<IndexTemplateMetaDat
 
         private Settings settings = Settings.Builder.EMPTY_SETTINGS;
 
-        private final ImmutableOpenMap.Builder<String, CompressedString> mappings;
+        private final ImmutableOpenMap.Builder<String, CompressedXContent> mappings;
 
         private final ImmutableOpenMap.Builder<String, AliasMetaData> aliases;
 
@@ -276,13 +276,13 @@ public class IndexTemplateMetaData extends AbstractDiffable<IndexTemplateMetaDat
             return this;
         }
 
-        public Builder putMapping(String mappingType, CompressedString mappingSource) throws IOException {
+        public Builder putMapping(String mappingType, CompressedXContent mappingSource) throws IOException {
             mappings.put(mappingType, mappingSource);
             return this;
         }
 
         public Builder putMapping(String mappingType, String mappingSource) throws IOException {
-            mappings.put(mappingType, new CompressedString(mappingSource));
+            mappings.put(mappingType, new CompressedXContent(mappingSource));
             return this;
         }
 
@@ -327,7 +327,7 @@ public class IndexTemplateMetaData extends AbstractDiffable<IndexTemplateMetaDat
 
             if (params.paramAsBoolean("reduce_mappings", false)) {
                 builder.startObject("mappings");
-                for (ObjectObjectCursor<String, CompressedString> cursor : indexTemplateMetaData.mappings()) {
+                for (ObjectObjectCursor<String, CompressedXContent> cursor : indexTemplateMetaData.mappings()) {
                     byte[] mappingSource = cursor.value.uncompressed();
                     XContentParser parser = XContentFactory.xContent(mappingSource).createParser(mappingSource);
                     Map<String, Object> mapping = parser.map();
@@ -341,7 +341,7 @@ public class IndexTemplateMetaData extends AbstractDiffable<IndexTemplateMetaDat
                 builder.endObject();
             } else {
                 builder.startArray("mappings");
-                for (ObjectObjectCursor<String, CompressedString> cursor : indexTemplateMetaData.mappings()) {
+                for (ObjectObjectCursor<String, CompressedXContent> cursor : indexTemplateMetaData.mappings()) {
                     byte[] data = cursor.value.uncompressed();
                     XContentParser parser = XContentFactory.xContent(data).createParser(data);
                     Map<String, Object> mapping = parser.mapOrderedAndClose();
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
index e6067c46817..2d8054d748f 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
@@ -23,7 +23,7 @@ import org.elasticsearch.action.TimestampParsingException;
 import org.elasticsearch.cluster.AbstractDiffable;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.joda.FormatDateTimeFormatter;
@@ -276,7 +276,7 @@ public class MappingMetaData extends AbstractDiffable<MappingMetaData> {
 
     private final String type;
 
-    private final CompressedString source;
+    private final CompressedXContent source;
 
     private Id id;
     private Routing routing;
@@ -294,9 +294,9 @@ public class MappingMetaData extends AbstractDiffable<MappingMetaData> {
         this.hasParentField = docMapper.parentFieldMapper().active();
     }
 
-    public MappingMetaData(CompressedString mapping) throws IOException {
+    public MappingMetaData(CompressedXContent mapping) throws IOException {
         this.source = mapping;
-        Map<String, Object> mappingMap = XContentHelper.createParser(mapping.compressed(), 0, mapping.compressed().length).mapOrderedAndClose();
+        Map<String, Object> mappingMap = XContentHelper.createParser(mapping.compressedReference()).mapOrderedAndClose();
         if (mappingMap.size() != 1) {
             throw new IllegalStateException("Can't derive type from mapping, no root type: " + mapping.string());
         }
@@ -311,7 +311,7 @@ public class MappingMetaData extends AbstractDiffable<MappingMetaData> {
     public MappingMetaData(String type, Map<String, Object> mapping) throws IOException {
         this.type = type;
         XContentBuilder mappingBuilder = XContentFactory.jsonBuilder().map(mapping);
-        this.source = new CompressedString(mappingBuilder.bytes());
+        this.source = new CompressedXContent(mappingBuilder.bytes());
         Map<String, Object> withoutType = mapping;
         if (mapping.size() == 1 && mapping.containsKey(type)) {
             withoutType = (Map<String, Object>) mapping.get(type);
@@ -322,7 +322,7 @@ public class MappingMetaData extends AbstractDiffable<MappingMetaData> {
     private MappingMetaData() {
         this.type = "";
         try {
-            this.source = new CompressedString("");
+            this.source = new CompressedXContent("{}");
         } catch (IOException ex) {
             throw new IllegalStateException("Cannot create MappingMetaData prototype", ex);
         }
@@ -393,7 +393,7 @@ public class MappingMetaData extends AbstractDiffable<MappingMetaData> {
         }
     }
 
-    public MappingMetaData(String type, CompressedString source, Id id, Routing routing, Timestamp timestamp, boolean hasParentField) {
+    public MappingMetaData(String type, CompressedXContent source, Id id, Routing routing, Timestamp timestamp, boolean hasParentField) {
         this.type = type;
         this.source = source;
         this.id = id;
@@ -418,7 +418,7 @@ public class MappingMetaData extends AbstractDiffable<MappingMetaData> {
         return this.type;
     }
 
-    public CompressedString source() {
+    public CompressedXContent source() {
         return this.source;
     }
 
@@ -430,7 +430,7 @@ public class MappingMetaData extends AbstractDiffable<MappingMetaData> {
      * Converts the serialized compressed form of the mappings into a parsed map.
      */
     public Map<String, Object> sourceAsMap() throws IOException {
-        Map<String, Object> mapping = XContentHelper.convertToMap(source.compressed(), 0, source.compressed().length, true).v2();
+        Map<String, Object> mapping = XContentHelper.convertToMap(source.compressedReference(), true).v2();
         if (mapping.size() == 1 && mapping.containsKey(type())) {
             // the type name is the root value, reduce it
             mapping = (Map<String, Object>) mapping.get(type());
@@ -599,7 +599,7 @@ public class MappingMetaData extends AbstractDiffable<MappingMetaData> {
 
     public MappingMetaData readFrom(StreamInput in) throws IOException {
         String type = in.readString();
-        CompressedString source = CompressedString.readCompressedString(in);
+        CompressedXContent source = CompressedXContent.readCompressedString(in);
         // id
         Id id = new Id(in.readBoolean() ? in.readString() : null);
         // routing
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
index 41e310a95ad..612989bb451 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
@@ -46,7 +46,7 @@ import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Priority;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.component.AbstractComponent;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.io.Streams;
 import org.elasticsearch.common.regex.Regex;
@@ -254,7 +254,7 @@ public class MetaDataCreateIndexService extends AbstractComponent {
                     // apply templates, merging the mappings into the request mapping if exists
                     for (IndexTemplateMetaData template : templates) {
                         templateNames.add(template.getName());
-                        for (ObjectObjectCursor<String, CompressedString> cursor : template.mappings()) {
+                        for (ObjectObjectCursor<String, CompressedXContent> cursor : template.mappings()) {
                             if (mappings.containsKey(cursor.key)) {
                                 XContentHelper.mergeDefaults(mappings.get(cursor.key), parseMapping(cursor.value.string()));
                             } else {
@@ -357,7 +357,7 @@ public class MetaDataCreateIndexService extends AbstractComponent {
                     // first, add the default mapping
                     if (mappings.containsKey(MapperService.DEFAULT_MAPPING)) {
                         try {
-                            mapperService.merge(MapperService.DEFAULT_MAPPING, new CompressedString(XContentFactory.jsonBuilder().map(mappings.get(MapperService.DEFAULT_MAPPING)).string()), false);
+                            mapperService.merge(MapperService.DEFAULT_MAPPING, new CompressedXContent(XContentFactory.jsonBuilder().map(mappings.get(MapperService.DEFAULT_MAPPING)).string()), false);
                         } catch (Exception e) {
                             removalReason = "failed on parsing default mapping on index creation";
                             throw new MapperParsingException("mapping [" + MapperService.DEFAULT_MAPPING + "]", e);
@@ -369,7 +369,7 @@ public class MetaDataCreateIndexService extends AbstractComponent {
                         }
                         try {
                             // apply the default here, its the first time we parse it
-                            mapperService.merge(entry.getKey(), new CompressedString(XContentFactory.jsonBuilder().map(entry.getValue()).string()), true);
+                            mapperService.merge(entry.getKey(), new CompressedXContent(XContentFactory.jsonBuilder().map(entry.getValue()).string()), true);
                         } catch (Exception e) {
                             removalReason = "failed on parsing mappings on index creation";
                             throw new MapperParsingException("mapping [" + entry.getKey() + "]", e);
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
index 0e39e7a613d..4406decfe0c 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
@@ -32,7 +32,7 @@ import org.elasticsearch.cluster.ack.ClusterStateUpdateResponse;
 import org.elasticsearch.common.Priority;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.component.AbstractComponent;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.Index;
@@ -91,11 +91,11 @@ public class MetaDataMappingService extends AbstractComponent {
 
     static class UpdateTask extends MappingTask {
         final String type;
-        final CompressedString mappingSource;
+        final CompressedXContent mappingSource;
         final String nodeId; // null fr unknown
         final ActionListener<ClusterStateUpdateResponse> listener;
 
-        UpdateTask(String index, String indexUUID, String type, CompressedString mappingSource, String nodeId, ActionListener<ClusterStateUpdateResponse> listener) {
+        UpdateTask(String index, String indexUUID, String type, CompressedXContent mappingSource, String nodeId, ActionListener<ClusterStateUpdateResponse> listener) {
             super(index, indexUUID);
             this.type = type;
             this.mappingSource = mappingSource;
@@ -254,7 +254,7 @@ public class MetaDataMappingService extends AbstractComponent {
                 UpdateTask updateTask = (UpdateTask) task;
                 try {
                     String type = updateTask.type;
-                    CompressedString mappingSource = updateTask.mappingSource;
+                    CompressedXContent mappingSource = updateTask.mappingSource;
 
                     MappingMetaData mappingMetaData = builder.mapping(type);
                     if (mappingMetaData != null && mappingMetaData.source().equals(mappingSource)) {
@@ -376,9 +376,9 @@ public class MetaDataMappingService extends AbstractComponent {
                         DocumentMapper existingMapper = indexService.mapperService().documentMapper(request.type());
                         if (MapperService.DEFAULT_MAPPING.equals(request.type())) {
                             // _default_ types do not go through merging, but we do test the new settings. Also don't apply the old default
-                            newMapper = indexService.mapperService().parse(request.type(), new CompressedString(request.source()), false);
+                            newMapper = indexService.mapperService().parse(request.type(), new CompressedXContent(request.source()), false);
                         } else {
-                            newMapper = indexService.mapperService().parse(request.type(), new CompressedString(request.source()), existingMapper == null);
+                            newMapper = indexService.mapperService().parse(request.type(), new CompressedXContent(request.source()), existingMapper == null);
                             if (existingMapper != null) {
                                 // first, simulate
                                 MergeResult mergeResult = existingMapper.merge(newMapper.mapping(), true);
@@ -415,12 +415,12 @@ public class MetaDataMappingService extends AbstractComponent {
                             continue;
                         }
 
-                        CompressedString existingSource = null;
+                        CompressedXContent existingSource = null;
                         if (existingMappers.containsKey(entry.getKey())) {
                             existingSource = existingMappers.get(entry.getKey()).mappingSource();
                         }
                         DocumentMapper mergedMapper = indexService.mapperService().merge(newMapper.type(), newMapper.mappingSource(), false);
-                        CompressedString updatedSource = mergedMapper.mappingSource();
+                        CompressedXContent updatedSource = mergedMapper.mappingSource();
 
                         if (existingSource != null) {
                             if (existingSource.equals(updatedSource)) {
diff --git a/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java b/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java
index 1bc370cd894..add383b75fa 100644
--- a/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java
+++ b/src/main/java/org/elasticsearch/common/bytes/PagedBytesReference.java
@@ -352,6 +352,7 @@ public class PagedBytesReference implements BytesReference {
         private final int offset;
         private final int length;
         private int pos;
+        private int mark;
 
         public PagedBytesReferenceStreamInput(ByteArray bytearray, int offset, int length) {
             this.bytearray = bytearray;
@@ -420,9 +421,19 @@ public class PagedBytesReference implements BytesReference {
             return copiedBytes;
         }
 
+        @Override
+        public boolean markSupported() {
+            return true;
+        }
+
+        @Override
+        public void mark(int readlimit) {
+            this.mark = pos;
+        }
+
         @Override
         public void reset() throws IOException {
-            pos = 0;
+            pos = mark;
         }
 
         @Override
diff --git a/src/main/java/org/elasticsearch/common/compress/CompressedIndexInput.java b/src/main/java/org/elasticsearch/common/compress/CompressedIndexInput.java
index 06ec2a2f48f..12094108932 100644
--- a/src/main/java/org/elasticsearch/common/compress/CompressedIndexInput.java
+++ b/src/main/java/org/elasticsearch/common/compress/CompressedIndexInput.java
@@ -30,10 +30,9 @@ import java.io.IOException;
  * @deprecated Used only for backward comp. to read old compressed files, since we now use codec based compression
  */
 @Deprecated
-public abstract class CompressedIndexInput<T extends CompressorContext> extends IndexInput {
+public abstract class CompressedIndexInput extends IndexInput {
 
     private IndexInput in;
-    protected final T context;
 
     private int version;
     private long totalUncompressedLength;
@@ -48,10 +47,9 @@ public abstract class CompressedIndexInput<T extends CompressorContext> extends
     private int currentOffsetIdx;
     private long currentUncompressedChunkPointer;
 
-    public CompressedIndexInput(IndexInput in, T context) throws IOException {
+    public CompressedIndexInput(IndexInput in) throws IOException {
         super("compressed(" + in.toString() + ")");
         this.in = in;
-        this.context = context;
         readHeader(in);
         this.version = in.readInt();
         long metaDataPosition = in.readLong();
diff --git a/src/main/java/org/elasticsearch/common/compress/CompressedStreamInput.java b/src/main/java/org/elasticsearch/common/compress/CompressedStreamInput.java
index 3df98a7f718..82eefe13a4c 100644
--- a/src/main/java/org/elasticsearch/common/compress/CompressedStreamInput.java
+++ b/src/main/java/org/elasticsearch/common/compress/CompressedStreamInput.java
@@ -27,10 +27,9 @@ import java.io.IOException;
 
 /**
  */
-public abstract class CompressedStreamInput<T extends CompressorContext> extends StreamInput {
+public abstract class CompressedStreamInput extends StreamInput {
 
     private final StreamInput in;
-    protected final CompressorContext context;
 
     private boolean closed;
 
@@ -38,9 +37,8 @@ public abstract class CompressedStreamInput<T extends CompressorContext> extends
     private int position = 0;
     private int valid = 0;
 
-    public CompressedStreamInput(StreamInput in, T context) throws IOException {
+    public CompressedStreamInput(StreamInput in) throws IOException {
         this.in = in;
-        this.context = context;
         super.setVersion(in.getVersion());
         readHeader(in);
     }
@@ -51,13 +49,6 @@ public abstract class CompressedStreamInput<T extends CompressorContext> extends
         return super.setVersion(version);
     }
 
-    /**
-     * Expert!, resets to buffer start, without the need to decompress it again.
-     */
-    public void resetToBufferStart() {
-        this.position = 0;
-    }
-
     /**
      * Method is overridden to report number of bytes that can now be read
      * from decoded data buffer, without reading bytes from the underlying
diff --git a/src/main/java/org/elasticsearch/common/compress/CompressedStreamOutput.java b/src/main/java/org/elasticsearch/common/compress/CompressedStreamOutput.java
index 009fddc074c..9e0763816a8 100644
--- a/src/main/java/org/elasticsearch/common/compress/CompressedStreamOutput.java
+++ b/src/main/java/org/elasticsearch/common/compress/CompressedStreamOutput.java
@@ -26,10 +26,9 @@ import java.io.IOException;
 
 /**
  */
-public abstract class CompressedStreamOutput<T extends CompressorContext> extends StreamOutput {
+public abstract class CompressedStreamOutput extends StreamOutput {
 
     private final StreamOutput out;
-    protected final T context;
 
     protected byte[] uncompressed;
     protected int uncompressedLength;
@@ -37,9 +36,8 @@ public abstract class CompressedStreamOutput<T extends CompressorContext> extend
 
     private boolean closed;
 
-    public CompressedStreamOutput(StreamOutput out, T context) throws IOException {
+    public CompressedStreamOutput(StreamOutput out) throws IOException {
         this.out = out;
-        this.context = context;
         super.setVersion(out.getVersion());
         writeHeader(out);
     }
diff --git a/src/main/java/org/elasticsearch/common/compress/CompressedString.java b/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java
similarity index 74%
rename from src/main/java/org/elasticsearch/common/compress/CompressedString.java
rename to src/main/java/org/elasticsearch/common/compress/CompressedXContent.java
index aca1d45f86d..09ced0e29b2 100644
--- a/src/main/java/org/elasticsearch/common/compress/CompressedString.java
+++ b/src/main/java/org/elasticsearch/common/compress/CompressedXContent.java
@@ -22,6 +22,7 @@ package org.elasticsearch.common.compress;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
+import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -34,33 +35,32 @@ import java.util.Arrays;
  * memory. Note that the compressed string might still sometimes need to be
  * decompressed in order to perform equality checks or to compute hash codes.
  */
-public final class CompressedString {
+public final class CompressedXContent {
 
     private final byte[] bytes;
     private int hashCode;
 
-    public CompressedString(BytesReference data) throws IOException {
+    public CompressedXContent(BytesReference data) throws IOException {
         Compressor compressor = CompressorFactory.compressor(data);
         if (compressor != null) {
             // already compressed...
             this.bytes = data.toBytes();
         } else {
-            BytesArray bytesArray = data.toBytesArray();
-            this.bytes = CompressorFactory.defaultCompressor().compress(bytesArray.array(), bytesArray.arrayOffset(), bytesArray.length());
-            assert CompressorFactory.compressor(bytes) != null;
+            BytesStreamOutput out = new BytesStreamOutput();
+            try (StreamOutput compressedOutput = CompressorFactory.defaultCompressor().streamOutput(out)) {
+                data.writeTo(compressedOutput);
+            }
+            this.bytes = out.bytes().toBytes();
+            assert CompressorFactory.compressor(new BytesArray(bytes)) != null;
         }
 
     }
 
-    public CompressedString(byte[] data, int offset, int length) throws IOException {
-        this(new BytesArray(data, offset, length));
+    public CompressedXContent(byte[] data) throws IOException {
+        this(new BytesArray(data));
     }
 
-    public CompressedString(byte[] data) throws IOException {
-        this(data, 0, data.length);
-    }
-
-    public CompressedString(String str) throws IOException {
+    public CompressedXContent(String str) throws IOException {
         this(new BytesArray(new BytesRef(str)));
     }
 
@@ -69,12 +69,15 @@ public final class CompressedString {
         return this.bytes;
     }
 
+    /** Return the compressed bytes as a {@link BytesReference}. */
+    public BytesReference compressedReference() {
+        return new BytesArray(bytes);
+    }
+
     /** Return the uncompressed bytes. */
     public byte[] uncompressed() {
-        Compressor compressor = CompressorFactory.compressor(bytes);
-        assert compressor != null;
         try {
-            return compressor.uncompress(bytes, 0, bytes.length);
+            return CompressorFactory.uncompress(new BytesArray(bytes)).toBytes();
         } catch (IOException e) {
             throw new IllegalStateException("Cannot decompress compressed string", e);
         }
@@ -84,10 +87,10 @@ public final class CompressedString {
         return new BytesRef(uncompressed()).utf8ToString();
     }
 
-    public static CompressedString readCompressedString(StreamInput in) throws IOException {
+    public static CompressedXContent readCompressedString(StreamInput in) throws IOException {
         byte[] bytes = new byte[in.readVInt()];
         in.readBytes(bytes, 0, bytes.length);
-        return new CompressedString(bytes);
+        return new CompressedXContent(bytes);
     }
 
     public void writeTo(StreamOutput out) throws IOException {
@@ -100,7 +103,7 @@ public final class CompressedString {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        CompressedString that = (CompressedString) o;
+        CompressedXContent that = (CompressedXContent) o;
 
         if (Arrays.equals(compressed(), that.compressed())) {
             return true;
diff --git a/src/main/java/org/elasticsearch/common/compress/Compressor.java b/src/main/java/org/elasticsearch/common/compress/Compressor.java
index 8d0199703ac..d8f0ae82bf6 100644
--- a/src/main/java/org/elasticsearch/common/compress/Compressor.java
+++ b/src/main/java/org/elasticsearch/common/compress/Compressor.java
@@ -38,26 +38,18 @@ public interface Compressor {
 
     boolean isCompressed(BytesReference bytes);
 
-    boolean isCompressed(byte[] data, int offset, int length);
-
     boolean isCompressed(ChannelBuffer buffer);
 
+    StreamInput streamInput(StreamInput in) throws IOException;
+
+    StreamOutput streamOutput(StreamOutput out) throws IOException;
+
+    /**
+     * @deprecated Used for backward comp. since we now use Lucene compressed codec.
+     */
+    @Deprecated
     boolean isCompressed(IndexInput in) throws IOException;
 
-    /**
-     * Uncompress the provided data, data can be detected as compressed using {@link #isCompressed(byte[], int, int)}.
-     */
-    byte[] uncompress(byte[] data, int offset, int length) throws IOException;
-
-    /**
-     * Compresses the provided data, data can be detected as compressed using {@link #isCompressed(byte[], int, int)}.
-     */
-    byte[] compress(byte[] data, int offset, int length) throws IOException;
-
-    CompressedStreamInput streamInput(StreamInput in) throws IOException;
-
-    CompressedStreamOutput streamOutput(StreamOutput out) throws IOException;
-
     /**
      * @deprecated Used for backward comp. since we now use Lucene compressed codec.
      */
diff --git a/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java b/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java
index 9eb9c9d7212..9873123e558 100644
--- a/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java
+++ b/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java
@@ -21,9 +21,9 @@ package org.elasticsearch.common.compress;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
+
 import org.apache.lucene.store.IndexInput;
 import org.elasticsearch.common.Nullable;
-import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.collect.MapBuilder;
 import org.elasticsearch.common.compress.lzf.LZFCompressor;
@@ -32,6 +32,8 @@ import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.common.xcontent.XContentType;
 import org.jboss.netty.buffer.ChannelBuffer;
 
 import java.io.IOException;
@@ -92,14 +94,6 @@ public class CompressorFactory {
         return compressor(bytes) != null;
     }
 
-    public static boolean isCompressed(byte[] data) {
-        return compressor(data, 0, data.length) != null;
-    }
-
-    public static boolean isCompressed(byte[] data, int offset, int length) {
-        return compressor(data, offset, length) != null;
-    }
-
     public static boolean isCompressed(IndexInput in) throws IOException {
         return compressor(in) != null;
     }
@@ -108,35 +102,29 @@ public class CompressorFactory {
     public static Compressor compressor(BytesReference bytes) {
         for (Compressor compressor : compressors) {
             if (compressor.isCompressed(bytes)) {
+                // bytes should be either detected as compressed or as xcontent,
+                // if we have bytes that can be either detected as compressed or
+                // as a xcontent, we have a problem
+                assert XContentFactory.xContentType(bytes) == null;
                 return compressor;
             }
         }
-        return null;
-    }
 
-    @Nullable
-    public static Compressor compressor(byte[] data) {
-        return compressor(data, 0, data.length);
-    }
-
-    @Nullable
-    public static Compressor compressor(byte[] data, int offset, int length) {
-        for (Compressor compressor : compressors) {
-            if (compressor.isCompressed(data, offset, length)) {
-                return compressor;
-            }
+        XContentType contentType = XContentFactory.xContentType(bytes);
+        if (contentType == null) {
+            throw new NotXContentException("Compressor detection can only be called on some xcontent bytes or compressed xcontent bytes");
         }
+
         return null;
     }
 
-    @Nullable
     public static Compressor compressor(ChannelBuffer buffer) {
         for (Compressor compressor : compressors) {
             if (compressor.isCompressed(buffer)) {
                 return compressor;
             }
         }
-        return null;
+        throw new NotCompressedException();
     }
 
     @Nullable
@@ -158,16 +146,30 @@ public class CompressorFactory {
      */
     public static BytesReference uncompressIfNeeded(BytesReference bytes) throws IOException {
         Compressor compressor = compressor(bytes);
+        BytesReference uncompressed;
         if (compressor != null) {
-            if (bytes.hasArray()) {
-                return new BytesArray(compressor.uncompress(bytes.array(), bytes.arrayOffset(), bytes.length()));
-            }
-            StreamInput compressed = compressor.streamInput(bytes.streamInput());
-            BytesStreamOutput bStream = new BytesStreamOutput();
-            Streams.copy(compressed, bStream);
-            compressed.close();
-            return bStream.bytes();
+            uncompressed = uncompress(bytes, compressor);
+        } else {
+            uncompressed = bytes;
         }
-        return bytes;
+
+        return uncompressed;
+    }
+
+    /** Decompress the provided {@link BytesReference}. */
+    public static BytesReference uncompress(BytesReference bytes) throws IOException {
+        Compressor compressor = compressor(bytes);
+        if (compressor == null) {
+            throw new IllegalArgumentException("Bytes are not compressed");
+        }
+        return uncompress(bytes, compressor);
+    }
+
+    private static BytesReference uncompress(BytesReference bytes, Compressor compressor) throws IOException {
+        StreamInput compressed = compressor.streamInput(bytes.streamInput());
+        BytesStreamOutput bStream = new BytesStreamOutput();
+        Streams.copy(compressed, bStream);
+        compressed.close();
+        return bStream.bytes();
     }
 }
diff --git a/src/main/java/org/elasticsearch/common/compress/CompressorContext.java b/src/main/java/org/elasticsearch/common/compress/NotCompressedException.java
similarity index 73%
rename from src/main/java/org/elasticsearch/common/compress/CompressorContext.java
rename to src/main/java/org/elasticsearch/common/compress/NotCompressedException.java
index 9ad70554046..653483fc586 100644
--- a/src/main/java/org/elasticsearch/common/compress/CompressorContext.java
+++ b/src/main/java/org/elasticsearch/common/compress/NotCompressedException.java
@@ -19,7 +19,13 @@
 
 package org.elasticsearch.common.compress;
 
-/**
- */
-public interface CompressorContext {
+/** Exception indicating that we were expecting something compressed, which
+ *  was not compressed or corrupted so that the compression format could not
+ *  be detected. */
+public class NotCompressedException extends RuntimeException {
+
+    public NotCompressedException() {
+        super();
+    }
+
 }
diff --git a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressorContext.java b/src/main/java/org/elasticsearch/common/compress/NotXContentException.java
similarity index 69%
rename from src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressorContext.java
rename to src/main/java/org/elasticsearch/common/compress/NotXContentException.java
index 89c7b182c47..bca35c317d8 100644
--- a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressorContext.java
+++ b/src/main/java/org/elasticsearch/common/compress/NotXContentException.java
@@ -17,13 +17,15 @@
  * under the License.
  */
 
-package org.elasticsearch.common.compress.lzf;
+package org.elasticsearch.common.compress;
 
-import org.elasticsearch.common.compress.CompressorContext;
+/** Exception indicating that we were expecting something compressed, which
+ *  was not compressed or corrupted so that the compression format could not
+ *  be detected. */
+public class NotXContentException extends RuntimeException {
 
-/**
- */
-public class LZFCompressorContext implements CompressorContext {
+    public NotXContentException(String message) {
+        super(message);
+    }
 
-    public static final LZFCompressorContext INSTANCE = new LZFCompressorContext();
 }
diff --git a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedIndexInput.java b/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedIndexInput.java
index 326eceb77c4..93bd583662b 100644
--- a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedIndexInput.java
+++ b/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedIndexInput.java
@@ -32,14 +32,14 @@ import java.util.Arrays;
 /**
  */
 @Deprecated
-public class LZFCompressedIndexInput extends CompressedIndexInput<LZFCompressorContext> {
+public class LZFCompressedIndexInput extends CompressedIndexInput {
 
     private final ChunkDecoder decoder;
     // scratch area buffer
     private byte[] inputBuffer;
 
     public LZFCompressedIndexInput(IndexInput in, ChunkDecoder decoder) throws IOException {
-        super(in, LZFCompressorContext.INSTANCE);
+        super(in);
 
         this.decoder = decoder;
         this.uncompressed = new byte[LZFChunk.MAX_CHUNK_LEN];
diff --git a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamInput.java b/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamInput.java
index caaaadbeb3e..baefcaa8928 100644
--- a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamInput.java
+++ b/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamInput.java
@@ -29,7 +29,7 @@ import java.io.IOException;
 
 /**
  */
-public class LZFCompressedStreamInput extends CompressedStreamInput<LZFCompressorContext> {
+public class LZFCompressedStreamInput extends CompressedStreamInput {
 
     private final BufferRecycler recycler;
 
@@ -39,7 +39,7 @@ public class LZFCompressedStreamInput extends CompressedStreamInput<LZFCompresso
     private byte[] inputBuffer;
 
     public LZFCompressedStreamInput(StreamInput in, ChunkDecoder decoder) throws IOException {
-        super(in, LZFCompressorContext.INSTANCE);
+        super(in);
         this.recycler = BufferRecycler.instance();
         this.decoder = decoder;
 
diff --git a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java b/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java
index 36caadbeefe..3faeb496e0b 100644
--- a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java
+++ b/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java
@@ -28,13 +28,13 @@ import org.elasticsearch.common.io.stream.StreamOutput;
 
 import java.io.IOException;
 
-public class LZFCompressedStreamOutput extends CompressedStreamOutput<LZFCompressorContext> {
+public class LZFCompressedStreamOutput extends CompressedStreamOutput {
 
     private final BufferRecycler recycler;
     private final ChunkEncoder encoder;
 
     public LZFCompressedStreamOutput(StreamOutput out) throws IOException {
-        super(out, LZFCompressorContext.INSTANCE);
+        super(out);
         this.recycler = BufferRecycler.instance();
         this.uncompressed = this.recycler.allocOutputBuffer(LZFChunk.MAX_CHUNK_LEN);
         this.uncompressedLength = LZFChunk.MAX_CHUNK_LEN;
diff --git a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressor.java b/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressor.java
index 57771a1e3a8..c5c937ccbb9 100644
--- a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressor.java
+++ b/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressor.java
@@ -21,7 +21,6 @@ package org.elasticsearch.common.compress.lzf;
 
 import com.ning.compress.lzf.ChunkDecoder;
 import com.ning.compress.lzf.LZFChunk;
-import com.ning.compress.lzf.LZFEncoder;
 import com.ning.compress.lzf.util.ChunkDecoderFactory;
 import org.apache.lucene.store.IndexInput;
 import org.elasticsearch.common.bytes.BytesReference;
@@ -69,14 +68,6 @@ public class LZFCompressor implements Compressor {
                 (bytes.get(2) == LZFChunk.BLOCK_TYPE_COMPRESSED || bytes.get(2) == LZFChunk.BLOCK_TYPE_NON_COMPRESSED);
     }
 
-    @Override
-    public boolean isCompressed(byte[] data, int offset, int length) {
-        return length >= 3 &&
-                data[offset] == LZFChunk.BYTE_Z &&
-                data[offset + 1] == LZFChunk.BYTE_V &&
-                (data[offset + 2] == LZFChunk.BLOCK_TYPE_COMPRESSED || data[offset + 2] == LZFChunk.BLOCK_TYPE_NON_COMPRESSED);
-    }
-
     @Override
     public boolean isCompressed(ChannelBuffer buffer) {
         int offset = buffer.readerIndex();
@@ -103,16 +94,6 @@ public class LZFCompressor implements Compressor {
         return true;
     }
 
-    @Override
-    public byte[] uncompress(byte[] data, int offset, int length) throws IOException {
-        return decoder.decode(data, offset, length);
-    }
-
-    @Override
-    public byte[] compress(byte[] data, int offset, int length) throws IOException {
-        return LZFEncoder.safeEncode(data, offset, length);
-    }
-
     @Override
     public CompressedStreamInput streamInput(StreamInput in) throws IOException {
         return new LZFCompressedStreamInput(in, decoder);
diff --git a/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java b/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java
index ffe8d297ba4..e9aa52cf4d0 100644
--- a/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java
+++ b/src/main/java/org/elasticsearch/common/io/stream/InputStreamStreamInput.java
@@ -59,6 +59,16 @@ public class InputStreamStreamInput extends StreamInput {
         is.reset();
     }
 
+    @Override
+    public boolean markSupported() {
+        return is.markSupported();
+    }
+
+    @Override
+    public void mark(int readlimit) {
+        is.mark(readlimit);
+    }
+
     @Override
     public void close() throws IOException {
         is.close();
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java b/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java
index 9ae1a03a67d..75e57509948 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/XContentFactory.java
@@ -21,6 +21,7 @@ package org.elasticsearch.common.xcontent;
 
 import com.fasterxml.jackson.dataformat.cbor.CBORConstants;
 import com.fasterxml.jackson.dataformat.smile.SmileConstants;
+
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
@@ -163,6 +164,9 @@ public class XContentFactory {
             if (c == '{') {
                 return XContentType.JSON;
             }
+            if (Character.isWhitespace(c) == false) {
+                break;
+            }
         }
         return null;
     }
@@ -204,65 +208,76 @@ public class XContentFactory {
     }
 
     /**
-     * Guesses the content type based on the provided input stream.
+     * Guesses the content type based on the provided input stream without consuming it.
      */
     public static XContentType xContentType(InputStream si) throws IOException {
-        final int firstInt = si.read(); // this must be an int since we need to respect the method contract
-        if (firstInt == -1) {
-            return null;
+        if (si.markSupported() == false) {
+            throw new IllegalArgumentException("Cannot guess the xcontent type without mark/reset support on " + si.getClass());
         }
-
-        final int secondInt = si.read(); // this must be an int since we need to respect the method contract
-        if (secondInt == -1) {
-           return null;
-        }
-        final byte first = (byte) (0xff & firstInt);
-        final byte second = (byte) (0xff & secondInt);
-        if (first == SmileConstants.HEADER_BYTE_1 && second == SmileConstants.HEADER_BYTE_2) {
-            int third = si.read();
-            if (third == SmileConstants.HEADER_BYTE_3) {
-                return XContentType.SMILE;
-            }
-        }
-        if (first == '{' || second == '{') {
-            return XContentType.JSON;
-        }
-        if (first == '-' && second == '-') {
-            int third = si.read();
-            if (third == '-') {
-                return XContentType.YAML;
-            }
-        }
-        // CBOR logic similar to CBORFactory#hasCBORFormat
-        if (first == CBORConstants.BYTE_OBJECT_INDEFINITE){
-            return XContentType.CBOR;
-        }
-        if (CBORConstants.hasMajorType(CBORConstants.MAJOR_TYPE_TAG, first)) {
-            // Actually, specific "self-describe tag" is a very good indicator
-            int third = si.read();
-            if (third == -1) {
+        si.mark(GUESS_HEADER_LENGTH);
+        try {
+            final int firstInt = si.read(); // this must be an int since we need to respect the method contract
+            if (firstInt == -1) {
                 return null;
             }
-            if (first == (byte) 0xD9 && second == (byte) 0xD9 && third == (byte) 0xF7) {
-                return XContentType.CBOR;
-            }
-        }
-        // for small objects, some encoders just encode as major type object, we can safely
-        // say its CBOR since it doesn't contradict SMILE or JSON, and its a last resort
-        if (CBORConstants.hasMajorType(CBORConstants.MAJOR_TYPE_OBJECT, first)) {
-            return XContentType.CBOR;
-        }
 
-        for (int i = 2; i < GUESS_HEADER_LENGTH; i++) {
-            int val = si.read();
-            if (val == -1) {
-                return null;
+            final int secondInt = si.read(); // this must be an int since we need to respect the method contract
+            if (secondInt == -1) {
+               return null;
             }
-            if (val == '{') {
+            final byte first = (byte) (0xff & firstInt);
+            final byte second = (byte) (0xff & secondInt);
+            if (first == SmileConstants.HEADER_BYTE_1 && second == SmileConstants.HEADER_BYTE_2) {
+                int third = si.read();
+                if (third == SmileConstants.HEADER_BYTE_3) {
+                    return XContentType.SMILE;
+                }
+            }
+            if (first == '{' || second == '{') {
                 return XContentType.JSON;
             }
+            if (first == '-' && second == '-') {
+                int third = si.read();
+                if (third == '-') {
+                    return XContentType.YAML;
+                }
+            }
+            // CBOR logic similar to CBORFactory#hasCBORFormat
+            if (first == CBORConstants.BYTE_OBJECT_INDEFINITE){
+                return XContentType.CBOR;
+            }
+            if (CBORConstants.hasMajorType(CBORConstants.MAJOR_TYPE_TAG, first)) {
+                // Actually, specific "self-describe tag" is a very good indicator
+                int third = si.read();
+                if (third == -1) {
+                    return null;
+                }
+                if (first == (byte) 0xD9 && second == (byte) 0xD9 && third == (byte) 0xF7) {
+                    return XContentType.CBOR;
+                }
+            }
+            // for small objects, some encoders just encode as major type object, we can safely
+            // say its CBOR since it doesn't contradict SMILE or JSON, and its a last resort
+            if (CBORConstants.hasMajorType(CBORConstants.MAJOR_TYPE_OBJECT, first)) {
+                return XContentType.CBOR;
+            }
+
+            for (int i = 2; i < GUESS_HEADER_LENGTH; i++) {
+                int val = si.read();
+                if (val == -1) {
+                    return null;
+                }
+                if (val == '{') {
+                    return XContentType.JSON;
+                }
+                if (Character.isWhitespace(val) == false) {
+                    break;
+                }
+            }
+            return null;
+        } finally {
+            si.reset();
         }
-        return null;
     }
 
     /**
@@ -284,7 +299,7 @@ public class XContentFactory {
      * Guesses the content type based on the provided bytes.
      */
     public static XContentType xContentType(BytesReference bytes) {
-        int length = bytes.length() < GUESS_HEADER_LENGTH ? bytes.length() : GUESS_HEADER_LENGTH;
+        int length = bytes.length();
         if (length == 0) {
             return null;
         }
@@ -316,9 +331,13 @@ public class XContentFactory {
 
         // a last chance for JSON
         for (int i = 0; i < length; i++) {
-            if (bytes.get(i) == '{') {
+            byte b = bytes.get(i);
+            if (b == '{') {
                 return XContentType.JSON;
             }
+            if (Character.isWhitespace(b) == false) {
+                break;
+            }
         }
         return null;
     }
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java b/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java
index d196d459fbd..5325950e202 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java
@@ -28,14 +28,14 @@ import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.collect.Tuple;
-import org.elasticsearch.common.compress.CompressedStreamInput;
 import org.elasticsearch.common.compress.Compressor;
 import org.elasticsearch.common.compress.CompressorFactory;
 import org.elasticsearch.common.io.Streams;
-import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.xcontent.ToXContent.Params;
 
+import java.io.BufferedInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -49,45 +49,30 @@ import static org.elasticsearch.common.xcontent.ToXContent.EMPTY_PARAMS;
 public class XContentHelper {
 
     public static XContentParser createParser(BytesReference bytes) throws IOException {
-        if (bytes.hasArray()) {
-            return createParser(bytes.array(), bytes.arrayOffset(), bytes.length());
-        }
         Compressor compressor = CompressorFactory.compressor(bytes);
         if (compressor != null) {
-            CompressedStreamInput compressedInput = compressor.streamInput(bytes.streamInput());
+            InputStream compressedInput = compressor.streamInput(bytes.streamInput());
+            if (compressedInput.markSupported() == false) {
+                compressedInput = new BufferedInputStream(compressedInput);
+            }
             XContentType contentType = XContentFactory.xContentType(compressedInput);
-            compressedInput.resetToBufferStart();
             return XContentFactory.xContent(contentType).createParser(compressedInput);
         } else {
             return XContentFactory.xContent(bytes).createParser(bytes.streamInput());
         }
     }
 
-
-    public static XContentParser createParser(byte[] data, int offset, int length) throws IOException {
-        Compressor compressor = CompressorFactory.compressor(data, offset, length);
-        if (compressor != null) {
-            CompressedStreamInput compressedInput = compressor.streamInput(StreamInput.wrap(data, offset, length));
-            XContentType contentType = XContentFactory.xContentType(compressedInput);
-            compressedInput.resetToBufferStart();
-            return XContentFactory.xContent(contentType).createParser(compressedInput);
-        } else {
-            return XContentFactory.xContent(data, offset, length).createParser(data, offset, length);
-        }
-    }
-
     public static Tuple<XContentType, Map<String, Object>> convertToMap(BytesReference bytes, boolean ordered) throws ElasticsearchParseException {
-        if (bytes.hasArray()) {
-            return convertToMap(bytes.array(), bytes.arrayOffset(), bytes.length(), ordered);
-        }
         try {
             XContentParser parser;
             XContentType contentType;
             Compressor compressor = CompressorFactory.compressor(bytes);
             if (compressor != null) {
-                CompressedStreamInput compressedStreamInput = compressor.streamInput(bytes.streamInput());
+                InputStream compressedStreamInput = compressor.streamInput(bytes.streamInput());
+                if (compressedStreamInput.markSupported() == false) {
+                    compressedStreamInput = new BufferedInputStream(compressedStreamInput);
+                }
                 contentType = XContentFactory.xContentType(compressedStreamInput);
-                compressedStreamInput.resetToBufferStart();
                 parser = XContentFactory.xContent(contentType).createParser(compressedStreamInput);
             } else {
                 contentType = XContentFactory.xContentType(bytes);
@@ -103,34 +88,6 @@ public class XContentHelper {
         }
     }
 
-    public static Tuple<XContentType, Map<String, Object>> convertToMap(byte[] data, boolean ordered) throws ElasticsearchParseException {
-        return convertToMap(data, 0, data.length, ordered);
-    }
-
-    public static Tuple<XContentType, Map<String, Object>> convertToMap(byte[] data, int offset, int length, boolean ordered) throws ElasticsearchParseException {
-        try {
-            XContentParser parser;
-            XContentType contentType;
-            Compressor compressor = CompressorFactory.compressor(data, offset, length);
-            if (compressor != null) {
-                CompressedStreamInput compressedStreamInput = compressor.streamInput(StreamInput.wrap(data, offset, length));
-                contentType = XContentFactory.xContentType(compressedStreamInput);
-                compressedStreamInput.resetToBufferStart();
-                parser = XContentFactory.xContent(contentType).createParser(compressedStreamInput);
-            } else {
-                contentType = XContentFactory.xContentType(data, offset, length);
-                parser = XContentFactory.xContent(contentType).createParser(data, offset, length);
-            }
-            if (ordered) {
-                return Tuple.tuple(contentType, parser.mapOrderedAndClose());
-            } else {
-                return Tuple.tuple(contentType, parser.mapAndClose());
-            }
-        } catch (IOException e) {
-            throw new ElasticsearchParseException("Failed to parse content to map", e);
-        }
-    }
-
     public static String convertToJson(BytesReference bytes, boolean reformatJson) throws IOException {
         return convertToJson(bytes, reformatJson, false);
     }
@@ -426,9 +383,11 @@ public class XContentHelper {
     public static void writeDirect(BytesReference source, XContentBuilder rawBuilder, ToXContent.Params params) throws IOException {
         Compressor compressor = CompressorFactory.compressor(source);
         if (compressor != null) {
-            CompressedStreamInput compressedStreamInput = compressor.streamInput(source.streamInput());
+            InputStream compressedStreamInput = compressor.streamInput(source.streamInput());
+            if (compressedStreamInput.markSupported() == false) {
+                compressedStreamInput = new BufferedInputStream(compressedStreamInput);
+            }
             XContentType contentType = XContentFactory.xContentType(compressedStreamInput);
-            compressedStreamInput.resetToBufferStart();
             if (contentType == rawBuilder.contentType()) {
                 Streams.copy(compressedStreamInput, rawBuilder.stream());
             } else {
@@ -457,9 +416,11 @@ public class XContentHelper {
     public static void writeRawField(String field, BytesReference source, XContentBuilder builder, ToXContent.Params params) throws IOException {
         Compressor compressor = CompressorFactory.compressor(source);
         if (compressor != null) {
-            CompressedStreamInput compressedStreamInput = compressor.streamInput(source.streamInput());
+            InputStream compressedStreamInput = compressor.streamInput(source.streamInput());
             XContentType contentType = XContentFactory.xContentType(compressedStreamInput);
-            compressedStreamInput.resetToBufferStart();
+            if (compressedStreamInput.markSupported() == false) {
+                compressedStreamInput = new BufferedInputStream(compressedStreamInput);
+            }
             if (contentType == builder.contentType()) {
                 builder.rawField(field, compressedStreamInput);
             } else {
diff --git a/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java b/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java
index 9d88d84f64a..9ea7cf5e60b 100644
--- a/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java
+++ b/src/main/java/org/elasticsearch/gateway/MetaDataStateFormat.java
@@ -21,16 +21,26 @@ package org.elasticsearch.gateway;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
+
 import org.apache.lucene.codecs.CodecUtil;
 import org.apache.lucene.index.CorruptIndexException;
 import org.apache.lucene.index.IndexFormatTooNewException;
 import org.apache.lucene.index.IndexFormatTooOldException;
-import org.apache.lucene.store.*;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.IOContext;
+import org.apache.lucene.store.IndexInput;
+import org.apache.lucene.store.OutputStreamIndexOutput;
+import org.apache.lucene.store.SimpleFSDirectory;
 import org.apache.lucene.util.IOUtils;
 import org.elasticsearch.ExceptionsHelper;
+import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.lucene.store.InputStreamIndexInput;
-import org.elasticsearch.common.xcontent.*;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.common.xcontent.XContentType;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -280,7 +290,7 @@ public abstract class MetaDataStateFormat<T> {
                         logger.debug("{}: no data for [{}], ignoring...", prefix, stateFile.toAbsolutePath());
                         continue;
                     }
-                    parser = XContentHelper.createParser(data, 0, data.length);
+                    parser = XContentHelper.createParser(new BytesArray(data));
                     state = fromXContent(parser);
                     if (state == null) {
                         logger.debug("{}: no data for [{}], ignoring...", prefix, stateFile.toAbsolutePath());
diff --git a/src/main/java/org/elasticsearch/index/aliases/IndexAlias.java b/src/main/java/org/elasticsearch/index/aliases/IndexAlias.java
index 3d02731dbfa..48ebc4239ac 100644
--- a/src/main/java/org/elasticsearch/index/aliases/IndexAlias.java
+++ b/src/main/java/org/elasticsearch/index/aliases/IndexAlias.java
@@ -21,7 +21,7 @@ package org.elasticsearch.index.aliases;
 
 import org.apache.lucene.search.Query;
 import org.elasticsearch.common.Nullable;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 
 /**
  *
@@ -30,11 +30,11 @@ public class IndexAlias {
 
     private final String alias;
 
-    private final CompressedString filter;
+    private final CompressedXContent filter;
 
     private final Query parsedFilter;
 
-    public IndexAlias(String alias, @Nullable CompressedString filter, @Nullable Query parsedFilter) {
+    public IndexAlias(String alias, @Nullable CompressedXContent filter, @Nullable Query parsedFilter) {
         this.alias = alias;
         this.filter = filter;
         this.parsedFilter = parsedFilter;
@@ -45,7 +45,7 @@ public class IndexAlias {
     }
 
     @Nullable
-    public CompressedString filter() {
+    public CompressedXContent filter() {
         return filter;
     }
 
diff --git a/src/main/java/org/elasticsearch/index/aliases/IndexAliasesService.java b/src/main/java/org/elasticsearch/index/aliases/IndexAliasesService.java
index a097a01675b..21d6582e03f 100644
--- a/src/main/java/org/elasticsearch/index/aliases/IndexAliasesService.java
+++ b/src/main/java/org/elasticsearch/index/aliases/IndexAliasesService.java
@@ -23,7 +23,7 @@ import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.Query;
 import org.elasticsearch.common.Nullable;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
@@ -63,11 +63,11 @@ public class IndexAliasesService extends AbstractIndexComponent implements Itera
         return aliases.get(alias);
     }
 
-    public IndexAlias create(String alias, @Nullable CompressedString filter) {
+    public IndexAlias create(String alias, @Nullable CompressedXContent filter) {
         return new IndexAlias(alias, filter, parse(alias, filter));
     }
 
-    public void add(String alias, @Nullable CompressedString filter) {
+    public void add(String alias, @Nullable CompressedXContent filter) {
         add(new IndexAlias(alias, filter, parse(alias, filter)));
     }
 
@@ -120,7 +120,7 @@ public class IndexAliasesService extends AbstractIndexComponent implements Itera
         aliases.remove(alias);
     }
 
-    private Query parse(String alias, CompressedString filter) {
+    private Query parse(String alias, CompressedXContent filter) {
         if (filter == null) {
             return null;
         }
diff --git a/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java b/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
index 45da4be320b..2c4bd053251 100644
--- a/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
@@ -35,7 +35,7 @@ import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.collect.MapBuilder;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.compress.CompressorFactory;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.settings.Settings;
@@ -150,7 +150,7 @@ public class DocumentMapper implements ToXContent {
     private final String type;
     private final StringAndBytesText typeText;
 
-    private volatile CompressedString mappingSource;
+    private volatile CompressedXContent mappingSource;
 
     private final Mapping mapping;
 
@@ -235,7 +235,7 @@ public class DocumentMapper implements ToXContent {
         return mapping.meta;
     }
 
-    public CompressedString mappingSource() {
+    public CompressedXContent mappingSource() {
         return this.mappingSource;
     }
 
@@ -473,7 +473,7 @@ public class DocumentMapper implements ToXContent {
             toXContent(builder, ToXContent.EMPTY_PARAMS);
             builder.endObject();
             builder.close();
-            mappingSource = new CompressedString(bStream.bytes());
+            mappingSource = new CompressedXContent(bStream.bytes());
         } catch (Exception e) {
             throw new ElasticsearchGenerationException("failed to serialize source for type [" + type + "]", e);
         }
diff --git a/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java b/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java
index 9084e17d60b..4bb9e8d830e 100644
--- a/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java
+++ b/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java
@@ -27,7 +27,7 @@ import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.collect.MapBuilder;
 import org.elasticsearch.common.collect.Tuple;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.geo.ShapesAvailability;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
@@ -194,15 +194,15 @@ public class DocumentMapperParser extends AbstractIndexComponent {
         return parse(type, mapping, defaultSource);
     }
 
-    public DocumentMapper parseCompressed(@Nullable String type, CompressedString source) throws MapperParsingException {
+    public DocumentMapper parseCompressed(@Nullable String type, CompressedXContent source) throws MapperParsingException {
         return parseCompressed(type, source, null);
     }
 
     @SuppressWarnings({"unchecked"})
-    public DocumentMapper parseCompressed(@Nullable String type, CompressedString source, String defaultSource) throws MapperParsingException {
+    public DocumentMapper parseCompressed(@Nullable String type, CompressedXContent source, String defaultSource) throws MapperParsingException {
         Map<String, Object> mapping = null;
         if (source != null) {
-            Map<String, Object> root = XContentHelper.convertToMap(source.compressed(), true).v2();
+            Map<String, Object> root = XContentHelper.convertToMap(source.compressedReference(), true).v2();
             Tuple<String, Map<String, Object>> t = extractMapping(type, root);
             type = t.v1();
             mapping = t.v2();
diff --git a/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/src/main/java/org/elasticsearch/index/mapper/MapperService.java
index b63df2d6cc4..8847550c6c9 100755
--- a/src/main/java/org/elasticsearch/index/mapper/MapperService.java
+++ b/src/main/java/org/elasticsearch/index/mapper/MapperService.java
@@ -43,7 +43,7 @@ import org.elasticsearch.cluster.metadata.MetaData;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.collect.ImmutableOpenMap;
 import org.elasticsearch.common.collect.Tuple;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.lucene.search.Queries;
 import org.elasticsearch.common.regex.Regex;
@@ -214,7 +214,7 @@ public class MapperService extends AbstractIndexComponent  {
         typeListeners.remove(listener);
     }
 
-    public DocumentMapper merge(String type, CompressedString mappingSource, boolean applyDefault) {
+    public DocumentMapper merge(String type, CompressedXContent mappingSource, boolean applyDefault) {
         if (DEFAULT_MAPPING.equals(type)) {
             // verify we can parse it
             DocumentMapper mapper = documentParser.parseCompressed(type, mappingSource);
@@ -293,7 +293,7 @@ public class MapperService extends AbstractIndexComponent  {
 
     private boolean assertSerialization(DocumentMapper mapper) {
         // capture the source now, it may change due to concurrent parsing
-        final CompressedString mappingSource = mapper.mappingSource();
+        final CompressedXContent mappingSource = mapper.mappingSource();
         DocumentMapper newMapper = parse(mapper.type(), mappingSource, false);
 
         if (newMapper.mappingSource().equals(mappingSource) == false) {
@@ -328,7 +328,7 @@ public class MapperService extends AbstractIndexComponent  {
         this.fieldMappers = this.fieldMappers.copyAndAddAll(fieldMappers);
     }
 
-    public DocumentMapper parse(String mappingType, CompressedString mappingSource, boolean applyDefault) throws MapperParsingException {
+    public DocumentMapper parse(String mappingType, CompressedXContent mappingSource, boolean applyDefault) throws MapperParsingException {
         String defaultMappingSource;
         if (PercolatorService.TYPE_NAME.equals(mappingType)) {
             defaultMappingSource = this.defaultPercolatorMappingSource;
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java
index 9972ca45cbd..91375efed47 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java
@@ -36,6 +36,9 @@ import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.compress.CompressorFactory;
+import org.elasticsearch.common.compress.NotXContentException;
+import org.elasticsearch.common.io.stream.BytesStreamOutput;
+import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.common.xcontent.XContentParser;
@@ -144,10 +147,16 @@ public class BinaryFieldMapper extends AbstractFieldMapper {
         }
         try {
             if (indexCreatedBefore2x) {
-                return CompressorFactory.uncompressIfNeeded(bytes);
-            } else {
-                return bytes;
+                try {
+                    return CompressorFactory.uncompressIfNeeded(bytes);
+                } catch (NotXContentException e) {
+                    // This is a BUG! We try to decompress by detecting a header in
+                    // the stored bytes but since we accept arbitrary bytes, we have
+                    // no guarantee that uncompressed bytes will be detected as
+                    // compressed!
+                }
             }
+            return bytes;
         } catch (IOException e) {
             throw new ElasticsearchParseException("failed to decompress source", e);
         }
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java
index 7c8ae58d5fd..d5d745f263f 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java
@@ -20,6 +20,7 @@
 package org.elasticsearch.index.mapper.internal;
 
 import com.google.common.base.Objects;
+
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldType;
 import org.apache.lucene.document.StoredField;
@@ -31,7 +32,6 @@ import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.collect.Tuple;
-import org.elasticsearch.common.compress.CompressedStreamInput;
 import org.elasticsearch.common.compress.Compressor;
 import org.elasticsearch.common.compress.CompressorFactory;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
@@ -53,7 +53,9 @@ import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.mapper.RootMapper;
 import org.elasticsearch.index.mapper.core.AbstractFieldMapper;
 
+import java.io.BufferedInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
@@ -324,9 +326,11 @@ public class SourceFieldMapper extends AbstractFieldMapper implements RootMapper
             // see if we need to convert the content type
             Compressor compressor = CompressorFactory.compressor(source);
             if (compressor != null) {
-                CompressedStreamInput compressedStreamInput = compressor.streamInput(source.streamInput());
+                InputStream compressedStreamInput = compressor.streamInput(source.streamInput());
+                if (compressedStreamInput.markSupported() == false) {
+                    compressedStreamInput = new BufferedInputStream(compressedStreamInput);
+                }
                 XContentType contentType = XContentFactory.xContentType(compressedStreamInput);
-                compressedStreamInput.resetToBufferStart();
                 if (contentType != formatContentType) {
                     // we need to reread and store back, compressed....
                     BytesStreamOutput bStream = new BytesStreamOutput();
diff --git a/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java b/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
index 77832bb052d..6995ecae587 100644
--- a/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
+++ b/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
@@ -41,7 +41,7 @@ import org.elasticsearch.cluster.routing.*;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
@@ -369,7 +369,7 @@ public class IndicesClusterStateService extends AbstractLifecycleComponent<Indic
                 for (ObjectCursor<MappingMetaData> cursor : indexMetaData.mappings().values()) {
                     MappingMetaData mappingMd = cursor.value;
                     String mappingType = mappingMd.type();
-                    CompressedString mappingSource = mappingMd.source();
+                    CompressedXContent mappingSource = mappingMd.source();
                     if (mappingType.equals(MapperService.DEFAULT_MAPPING)) { // we processed _default_ first
                         continue;
                     }
@@ -396,7 +396,7 @@ public class IndicesClusterStateService extends AbstractLifecycleComponent<Indic
         }
     }
 
-    private boolean processMapping(String index, MapperService mapperService, String mappingType, CompressedString mappingSource) throws Throwable {
+    private boolean processMapping(String index, MapperService mapperService, String mappingType, CompressedXContent mappingSource) throws Throwable {
         if (!seenMappings.containsKey(new Tuple<>(index, mappingType))) {
             seenMappings.put(new Tuple<>(index, mappingType), true);
         }
@@ -484,7 +484,7 @@ public class IndicesClusterStateService extends AbstractLifecycleComponent<Indic
         for (ObjectCursor<AliasMetaData> cursor : aliases) {
             AliasMetaData aliasMd = cursor.value;
             String alias = aliasMd.alias();
-            CompressedString filter = aliasMd.filter();
+            CompressedXContent filter = aliasMd.filter();
             try {
                 if (!indexAliasesService.hasAlias(alias)) {
                     if (logger.isDebugEnabled()) {
diff --git a/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java b/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
index 180f6595521..83baf8d1e2d 100644
--- a/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
+++ b/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
@@ -24,8 +24,8 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.google.common.io.ByteStreams;
+
 import org.apache.lucene.store.RateLimiter;
-import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.metadata.MetaData;
@@ -35,6 +35,7 @@ import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.blobstore.BlobMetaData;
 import org.elasticsearch.common.blobstore.BlobPath;
 import org.elasticsearch.common.blobstore.BlobStore;
+import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.common.compress.CompressorFactory;
@@ -407,7 +408,7 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent<Rep
             BlobContainer indexMetaDataBlobContainer = blobStore().blobContainer(indexPath);
             try (InputStream blob = indexMetaDataBlobContainer.openInput(snapshotBlobName(snapshotId))) {
                 byte[] data = ByteStreams.toByteArray(blob);
-                try (XContentParser parser = XContentHelper.createParser(data, 0, data.length)) {
+                try (XContentParser parser = XContentHelper.createParser(new BytesArray(data))) {
                     XContentParser.Token token;
                     if ((token = parser.nextToken()) == XContentParser.Token.START_OBJECT) {
                         IndexMetaData indexMetaData = IndexMetaData.Builder.fromXContent(parser);
@@ -459,7 +460,7 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent<Rep
      * @throws IOException parse exceptions
      */
     public Snapshot readSnapshot(byte[] data) throws IOException {
-        try (XContentParser parser = XContentHelper.createParser(data, 0, data.length)) {
+        try (XContentParser parser = XContentHelper.createParser(new BytesArray(data))) {
             XContentParser.Token token;
             if ((token = parser.nextToken()) == XContentParser.Token.START_OBJECT) {
                 if ((token = parser.nextToken()) == XContentParser.Token.FIELD_NAME) {
@@ -484,7 +485,7 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent<Rep
      * @throws IOException parse exceptions
      */
     private MetaData readMetaData(byte[] data) throws IOException {
-        try (XContentParser parser = XContentHelper.createParser(data, 0, data.length)) {
+        try (XContentParser parser = XContentHelper.createParser(new BytesArray(data))) {
             XContentParser.Token token;
             if ((token = parser.nextToken()) == XContentParser.Token.START_OBJECT) {
                 if ((token = parser.nextToken()) == XContentParser.Token.FIELD_NAME) {
@@ -608,7 +609,7 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent<Rep
         try (InputStream blob = snapshotsBlobContainer.openInput(SNAPSHOTS_FILE)) {
             final byte[] data = ByteStreams.toByteArray(blob);
             ArrayList<SnapshotId> snapshots = new ArrayList<>();
-            try (XContentParser parser = XContentHelper.createParser(data, 0, data.length)) {
+            try (XContentParser parser = XContentHelper.createParser(new BytesArray(data))) {
                 if (parser.nextToken() == XContentParser.Token.START_OBJECT) {
                     if (parser.nextToken() == XContentParser.Token.FIELD_NAME) {
                         String currentFieldName = parser.currentName();
diff --git a/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java b/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java
index ee7018d397e..7c3a2aa4e2d 100644
--- a/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java
+++ b/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java
@@ -91,14 +91,6 @@ public class SourceLookup implements Map {
         return sourceAsMapAndType(source).v2();
     }
 
-    public static Tuple<XContentType, Map<String, Object>> sourceAsMapAndType(byte[] bytes, int offset, int length) throws ElasticsearchParseException {
-        return XContentHelper.convertToMap(bytes, offset, length, false);
-    }
-
-    public static Map<String, Object> sourceAsMap(byte[] bytes, int offset, int length) throws ElasticsearchParseException {
-        return sourceAsMapAndType(bytes, offset, length).v2();
-    }
-
     public void setSegmentAndDocument(LeafReaderContext context, int docId) {
         if (this.reader == context.reader() && this.docId == docId) {
             // if we are called with the same document, don't invalidate source
diff --git a/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java b/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java
index b0689df6f2c..aa2d69dac6b 100644
--- a/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java
+++ b/src/main/java/org/elasticsearch/transport/netty/MessageChannelHandler.java
@@ -23,6 +23,7 @@ import org.elasticsearch.Version;
 import org.elasticsearch.common.component.Lifecycle;
 import org.elasticsearch.common.compress.Compressor;
 import org.elasticsearch.common.compress.CompressorFactory;
+import org.elasticsearch.common.compress.NotCompressedException;
 import org.elasticsearch.common.io.ThrowableObjectInputStream;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.logging.ESLogger;
@@ -91,8 +92,10 @@ public class MessageChannelHandler extends SimpleChannelUpstreamHandler {
 
         StreamInput wrappedStream;
         if (TransportStatus.isCompress(status) && hasMessageBytesToRead && buffer.readable()) {
-            Compressor compressor = CompressorFactory.compressor(buffer);
-            if (compressor == null) {
+            Compressor compressor;
+            try {
+                compressor = CompressorFactory.compressor(buffer);
+            } catch (NotCompressedException ex) {
                 int maxToRead = Math.min(buffer.readableBytes(), 10);
                 int offset = buffer.readerIndex();
                 StringBuilder sb = new StringBuilder("stream marked as compressed, but no compressor found, first [").append(maxToRead).append("] content bytes out of [").append(buffer.readableBytes()).append("] readable bytes with message size [").append(size).append("] ").append("] are [");
diff --git a/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java b/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java
index 230889699a4..18ebbc8c430 100644
--- a/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java
+++ b/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.cluster.metadata;
 
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.internal.TimestampFieldMapper;
@@ -34,7 +34,7 @@ public class MappingMetaDataParserTests extends ElasticsearchTestCase {
 
     @Test
     public void testParseIdAlone() throws Exception {
-        MappingMetaData md = new MappingMetaData("type1", new CompressedString(""),
+        MappingMetaData md = new MappingMetaData("type1", new CompressedXContent("{}"),
                 new MappingMetaData.Id("id"),
                 new MappingMetaData.Routing(true, "routing"),
                 new MappingMetaData.Timestamp(true, "timestamp", "dateOptionalTime", TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP, null), false);
@@ -52,7 +52,7 @@ public class MappingMetaDataParserTests extends ElasticsearchTestCase {
     
     @Test
     public void testFailIfIdIsNoValue() throws Exception {
-        MappingMetaData md = new MappingMetaData("type1", new CompressedString(""),
+        MappingMetaData md = new MappingMetaData("type1", new CompressedXContent("{}"),
                 new MappingMetaData.Id("id"),
                 new MappingMetaData.Routing(true, "routing"),
                 new MappingMetaData.Timestamp(true, "timestamp", "dateOptionalTime", TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP, null), false);
@@ -79,7 +79,7 @@ public class MappingMetaDataParserTests extends ElasticsearchTestCase {
 
     @Test
     public void testParseRoutingAlone() throws Exception {
-        MappingMetaData md = new MappingMetaData("type1", new CompressedString(""),
+        MappingMetaData md = new MappingMetaData("type1", new CompressedXContent("{}"),
                 new MappingMetaData.Id("id"),
                 new MappingMetaData.Routing(true, "routing"),
                 new MappingMetaData.Timestamp(true, "timestamp", "dateOptionalTime", TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP, null), false);
@@ -97,7 +97,7 @@ public class MappingMetaDataParserTests extends ElasticsearchTestCase {
 
     @Test
     public void testParseTimestampAlone() throws Exception {
-        MappingMetaData md = new MappingMetaData("type1", new CompressedString(""),
+        MappingMetaData md = new MappingMetaData("type1", new CompressedXContent("{}"),
                 new MappingMetaData.Id("id"),
                 new MappingMetaData.Routing(true, "routing"),
                 new MappingMetaData.Timestamp(true, "timestamp", "dateOptionalTime", TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP, null), false);
@@ -115,11 +115,11 @@ public class MappingMetaDataParserTests extends ElasticsearchTestCase {
 
     @Test
     public void testParseTimestampEquals() throws Exception {
-        MappingMetaData md1 = new MappingMetaData("type1", new CompressedString(""),
+        MappingMetaData md1 = new MappingMetaData("type1", new CompressedXContent("{}"),
                 new MappingMetaData.Id("id"),
                 new MappingMetaData.Routing(true, "routing"),
                 new MappingMetaData.Timestamp(true, "timestamp", "dateOptionalTime", TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP, null), false);
-        MappingMetaData md2 = new MappingMetaData("type1", new CompressedString(""),
+        MappingMetaData md2 = new MappingMetaData("type1", new CompressedXContent("{}"),
                 new MappingMetaData.Id("id"),
                 new MappingMetaData.Routing(true, "routing"),
                 new MappingMetaData.Timestamp(true, "timestamp", "dateOptionalTime", TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP, null), false);
@@ -128,7 +128,7 @@ public class MappingMetaDataParserTests extends ElasticsearchTestCase {
 
     @Test
     public void testParseIdAndRoutingAndTimestamp() throws Exception {
-        MappingMetaData md = new MappingMetaData("type1", new CompressedString(""),
+        MappingMetaData md = new MappingMetaData("type1", new CompressedXContent("{}"),
                 new MappingMetaData.Id("id"),
                 new MappingMetaData.Routing(true, "routing"),
                 new MappingMetaData.Timestamp(true, "timestamp", "dateOptionalTime", TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP, null), false);
@@ -143,7 +143,7 @@ public class MappingMetaDataParserTests extends ElasticsearchTestCase {
 
     @Test
     public void testParseIdAndRoutingAndTimestampWithPath() throws Exception {
-        MappingMetaData md = new MappingMetaData("type1", new CompressedString(""),
+        MappingMetaData md = new MappingMetaData("type1", new CompressedXContent("{}"),
                 new MappingMetaData.Id("obj1.id"),
                 new MappingMetaData.Routing(true, "obj1.routing"),
                 new MappingMetaData.Timestamp(true, "obj2.timestamp", "dateOptionalTime", TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP, null), false);
@@ -161,7 +161,7 @@ public class MappingMetaDataParserTests extends ElasticsearchTestCase {
 
     @Test
     public void testParseIdWithPath() throws Exception {
-        MappingMetaData md = new MappingMetaData("type1", new CompressedString(""),
+        MappingMetaData md = new MappingMetaData("type1", new CompressedXContent("{}"),
                 new MappingMetaData.Id("obj1.id"),
                 new MappingMetaData.Routing(true, "obj1.routing"),
                 new MappingMetaData.Timestamp(true, "obj2.timestamp", "dateOptionalTime", TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP, null), false);
@@ -182,7 +182,7 @@ public class MappingMetaDataParserTests extends ElasticsearchTestCase {
 
     @Test
     public void testParseRoutingWithPath() throws Exception {
-        MappingMetaData md = new MappingMetaData("type1", new CompressedString(""),
+        MappingMetaData md = new MappingMetaData("type1", new CompressedXContent("{}"),
                 new MappingMetaData.Id("obj1.id"),
                 new MappingMetaData.Routing(true, "obj1.routing"),
                 new MappingMetaData.Timestamp(true, "obj2.timestamp", "dateOptionalTime", TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP, null), false);
@@ -203,7 +203,7 @@ public class MappingMetaDataParserTests extends ElasticsearchTestCase {
 
     @Test
     public void testParseTimestampWithPath() throws Exception {
-        MappingMetaData md = new MappingMetaData("type1", new CompressedString(""),
+        MappingMetaData md = new MappingMetaData("type1", new CompressedXContent("{}"),
                 new MappingMetaData.Id("obj1.id"),
                 new MappingMetaData.Routing(true, "obj1.routing"),
                 new MappingMetaData.Timestamp(true, "obj2.timestamp", "dateOptionalTime", TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP, null), false);
@@ -224,7 +224,7 @@ public class MappingMetaDataParserTests extends ElasticsearchTestCase {
 
     @Test
     public void testParseIdAndRoutingAndTimestampWithinSamePath() throws Exception {
-        MappingMetaData md = new MappingMetaData("type1", new CompressedString(""),
+        MappingMetaData md = new MappingMetaData("type1", new CompressedXContent("{}"),
                 new MappingMetaData.Id("obj1.id"),
                 new MappingMetaData.Routing(true, "obj1.routing"),
                 new MappingMetaData.Timestamp(true, "obj1.timestamp", "dateOptionalTime", TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP, null), false);
@@ -242,7 +242,7 @@ public class MappingMetaDataParserTests extends ElasticsearchTestCase {
 
     @Test
     public void testParseIdAndRoutingAndTimestampWithinSamePathAndMoreLevels() throws Exception {
-        MappingMetaData md = new MappingMetaData("type1", new CompressedString(""),
+        MappingMetaData md = new MappingMetaData("type1", new CompressedXContent("{}"),
                 new MappingMetaData.Id("obj1.obj0.id"),
                 new MappingMetaData.Routing(true, "obj1.obj2.routing"),
                 new MappingMetaData.Timestamp(true, "obj1.obj3.timestamp", "dateOptionalTime", TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP, null), false);
@@ -271,7 +271,7 @@ public class MappingMetaDataParserTests extends ElasticsearchTestCase {
 
     @Test
     public void testParseIdAndRoutingAndTimestampWithSameRepeatedObject() throws Exception {
-        MappingMetaData md = new MappingMetaData("type1", new CompressedString(""),
+        MappingMetaData md = new MappingMetaData("type1", new CompressedXContent("{}"),
                 new MappingMetaData.Id("obj1.id"),
                 new MappingMetaData.Routing(true, "obj1.routing"),
                 new MappingMetaData.Timestamp(true, "obj1.timestamp", "dateOptionalTime", TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP, null), false);
@@ -291,7 +291,7 @@ public class MappingMetaDataParserTests extends ElasticsearchTestCase {
     //
     @Test
     public void testParseIdRoutingTimestampWithRepeatedField() throws Exception {
-        MappingMetaData md = new MappingMetaData("type1", new CompressedString(""),
+        MappingMetaData md = new MappingMetaData("type1", new CompressedXContent("{}"),
                 new MappingMetaData.Id("field1"),
                 new MappingMetaData.Routing(true, "field1.field1"),
                 new MappingMetaData.Timestamp(true, "field1", "dateOptionalTime", TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP, null), false);
@@ -314,7 +314,7 @@ public class MappingMetaDataParserTests extends ElasticsearchTestCase {
 
     @Test
     public void testParseNoIdRoutingWithRepeatedFieldAndObject() throws Exception {
-        MappingMetaData md = new MappingMetaData("type1", new CompressedString(""),
+        MappingMetaData md = new MappingMetaData("type1", new CompressedXContent("{}"),
                 new MappingMetaData.Id("id"),
                 new MappingMetaData.Routing(true, "field1.field1.field2"),
                 new MappingMetaData.Timestamp(true, "field1", "dateOptionalTime", TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP, null), false);
@@ -337,7 +337,7 @@ public class MappingMetaDataParserTests extends ElasticsearchTestCase {
 
     @Test
     public void testParseRoutingWithRepeatedFieldAndValidRouting() throws Exception {
-        MappingMetaData md = new MappingMetaData("type1", new CompressedString(""),
+        MappingMetaData md = new MappingMetaData("type1", new CompressedXContent("{}"),
                 new MappingMetaData.Id(null),
                 new MappingMetaData.Routing(true, "field1.field2"),
                 new MappingMetaData.Timestamp(true, "field1", "dateOptionalTime", TimestampFieldMapper.Defaults.DEFAULT_TIMESTAMP, null), false);
diff --git a/src/test/java/org/elasticsearch/common/compress/CompressedStringTests.java b/src/test/java/org/elasticsearch/common/compress/CompressedXContentTests.java
similarity index 72%
rename from src/test/java/org/elasticsearch/common/compress/CompressedStringTests.java
rename to src/test/java/org/elasticsearch/common/compress/CompressedXContentTests.java
index 4d9de6736e7..670ad10aaf2 100644
--- a/src/test/java/org/elasticsearch/common/compress/CompressedStringTests.java
+++ b/src/test/java/org/elasticsearch/common/compress/CompressedXContentTests.java
@@ -37,14 +37,14 @@ import static org.hamcrest.Matchers.not;
 /**
  *
  */
-public class CompressedStringTests extends ElasticsearchTestCase {
+public class CompressedXContentTests extends ElasticsearchTestCase {
 
     @Test
     public void simpleTestsLZF() throws IOException {
         simpleTests("lzf");
     }
 
-    private void assertEquals(CompressedString s1, CompressedString s2) {
+    private void assertEquals(CompressedXContent s1, CompressedXContent s2) {
         Assert.assertEquals(s1, s2);
         assertArrayEquals(s1.uncompressed(), s2.uncompressed());
         assertEquals(s1.hashCode(), s2.hashCode());
@@ -52,16 +52,16 @@ public class CompressedStringTests extends ElasticsearchTestCase {
 
     public void simpleTests(String compressor) throws IOException {
         CompressorFactory.configure(Settings.settingsBuilder().put("compress.default.type", compressor).build());
-        String str = "this is a simple string";
-        CompressedString cstr = new CompressedString(str);
+        String str = "---\nf:this is a simple string";
+        CompressedXContent cstr = new CompressedXContent(str);
         assertThat(cstr.string(), equalTo(str));
-        assertThat(new CompressedString(str), equalTo(cstr));
+        assertThat(new CompressedXContent(str), equalTo(cstr));
 
-        String str2 = "this is a simple string 2";
-        CompressedString cstr2 = new CompressedString(str2);
+        String str2 = "---\nf:this is a simple string 2";
+        CompressedXContent cstr2 = new CompressedXContent(str2);
         assertThat(cstr2.string(), not(equalTo(str)));
-        assertThat(new CompressedString(str2), not(equalTo(cstr)));
-        assertEquals(new CompressedString(str2), cstr2);
+        assertThat(new CompressedXContent(str2), not(equalTo(cstr)));
+        assertEquals(new CompressedXContent(str2), cstr2);
     }
 
     public void testRandom() throws IOException {
@@ -70,13 +70,15 @@ public class CompressedStringTests extends ElasticsearchTestCase {
         Random r = getRandom();
         for (int i = 0; i < 1000; i++) {
             String string = TestUtil.randomUnicodeString(r, 10000);
-            CompressedString compressedString = new CompressedString(string);
-            assertThat(compressedString.string(), equalTo(string));
+            // hack to make it detected as YAML
+            string = "---\n" + string;
+            CompressedXContent compressedXContent = new CompressedXContent(string);
+            assertThat(compressedXContent.string(), equalTo(string));
         }
     }
 
     public void testDifferentCompressedRepresentation() throws Exception {
-        byte[] b = "abcdefghijabcdefghij".getBytes("UTF-8");
+        byte[] b = "---\nf:abcdefghijabcdefghij".getBytes("UTF-8");
         CompressorFactory.defaultCompressor();
 
         Compressor compressor = CompressorFactory.defaultCompressor();
@@ -100,14 +102,14 @@ public class CompressedStringTests extends ElasticsearchTestCase {
         // of different size are being used
         assertFalse(b1.equals(b2));
         // we used the compressed representation directly and did not recompress
-        assertArrayEquals(b1.toBytes(), new CompressedString(b1).compressed());
-        assertArrayEquals(b2.toBytes(), new CompressedString(b2).compressed());
+        assertArrayEquals(b1.toBytes(), new CompressedXContent(b1).compressed());
+        assertArrayEquals(b2.toBytes(), new CompressedXContent(b2).compressed());
         // but compressedstring instances are still equal
-        assertEquals(new CompressedString(b1), new CompressedString(b2));
+        assertEquals(new CompressedXContent(b1), new CompressedXContent(b2));
     }
 
     public void testHashCode() throws IOException {
-        assertFalse(new CompressedString("a").hashCode() == new CompressedString("b").hashCode());
+        assertFalse(new CompressedXContent("{\"a\":\"b\"}").hashCode() == new CompressedXContent("{\"a\":\"c\"}").hashCode());
     }
 
 }
diff --git a/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java b/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java
index e904116221f..f3d89e86ca9 100644
--- a/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java
+++ b/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java
@@ -82,7 +82,7 @@ public class XContentFactoryTests extends ElasticsearchTestCase {
         // this if for {"foo" : 5} in python CBOR
         bytes = new byte[] {(byte) 0xA1, (byte) 0x63, (byte) 0x66, (byte) 0x6f, (byte) 0x6f, (byte) 0x5};
         assertThat(XContentFactory.xContentType(bytes), equalTo(XContentType.CBOR));
-        assertThat(((Number) XContentHelper.convertToMap(bytes, true).v2().get("foo")).intValue(), equalTo(5));
+        assertThat(((Number) XContentHelper.convertToMap(new BytesArray(bytes), true).v2().get("foo")).intValue(), equalTo(5));
 
         // also make sure major type check doesn't collide with SMILE and JSON, just in case
         assertThat(CBORConstants.hasMajorType(CBORConstants.MAJOR_TYPE_OBJECT, SmileConstants.HEADER_BYTE_1), equalTo(false));
diff --git a/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java b/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java
index 3115edeca26..484e5c92270 100644
--- a/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java
+++ b/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java
@@ -19,7 +19,8 @@
 
 package org.elasticsearch.index.aliases;
 
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
@@ -47,11 +48,11 @@ public class IndexAliasesServiceTests extends ElasticsearchSingleNodeTest {
         return indexService.aliasesService();
     }
 
-    public static CompressedString filter(QueryBuilder filterBuilder) throws IOException {
+    public static CompressedXContent filter(QueryBuilder filterBuilder) throws IOException {
         XContentBuilder builder = XContentFactory.jsonBuilder();
         filterBuilder.toXContent(builder, ToXContent.EMPTY_PARAMS);
         builder.close();
-        return new CompressedString(builder.string());
+        return new CompressedXContent(builder.string());
     }
 
     @Test
diff --git a/src/test/java/org/elasticsearch/index/fielddata/ParentChildFieldDataTests.java b/src/test/java/org/elasticsearch/index/fielddata/ParentChildFieldDataTests.java
index 144d137f46d..bdd3b716259 100644
--- a/src/test/java/org/elasticsearch/index/fielddata/ParentChildFieldDataTests.java
+++ b/src/test/java/org/elasticsearch/index/fielddata/ParentChildFieldDataTests.java
@@ -33,7 +33,7 @@ import org.apache.lucene.search.SortField;
 import org.apache.lucene.search.TopFieldDocs;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource;
 import org.elasticsearch.index.fielddata.plain.ParentChildIndexFieldData;
 import org.elasticsearch.index.mapper.Uid;
@@ -63,10 +63,10 @@ public class ParentChildFieldDataTests extends AbstractFieldDataTests {
     @Before
     public void before() throws Exception {
         mapperService.merge(
-                childType, new CompressedString(PutMappingRequest.buildFromSimplifiedDef(childType, "_parent", "type=" + parentType).string()), true
+                childType, new CompressedXContent(PutMappingRequest.buildFromSimplifiedDef(childType, "_parent", "type=" + parentType).string()), true
         );
         mapperService.merge(
-                grandChildType, new CompressedString(PutMappingRequest.buildFromSimplifiedDef(grandChildType, "_parent", "type=" + childType).string()), true
+                grandChildType, new CompressedXContent(PutMappingRequest.buildFromSimplifiedDef(grandChildType, "_parent", "type=" + childType).string()), true
         );
 
         Document d = new Document();
diff --git a/src/test/java/org/elasticsearch/index/mapper/binary/BinaryMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/binary/BinaryMappingTests.java
index a7f8017efa7..efe22e0eaf8 100644
--- a/src/test/java/org/elasticsearch/index/mapper/binary/BinaryMappingTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/binary/BinaryMappingTests.java
@@ -82,7 +82,7 @@ public class BinaryMappingTests extends ElasticsearchSingleNodeTest {
             new BytesArray(binaryValue1).writeTo(compressed);
         }
         final byte[] binaryValue2 = out.bytes().toBytes();
-        assertTrue(CompressorFactory.isCompressed(binaryValue2));
+        assertTrue(CompressorFactory.isCompressed(new BytesArray(binaryValue2)));
         
         for (byte[] value : Arrays.asList(binaryValue1, binaryValue2)) {
             ParsedDocument doc = mapper.parse("type", "id", XContentFactory.jsonBuilder().startObject().field("field", value).endObject().bytes());
@@ -114,7 +114,7 @@ public class BinaryMappingTests extends ElasticsearchSingleNodeTest {
             new BytesArray(original).writeTo(compressed);
         }
         final byte[] binaryValue = out.bytes().toBytes();
-        assertTrue(CompressorFactory.isCompressed(binaryValue));
+        assertTrue(CompressorFactory.isCompressed(new BytesArray(binaryValue)));
         
         ParsedDocument doc = mapper.parse("type", "id", XContentFactory.jsonBuilder().startObject().field("field", binaryValue).endObject().bytes());
         BytesRef indexedValue = doc.rootDoc().getBinaryValue("field");
diff --git a/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java
index 620847559ee..98d17ba150d 100644
--- a/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java
@@ -21,7 +21,7 @@ package org.elasticsearch.index.mapper.merge;
 
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.analysis.FieldNameAnalyzer;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
@@ -160,7 +160,7 @@ public class TestMergeMapperTests extends ElasticsearchSingleNodeTest {
 
     public void testConcurrentMergeTest() throws Throwable {
         final MapperService mapperService = createIndex("test").mapperService();
-        mapperService.merge("test", new CompressedString("{\"test\":{}}"), true);
+        mapperService.merge("test", new CompressedXContent("{\"test\":{}}"), true);
         final DocumentMapper documentMapper = mapperService.documentMapper("test");
 
         DocumentFieldMappers dfm = documentMapper.mappers();
@@ -186,7 +186,7 @@ public class TestMergeMapperTests extends ElasticsearchSingleNodeTest {
                         Mapping update = doc.dynamicMappingsUpdate();
                         assert update != null;
                         lastIntroducedFieldName.set(fieldName);
-                        mapperService.merge("test", new CompressedString(update.toString()), false);
+                        mapperService.merge("test", new CompressedXContent(update.toString()), false);
                     }
                 } catch (Throwable t) {
                     error.set(t);
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java b/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java
index e7df72c3dcd..89e88469913 100644
--- a/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java
@@ -432,7 +432,7 @@ public class MultiFieldTests extends ElasticsearchSingleNodeTest {
         DocumentMapper docMapper = createIndex("test").mapperService().documentMapperParser().parse(mapping);
         Arrays.sort(multiFieldNames);
 
-        Map<String, Object> sourceAsMap = XContentHelper.convertToMap(docMapper.mappingSource().compressed(), true).v2();
+        Map<String, Object> sourceAsMap = XContentHelper.convertToMap(docMapper.mappingSource().compressedReference(), true).v2();
         @SuppressWarnings("unchecked")
         Map<String, Object> multiFields = (Map<String, Object>) XContentMapValues.extractValue("type.properties.my_field.fields", sourceAsMap);
         assertThat(multiFields.size(), equalTo(multiFieldNames.length));
diff --git a/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java
index 90da64b3fbd..e08562cfb78 100644
--- a/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java
@@ -22,6 +22,7 @@ package org.elasticsearch.index.mapper.source;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
+import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.compress.CompressorFactory;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentFactory;
@@ -51,7 +52,7 @@ public class CompressSourceMappingTests extends ElasticsearchSingleNodeTest {
                 .field("field2", "value2")
                 .endObject().bytes());
         BytesRef bytes = doc.rootDoc().getBinaryValue("_source");
-        assertThat(CompressorFactory.isCompressed(bytes.bytes, bytes.offset, bytes.length), equalTo(false));
+        assertThat(CompressorFactory.isCompressed(new BytesArray(bytes)), equalTo(false));
     }
 
     @Test
@@ -68,7 +69,7 @@ public class CompressSourceMappingTests extends ElasticsearchSingleNodeTest {
                 .endObject().bytes());
 
         BytesRef bytes = doc.rootDoc().getBinaryValue("_source");
-        assertThat(CompressorFactory.isCompressed(bytes.bytes, bytes.offset, bytes.length), equalTo(true));
+        assertThat(CompressorFactory.isCompressed(new BytesArray(bytes)), equalTo(true));
     }
 
     @Test
@@ -84,7 +85,7 @@ public class CompressSourceMappingTests extends ElasticsearchSingleNodeTest {
                 .endObject().bytes());
 
         BytesRef bytes = doc.rootDoc().getBinaryValue("_source");
-        assertThat(CompressorFactory.isCompressed(bytes.bytes, bytes.offset, bytes.length), equalTo(false));
+        assertThat(CompressorFactory.isCompressed(new BytesArray(bytes)), equalTo(false));
 
         doc = documentMapper.parse("type", "1", XContentFactory.jsonBuilder().startObject()
                 .field("field1", "value1")
@@ -95,6 +96,6 @@ public class CompressSourceMappingTests extends ElasticsearchSingleNodeTest {
                 .endObject().bytes());
 
         bytes = doc.rootDoc().getBinaryValue("_source");
-        assertThat(CompressorFactory.isCompressed(bytes.bytes, bytes.offset, bytes.length), equalTo(true));
+        assertThat(CompressorFactory.isCompressed(new BytesArray(bytes)), equalTo(true));
     }
 }
diff --git a/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java
index 0760255c2a8..10f33c9025d 100644
--- a/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java
@@ -23,7 +23,7 @@ import org.apache.lucene.index.IndexableField;
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.bytes.BytesArray;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.compress.CompressorFactory;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentFactory;
@@ -193,7 +193,7 @@ public class DefaultSourceMappingTests extends ElasticsearchSingleNodeTest {
                 .endObject().endObject().string();
 
         MapperService mapperService = createIndex("test").mapperService();
-        mapperService.merge(MapperService.DEFAULT_MAPPING, new CompressedString(defaultMapping), true);
+        mapperService.merge(MapperService.DEFAULT_MAPPING, new CompressedXContent(defaultMapping), true);
 
         DocumentMapper mapper = mapperService.documentMapperWithAutoCreate("my_type").v1();
         assertThat(mapper.type(), equalTo("my_type"));
@@ -206,12 +206,12 @@ public class DefaultSourceMappingTests extends ElasticsearchSingleNodeTest {
                 .endObject().endObject().string();
 
         MapperService mapperService = createIndex("test").mapperService();
-        mapperService.merge(MapperService.DEFAULT_MAPPING, new CompressedString(defaultMapping), true);
+        mapperService.merge(MapperService.DEFAULT_MAPPING, new CompressedXContent(defaultMapping), true);
 
         String mapping = XContentFactory.jsonBuilder().startObject().startObject("my_type")
                 .startObject("_source").field("enabled", true).endObject()
                 .endObject().endObject().string();
-        mapperService.merge("my_type", new CompressedString(mapping), true);
+        mapperService.merge("my_type", new CompressedXContent(mapping), true);
 
         DocumentMapper mapper = mapperService.documentMapper("my_type");
         assertThat(mapper.type(), equalTo("my_type"));
diff --git a/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java
index e415ea76c07..c5e17a7fe6b 100644
--- a/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java
@@ -27,7 +27,7 @@ import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.metadata.MappingMetaData;
 import org.elasticsearch.cluster.metadata.MetaData;
 import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.joda.Joda;
@@ -450,7 +450,7 @@ public class TimestampMappingTests extends ElasticsearchSingleNodeTest {
         {
             MappingMetaData.Timestamp timestamp = new MappingMetaData.Timestamp(true, null,
                     TimestampFieldMapper.DEFAULT_DATE_TIME_FORMAT, null, null);
-            MappingMetaData expected = new MappingMetaData("type", new CompressedString("{}".getBytes(StandardCharsets.UTF_8)),
+            MappingMetaData expected = new MappingMetaData("type", new CompressedXContent("{}".getBytes(StandardCharsets.UTF_8)),
                     new MappingMetaData.Id(null), new MappingMetaData.Routing(false, null), timestamp, false);
 
             BytesStreamOutput out = new BytesStreamOutput();
@@ -467,7 +467,7 @@ public class TimestampMappingTests extends ElasticsearchSingleNodeTest {
         {
             MappingMetaData.Timestamp timestamp = new MappingMetaData.Timestamp(true, null,
                     TimestampFieldMapper.DEFAULT_DATE_TIME_FORMAT, "now", null);
-            MappingMetaData expected = new MappingMetaData("type", new CompressedString("{}".getBytes(StandardCharsets.UTF_8)),
+            MappingMetaData expected = new MappingMetaData("type", new CompressedXContent("{}".getBytes(StandardCharsets.UTF_8)),
                     new MappingMetaData.Id(null), new MappingMetaData.Routing(false, null), timestamp, false);
 
             BytesStreamOutput out = new BytesStreamOutput();
@@ -484,7 +484,7 @@ public class TimestampMappingTests extends ElasticsearchSingleNodeTest {
         {
             MappingMetaData.Timestamp timestamp = new MappingMetaData.Timestamp(true, null,
                     TimestampFieldMapper.DEFAULT_DATE_TIME_FORMAT, "now", false);
-            MappingMetaData expected = new MappingMetaData("type", new CompressedString("{}".getBytes(StandardCharsets.UTF_8)),
+            MappingMetaData expected = new MappingMetaData("type", new CompressedXContent("{}".getBytes(StandardCharsets.UTF_8)),
                     new MappingMetaData.Id(null), new MappingMetaData.Routing(false, null), timestamp, false);
 
             BytesStreamOutput out = new BytesStreamOutput();
@@ -652,7 +652,7 @@ public class TimestampMappingTests extends ElasticsearchSingleNodeTest {
                     .endObject()
                 .endObject().endObject().string();
         // This was causing a NPE
-        new MappingMetaData(new CompressedString(mapping));
+        new MappingMetaData(new CompressedXContent(mapping));
     }
 
     @Test
diff --git a/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java
index dca10c636fe..32b75094a8d 100644
--- a/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java
@@ -27,7 +27,8 @@ import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.metadata.MappingMetaData;
 import org.elasticsearch.cluster.metadata.MetaData;
 import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
@@ -196,7 +197,7 @@ public class TTLMappingTests extends ElasticsearchSingleNodeTest {
     public void testNoConflictIfNothingSetAndDisabledLater() throws Exception {
         IndexService indexService = createIndex("testindex", Settings.settingsBuilder().build(), "type");
         XContentBuilder mappingWithTtlDisabled = getMappingWithTtlDisabled("7d");
-        MergeResult mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedString(mappingWithTtlDisabled.string()), true).mapping(), randomBoolean());
+        MergeResult mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedXContent(mappingWithTtlDisabled.string()), true).mapping(), randomBoolean());
         assertFalse(mergeResult.hasConflicts());
     }
 
@@ -204,7 +205,7 @@ public class TTLMappingTests extends ElasticsearchSingleNodeTest {
     public void testNoConflictIfNothingSetAndEnabledLater() throws Exception {
         IndexService indexService = createIndex("testindex", Settings.settingsBuilder().build(), "type");
         XContentBuilder mappingWithTtlEnabled = getMappingWithTtlEnabled("7d");
-        MergeResult mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedString(mappingWithTtlEnabled.string()), true).mapping(), randomBoolean());
+        MergeResult mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedXContent(mappingWithTtlEnabled.string()), true).mapping(), randomBoolean());
         assertFalse(mergeResult.hasConflicts());
     }
 
@@ -213,23 +214,23 @@ public class TTLMappingTests extends ElasticsearchSingleNodeTest {
         XContentBuilder mappingWithTtlEnabled = getMappingWithTtlEnabled("7d");
         IndexService indexService = createIndex("testindex", Settings.settingsBuilder().build(), "type", mappingWithTtlEnabled);
         XContentBuilder mappingWithOnlyDefaultSet = getMappingWithOnlyTtlDefaultSet("6m");
-        MergeResult mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedString(mappingWithOnlyDefaultSet.string()), true).mapping(), false);
+        MergeResult mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedXContent(mappingWithOnlyDefaultSet.string()), true).mapping(), false);
         assertFalse(mergeResult.hasConflicts());
-        CompressedString mappingAfterMerge = indexService.mapperService().documentMapper("type").mappingSource();
-        assertThat(mappingAfterMerge, equalTo(new CompressedString("{\"type\":{\"_ttl\":{\"enabled\":true,\"default\":360000},\"properties\":{\"field\":{\"type\":\"string\"}}}}")));
+        CompressedXContent mappingAfterMerge = indexService.mapperService().documentMapper("type").mappingSource();
+        assertThat(mappingAfterMerge, equalTo(new CompressedXContent("{\"type\":{\"_ttl\":{\"enabled\":true,\"default\":360000},\"properties\":{\"field\":{\"type\":\"string\"}}}}")));
     }
 
     @Test
     public void testMergeWithOnlyDefaultSetTtlDisabled() throws Exception {
         XContentBuilder mappingWithTtlEnabled = getMappingWithTtlDisabled("7d");
         IndexService indexService = createIndex("testindex", Settings.settingsBuilder().build(), "type", mappingWithTtlEnabled);
-        CompressedString mappingAfterCreation = indexService.mapperService().documentMapper("type").mappingSource();
-        assertThat(mappingAfterCreation, equalTo(new CompressedString("{\"type\":{\"_ttl\":{\"enabled\":false},\"properties\":{\"field\":{\"type\":\"string\"}}}}")));
+        CompressedXContent mappingAfterCreation = indexService.mapperService().documentMapper("type").mappingSource();
+        assertThat(mappingAfterCreation, equalTo(new CompressedXContent("{\"type\":{\"_ttl\":{\"enabled\":false},\"properties\":{\"field\":{\"type\":\"string\"}}}}")));
         XContentBuilder mappingWithOnlyDefaultSet = getMappingWithOnlyTtlDefaultSet("6m");
-        MergeResult mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedString(mappingWithOnlyDefaultSet.string()), true).mapping(), false);
+        MergeResult mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedXContent(mappingWithOnlyDefaultSet.string()), true).mapping(), false);
         assertFalse(mergeResult.hasConflicts());
-        CompressedString mappingAfterMerge = indexService.mapperService().documentMapper("type").mappingSource();
-        assertThat(mappingAfterMerge, equalTo(new CompressedString("{\"type\":{\"_ttl\":{\"enabled\":false},\"properties\":{\"field\":{\"type\":\"string\"}}}}")));
+        CompressedXContent mappingAfterMerge = indexService.mapperService().documentMapper("type").mappingSource();
+        assertThat(mappingAfterMerge, equalTo(new CompressedXContent("{\"type\":{\"_ttl\":{\"enabled\":false},\"properties\":{\"field\":{\"type\":\"string\"}}}}")));
     }
 
     @Test
@@ -238,12 +239,12 @@ public class TTLMappingTests extends ElasticsearchSingleNodeTest {
         //check if default ttl changed when simulate set to true
         XContentBuilder mappingWithTtl = getMappingWithTtlEnabled("6d");
         IndexService indexService = createIndex("testindex", Settings.settingsBuilder().build(), "type", mappingWithTtl);
-        CompressedString mappingBeforeMerge = indexService.mapperService().documentMapper("type").mappingSource();
+        CompressedXContent mappingBeforeMerge = indexService.mapperService().documentMapper("type").mappingSource();
         XContentBuilder mappingWithTtlDifferentDefault = getMappingWithTtlEnabled("7d");
-        MergeResult mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedString(mappingWithTtlDifferentDefault.string()), true).mapping(), true);
+        MergeResult mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedXContent(mappingWithTtlDifferentDefault.string()), true).mapping(), true);
         assertFalse(mergeResult.hasConflicts());
         // make sure simulate flag actually worked - no mappings applied
-        CompressedString mappingAfterMerge = indexService.mapperService().documentMapper("type").mappingSource();
+        CompressedXContent mappingAfterMerge = indexService.mapperService().documentMapper("type").mappingSource();
         assertThat(mappingAfterMerge, equalTo(mappingBeforeMerge));
 
         client().admin().indices().prepareDelete("testindex").get();
@@ -252,7 +253,7 @@ public class TTLMappingTests extends ElasticsearchSingleNodeTest {
         indexService = createIndex("testindex", Settings.settingsBuilder().build(), "type", mappingWithoutTtl);
         mappingBeforeMerge = indexService.mapperService().documentMapper("type").mappingSource();
         XContentBuilder mappingWithTtlEnabled = getMappingWithTtlEnabled();
-        mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedString(mappingWithTtlEnabled.string()), true).mapping(), true);
+        mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedXContent(mappingWithTtlEnabled.string()), true).mapping(), true);
         assertFalse(mergeResult.hasConflicts());
         // make sure simulate flag actually worked - no mappings applied
         mappingAfterMerge = indexService.mapperService().documentMapper("type").mappingSource();
@@ -264,7 +265,7 @@ public class TTLMappingTests extends ElasticsearchSingleNodeTest {
         indexService = createIndex("testindex", Settings.settingsBuilder().build(), "type", mappingWithoutTtl);
         mappingBeforeMerge = indexService.mapperService().documentMapper("type").mappingSource();
         mappingWithTtlEnabled = getMappingWithTtlEnabled("7d");
-        mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedString(mappingWithTtlEnabled.string()), true).mapping(), true);
+        mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedXContent(mappingWithTtlEnabled.string()), true).mapping(), true);
         assertFalse(mergeResult.hasConflicts());
         // make sure simulate flag actually worked - no mappings applied
         mappingAfterMerge = indexService.mapperService().documentMapper("type").mappingSource();
@@ -275,21 +276,21 @@ public class TTLMappingTests extends ElasticsearchSingleNodeTest {
         mappingWithoutTtl = getMappingWithTtlDisabled("6d");
         indexService = createIndex("testindex", Settings.settingsBuilder().build(), "type", mappingWithoutTtl);
         mappingWithTtlEnabled = getMappingWithTtlEnabled("7d");
-        mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedString(mappingWithTtlEnabled.string()), true).mapping(), false);
+        mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedXContent(mappingWithTtlEnabled.string()), true).mapping(), false);
         assertFalse(mergeResult.hasConflicts());
         // make sure simulate flag actually worked - mappings applied
         mappingAfterMerge = indexService.mapperService().documentMapper("type").mappingSource();
-        assertThat(mappingAfterMerge, equalTo(new CompressedString("{\"type\":{\"_ttl\":{\"enabled\":true,\"default\":604800000},\"properties\":{\"field\":{\"type\":\"string\"}}}}")));
+        assertThat(mappingAfterMerge, equalTo(new CompressedXContent("{\"type\":{\"_ttl\":{\"enabled\":true,\"default\":604800000},\"properties\":{\"field\":{\"type\":\"string\"}}}}")));
 
         client().admin().indices().prepareDelete("testindex").get();
         // check if switching simulate flag off works if nothing was applied in the beginning
         indexService = createIndex("testindex", Settings.settingsBuilder().build(), "type");
         mappingWithTtlEnabled = getMappingWithTtlEnabled("7d");
-        mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedString(mappingWithTtlEnabled.string()), true).mapping(), false);
+        mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedXContent(mappingWithTtlEnabled.string()), true).mapping(), false);
         assertFalse(mergeResult.hasConflicts());
         // make sure simulate flag actually worked - mappings applied
         mappingAfterMerge = indexService.mapperService().documentMapper("type").mappingSource();
-        assertThat(mappingAfterMerge, equalTo(new CompressedString("{\"type\":{\"_ttl\":{\"enabled\":true,\"default\":604800000},\"properties\":{\"field\":{\"type\":\"string\"}}}}")));
+        assertThat(mappingAfterMerge, equalTo(new CompressedXContent("{\"type\":{\"_ttl\":{\"enabled\":true,\"default\":604800000},\"properties\":{\"field\":{\"type\":\"string\"}}}}")));
 
     }
 
@@ -348,4 +349,4 @@ public class TTLMappingTests extends ElasticsearchSingleNodeTest {
                 .startObject("properties").field("field").startObject().field("type", "string").endObject().endObject()
                 .endObject().endObject();
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingTests.java
index 1090f6df85a..35ae3dbb8c4 100644
--- a/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingTests.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.index.mapper.update;
 
 import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
@@ -80,11 +80,11 @@ public class UpdateMappingTests extends ElasticsearchSingleNodeTest {
     private void testNoConflictWhileMergingAndMappingChanged(XContentBuilder mapping, XContentBuilder mappingUpdate, XContentBuilder expectedMapping) throws IOException {
         IndexService indexService = createIndex("test", Settings.settingsBuilder().build(), "type", mapping);
         // simulate like in MetaDataMappingService#putMapping
-        MergeResult mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedString(mappingUpdate.bytes()), true).mapping(), false);
+        MergeResult mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedXContent(mappingUpdate.bytes()), true).mapping(), false);
         // assure we have no conflicts
         assertThat(mergeResult.buildConflicts().length, equalTo(0));
         // make sure mappings applied
-        CompressedString mappingAfterUpdate = indexService.mapperService().documentMapper("type").mappingSource();
+        CompressedXContent mappingAfterUpdate = indexService.mapperService().documentMapper("type").mappingSource();
         assertThat(mappingAfterUpdate.toString(), equalTo(expectedMapping.string()));
     }
 
@@ -102,13 +102,13 @@ public class UpdateMappingTests extends ElasticsearchSingleNodeTest {
 
     protected void testConflictWhileMergingAndMappingUnchanged(XContentBuilder mapping, XContentBuilder mappingUpdate) throws IOException {
         IndexService indexService = createIndex("test", Settings.settingsBuilder().build(), "type", mapping);
-        CompressedString mappingBeforeUpdate = indexService.mapperService().documentMapper("type").mappingSource();
+        CompressedXContent mappingBeforeUpdate = indexService.mapperService().documentMapper("type").mappingSource();
         // simulate like in MetaDataMappingService#putMapping
-        MergeResult mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedString(mappingUpdate.bytes()), true).mapping(), true);
+        MergeResult mergeResult = indexService.mapperService().documentMapper("type").merge(indexService.mapperService().parse("type", new CompressedXContent(mappingUpdate.bytes()), true).mapping(), true);
         // assure we have conflicts
         assertThat(mergeResult.buildConflicts().length, equalTo(1));
         // make sure simulate flag actually worked - no mappings applied
-        CompressedString mappingAfterUpdate = indexService.mapperService().documentMapper("type").mappingSource();
+        CompressedXContent mappingAfterUpdate = indexService.mapperService().documentMapper("type").mappingSource();
         assertThat(mappingAfterUpdate, equalTo(mappingBeforeUpdate));
     }
 
@@ -124,9 +124,9 @@ public class UpdateMappingTests extends ElasticsearchSingleNodeTest {
                 .endObject()
                 .endObject()
                 .endObject();
-        DocumentMapper documentMapper = indexService.mapperService().parse("type", new CompressedString(indexMapping.string()), true);
+        DocumentMapper documentMapper = indexService.mapperService().parse("type", new CompressedXContent(indexMapping.string()), true);
         assertThat(documentMapper.indexMapper().enabled(), equalTo(enabled));
-        documentMapper = indexService.mapperService().parse("type", new CompressedString(documentMapper.mappingSource().string()), true);
+        documentMapper = indexService.mapperService().parse("type", new CompressedXContent(documentMapper.mappingSource().string()), true);
         assertThat(documentMapper.indexMapper().enabled(), equalTo(enabled));
     }
 
@@ -146,11 +146,11 @@ public class UpdateMappingTests extends ElasticsearchSingleNodeTest {
                 .endObject()
                 .endObject()
                 .endObject();
-        DocumentMapper documentMapper = indexService.mapperService().parse("type", new CompressedString(indexMapping.string()), true);
+        DocumentMapper documentMapper = indexService.mapperService().parse("type", new CompressedXContent(indexMapping.string()), true);
         assertThat(documentMapper.timestampFieldMapper().enabled(), equalTo(enabled));
         assertTrue(documentMapper.timestampFieldMapper().fieldType().stored());
         assertTrue(documentMapper.timestampFieldMapper().hasDocValues());
-        documentMapper = indexService.mapperService().parse("type", new CompressedString(documentMapper.mappingSource().string()), true);
+        documentMapper = indexService.mapperService().parse("type", new CompressedXContent(documentMapper.mappingSource().string()), true);
         assertThat(documentMapper.timestampFieldMapper().enabled(), equalTo(enabled));
         assertTrue(documentMapper.timestampFieldMapper().hasDocValues());
         assertTrue(documentMapper.timestampFieldMapper().fieldType().stored());
@@ -168,10 +168,10 @@ public class UpdateMappingTests extends ElasticsearchSingleNodeTest {
                 .endObject()
                 .endObject()
                 .endObject();
-        DocumentMapper documentMapper = indexService.mapperService().parse("type", new CompressedString(indexMapping.string()), true);
+        DocumentMapper documentMapper = indexService.mapperService().parse("type", new CompressedXContent(indexMapping.string()), true);
         assertThat(documentMapper.sizeFieldMapper().enabled(), equalTo(enabled));
         assertTrue(documentMapper.sizeFieldMapper().fieldType().stored());
-        documentMapper = indexService.mapperService().parse("type", new CompressedString(documentMapper.mappingSource().string()), true);
+        documentMapper = indexService.mapperService().parse("type", new CompressedXContent(documentMapper.mappingSource().string()), true);
         assertThat(documentMapper.sizeFieldMapper().enabled(), equalTo(enabled));
     }
 
@@ -179,9 +179,9 @@ public class UpdateMappingTests extends ElasticsearchSingleNodeTest {
     public void testSizeTimestampIndexParsing() throws IOException {
         IndexService indexService = createIndex("test", Settings.settingsBuilder().build());
         String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/update/default_mapping_with_disabled_root_types.json");
-        DocumentMapper documentMapper = indexService.mapperService().parse("type", new CompressedString(mapping), true);
+        DocumentMapper documentMapper = indexService.mapperService().parse("type", new CompressedXContent(mapping), true);
         assertThat(documentMapper.mappingSource().string(), equalTo(mapping));
-        documentMapper = indexService.mapperService().parse("type", new CompressedString(documentMapper.mappingSource().string()), true);
+        documentMapper = indexService.mapperService().parse("type", new CompressedXContent(documentMapper.mappingSource().string()), true);
         assertThat(documentMapper.mappingSource().string(), equalTo(mapping));
     }
 
diff --git a/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeFormatTests.java b/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeFormatTests.java
index 9431f8a8cf6..5111b36969e 100644
--- a/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeFormatTests.java
+++ b/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeFormatTests.java
@@ -23,7 +23,7 @@ package org.elasticsearch.index.query;
 import org.apache.lucene.search.NumericRangeQuery;
 import org.apache.lucene.search.Query;
 import org.elasticsearch.common.bytes.BytesArray;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.inject.Injector;
 import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.mapper.MapperService;
@@ -57,7 +57,7 @@ public class IndexQueryParserFilterDateRangeFormatTests extends ElasticsearchSin
 
         MapperService mapperService = indexService.mapperService();
         String mapping = copyToStringFromClasspath("/org/elasticsearch/index/query/mapping.json");
-        mapperService.merge("person", new CompressedString(mapping), true);
+        mapperService.merge("person", new CompressedXContent(mapping), true);
         ParsedDocument doc = mapperService.documentMapper("person").parse("person", "1", new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/index/query/data.json")));
         assertNotNull(doc.dynamicMappingsUpdate());
         client().admin().indices().preparePutMapping("test").setType("person").setSource(doc.dynamicMappingsUpdate().toString()).get();
diff --git a/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeTimezoneTests.java b/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeTimezoneTests.java
index 6d1a3dbb344..fde771c5457 100644
--- a/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeTimezoneTests.java
+++ b/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeTimezoneTests.java
@@ -23,7 +23,7 @@ package org.elasticsearch.index.query;
 import org.apache.lucene.search.NumericRangeQuery;
 import org.apache.lucene.search.Query;
 import org.elasticsearch.common.bytes.BytesArray;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.inject.Injector;
 import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.mapper.MapperService;
@@ -58,7 +58,7 @@ public class IndexQueryParserFilterDateRangeTimezoneTests extends ElasticsearchS
 
         MapperService mapperService = indexService.mapperService();
         String mapping = copyToStringFromClasspath("/org/elasticsearch/index/query/mapping.json");
-        mapperService.merge("person", new CompressedString(mapping), true);
+        mapperService.merge("person", new CompressedXContent(mapping), true);
         ParsedDocument doc = mapperService.documentMapper("person").parse("person", "1", new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/index/query/data.json")));
         assertNotNull(doc.dynamicMappingsUpdate());
         client().admin().indices().preparePutMapping("test").setType("person").setSource(doc.dynamicMappingsUpdate().toString()).get();
diff --git a/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java b/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
index 992f1777a2c..b42a622fcf1 100644
--- a/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
+++ b/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
@@ -70,7 +70,7 @@ import org.elasticsearch.action.termvectors.TermVectorsRequest;
 import org.elasticsearch.action.termvectors.TermVectorsResponse;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesArray;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.lucene.search.MoreLikeThisQuery;
 import org.elasticsearch.common.lucene.search.Queries;
@@ -209,7 +209,7 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
         MapperService mapperService = indexService.mapperService();
 
         String mapping = copyToStringFromClasspath("/org/elasticsearch/index/query/mapping.json");
-        mapperService.merge("person", new CompressedString(mapping), true);
+        mapperService.merge("person", new CompressedXContent(mapping), true);
         ParsedDocument doc = mapperService.documentMapper("person").parse("person", "1", new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/index/query/data.json")));
         assertNotNull(doc.dynamicMappingsUpdate());
         client().admin().indices().preparePutMapping("test").setType("person").setSource(doc.dynamicMappingsUpdate().toString()).get();
diff --git a/src/test/java/org/elasticsearch/index/search/child/AbstractChildTests.java b/src/test/java/org/elasticsearch/index/search/child/AbstractChildTests.java
index d6aa83c341b..8eabad9735d 100644
--- a/src/test/java/org/elasticsearch/index/search/child/AbstractChildTests.java
+++ b/src/test/java/org/elasticsearch/index/search/child/AbstractChildTests.java
@@ -31,7 +31,7 @@ import org.apache.lucene.util.BitDocIdSet;
 import org.apache.lucene.util.BitSet;
 import org.apache.lucene.util.LuceneTestCase;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.Index;
@@ -67,8 +67,8 @@ public abstract class AbstractChildTests extends ElasticsearchSingleNodeTest {
         MapperService mapperService = indexService.mapperService();
         // Parent/child parsers require that the parent and child type to be presented in mapping
         // Sometimes we want a nested object field in the parent type that triggers nonNestedDocsFilter to be used
-        mapperService.merge(parentType, new CompressedString(PutMappingRequest.buildFromSimplifiedDef(parentType, "nested_field", random().nextBoolean() ? "type=nested" : "type=object").string()), true);
-        mapperService.merge(childType, new CompressedString(PutMappingRequest.buildFromSimplifiedDef(childType, "_parent", "type=" + parentType, CHILD_SCORE_NAME, "type=double,doc_values=false").string()), true);
+        mapperService.merge(parentType, new CompressedXContent(PutMappingRequest.buildFromSimplifiedDef(parentType, "nested_field", random().nextBoolean() ? "type=nested" : "type=object").string()), true);
+        mapperService.merge(childType, new CompressedXContent(PutMappingRequest.buildFromSimplifiedDef(childType, "_parent", "type=" + parentType, CHILD_SCORE_NAME, "type=double,doc_values=false").string()), true);
         return createSearchContext(indexService);
     }
     
diff --git a/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java b/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java
index 6907736d3cb..131e8ad73df 100644
--- a/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java
+++ b/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java
@@ -20,6 +20,7 @@ package org.elasticsearch.indices.template;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.ActionRequestValidationException;
@@ -32,6 +33,7 @@ import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.cluster.metadata.AliasMetaData;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -42,6 +44,7 @@ import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
@@ -668,4 +671,5 @@ public class SimpleIndexTemplateTests extends ElasticsearchIntegrationTest {
         assertThat(response.getItems()[0].isFailed(), equalTo(true));
         assertThat(response.getItems()[0].getFailureMessage(), containsString("failed to parse filter for alias [alias4]"));
     }
+
 }
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTest.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTest.java
index 855f21de852..f07d7790ff4 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTest.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTest.java
@@ -33,7 +33,7 @@ import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.store.Directory;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
-import org.elasticsearch.common.compress.CompressedString;
+import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.lucene.search.Queries;
 import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.mapper.internal.TypeFieldMapper;
@@ -117,7 +117,7 @@ public class NestedAggregatorTest extends ElasticsearchSingleNodeTest {
         IndexSearcher searcher = new IndexSearcher(directoryReader);
 
         IndexService indexService = createIndex("test");
-        indexService.mapperService().merge("test", new CompressedString(PutMappingRequest.buildFromSimplifiedDef("test", "nested_field", "type=nested").string()), true);
+        indexService.mapperService().merge("test", new CompressedXContent(PutMappingRequest.buildFromSimplifiedDef("test", "nested_field", "type=nested").string()), true);
         SearchContext searchContext = createSearchContext(indexService);
         AggregationContext context = new AggregationContext(searchContext);
 

From 18c8394fbd74257f215f4aa6980b21c10d792134 Mon Sep 17 00:00:00 2001
From: Clinton Gormley <clint@traveljury.com>
Date: Fri, 29 May 2015 12:30:43 +0200
Subject: [PATCH 065/123] REST spec: Renamed indices.flush.synced to
 indices.flush_synced

---
 rest-api-spec/api/indices.flush_synced.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest-api-spec/api/indices.flush_synced.json b/rest-api-spec/api/indices.flush_synced.json
index 28cad291e6a..e2d40a9c402 100644
--- a/rest-api-spec/api/indices.flush_synced.json
+++ b/rest-api-spec/api/indices.flush_synced.json
@@ -1,5 +1,5 @@
 {
-  "indices.flush.synced": {
+  "indices.flush_synced": {
     "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-flush.html",
     "methods": ["POST", "GET"],
     "url": {

From 784a26321bc1b116939adb32ffc1324e85b4ad89 Mon Sep 17 00:00:00 2001
From: Spyros Kapnissis <spyros@gmail.com>
Date: Wed, 27 May 2015 09:43:33 +0300
Subject: [PATCH 066/123] Query DSL: throw an exception if array passed to
 `term` query.

Closes #11246
Closes #11384
---
 .../org/elasticsearch/index/query/TermQueryParser.java     | 2 ++
 .../index/query/SimpleIndexQueryParserTests.java           | 7 +++++++
 .../org/elasticsearch/index/query/term-array-invalid.json  | 5 +++++
 3 files changed, 14 insertions(+)
 create mode 100644 src/test/java/org/elasticsearch/index/query/term-array-invalid.json

diff --git a/src/main/java/org/elasticsearch/index/query/TermQueryParser.java b/src/main/java/org/elasticsearch/index/query/TermQueryParser.java
index 5e6babdbaeb..c0755289f06 100644
--- a/src/main/java/org/elasticsearch/index/query/TermQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/TermQueryParser.java
@@ -89,6 +89,8 @@ public class TermQueryParser implements QueryParser {
                     fieldName = currentFieldName;
                     value = parser.objectBytes();
                 }
+            } else if (token == XContentParser.Token.START_ARRAY) {
+                throw new QueryParsingException(parseContext, "[term] query does not support array of values");
             }
         }
 
diff --git a/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java b/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
index 992f1777a2c..88c3b9d2f90 100644
--- a/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
+++ b/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
@@ -516,6 +516,13 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
         assertThat(fieldQuery.getTerm().bytes(), equalTo(indexedValueForSearch(34l)));
     }
 
+    @Test(expected = QueryParsingException.class)
+    public void testTermQueryArrayInvalid() throws IOException {
+        IndexQueryParserService queryParser = queryParser();
+        String query = copyToStringFromClasspath("/org/elasticsearch/index/query/term-array-invalid.json");
+        unwrapTermQuery(queryParser.parse(query).query());
+    }
+
     private static TermQuery unwrapTermQuery(Query q) {
         assertThat(q, instanceOf(TermQuery.class));
         return (TermQuery) q;
diff --git a/src/test/java/org/elasticsearch/index/query/term-array-invalid.json b/src/test/java/org/elasticsearch/index/query/term-array-invalid.json
new file mode 100644
index 00000000000..a198bc2dafc
--- /dev/null
+++ b/src/test/java/org/elasticsearch/index/query/term-array-invalid.json
@@ -0,0 +1,5 @@
+{
+    "term": {
+        "age": [34, 35]
+    }
+}

From d23449ee85256d3200c5e99c11f999211da87759 Mon Sep 17 00:00:00 2001
From: Britta Weber <britta.weber@elasticsearch.com>
Date: Fri, 29 May 2015 13:47:43 +0200
Subject: [PATCH 067/123] [test] fix name in synced flush test

---
 rest-api-spec/test/indices.flush/10_basic.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rest-api-spec/test/indices.flush/10_basic.yaml b/rest-api-spec/test/indices.flush/10_basic.yaml
index f85458da69e..3c8d34be31a 100644
--- a/rest-api-spec/test/indices.flush/10_basic.yaml
+++ b/rest-api-spec/test/indices.flush/10_basic.yaml
@@ -8,7 +8,7 @@
        cluster.health:
           wait_for_status: yellow
     - do:
-       indices.flush.synced:
+       indices.flush_synced:
           index: testing
 
     - is_false: _shards.failed

From 5a9694783b657e58ee2c3e3c84b9696a0fdd4eeb Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Fri, 29 May 2015 13:52:26 +0200
Subject: [PATCH 068/123] Consolidate shard level modules without logic into
 IndexShardModule

We have a lot of module classes that don't contain any actual logic,
only declarative bind actions. These classes are unnecessary and can
be consolidated into the already existings IndexShardModule
---
 .../metadata/MetaDataCreateIndexService.java  |  4 +-
 .../org/elasticsearch/index/IndexService.java | 39 +++++++-----------
 .../bitset/ShardBitsetFilterCacheModule.java  | 32 ---------------
 .../cache/filter/ShardFilterCacheModule.java  | 38 -----------------
 .../cache/query/ShardQueryCacheModule.java    | 32 ---------------
 .../gateway/IndexShardGatewayModule.java      | 35 ----------------
 .../index/get/ShardGetModule.java             | 32 ---------------
 .../index/indexing/ShardIndexingModule.java   | 34 ---------------
 .../percolator/PercolatorShardModule.java     | 34 ---------------
 .../index/search/stats/ShardSearchModule.java | 34 ---------------
 .../index/shard/IndexShardModule.java         | 41 ++++++++++++++++++-
 .../snapshots/IndexShardSnapshotModule.java   | 33 ---------------
 .../index/store/StoreModule.java              |  2 -
 .../termvectors/ShardTermVectorsModule.java   | 32 ---------------
 .../index/shard/IndexShardModuleTests.java    |  8 ++--
 15 files changed, 59 insertions(+), 371 deletions(-)
 delete mode 100644 src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCacheModule.java
 delete mode 100644 src/main/java/org/elasticsearch/index/cache/filter/ShardFilterCacheModule.java
 delete mode 100644 src/main/java/org/elasticsearch/index/cache/query/ShardQueryCacheModule.java
 delete mode 100644 src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayModule.java
 delete mode 100644 src/main/java/org/elasticsearch/index/get/ShardGetModule.java
 delete mode 100644 src/main/java/org/elasticsearch/index/indexing/ShardIndexingModule.java
 delete mode 100644 src/main/java/org/elasticsearch/index/percolator/PercolatorShardModule.java
 delete mode 100644 src/main/java/org/elasticsearch/index/search/stats/ShardSearchModule.java
 delete mode 100644 src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotModule.java
 delete mode 100644 src/main/java/org/elasticsearch/index/termvectors/ShardTermVectorsModule.java

diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
index 41e310a95ad..b16edc21dd7 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
@@ -87,7 +87,6 @@ public class MetaDataCreateIndexService extends AbstractComponent {
     public final static int MAX_INDEX_NAME_BYTES = 255;
     private static final DefaultIndexTemplateFilter DEFAULT_INDEX_TEMPLATE_FILTER = new DefaultIndexTemplateFilter();
 
-    private final Environment environment;
     private final ThreadPool threadPool;
     private final ClusterService clusterService;
     private final IndicesService indicesService;
@@ -100,12 +99,11 @@ public class MetaDataCreateIndexService extends AbstractComponent {
     private final NodeEnvironment nodeEnv;
 
     @Inject
-    public MetaDataCreateIndexService(Settings settings, Environment environment, ThreadPool threadPool, ClusterService clusterService,
+    public MetaDataCreateIndexService(Settings settings, ThreadPool threadPool, ClusterService clusterService,
                                       IndicesService indicesService, AllocationService allocationService, MetaDataService metaDataService,
                                       Version version, @RiverIndexName String riverIndexName, AliasValidator aliasValidator,
                                       Set<IndexTemplateFilter> indexTemplateFilters, NodeEnvironment nodeEnv) {
         super(settings);
-        this.environment = environment;
         this.threadPool = threadPool;
         this.clusterService = clusterService;
         this.indicesService = indicesService;
diff --git a/src/main/java/org/elasticsearch/index/IndexService.java b/src/main/java/org/elasticsearch/index/IndexService.java
index 09335126c73..e6ff7f232f2 100644
--- a/src/main/java/org/elasticsearch/index/IndexService.java
+++ b/src/main/java/org/elasticsearch/index/IndexService.java
@@ -36,36 +36,37 @@ import org.elasticsearch.index.aliases.IndexAliasesService;
 import org.elasticsearch.index.analysis.AnalysisService;
 import org.elasticsearch.index.cache.IndexCache;
 import org.elasticsearch.index.cache.bitset.BitsetFilterCache;
-import org.elasticsearch.index.cache.bitset.ShardBitsetFilterCacheModule;
+import org.elasticsearch.index.cache.bitset.ShardBitsetFilterCache;
 import org.elasticsearch.index.cache.filter.ShardFilterCache;
-import org.elasticsearch.index.cache.filter.ShardFilterCacheModule;
-import org.elasticsearch.index.cache.query.ShardQueryCacheModule;
+import org.elasticsearch.index.cache.query.ShardQueryCache;
 import org.elasticsearch.index.deletionpolicy.DeletionPolicyModule;
 import org.elasticsearch.index.fielddata.IndexFieldDataService;
-import org.elasticsearch.index.fielddata.ShardFieldDataModule;
-import org.elasticsearch.index.gateway.IndexShardGatewayModule;
+import org.elasticsearch.index.fielddata.ShardFieldData;
+import org.elasticsearch.index.gateway.IndexShardGateway;
 import org.elasticsearch.index.gateway.IndexShardGatewayService;
-import org.elasticsearch.index.get.ShardGetModule;
-import org.elasticsearch.index.indexing.ShardIndexingModule;
+import org.elasticsearch.index.get.ShardGetService;
+import org.elasticsearch.index.indexing.ShardIndexingService;
+import org.elasticsearch.index.indexing.slowlog.ShardSlowLogIndexingService;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.merge.policy.MergePolicyModule;
 import org.elasticsearch.index.merge.policy.MergePolicyProvider;
 import org.elasticsearch.index.merge.scheduler.MergeSchedulerModule;
 import org.elasticsearch.index.merge.scheduler.MergeSchedulerProvider;
 import org.elasticsearch.index.percolator.PercolatorQueriesRegistry;
-import org.elasticsearch.index.percolator.PercolatorShardModule;
+import org.elasticsearch.index.percolator.stats.ShardPercolateService;
 import org.elasticsearch.index.query.IndexQueryParserService;
-import org.elasticsearch.index.search.stats.ShardSearchModule;
+import org.elasticsearch.index.search.slowlog.ShardSlowLogSearchService;
+import org.elasticsearch.index.search.stats.ShardSearchService;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.index.settings.IndexSettingsService;
 import org.elasticsearch.index.shard.*;
 import org.elasticsearch.index.similarity.SimilarityService;
-import org.elasticsearch.index.snapshots.IndexShardSnapshotModule;
+import org.elasticsearch.index.snapshots.IndexShardSnapshotAndRestoreService;
 import org.elasticsearch.index.store.IndexStore;
 import org.elasticsearch.index.store.Store;
 import org.elasticsearch.index.store.StoreModule;
-import org.elasticsearch.index.suggest.SuggestShardModule;
-import org.elasticsearch.index.termvectors.ShardTermVectorsModule;
+import org.elasticsearch.index.suggest.stats.ShardSuggestService;
+import org.elasticsearch.index.termvectors.ShardTermVectorsService;
 import org.elasticsearch.index.translog.TranslogService;
 import org.elasticsearch.indices.IndicesLifecycle;
 import org.elasticsearch.indices.IndicesService;
@@ -307,24 +308,12 @@ public class IndexService extends AbstractIndexComponent implements IndexCompone
             final ShardFilterCache shardFilterCache = new ShardFilterCache(shardId, injector.getInstance(IndicesFilterCache.class));
             ModulesBuilder modules = new ModulesBuilder();
             modules.add(new ShardsPluginsModule(indexSettings, pluginsService));
-            modules.add(new IndexShardModule(shardId, primary, indexSettings));
-            modules.add(new ShardIndexingModule());
-            modules.add(new ShardSearchModule());
-            modules.add(new ShardGetModule());
+            modules.add(new IndexShardModule(shardId, primary, indexSettings, shardFilterCache));
             modules.add(new StoreModule(injector.getInstance(IndexStore.class).shardDirectory(), lock,
                     new StoreCloseListener(shardId, canDeleteShardContent, shardFilterCache), path));
             modules.add(new DeletionPolicyModule(indexSettings));
             modules.add(new MergePolicyModule(indexSettings));
             modules.add(new MergeSchedulerModule(indexSettings));
-            modules.add(new ShardFilterCacheModule(shardFilterCache));
-            modules.add(new ShardQueryCacheModule());
-            modules.add(new ShardBitsetFilterCacheModule());
-            modules.add(new ShardFieldDataModule());
-            modules.add(new IndexShardGatewayModule());
-            modules.add(new PercolatorShardModule());
-            modules.add(new ShardTermVectorsModule());
-            modules.add(new IndexShardSnapshotModule());
-            modules.add(new SuggestShardModule());
             try {
                 shardInjector = modules.createChildInjector(injector);
             } catch (CreationException e) {
diff --git a/src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCacheModule.java b/src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCacheModule.java
deleted file mode 100644
index c0087119f66..00000000000
--- a/src/main/java/org/elasticsearch/index/cache/bitset/ShardBitsetFilterCacheModule.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.index.cache.bitset;
-
-import org.elasticsearch.common.inject.AbstractModule;
-
-/**
- */
-public class ShardBitsetFilterCacheModule extends AbstractModule {
-
-    @Override
-    protected void configure() {
-        bind(ShardBitsetFilterCache.class).asEagerSingleton();
-    }
-}
diff --git a/src/main/java/org/elasticsearch/index/cache/filter/ShardFilterCacheModule.java b/src/main/java/org/elasticsearch/index/cache/filter/ShardFilterCacheModule.java
deleted file mode 100644
index 37bcb805768..00000000000
--- a/src/main/java/org/elasticsearch/index/cache/filter/ShardFilterCacheModule.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.index.cache.filter;
-
-import org.elasticsearch.common.inject.AbstractModule;
-
-/**
- */
-public class ShardFilterCacheModule extends AbstractModule {
-
-    private final ShardFilterCache shardFilterCache;
-
-    public ShardFilterCacheModule(ShardFilterCache shardFilterCache) {
-        this.shardFilterCache = shardFilterCache;
-    }
-
-    @Override
-    protected void configure() {
-        bind(ShardFilterCache.class).toInstance(shardFilterCache);
-    }
-}
diff --git a/src/main/java/org/elasticsearch/index/cache/query/ShardQueryCacheModule.java b/src/main/java/org/elasticsearch/index/cache/query/ShardQueryCacheModule.java
deleted file mode 100644
index 938f016a8c3..00000000000
--- a/src/main/java/org/elasticsearch/index/cache/query/ShardQueryCacheModule.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.index.cache.query;
-
-import org.elasticsearch.common.inject.AbstractModule;
-
-/**
- */
-public class ShardQueryCacheModule extends AbstractModule {
-
-    @Override
-    protected void configure() {
-        bind(ShardQueryCache.class).asEagerSingleton();
-    }
-}
diff --git a/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayModule.java b/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayModule.java
deleted file mode 100644
index 11ff2cf717e..00000000000
--- a/src/main/java/org/elasticsearch/index/gateway/IndexShardGatewayModule.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.index.gateway;
-
-import org.elasticsearch.common.inject.AbstractModule;
-
-/**
- *
- */
-public class IndexShardGatewayModule extends AbstractModule {
-
-
-    @Override
-    protected void configure() {
-        bind(IndexShardGateway.class).asEagerSingleton();
-        bind(IndexShardGatewayService.class).asEagerSingleton();
-    }
-}
diff --git a/src/main/java/org/elasticsearch/index/get/ShardGetModule.java b/src/main/java/org/elasticsearch/index/get/ShardGetModule.java
deleted file mode 100644
index bc1df275dc5..00000000000
--- a/src/main/java/org/elasticsearch/index/get/ShardGetModule.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.index.get;
-
-import org.elasticsearch.common.inject.AbstractModule;
-
-/**
- */
-public class ShardGetModule extends AbstractModule {
-
-    @Override
-    protected void configure() {
-        bind(ShardGetService.class).asEagerSingleton();
-    }
-}
diff --git a/src/main/java/org/elasticsearch/index/indexing/ShardIndexingModule.java b/src/main/java/org/elasticsearch/index/indexing/ShardIndexingModule.java
deleted file mode 100644
index 4d5e29daca3..00000000000
--- a/src/main/java/org/elasticsearch/index/indexing/ShardIndexingModule.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.index.indexing;
-
-import org.elasticsearch.common.inject.AbstractModule;
-import org.elasticsearch.index.indexing.slowlog.ShardSlowLogIndexingService;
-
-/**
- */
-public class ShardIndexingModule extends AbstractModule {
-
-    @Override
-    protected void configure() {
-        bind(ShardIndexingService.class).asEagerSingleton();
-        bind(ShardSlowLogIndexingService.class).asEagerSingleton();
-    }
-}
diff --git a/src/main/java/org/elasticsearch/index/percolator/PercolatorShardModule.java b/src/main/java/org/elasticsearch/index/percolator/PercolatorShardModule.java
deleted file mode 100644
index aba7e10fb2e..00000000000
--- a/src/main/java/org/elasticsearch/index/percolator/PercolatorShardModule.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.elasticsearch.index.percolator;
-
-import org.elasticsearch.common.inject.AbstractModule;
-import org.elasticsearch.index.percolator.stats.ShardPercolateService;
-
-/**
- *
- */
-public class PercolatorShardModule extends AbstractModule {
-
-    @Override
-    protected void configure() {
-        bind(PercolatorQueriesRegistry.class).asEagerSingleton();
-        bind(ShardPercolateService.class).asEagerSingleton();
-    }
-}
diff --git a/src/main/java/org/elasticsearch/index/search/stats/ShardSearchModule.java b/src/main/java/org/elasticsearch/index/search/stats/ShardSearchModule.java
deleted file mode 100644
index 28f8c09c8c2..00000000000
--- a/src/main/java/org/elasticsearch/index/search/stats/ShardSearchModule.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.index.search.stats;
-
-import org.elasticsearch.common.inject.AbstractModule;
-import org.elasticsearch.index.search.slowlog.ShardSlowLogSearchService;
-
-/**
- */
-public class ShardSearchModule extends AbstractModule {
-
-    @Override
-    protected void configure() {
-        bind(ShardSearchService.class).asEagerSingleton();
-        bind(ShardSlowLogSearchService.class).asEagerSingleton();
-    }
-}
diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShardModule.java b/src/main/java/org/elasticsearch/index/shard/IndexShardModule.java
index fc44f11eab9..672b63bfb1c 100644
--- a/src/main/java/org/elasticsearch/index/shard/IndexShardModule.java
+++ b/src/main/java/org/elasticsearch/index/shard/IndexShardModule.java
@@ -22,8 +22,27 @@ package org.elasticsearch.index.shard;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.inject.AbstractModule;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.env.ShardLock;
+import org.elasticsearch.index.cache.bitset.ShardBitsetFilterCache;
+import org.elasticsearch.index.cache.filter.ShardFilterCache;
+import org.elasticsearch.index.cache.query.ShardQueryCache;
 import org.elasticsearch.index.engine.EngineFactory;
 import org.elasticsearch.index.engine.InternalEngineFactory;
+import org.elasticsearch.index.fielddata.ShardFieldData;
+import org.elasticsearch.index.gateway.IndexShardGateway;
+import org.elasticsearch.index.gateway.IndexShardGatewayService;
+import org.elasticsearch.index.get.ShardGetService;
+import org.elasticsearch.index.indexing.ShardIndexingService;
+import org.elasticsearch.index.indexing.slowlog.ShardSlowLogIndexingService;
+import org.elasticsearch.index.percolator.PercolatorQueriesRegistry;
+import org.elasticsearch.index.percolator.stats.ShardPercolateService;
+import org.elasticsearch.index.search.slowlog.ShardSlowLogSearchService;
+import org.elasticsearch.index.search.stats.ShardSearchService;
+import org.elasticsearch.index.snapshots.IndexShardSnapshotAndRestoreService;
+import org.elasticsearch.index.store.DirectoryService;
+import org.elasticsearch.index.store.Store;
+import org.elasticsearch.index.suggest.stats.ShardSuggestService;
+import org.elasticsearch.index.termvectors.ShardTermVectorsService;
 import org.elasticsearch.index.translog.TranslogService;
 import org.elasticsearch.index.warmer.ShardIndexWarmerService;
 
@@ -43,9 +62,11 @@ public class IndexShardModule extends AbstractModule {
     private final ShardId shardId;
     private final Settings settings;
     private final boolean primary;
+    private final ShardFilterCache shardFilterCache;
 
-    public IndexShardModule(ShardId shardId, boolean primary, Settings settings) {
+    public IndexShardModule(ShardId shardId, boolean primary, Settings settings, ShardFilterCache shardFilterCache) {
         this.settings = settings;
+        this.shardFilterCache = shardFilterCache;
         this.shardId = shardId;
         this.primary = primary;
         if (settings.get("index.translog.type") != null) {
@@ -69,7 +90,25 @@ public class IndexShardModule extends AbstractModule {
         }
 
         bind(EngineFactory.class).to(settings.getAsClass(ENGINE_FACTORY, DEFAULT_ENGINE_FACTORY_CLASS, ENGINE_PREFIX, ENGINE_SUFFIX));
+
         bind(ShardIndexWarmerService.class).asEagerSingleton();
+        bind(ShardIndexingService.class).asEagerSingleton();
+        bind(ShardSlowLogIndexingService.class).asEagerSingleton();
+        bind(ShardSearchService.class).asEagerSingleton();
+        bind(ShardSlowLogSearchService.class).asEagerSingleton();
+        bind(ShardGetService.class).asEagerSingleton();
+        bind(ShardFilterCache.class).toInstance(shardFilterCache);
+        bind(ShardQueryCache.class).asEagerSingleton();
+        bind(ShardBitsetFilterCache.class).asEagerSingleton();
+        bind(ShardFieldData.class).asEagerSingleton();
+        bind(IndexShardGateway.class).asEagerSingleton();
+        bind(IndexShardGatewayService.class).asEagerSingleton();
+        bind(PercolatorQueriesRegistry.class).asEagerSingleton();
+        bind(ShardPercolateService.class).asEagerSingleton();
+        bind(ShardTermVectorsService.class).asEagerSingleton();
+        bind(IndexShardSnapshotAndRestoreService.class).asEagerSingleton();
+        bind(ShardSuggestService.class).asEagerSingleton();
     }
 
+
 }
\ No newline at end of file
diff --git a/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotModule.java b/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotModule.java
deleted file mode 100644
index c0cf9788400..00000000000
--- a/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotModule.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.index.snapshots;
-
-import org.elasticsearch.common.inject.AbstractModule;
-
-/**
- * This shard-level module configures {@link IndexShardSnapshotAndRestoreService}
- */
-public class IndexShardSnapshotModule extends AbstractModule {
-
-    @Override
-    protected void configure() {
-        bind(IndexShardSnapshotAndRestoreService.class).asEagerSingleton();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/org/elasticsearch/index/store/StoreModule.java b/src/main/java/org/elasticsearch/index/store/StoreModule.java
index fe0e314ba16..fccd2de2e43 100644
--- a/src/main/java/org/elasticsearch/index/store/StoreModule.java
+++ b/src/main/java/org/elasticsearch/index/store/StoreModule.java
@@ -27,8 +27,6 @@ import org.elasticsearch.index.shard.ShardPath;
  *
  */
 public class StoreModule extends AbstractModule {
-
-
     private final ShardLock lock;
     private final Store.OnClose closeCallback;
     private final ShardPath path;
diff --git a/src/main/java/org/elasticsearch/index/termvectors/ShardTermVectorsModule.java b/src/main/java/org/elasticsearch/index/termvectors/ShardTermVectorsModule.java
deleted file mode 100644
index 45a7d14b703..00000000000
--- a/src/main/java/org/elasticsearch/index/termvectors/ShardTermVectorsModule.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.elasticsearch.index.termvectors;
-
-import org.elasticsearch.common.inject.AbstractModule;
-
-/**
- *
- */
-public class ShardTermVectorsModule extends AbstractModule {
-
-    @Override
-    protected void configure() {
-        bind(ShardTermVectorsService.class).asEagerSingleton();
-    }
-}
diff --git a/src/test/java/org/elasticsearch/index/shard/IndexShardModuleTests.java b/src/test/java/org/elasticsearch/index/shard/IndexShardModuleTests.java
index b5ac0cce405..8238c159df2 100644
--- a/src/test/java/org/elasticsearch/index/shard/IndexShardModuleTests.java
+++ b/src/test/java/org/elasticsearch/index/shard/IndexShardModuleTests.java
@@ -41,10 +41,10 @@ public class IndexShardModuleTests extends ElasticsearchTestCase {
                 .put(IndexMetaData.SETTING_SHADOW_REPLICAS, true)
                 .build();
 
-        IndexShardModule ism1 = new IndexShardModule(shardId, true, regularSettings);
-        IndexShardModule ism2 = new IndexShardModule(shardId, false, regularSettings);
-        IndexShardModule ism3 = new IndexShardModule(shardId, true, shadowSettings);
-        IndexShardModule ism4 = new IndexShardModule(shardId, false, shadowSettings);
+        IndexShardModule ism1 = new IndexShardModule(shardId, true, regularSettings, null);
+        IndexShardModule ism2 = new IndexShardModule(shardId, false, regularSettings, null);
+        IndexShardModule ism3 = new IndexShardModule(shardId, true, shadowSettings, null);
+        IndexShardModule ism4 = new IndexShardModule(shardId, false, shadowSettings, null);
 
         assertFalse("no shadow replicas for normal settings", ism1.useShadowEngine());
         assertFalse("no shadow replicas for normal settings", ism2.useShadowEngine());

From c7ca64cc080ba9426e82e9223f71d0e9177a7868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20B=C3=BCscher?= <christoph@elastic.co>
Date: Tue, 26 May 2015 16:14:54 +0200
Subject: [PATCH 069/123] Fix typed parameters in IndexRequestBuilder and
 CreateIndexRequestBuilder

IndexRequestBuilder#setSource as well as CreateIndexRequestBuilder#setSettings and
CreateIndexRequestBuilder#setSouce() will not work with Map<String, String> argument
although the API looks like it should. This PR fixes the problem introducing correct
wildcard parameters and adds tests.

Closes #10825
---
 .../indices/create/CreateIndexRequest.java    |   4 +-
 .../create/CreateIndexRequestBuilder.java     |   4 +-
 .../action/index/IndexRequestBuilder.java     |   4 +-
 .../create/CreateIndexRequestBuilderTest.java | 112 ++++++++++++++++++
 .../action/index/IndexRequestBuilderTest.java |  87 ++++++++++++++
 .../HeadersAndContextCopyClientTests.java     |  52 +++-----
 .../org/elasticsearch/rest/NoOpClient.java    |  54 +++++++++
 7 files changed, 276 insertions(+), 41 deletions(-)
 create mode 100644 src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTest.java
 create mode 100644 src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTest.java
 create mode 100644 src/test/java/org/elasticsearch/rest/NoOpClient.java

diff --git a/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java b/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java
index 873e6e9e8ca..3a174484ef9 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java
@@ -377,9 +377,9 @@ public class CreateIndexRequest extends AcknowledgedRequest<CreateIndexRequest>
      * Sets the settings and mappings as a single source.
      */
     @SuppressWarnings("unchecked")
-    public CreateIndexRequest source(Map<String, Object> source) {
+    public CreateIndexRequest source(Map<String, ?> source) {
         boolean found = false;
-        for (Map.Entry<String, Object> entry : source.entrySet()) {
+        for (Map.Entry<String, ?> entry : source.entrySet()) {
             String name = entry.getKey();
             if (name.equals("settings")) {
                 found = true;
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java
index 12648db563a..637c6d7ba08 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java
@@ -93,7 +93,7 @@ public class CreateIndexRequestBuilder extends AcknowledgedRequestBuilder<Create
     /**
      * The settings to create the index with (either json/yaml/properties format)
      */
-    public CreateIndexRequestBuilder setSettings(Map<String, Object> source) {
+    public CreateIndexRequestBuilder setSettings(Map<String, ?> source) {
         request.settings(source);
         return this;
     }
@@ -223,7 +223,7 @@ public class CreateIndexRequestBuilder extends AcknowledgedRequestBuilder<Create
     /**
      * Sets the settings and mappings as a single source.
      */
-    public CreateIndexRequestBuilder setSource(Map<String, Object> source) {
+    public CreateIndexRequestBuilder setSource(Map<String, ?> source) {
         request.source(source);
         return this;
     }
diff --git a/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java b/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java
index cf494358628..5b6674e38a1 100644
--- a/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java
+++ b/src/main/java/org/elasticsearch/action/index/IndexRequestBuilder.java
@@ -90,7 +90,7 @@ public class IndexRequestBuilder extends ReplicationRequestBuilder<IndexRequest,
      *
      * @param source The map to index
      */
-    public IndexRequestBuilder setSource(Map<String, Object> source) {
+    public IndexRequestBuilder setSource(Map<String, ?> source) {
         request.source(source);
         return this;
     }
@@ -100,7 +100,7 @@ public class IndexRequestBuilder extends ReplicationRequestBuilder<IndexRequest,
      *
      * @param source The map to index
      */
-    public IndexRequestBuilder setSource(Map<String, Object> source, XContentType contentType) {
+    public IndexRequestBuilder setSource(Map<String, ?> source, XContentType contentType) {
         request.source(source, contentType);
         return this;
     }
diff --git a/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTest.java b/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTest.java
new file mode 100644
index 00000000000..31576c38d06
--- /dev/null
+++ b/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTest.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.admin.indices.create;
+
+import org.elasticsearch.action.index.IndexRequestBuilderTest;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.rest.NoOpClient;
+import org.elasticsearch.test.ElasticsearchTestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class CreateIndexRequestBuilderTest extends ElasticsearchTestCase {
+
+    private static final String KEY = "my.settings.key";
+    private static final String VALUE = "my.settings.value";
+    private NoOpClient testClient;
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        this.testClient = new NoOpClient(getTestName());
+    }
+
+    @Override
+    @After
+    public void tearDown() throws Exception {
+        this.testClient.close();
+        super.tearDown();
+    }
+
+    /**
+     * test setting the source with available setters
+     */
+    @Test
+    public void testSetSource() throws IOException {
+        CreateIndexRequestBuilder builder = new CreateIndexRequestBuilder(this.testClient, CreateIndexAction.INSTANCE);
+        builder.setSource("{\""+KEY+"\" : \""+VALUE+"\"}");
+        assertEquals(VALUE, builder.request().settings().get(KEY));
+
+        XContentBuilder xContent = XContentFactory.jsonBuilder().startObject().field(KEY, VALUE).endObject();
+        xContent.close();
+        builder.setSource(xContent);
+        assertEquals(VALUE, builder.request().settings().get(KEY));
+
+        ByteArrayOutputStream docOut = new ByteArrayOutputStream();
+        XContentBuilder doc = XContentFactory.jsonBuilder(docOut).startObject().field(KEY, VALUE).endObject();
+        doc.close();
+        builder.setSource(docOut.toByteArray());
+        assertEquals(VALUE, builder.request().settings().get(KEY));
+
+        Map<String, String> settingsMap = new HashMap<>();
+        settingsMap.put(KEY, VALUE);
+        builder.setSettings(settingsMap);
+        assertEquals(VALUE, builder.request().settings().get(KEY));
+    }
+
+    /**
+     * test setting the settings with available setters
+     */
+    @Test
+    public void testSetSettings() throws IOException {
+        CreateIndexRequestBuilder builder = new CreateIndexRequestBuilder(this.testClient, CreateIndexAction.INSTANCE);
+        builder.setSettings(KEY, VALUE);
+        assertEquals(VALUE, builder.request().settings().get(KEY));
+
+        builder.setSettings("{\""+KEY+"\" : \""+VALUE+"\"}");
+        assertEquals(VALUE, builder.request().settings().get(KEY));
+
+        builder.setSettings(Settings.builder().put(KEY, VALUE));
+        assertEquals(VALUE, builder.request().settings().get(KEY));
+
+        builder.setSettings(Settings.builder().put(KEY, VALUE).build());
+        assertEquals(VALUE, builder.request().settings().get(KEY));
+
+        Map<String, String> settingsMap = new HashMap<>();
+        settingsMap.put(KEY, VALUE);
+        builder.setSettings(settingsMap);
+        assertEquals(VALUE, builder.request().settings().get(KEY));
+
+        XContentBuilder xContent = XContentFactory.jsonBuilder().startObject().field(KEY, VALUE).endObject();
+        xContent.close();
+        builder.setSettings(xContent);
+        assertEquals(VALUE, builder.request().settings().get(KEY));
+    }
+
+}
diff --git a/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTest.java b/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTest.java
new file mode 100644
index 00000000000..478e12051d6
--- /dev/null
+++ b/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTest.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.action.index;
+
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.rest.NoOpClient;
+import org.elasticsearch.test.ElasticsearchTestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+public class IndexRequestBuilderTest extends ElasticsearchTestCase {
+
+    private static final String EXPECTED_SOURCE = "{\"SomeKey\":\"SomeValue\"}";
+    private NoOpClient testClient;
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        this.testClient = new NoOpClient(getTestName());
+    }
+
+    @Override
+    @After
+    public void tearDown() throws Exception {
+        this.testClient.close();
+        super.tearDown();
+    }
+
+    /**
+     * test setting the source for the request with different available setters
+     */
+    @Test
+    public void testSetSource() throws Exception {
+        IndexRequestBuilder indexRequestBuilder = new IndexRequestBuilder(this.testClient, IndexAction.INSTANCE);
+        Map<String, String> source = new HashMap<>();
+        source.put("SomeKey", "SomeValue");
+        indexRequestBuilder.setSource(source);
+        assertEquals(EXPECTED_SOURCE, XContentHelper.convertToJson(indexRequestBuilder.request().source(), true));
+
+        indexRequestBuilder.setSource(source, XContentType.JSON);
+        assertEquals(EXPECTED_SOURCE, XContentHelper.convertToJson(indexRequestBuilder.request().source(), true));
+
+        indexRequestBuilder.setSource("SomeKey", "SomeValue");
+        assertEquals(EXPECTED_SOURCE, XContentHelper.convertToJson(indexRequestBuilder.request().source(), true));
+
+        // force the Object... setter
+        indexRequestBuilder.setSource((Object) "SomeKey", "SomeValue");
+        assertEquals(EXPECTED_SOURCE, XContentHelper.convertToJson(indexRequestBuilder.request().source(), true));
+
+        ByteArrayOutputStream docOut = new ByteArrayOutputStream();
+        XContentBuilder doc = XContentFactory.jsonBuilder(docOut).startObject().field("SomeKey", "SomeValue").endObject();
+        doc.close();
+        indexRequestBuilder.setSource(docOut.toByteArray());
+        assertEquals(EXPECTED_SOURCE, XContentHelper.convertToJson(indexRequestBuilder.request().source(), true));
+
+        doc = XContentFactory.jsonBuilder().startObject().field("SomeKey", "SomeValue").endObject();
+        doc.close();
+        indexRequestBuilder.setSource(doc);
+        assertEquals(EXPECTED_SOURCE, XContentHelper.convertToJson(indexRequestBuilder.request().source(), true));
+    }
+}
diff --git a/src/test/java/org/elasticsearch/rest/HeadersAndContextCopyClientTests.java b/src/test/java/org/elasticsearch/rest/HeadersAndContextCopyClientTests.java
index 9d87de9a354..6a110cd5da4 100644
--- a/src/test/java/org/elasticsearch/rest/HeadersAndContextCopyClientTests.java
+++ b/src/test/java/org/elasticsearch/rest/HeadersAndContextCopyClientTests.java
@@ -20,8 +20,9 @@
 package org.elasticsearch.rest;
 
 import com.google.common.collect.Maps;
-import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.action.*;
+
+import org.elasticsearch.action.ActionRequest;
+import org.elasticsearch.action.ActionRequestBuilder;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
 import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest;
 import org.elasticsearch.action.admin.cluster.stats.ClusterStatsRequest;
@@ -31,24 +32,26 @@ import org.elasticsearch.action.admin.indices.flush.FlushRequest;
 import org.elasticsearch.action.get.GetRequest;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.search.SearchRequest;
-import org.elasticsearch.client.*;
-import org.elasticsearch.client.support.AbstractClient;
-import org.elasticsearch.client.support.Headers;
+import org.elasticsearch.client.Client;
+import org.elasticsearch.client.Requests;
 import org.elasticsearch.common.collect.ImmutableOpenMap;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.elasticsearch.test.rest.FakeRestRequest;
-import org.elasticsearch.threadpool.ThreadPool;
 import org.junit.Test;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.is;
 
 public class HeadersAndContextCopyClientTests extends ElasticsearchTestCase {
 
@@ -108,7 +111,7 @@ public class HeadersAndContextCopyClientTests extends ElasticsearchTestCase {
         expectedContext.putAll(transportContext);
         expectedContext.putAll(restContext);
 
-        try (Client client = client(new NoOpClient(), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {
+        try (Client client = client(new NoOpClient(getTestName()), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {
 
             SearchRequest searchRequest = Requests.searchRequest();
             putHeaders(searchRequest, transportHeaders);
@@ -154,7 +157,7 @@ public class HeadersAndContextCopyClientTests extends ElasticsearchTestCase {
         expectedContext.putAll(transportContext);
         expectedContext.putAll(restContext);
 
-        try (Client client = client(new NoOpClient(), new FakeRestRequest(restHeaders, expectedContext), usefulRestHeaders)) {
+        try (Client client = client(new NoOpClient(getTestName()), new FakeRestRequest(restHeaders, expectedContext), usefulRestHeaders)) {
 
             ClusterHealthRequest clusterHealthRequest = Requests.clusterHealthRequest();
             putHeaders(clusterHealthRequest, transportHeaders);
@@ -200,7 +203,7 @@ public class HeadersAndContextCopyClientTests extends ElasticsearchTestCase {
         expectedContext.putAll(transportContext);
         expectedContext.putAll(restContext);
 
-        try (Client client = client(new NoOpClient(), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {
+        try (Client client = client(new NoOpClient(getTestName()), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {
 
             CreateIndexRequest createIndexRequest = Requests.createIndexRequest("test");
             putHeaders(createIndexRequest, transportHeaders);
@@ -246,7 +249,7 @@ public class HeadersAndContextCopyClientTests extends ElasticsearchTestCase {
         expectedContext.putAll(transportContext);
         expectedContext.putAll(restContext);
 
-        try (Client client = client(new NoOpClient(), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {
+        try (Client client = client(new NoOpClient(getTestName()), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {
 
             ActionRequestBuilder requestBuilders[] = new ActionRequestBuilder[]{
                     client.prepareIndex("index", "type"),
@@ -287,7 +290,7 @@ public class HeadersAndContextCopyClientTests extends ElasticsearchTestCase {
         expectedContext.putAll(transportContext);
         expectedContext.putAll(restContext);
 
-        try (Client client = client(new NoOpClient(), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {
+        try (Client client = client(new NoOpClient(getTestName()), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {
 
             ActionRequestBuilder requestBuilders[] = new ActionRequestBuilder[]{
                     client.admin().cluster().prepareNodesInfo(),
@@ -327,7 +330,7 @@ public class HeadersAndContextCopyClientTests extends ElasticsearchTestCase {
         expectedContext.putAll(transportContext);
         expectedContext.putAll(restContext);
 
-        try (Client client = client(new NoOpClient(), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {
+        try (Client client = client(new NoOpClient(getTestName()), new FakeRestRequest(restHeaders, restContext), usefulRestHeaders)) {
 
             ActionRequestBuilder requestBuilders[] = new ActionRequestBuilder[]{
                     client.admin().indices().prepareValidateQuery(),
@@ -420,25 +423,4 @@ public class HeadersAndContextCopyClientTests extends ElasticsearchTestCase {
             }
         }
     }
-
-    private class NoOpClient extends AbstractClient {
-
-        public NoOpClient() {
-            super(Settings.EMPTY, new ThreadPool(getTestName()), Headers.EMPTY);
-        }
-
-        @Override
-        protected <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> void doExecute(Action<Request, Response, RequestBuilder> action, Request request, ActionListener<Response> listener) {
-            listener.onResponse(null);
-        }
-
-        @Override
-        public void close() {
-            try {
-                terminate(threadPool());
-            } catch (Throwable t) {
-                throw new ElasticsearchException(t.getMessage(), t);
-            }
-        }
-    }
 }
diff --git a/src/test/java/org/elasticsearch/rest/NoOpClient.java b/src/test/java/org/elasticsearch/rest/NoOpClient.java
new file mode 100644
index 00000000000..245bdb96a33
--- /dev/null
+++ b/src/test/java/org/elasticsearch/rest/NoOpClient.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.rest;
+
+import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.action.Action;
+import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.ActionRequest;
+import org.elasticsearch.action.ActionRequestBuilder;
+import org.elasticsearch.action.ActionResponse;
+import org.elasticsearch.client.support.AbstractClient;
+import org.elasticsearch.client.support.Headers;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.threadpool.ThreadPool;
+
+import java.util.concurrent.TimeUnit;
+
+public class NoOpClient extends AbstractClient {
+
+    public NoOpClient(String testName) {
+        super(Settings.EMPTY, new ThreadPool(testName), Headers.EMPTY);
+    }
+
+    @Override
+    protected <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> void doExecute(Action<Request, Response, RequestBuilder> action, Request request, ActionListener<Response> listener) {
+        listener.onResponse(null);
+    }
+
+    @Override
+    public void close() {
+        try {
+            ThreadPool.terminate(threadPool(), 10, TimeUnit.SECONDS);
+        } catch (Throwable t) {
+            throw new ElasticsearchException(t.getMessage(), t);
+        }
+    }
+}
\ No newline at end of file

From b6a3952036b1e3297ae56de385aecf7adeab8f37 Mon Sep 17 00:00:00 2001
From: Adrien Grand <jpountz@gmail.com>
Date: Fri, 22 May 2015 17:56:51 +0200
Subject: [PATCH 070/123] Internal: Use DEFLATE instead of LZF for compression.

LZF only stays for backward-compatibility reasons and can only read, not write.
DEFLATE is configured to use level=3, which is a nice trade-off between speed
and compression ratio and is the same as we use for Lucene's high compression
codec.
---
 .../client/transport/TransportClient.java     |  11 +-
 .../common/compress/Compressor.java           |   5 -
 .../common/compress/CompressorFactory.java    |  64 ++-----
 .../common/compress/NotXContentException.java |   7 +-
 .../compress/deflate/DeflateCompressor.java   | 156 ++++++++++++++++++
 .../common/compress/lzf/LZFCompressor.java    |  22 +--
 .../common/xcontent/XContentHelper.java       |   2 +-
 .../publish/PublishClusterStateAction.java    |  20 +--
 .../index/mapper/DocumentMapper.java          |  10 +-
 .../index/mapper/core/BinaryFieldMapper.java  |  12 +-
 .../java/org/elasticsearch/node/Node.java     |   2 -
 .../blobstore/BlobStoreRepository.java        |  68 +++++---
 ...ava => AbstractCompressedStreamTests.java} |  48 +++---
 ...a => AbstractCompressedXContentTests.java} |  63 +++----
 .../deflate/DeflateCompressedStreamTests.java |  30 ++++
 .../deflate/DeflateXContentTests.java         |  30 ++++
 .../compress/lzf}/CompressedStreamOutput.java |   2 +-
 .../lzf/LZFCompressedStreamOutput.java        |   2 +-
 .../lzf/LZFCompressedStreamTests.java         |  30 ++++
 .../compress/lzf/LZFTestCompressor.java       |  34 ++++
 .../common/compress/lzf/LZFXContentTests.java |  30 ++++
 .../compress/SearchSourceCompressTests.java   |  16 +-
 22 files changed, 480 insertions(+), 184 deletions(-)
 create mode 100644 src/main/java/org/elasticsearch/common/compress/deflate/DeflateCompressor.java
 rename src/test/java/org/elasticsearch/common/compress/{CompressedStreamTests.java => AbstractCompressedStreamTests.java} (97%)
 rename src/test/java/org/elasticsearch/common/compress/{CompressedXContentTests.java => AbstractCompressedXContentTests.java} (62%)
 create mode 100644 src/test/java/org/elasticsearch/common/compress/deflate/DeflateCompressedStreamTests.java
 create mode 100644 src/test/java/org/elasticsearch/common/compress/deflate/DeflateXContentTests.java
 rename src/{main/java/org/elasticsearch/common/compress => test/java/org/elasticsearch/common/compress/lzf}/CompressedStreamOutput.java (98%)
 rename src/{main => test}/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java (97%)
 create mode 100644 src/test/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamTests.java
 create mode 100644 src/test/java/org/elasticsearch/common/compress/lzf/LZFTestCompressor.java
 create mode 100644 src/test/java/org/elasticsearch/common/compress/lzf/LZFXContentTests.java

diff --git a/src/main/java/org/elasticsearch/client/transport/TransportClient.java b/src/main/java/org/elasticsearch/client/transport/TransportClient.java
index 9e3cb1f0f80..d63e94d2ffe 100644
--- a/src/main/java/org/elasticsearch/client/transport/TransportClient.java
+++ b/src/main/java/org/elasticsearch/client/transport/TransportClient.java
@@ -20,8 +20,14 @@
 package org.elasticsearch.client.transport;
 
 import com.google.common.collect.ImmutableList;
+
 import org.elasticsearch.Version;
-import org.elasticsearch.action.*;
+import org.elasticsearch.action.Action;
+import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.ActionModule;
+import org.elasticsearch.action.ActionRequest;
+import org.elasticsearch.action.ActionRequestBuilder;
+import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.cache.recycler.PageCacheRecycler;
 import org.elasticsearch.client.support.AbstractClient;
 import org.elasticsearch.client.support.Headers;
@@ -30,7 +36,6 @@ import org.elasticsearch.cluster.ClusterNameModule;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.component.LifecycleComponent;
-import org.elasticsearch.common.compress.CompressorFactory;
 import org.elasticsearch.common.inject.Injector;
 import org.elasticsearch.common.inject.ModulesBuilder;
 import org.elasticsearch.common.network.NetworkModule;
@@ -122,8 +127,6 @@ public class TransportClient extends AbstractClient {
 
             Version version = Version.CURRENT;
 
-            CompressorFactory.configure(this.settings);
-
             final ThreadPool threadPool = new ThreadPool(settings);
 
             boolean success = false;
diff --git a/src/main/java/org/elasticsearch/common/compress/Compressor.java b/src/main/java/org/elasticsearch/common/compress/Compressor.java
index d8f0ae82bf6..252fad09807 100644
--- a/src/main/java/org/elasticsearch/common/compress/Compressor.java
+++ b/src/main/java/org/elasticsearch/common/compress/Compressor.java
@@ -23,7 +23,6 @@ import org.apache.lucene.store.IndexInput;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.settings.Settings;
 import org.jboss.netty.buffer.ChannelBuffer;
 
 import java.io.IOException;
@@ -32,10 +31,6 @@ import java.io.IOException;
  */
 public interface Compressor {
 
-    String type();
-
-    void configure(Settings settings);
-
     boolean isCompressed(BytesReference bytes);
 
     boolean isCompressed(ChannelBuffer buffer);
diff --git a/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java b/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java
index 9873123e558..72c57a97a01 100644
--- a/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java
+++ b/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java
@@ -19,70 +19,36 @@
 
 package org.elasticsearch.common.compress;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-
 import org.apache.lucene.store.IndexInput;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.common.collect.MapBuilder;
+import org.elasticsearch.common.compress.deflate.DeflateCompressor;
 import org.elasticsearch.common.compress.lzf.LZFCompressor;
 import org.elasticsearch.common.io.Streams;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.common.logging.Loggers;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.jboss.netty.buffer.ChannelBuffer;
 
 import java.io.IOException;
-import java.util.List;
-import java.util.Locale;
 
 /**
  */
 public class CompressorFactory {
 
-    private static final LZFCompressor LZF = new LZFCompressor();
-
     private static final Compressor[] compressors;
-    private static final ImmutableMap<String, Compressor> compressorsByType;
-    private static Compressor defaultCompressor;
+    private static volatile Compressor defaultCompressor;
 
     static {
-        List<Compressor> compressorsX = Lists.newArrayList();
-        compressorsX.add(LZF);
-
-        compressors = compressorsX.toArray(new Compressor[compressorsX.size()]);
-        MapBuilder<String, Compressor> compressorsByTypeX = MapBuilder.newMapBuilder();
-        for (Compressor compressor : compressors) {
-            compressorsByTypeX.put(compressor.type(), compressor);
-        }
-        compressorsByType = compressorsByTypeX.immutableMap();
-
-        defaultCompressor = LZF;
+        compressors = new Compressor[] {
+                new LZFCompressor(),
+                new DeflateCompressor()
+        };
+        defaultCompressor = new DeflateCompressor();
     }
 
-    public static synchronized void configure(Settings settings) {
-        for (Compressor compressor : compressors) {
-            compressor.configure(settings);
-        }
-        String defaultType = settings.get("compress.default.type", "lzf").toLowerCase(Locale.ENGLISH);
-        boolean found = false;
-        for (Compressor compressor : compressors) {
-            if (defaultType.equalsIgnoreCase(compressor.type())) {
-                defaultCompressor = compressor;
-                found = true;
-                break;
-            }
-        }
-        if (!found) {
-            Loggers.getLogger(CompressorFactory.class).warn("failed to find default type [{}]", defaultType);
-        }
-    }
-
-    public static synchronized void setDefaultCompressor(Compressor defaultCompressor) {
+    public static void setDefaultCompressor(Compressor defaultCompressor) {
         CompressorFactory.defaultCompressor = defaultCompressor;
     }
 
@@ -94,6 +60,10 @@ public class CompressorFactory {
         return compressor(bytes) != null;
     }
 
+    /**
+     * @deprecated we don't compress lucene indexes anymore and rely on lucene codecs
+     */
+    @Deprecated
     public static boolean isCompressed(IndexInput in) throws IOException {
         return compressor(in) != null;
     }
@@ -127,6 +97,10 @@ public class CompressorFactory {
         throw new NotCompressedException();
     }
 
+    /**
+     * @deprecated we don't compress lucene indexes anymore and rely on lucene codecs
+     */
+    @Deprecated
     @Nullable
     public static Compressor compressor(IndexInput in) throws IOException {
         for (Compressor compressor : compressors) {
@@ -137,10 +111,6 @@ public class CompressorFactory {
         return null;
     }
 
-    public static Compressor compressor(String type) {
-        return compressorsByType.get(type);
-    }
-
     /**
      * Uncompress the provided data, data can be detected as compressed using {@link #isCompressed(byte[], int, int)}.
      */
@@ -160,7 +130,7 @@ public class CompressorFactory {
     public static BytesReference uncompress(BytesReference bytes) throws IOException {
         Compressor compressor = compressor(bytes);
         if (compressor == null) {
-            throw new IllegalArgumentException("Bytes are not compressed");
+            throw new NotCompressedException();
         }
         return uncompress(bytes, compressor);
     }
diff --git a/src/main/java/org/elasticsearch/common/compress/NotXContentException.java b/src/main/java/org/elasticsearch/common/compress/NotXContentException.java
index bca35c317d8..68bbf4da81c 100644
--- a/src/main/java/org/elasticsearch/common/compress/NotXContentException.java
+++ b/src/main/java/org/elasticsearch/common/compress/NotXContentException.java
@@ -19,9 +19,10 @@
 
 package org.elasticsearch.common.compress;
 
-/** Exception indicating that we were expecting something compressed, which
- *  was not compressed or corrupted so that the compression format could not
- *  be detected. */
+import org.elasticsearch.common.xcontent.XContent;
+
+/** Exception indicating that we were expecting some {@link XContent} but could
+ *  not detect its type. */
 public class NotXContentException extends RuntimeException {
 
     public NotXContentException(String message) {
diff --git a/src/main/java/org/elasticsearch/common/compress/deflate/DeflateCompressor.java b/src/main/java/org/elasticsearch/common/compress/deflate/DeflateCompressor.java
new file mode 100644
index 00000000000..b2aea1fa0ce
--- /dev/null
+++ b/src/main/java/org/elasticsearch/common/compress/deflate/DeflateCompressor.java
@@ -0,0 +1,156 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.common.compress.deflate;
+
+import org.apache.lucene.store.IndexInput;
+import org.elasticsearch.common.bytes.BytesReference;
+import org.elasticsearch.common.compress.CompressedIndexInput;
+import org.elasticsearch.common.compress.Compressor;
+import org.elasticsearch.common.io.stream.InputStreamStreamInput;
+import org.elasticsearch.common.io.stream.OutputStreamStreamOutput;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.jboss.netty.buffer.ChannelBuffer;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.zip.Deflater;
+import java.util.zip.DeflaterOutputStream;
+import java.util.zip.Inflater;
+import java.util.zip.InflaterInputStream;
+
+/**
+ * {@link Compressor} implementation based on the DEFLATE compression algorithm.
+ */
+public class DeflateCompressor implements Compressor {
+
+    // An arbitrary header that we use to identify compressed streams
+    // It needs to be different from other compressors and to not be specific
+    // enough so that no stream starting with these bytes could be detected as
+    // a XContent
+    private static final byte[] HEADER = new byte[] { 'D', 'F', 'L', '\0' };
+    // 3 is a good trade-off between speed and compression ratio
+    private static final int LEVEL = 3;
+    // We use buffering on the input and ouput of in/def-laters in order to
+    // limit the number of JNI calls
+    private static final int BUFFER_SIZE = 4096;
+
+    @Override
+    public boolean isCompressed(BytesReference bytes) {
+        if (bytes.length() < HEADER.length) {
+            return false;
+        }
+        for (int i = 0; i < HEADER.length; ++i) {
+            if (bytes.get(i) != HEADER[i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public boolean isCompressed(ChannelBuffer buffer) {
+        if (buffer.readableBytes() < HEADER.length) {
+            return false;
+        }
+        final int offset = buffer.readerIndex();
+        for (int i = 0; i < HEADER.length; ++i) {
+            if (buffer.getByte(offset + i) != HEADER[i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public StreamInput streamInput(StreamInput in) throws IOException {
+        final byte[] headerBytes = new byte[HEADER.length];
+        int len = 0;
+        while (len < headerBytes.length) {
+            final int read = in.read(headerBytes, len, headerBytes.length - len);
+            if (read == -1) {
+                break;
+            }
+            len += read;
+        }
+        if (len != HEADER.length || Arrays.equals(headerBytes, HEADER) == false) {
+            throw new IllegalArgumentException("Input stream is not compressed with DEFLATE!");
+        }
+
+        final boolean nowrap = true;
+        final Inflater inflater = new Inflater(nowrap);
+        InputStream decompressedIn = new InflaterInputStream(in, inflater, BUFFER_SIZE);
+        decompressedIn = new BufferedInputStream(decompressedIn, BUFFER_SIZE);
+        return new InputStreamStreamInput(decompressedIn) {
+            private boolean closed = false;
+
+            public void close() throws IOException {
+                try {
+                    super.close();
+                } finally {
+                    if (closed == false) {
+                        // important to release native memory
+                        inflater.end();
+                        closed = true;
+                    }
+                }
+            }
+        };
+    }
+
+    @Override
+    public StreamOutput streamOutput(StreamOutput out) throws IOException {
+        out.writeBytes(HEADER);
+        final boolean nowrap = true;
+        final Deflater deflater = new Deflater(LEVEL, nowrap);
+        final boolean syncFlush = true;
+        OutputStream compressedOut = new DeflaterOutputStream(out, deflater, BUFFER_SIZE, syncFlush);
+        compressedOut = new BufferedOutputStream(compressedOut, BUFFER_SIZE);
+        return new OutputStreamStreamOutput(compressedOut) {
+            private boolean closed = false;
+
+            public void close() throws IOException {
+                try {
+                    super.close();
+                } finally {
+                    if (closed == false) {
+                        // important to release native memory
+                        deflater.end();
+                        closed = true;
+                    }
+                }
+            }
+        };
+    }
+
+    @Override
+    public boolean isCompressed(IndexInput in) throws IOException {
+        return false;
+    }
+
+    @Override
+    public CompressedIndexInput indexInput(IndexInput in) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressor.java b/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressor.java
index c5c937ccbb9..3646595f724 100644
--- a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressor.java
+++ b/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressor.java
@@ -25,25 +25,23 @@ import com.ning.compress.lzf.util.ChunkDecoderFactory;
 import org.apache.lucene.store.IndexInput;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.compress.CompressedIndexInput;
-import org.elasticsearch.common.compress.CompressedStreamInput;
-import org.elasticsearch.common.compress.CompressedStreamOutput;
 import org.elasticsearch.common.compress.Compressor;
+import org.elasticsearch.common.compress.deflate.DeflateCompressor;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.logging.Loggers;
-import org.elasticsearch.common.settings.Settings;
 import org.jboss.netty.buffer.ChannelBuffer;
 
 import java.io.IOException;
 
 /**
+ * @deprecated Use {@link DeflateCompressor} instead
  */
+@Deprecated
 public class LZFCompressor implements Compressor {
 
     static final byte[] LUCENE_HEADER = {'L', 'Z', 'F', 0};
 
-    public static final String TYPE = "lzf";
-
     private ChunkDecoder decoder;
 
     public LZFCompressor() {
@@ -52,14 +50,6 @@ public class LZFCompressor implements Compressor {
                 this.decoder.getClass().getSimpleName());
     }
 
-    @Override
-    public String type() {
-        return TYPE;
-    }
-
-    @Override
-    public void configure(Settings settings) {}
-
     @Override
     public boolean isCompressed(BytesReference bytes) {
         return bytes.length() >= 3 &&
@@ -95,13 +85,13 @@ public class LZFCompressor implements Compressor {
     }
 
     @Override
-    public CompressedStreamInput streamInput(StreamInput in) throws IOException {
+    public StreamInput streamInput(StreamInput in) throws IOException {
         return new LZFCompressedStreamInput(in, decoder);
     }
 
     @Override
-    public CompressedStreamOutput streamOutput(StreamOutput out) throws IOException {
-        return new LZFCompressedStreamOutput(out);
+    public StreamOutput streamOutput(StreamOutput out) throws IOException {
+        throw new UnsupportedOperationException("LZF is only here for back compat, no write support");
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java b/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java
index 5325950e202..4efd18e8fa9 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java
@@ -417,10 +417,10 @@ public class XContentHelper {
         Compressor compressor = CompressorFactory.compressor(source);
         if (compressor != null) {
             InputStream compressedStreamInput = compressor.streamInput(source.streamInput());
-            XContentType contentType = XContentFactory.xContentType(compressedStreamInput);
             if (compressedStreamInput.markSupported() == false) {
                 compressedStreamInput = new BufferedInputStream(compressedStreamInput);
             }
+            XContentType contentType = XContentFactory.xContentType(compressedStreamInput);
             if (contentType == builder.contentType()) {
                 builder.rawField(field, compressedStreamInput);
             } else {
diff --git a/src/main/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateAction.java b/src/main/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateAction.java
index 92d5bad4bf6..7fd585a6a41 100644
--- a/src/main/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateAction.java
+++ b/src/main/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateAction.java
@@ -227,21 +227,21 @@ public class PublishClusterStateAction extends AbstractComponent {
 
     public static BytesReference serializeFullClusterState(ClusterState clusterState, Version nodeVersion) throws IOException {
         BytesStreamOutput bStream = new BytesStreamOutput();
-        StreamOutput stream = CompressorFactory.defaultCompressor().streamOutput(bStream);
-        stream.setVersion(nodeVersion);
-        stream.writeBoolean(true);
-        clusterState.writeTo(stream);
-        stream.close();
+        try (StreamOutput stream = CompressorFactory.defaultCompressor().streamOutput(bStream)) {
+            stream.setVersion(nodeVersion);
+            stream.writeBoolean(true);
+            clusterState.writeTo(stream);
+        }
         return bStream.bytes();
     }
 
     public static BytesReference serializeDiffClusterState(Diff diff, Version nodeVersion) throws IOException {
         BytesStreamOutput bStream = new BytesStreamOutput();
-        StreamOutput stream = CompressorFactory.defaultCompressor().streamOutput(bStream);
-        stream.setVersion(nodeVersion);
-        stream.writeBoolean(false);
-        diff.writeTo(stream);
-        stream.close();
+        try (StreamOutput stream = CompressorFactory.defaultCompressor().streamOutput(bStream)) {
+            stream.setVersion(nodeVersion);
+            stream.writeBoolean(false);
+            diff.writeTo(stream);
+        }
         return bStream.bytes();
     }
 
diff --git a/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java b/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
index 2c4bd053251..7f8bb8ffa0a 100644
--- a/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
@@ -468,11 +468,11 @@ public class DocumentMapper implements ToXContent {
     private void refreshSource() throws ElasticsearchGenerationException {
         try {
             BytesStreamOutput bStream = new BytesStreamOutput();
-            XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON, CompressorFactory.defaultCompressor().streamOutput(bStream));
-            builder.startObject();
-            toXContent(builder, ToXContent.EMPTY_PARAMS);
-            builder.endObject();
-            builder.close();
+            try (XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON, CompressorFactory.defaultCompressor().streamOutput(bStream))) {
+                builder.startObject();
+                toXContent(builder, ToXContent.EMPTY_PARAMS);
+                builder.endObject();
+            }
             mappingSource = new CompressedXContent(bStream.bytes());
         } catch (Exception e) {
             throw new ElasticsearchGenerationException("failed to serialize source for type [" + type + "]", e);
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java
index 91375efed47..cda0877fdae 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java
@@ -37,8 +37,6 @@ import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.compress.CompressorFactory;
 import org.elasticsearch.common.compress.NotXContentException;
-import org.elasticsearch.common.io.stream.BytesStreamOutput;
-import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.common.xcontent.XContentParser;
@@ -150,10 +148,12 @@ public class BinaryFieldMapper extends AbstractFieldMapper {
                 try {
                     return CompressorFactory.uncompressIfNeeded(bytes);
                 } catch (NotXContentException e) {
-                    // This is a BUG! We try to decompress by detecting a header in
-                    // the stored bytes but since we accept arbitrary bytes, we have
-                    // no guarantee that uncompressed bytes will be detected as
-                    // compressed!
+                    // NOTE: previous versions of Elasticsearch used to try to detect if
+                    // data was compressed. However this could cause decompression failures
+                    // as a user may have submitted arbitrary data which looks like it is
+                    // compressed to elasticsearch but is not. So we removed the ability to
+                    // compress binary fields and keep this empty catch block for backward
+                    // compatibility with 1.x
                 }
             }
             return bytes;
diff --git a/src/main/java/org/elasticsearch/node/Node.java b/src/main/java/org/elasticsearch/node/Node.java
index 820c3a84534..355bea50643 100644
--- a/src/main/java/org/elasticsearch/node/Node.java
+++ b/src/main/java/org/elasticsearch/node/Node.java
@@ -36,7 +36,6 @@ import org.elasticsearch.common.StopWatch;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.component.Lifecycle;
 import org.elasticsearch.common.component.LifecycleComponent;
-import org.elasticsearch.common.compress.CompressorFactory;
 import org.elasticsearch.common.inject.Injector;
 import org.elasticsearch.common.inject.ModulesBuilder;
 import org.elasticsearch.common.lease.Releasable;
@@ -151,7 +150,6 @@ public class Node implements Releasable {
         // create the environment based on the finalized (processed) view of the settings
         this.environment = new Environment(this.settings());
 
-        CompressorFactory.configure(settings);
         final NodeEnvironment nodeEnvironment;
         try {
             nodeEnvironment = new NodeEnvironment(this.settings, this.environment);
diff --git a/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java b/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
index 83baf8d1e2d..2cf35a9905d 100644
--- a/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
+++ b/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
@@ -26,12 +26,13 @@ import com.google.common.collect.Maps;
 import com.google.common.io.ByteStreams;
 
 import org.apache.lucene.store.RateLimiter;
+import org.apache.lucene.util.IOUtils;
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.metadata.MetaData;
 import org.elasticsearch.cluster.metadata.SnapshotId;
-import org.elasticsearch.common.blobstore.BlobContainer;
 import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.blobstore.BlobContainer;
 import org.elasticsearch.common.blobstore.BlobMetaData;
 import org.elasticsearch.common.blobstore.BlobPath;
 import org.elasticsearch.common.blobstore.BlobStore;
@@ -39,13 +40,19 @@ import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.common.compress.CompressorFactory;
+import org.elasticsearch.common.compress.NotXContentException;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.io.stream.OutputStreamStreamOutput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.metrics.CounterMetric;
 import org.elasticsearch.common.unit.ByteSizeUnit;
 import org.elasticsearch.common.unit.ByteSizeValue;
-import org.elasticsearch.common.xcontent.*;
+import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.shard.IndexShardException;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.index.snapshots.IndexShardRepository;
@@ -55,14 +62,21 @@ import org.elasticsearch.repositories.Repository;
 import org.elasticsearch.repositories.RepositoryException;
 import org.elasticsearch.repositories.RepositorySettings;
 import org.elasticsearch.repositories.RepositoryVerificationException;
-import org.elasticsearch.snapshots.*;
+import org.elasticsearch.snapshots.InvalidSnapshotNameException;
+import org.elasticsearch.snapshots.Snapshot;
+import org.elasticsearch.snapshots.SnapshotCreationException;
+import org.elasticsearch.snapshots.SnapshotException;
+import org.elasticsearch.snapshots.SnapshotMissingException;
+import org.elasticsearch.snapshots.SnapshotShardFailure;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.file.NoSuchFileException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 import static com.google.common.collect.Lists.newArrayList;
 
@@ -230,19 +244,15 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent<Rep
             }
             // Write Global MetaData
             // TODO: Check if metadata needs to be written
-            try (OutputStream output = snapshotsBlobContainer.createOutput(metaDataBlobName(snapshotId))) {
+            try (StreamOutput output = compressIfNeeded(snapshotsBlobContainer.createOutput(metaDataBlobName(snapshotId)))) {
                 writeGlobalMetaData(metaData, output);
             }
             for (String index : indices) {
                 final IndexMetaData indexMetaData = metaData.index(index);
                 final BlobPath indexPath = basePath().add("indices").add(index);
                 final BlobContainer indexMetaDataBlobContainer = blobStore().blobContainer(indexPath);
-                try (OutputStream output = indexMetaDataBlobContainer.createOutput(snapshotBlobName(snapshotId))) {
-                    StreamOutput stream = new OutputStreamStreamOutput(output);
-                    if (isCompress()) {
-                        stream = CompressorFactory.defaultCompressor().streamOutput(stream);
-                    }
-                    XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON, stream);
+                try (StreamOutput output = compressIfNeeded(indexMetaDataBlobContainer.createOutput(snapshotBlobName(snapshotId)))) {
+                    XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON, output);
                     builder.startObject();
                     IndexMetaData.Builder.toXContent(indexMetaData, builder, ToXContent.EMPTY_PARAMS);
                     builder.endObject();
@@ -318,6 +328,22 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent<Rep
         }
     }
 
+    private StreamOutput compressIfNeeded(OutputStream output) throws IOException {
+        StreamOutput out = null;
+        boolean success = false;
+        try {
+            out = new OutputStreamStreamOutput(output);
+            if (isCompress()) {
+                out = CompressorFactory.defaultCompressor().streamOutput(out);
+            }
+            success = true;
+            return out;
+        } finally {
+            if (!success) {
+                IOUtils.closeWhileHandlingException(out, output);
+            }
+        }
+    }
 
     /**
      * {@inheritDoc}
@@ -328,7 +354,7 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent<Rep
             String tempBlobName = tempSnapshotBlobName(snapshotId);
             String blobName = snapshotBlobName(snapshotId);
             Snapshot blobStoreSnapshot = new Snapshot(snapshotId.getSnapshot(), indices, startTime, failure, System.currentTimeMillis(), totalShards, shardFailures);
-            try (OutputStream output = snapshotsBlobContainer.createOutput(tempBlobName)) {
+            try (StreamOutput output = compressIfNeeded(snapshotsBlobContainer.createOutput(tempBlobName))) {
                 writeSnapshot(blobStoreSnapshot, output);
             }
             snapshotsBlobContainer.move(tempBlobName, blobName);
@@ -387,7 +413,7 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent<Rep
             }
         } catch (FileNotFoundException | NoSuchFileException ex) {
             throw new SnapshotMissingException(snapshotId, ex);
-        } catch (IOException ex) {
+        } catch (IOException | NotXContentException ex) {
             throw new SnapshotException(snapshotId, "failed to get snapshots", ex);
         }
     }
@@ -537,12 +563,8 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent<Rep
      * @return BytesStreamOutput representing JSON serialized Snapshot
      * @throws IOException
      */
-    private void writeSnapshot(Snapshot snapshot, OutputStream outputStream) throws IOException {
-        StreamOutput stream = new OutputStreamStreamOutput(outputStream);
-        if (isCompress()) {
-            stream = CompressorFactory.defaultCompressor().streamOutput(stream);
-        }
-        XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON, stream);
+    private void writeSnapshot(Snapshot snapshot, StreamOutput outputStream) throws IOException {
+        XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON, outputStream);
         builder.startObject();
         snapshot.toXContent(builder, snapshotOnlyFormatParams);
         builder.endObject();
@@ -556,12 +578,8 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent<Rep
      * @return BytesStreamOutput representing JSON serialized global MetaData
      * @throws IOException
      */
-    private void writeGlobalMetaData(MetaData metaData, OutputStream outputStream) throws IOException {
-        StreamOutput stream = new OutputStreamStreamOutput(outputStream);
-        if (isCompress()) {
-            stream = CompressorFactory.defaultCompressor().streamOutput(stream);
-        }
-        XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON, stream);
+    private void writeGlobalMetaData(MetaData metaData, StreamOutput outputStream) throws IOException {
+        XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON, outputStream);
         builder.startObject();
         MetaData.Builder.toXContent(metaData, builder, snapshotOnlyFormatParams);
         builder.endObject();
diff --git a/src/test/java/org/elasticsearch/common/compress/CompressedStreamTests.java b/src/test/java/org/elasticsearch/common/compress/AbstractCompressedStreamTests.java
similarity index 97%
rename from src/test/java/org/elasticsearch/common/compress/CompressedStreamTests.java
rename to src/test/java/org/elasticsearch/common/compress/AbstractCompressedStreamTests.java
index 89763cc25e8..e9404f4f20d 100644
--- a/src/test/java/org/elasticsearch/common/compress/CompressedStreamTests.java
+++ b/src/test/java/org/elasticsearch/common/compress/AbstractCompressedStreamTests.java
@@ -38,12 +38,12 @@ import java.util.concurrent.CountDownLatch;
 /**
  * Test streaming compression (e.g. used for recovery)
  */
-public class CompressedStreamTests extends ElasticsearchTestCase {
-    
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        CompressorFactory.configure(Settings.settingsBuilder().put("compress.default.type", "lzf").build());
+public abstract class AbstractCompressedStreamTests extends ElasticsearchTestCase {
+
+    private final Compressor compressor;
+
+    protected AbstractCompressedStreamTests(Compressor compressor) {
+        this.compressor = compressor;
     }
 
     public void testRandom() throws IOException {
@@ -54,7 +54,7 @@ public class CompressedStreamTests extends ElasticsearchTestCase {
             doTest(bytes);
         }
     }
-    
+
     public void testRandomThreads() throws Exception {
         final Random r = getRandom();
         int threadCount = TestUtil.nextInt(r, 2, 10);
@@ -85,7 +85,7 @@ public class CompressedStreamTests extends ElasticsearchTestCase {
             t.join();
         }
     }
-    
+
     public void testLineDocs() throws IOException {
         Random r = getRandom();
         LineFileDocs lineFileDocs = new LineFileDocs(r);
@@ -100,7 +100,7 @@ public class CompressedStreamTests extends ElasticsearchTestCase {
         }
         lineFileDocs.close();
     }
-    
+
     public void testLineDocsThreads() throws Exception {
         final Random r = getRandom();
         int threadCount = TestUtil.nextInt(r, 2, 10);
@@ -137,7 +137,7 @@ public class CompressedStreamTests extends ElasticsearchTestCase {
             t.join();
         }
     }
-    
+
     public void testRepetitionsL() throws IOException {
         Random r = getRandom();
         for (int i = 0; i < 10; i++) {
@@ -160,7 +160,7 @@ public class CompressedStreamTests extends ElasticsearchTestCase {
             doTest(bos.toByteArray());
         }
     }
-    
+
     public void testRepetitionsLThreads() throws Exception {
         final Random r = getRandom();
         int threadCount = TestUtil.nextInt(r, 2, 10);
@@ -205,7 +205,7 @@ public class CompressedStreamTests extends ElasticsearchTestCase {
             t.join();
         }
     }
-    
+
     public void testRepetitionsI() throws IOException {
         Random r = getRandom();
         for (int i = 0; i < 10; i++) {
@@ -224,7 +224,7 @@ public class CompressedStreamTests extends ElasticsearchTestCase {
             doTest(bos.toByteArray());
         }
     }
-    
+
     public void testRepetitionsIThreads() throws Exception {
         final Random r = getRandom();
         int threadCount = TestUtil.nextInt(r, 2, 10);
@@ -265,7 +265,7 @@ public class CompressedStreamTests extends ElasticsearchTestCase {
             t.join();
         }
     }
-    
+
     public void testRepetitionsS() throws IOException {
         Random r = getRandom();
         for (int i = 0; i < 10; i++) {
@@ -348,7 +348,7 @@ public class CompressedStreamTests extends ElasticsearchTestCase {
         r.nextBytes(bytes);
         bos.write(bytes);
     }
-    
+
     public void testRepetitionsSThreads() throws Exception {
         final Random r = getRandom();
         int threadCount = TestUtil.nextInt(r, 2, 10);
@@ -387,16 +387,16 @@ public class CompressedStreamTests extends ElasticsearchTestCase {
             t.join();
         }
     }
-       
+
     private void doTest(byte bytes[]) throws IOException {
         ByteBuffer bb = ByteBuffer.wrap(bytes);
         StreamInput rawIn = new ByteBufferStreamInput(bb);
-        Compressor c = CompressorFactory.defaultCompressor();
-        
+        Compressor c = compressor;
+
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         OutputStreamStreamOutput rawOs = new OutputStreamStreamOutput(bos);
         StreamOutput os = c.streamOutput(rawOs);
-        
+
         Random r = getRandom();
         int bufferSize = r.nextBoolean() ? 65535 : TestUtil.nextInt(getRandom(), 1, 70000);
         int prepadding = r.nextInt(70000);
@@ -409,27 +409,27 @@ public class CompressedStreamTests extends ElasticsearchTestCase {
         }
         os.close();
         rawIn.close();
-        
+
         // now we have compressed byte array
-        
+
         byte compressed[] = bos.toByteArray();
         ByteBuffer bb2 = ByteBuffer.wrap(compressed);
         StreamInput compressedIn = new ByteBufferStreamInput(bb2);
         StreamInput in = c.streamInput(compressedIn);
-        
+
         // randomize constants again
         bufferSize = r.nextBoolean() ? 65535 : TestUtil.nextInt(getRandom(), 1, 70000);
         prepadding = r.nextInt(70000);
         postpadding = r.nextInt(70000);
         buffer = new byte[prepadding + bufferSize + postpadding];
         r.nextBytes(buffer); // fill block completely with junk
-        
+
         ByteArrayOutputStream uncompressedOut = new ByteArrayOutputStream();
         while ((len = in.read(buffer, prepadding, bufferSize)) != -1) {
             uncompressedOut.write(buffer, prepadding, len);
         }
         uncompressedOut.close();
-        
+
         assertArrayEquals(bytes, uncompressedOut.toByteArray());
     }
 }
diff --git a/src/test/java/org/elasticsearch/common/compress/CompressedXContentTests.java b/src/test/java/org/elasticsearch/common/compress/AbstractCompressedXContentTests.java
similarity index 62%
rename from src/test/java/org/elasticsearch/common/compress/CompressedXContentTests.java
rename to src/test/java/org/elasticsearch/common/compress/AbstractCompressedXContentTests.java
index 670ad10aaf2..ad424b7e337 100644
--- a/src/test/java/org/elasticsearch/common/compress/CompressedXContentTests.java
+++ b/src/test/java/org/elasticsearch/common/compress/AbstractCompressedXContentTests.java
@@ -23,10 +23,8 @@ import org.apache.lucene.util.TestUtil;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.junit.Assert;
-import org.junit.Test;
 
 import java.io.IOException;
 import java.util.Random;
@@ -37,11 +35,12 @@ import static org.hamcrest.Matchers.not;
 /**
  *
  */
-public class CompressedXContentTests extends ElasticsearchTestCase {
+public abstract class AbstractCompressedXContentTests extends ElasticsearchTestCase {
 
-    @Test
-    public void simpleTestsLZF() throws IOException {
-        simpleTests("lzf");
+    private final Compressor compressor;
+
+    protected AbstractCompressedXContentTests(Compressor compressor) {
+        this.compressor = compressor;
     }
 
     private void assertEquals(CompressedXContent s1, CompressedXContent s2) {
@@ -50,38 +49,44 @@ public class CompressedXContentTests extends ElasticsearchTestCase {
         assertEquals(s1.hashCode(), s2.hashCode());
     }
 
-    public void simpleTests(String compressor) throws IOException {
-        CompressorFactory.configure(Settings.settingsBuilder().put("compress.default.type", compressor).build());
-        String str = "---\nf:this is a simple string";
-        CompressedXContent cstr = new CompressedXContent(str);
-        assertThat(cstr.string(), equalTo(str));
-        assertThat(new CompressedXContent(str), equalTo(cstr));
+    public void simpleTests() throws IOException {
+        Compressor defaultCompressor = CompressorFactory.defaultCompressor();
+        try {
+            CompressorFactory.setDefaultCompressor(compressor);
+            String str = "---\nf:this is a simple string";
+            CompressedXContent cstr = new CompressedXContent(str);
+            assertThat(cstr.string(), equalTo(str));
+            assertThat(new CompressedXContent(str), equalTo(cstr));
 
-        String str2 = "---\nf:this is a simple string 2";
-        CompressedXContent cstr2 = new CompressedXContent(str2);
-        assertThat(cstr2.string(), not(equalTo(str)));
-        assertThat(new CompressedXContent(str2), not(equalTo(cstr)));
-        assertEquals(new CompressedXContent(str2), cstr2);
+            String str2 = "---\nf:this is a simple string 2";
+            CompressedXContent cstr2 = new CompressedXContent(str2);
+            assertThat(cstr2.string(), not(equalTo(str)));
+            assertThat(new CompressedXContent(str2), not(equalTo(cstr)));
+            assertEquals(new CompressedXContent(str2), cstr2);
+        } finally {
+            CompressorFactory.setDefaultCompressor(defaultCompressor);
+        }
     }
 
     public void testRandom() throws IOException {
-        String compressor = "lzf";
-        CompressorFactory.configure(Settings.settingsBuilder().put("compress.default.type", compressor).build());
-        Random r = getRandom();
-        for (int i = 0; i < 1000; i++) {
-            String string = TestUtil.randomUnicodeString(r, 10000);
-            // hack to make it detected as YAML
-            string = "---\n" + string;
-            CompressedXContent compressedXContent = new CompressedXContent(string);
-            assertThat(compressedXContent.string(), equalTo(string));
+        Compressor defaultCompressor = CompressorFactory.defaultCompressor();
+        try {
+            CompressorFactory.setDefaultCompressor(compressor);
+            Random r = getRandom();
+            for (int i = 0; i < 1000; i++) {
+                String string = TestUtil.randomUnicodeString(r, 10000);
+                // hack to make it detected as YAML
+                string = "---\n" + string;
+                CompressedXContent compressedXContent = new CompressedXContent(string);
+                assertThat(compressedXContent.string(), equalTo(string));
+            }
+        } finally {
+            CompressorFactory.setDefaultCompressor(defaultCompressor);
         }
     }
 
     public void testDifferentCompressedRepresentation() throws Exception {
         byte[] b = "---\nf:abcdefghijabcdefghij".getBytes("UTF-8");
-        CompressorFactory.defaultCompressor();
-
-        Compressor compressor = CompressorFactory.defaultCompressor();
         BytesStreamOutput bout = new BytesStreamOutput();
         StreamOutput out = compressor.streamOutput(bout);
         out.writeBytes(b);
diff --git a/src/test/java/org/elasticsearch/common/compress/deflate/DeflateCompressedStreamTests.java b/src/test/java/org/elasticsearch/common/compress/deflate/DeflateCompressedStreamTests.java
new file mode 100644
index 00000000000..6607274dfcf
--- /dev/null
+++ b/src/test/java/org/elasticsearch/common/compress/deflate/DeflateCompressedStreamTests.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.common.compress.deflate;
+
+import org.elasticsearch.common.compress.AbstractCompressedStreamTests;
+
+public class DeflateCompressedStreamTests extends AbstractCompressedStreamTests {
+
+    public DeflateCompressedStreamTests() {
+        super(new DeflateCompressor());
+    }
+
+}
diff --git a/src/test/java/org/elasticsearch/common/compress/deflate/DeflateXContentTests.java b/src/test/java/org/elasticsearch/common/compress/deflate/DeflateXContentTests.java
new file mode 100644
index 00000000000..8b103c97990
--- /dev/null
+++ b/src/test/java/org/elasticsearch/common/compress/deflate/DeflateXContentTests.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.common.compress.deflate;
+
+import org.elasticsearch.common.compress.AbstractCompressedXContentTests;
+
+public class DeflateXContentTests extends AbstractCompressedXContentTests {
+
+    public DeflateXContentTests() {
+        super(new DeflateCompressor());
+    }
+
+}
diff --git a/src/main/java/org/elasticsearch/common/compress/CompressedStreamOutput.java b/src/test/java/org/elasticsearch/common/compress/lzf/CompressedStreamOutput.java
similarity index 98%
rename from src/main/java/org/elasticsearch/common/compress/CompressedStreamOutput.java
rename to src/test/java/org/elasticsearch/common/compress/lzf/CompressedStreamOutput.java
index 9e0763816a8..3cf0bcd5cfd 100644
--- a/src/main/java/org/elasticsearch/common/compress/CompressedStreamOutput.java
+++ b/src/test/java/org/elasticsearch/common/compress/lzf/CompressedStreamOutput.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.compress;
+package org.elasticsearch.common.compress.lzf;
 
 import org.elasticsearch.Version;
 import org.elasticsearch.common.io.stream.StreamOutput;
diff --git a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java b/src/test/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java
similarity index 97%
rename from src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java
rename to src/test/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java
index 3faeb496e0b..3aa2a5de806 100644
--- a/src/main/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java
+++ b/src/test/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamOutput.java
@@ -23,7 +23,7 @@ import com.ning.compress.BufferRecycler;
 import com.ning.compress.lzf.ChunkEncoder;
 import com.ning.compress.lzf.LZFChunk;
 import com.ning.compress.lzf.util.ChunkEncoderFactory;
-import org.elasticsearch.common.compress.CompressedStreamOutput;
+
 import org.elasticsearch.common.io.stream.StreamOutput;
 
 import java.io.IOException;
diff --git a/src/test/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamTests.java b/src/test/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamTests.java
new file mode 100644
index 00000000000..1d69fce1b9b
--- /dev/null
+++ b/src/test/java/org/elasticsearch/common/compress/lzf/LZFCompressedStreamTests.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.common.compress.lzf;
+
+import org.elasticsearch.common.compress.AbstractCompressedStreamTests;
+
+public class LZFCompressedStreamTests extends AbstractCompressedStreamTests {
+
+    public LZFCompressedStreamTests() {
+        super(new LZFTestCompressor());
+    }
+
+}
diff --git a/src/test/java/org/elasticsearch/common/compress/lzf/LZFTestCompressor.java b/src/test/java/org/elasticsearch/common/compress/lzf/LZFTestCompressor.java
new file mode 100644
index 00000000000..8f21b0cbf0b
--- /dev/null
+++ b/src/test/java/org/elasticsearch/common/compress/lzf/LZFTestCompressor.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.common.compress.lzf;
+
+import org.elasticsearch.common.io.stream.StreamOutput;
+
+import java.io.IOException;
+
+// LZF compressor with write support, for testing only
+public class LZFTestCompressor extends LZFCompressor {
+
+    @Override
+    public StreamOutput streamOutput(StreamOutput out) throws IOException {
+        return new LZFCompressedStreamOutput(out);
+    }
+
+}
diff --git a/src/test/java/org/elasticsearch/common/compress/lzf/LZFXContentTests.java b/src/test/java/org/elasticsearch/common/compress/lzf/LZFXContentTests.java
new file mode 100644
index 00000000000..698a033755e
--- /dev/null
+++ b/src/test/java/org/elasticsearch/common/compress/lzf/LZFXContentTests.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.common.compress.lzf;
+
+import org.elasticsearch.common.compress.AbstractCompressedXContentTests;
+
+public class LZFXContentTests extends AbstractCompressedXContentTests {
+
+    public LZFXContentTests() {
+        super(new LZFTestCompressor());
+    }
+
+}
diff --git a/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java b/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java
index e2a88a8fb39..5cd5a9acc3b 100644
--- a/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java
+++ b/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java
@@ -24,8 +24,9 @@ import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.Priority;
+import org.elasticsearch.common.compress.Compressor;
 import org.elasticsearch.common.compress.CompressorFactory;
-import org.elasticsearch.common.compress.lzf.LZFCompressor;
+import org.elasticsearch.common.compress.lzf.LZFTestCompressor;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
@@ -41,10 +42,15 @@ public class SearchSourceCompressTests  extends ElasticsearchSingleNodeTest {
     
     @Test
     public void testSourceCompressionLZF() throws IOException {
-        CompressorFactory.setDefaultCompressor(new LZFCompressor());
-        verifySource(true);
-        verifySource(false);
-        verifySource(null);
+        final Compressor defaultCompressor = CompressorFactory.defaultCompressor();
+        try {
+            CompressorFactory.setDefaultCompressor(new LZFTestCompressor());
+            verifySource(true);
+            verifySource(false);
+            verifySource(null);
+        } finally {
+            CompressorFactory.setDefaultCompressor(defaultCompressor);
+        }
     }
 
     private void verifySource(Boolean compress) throws IOException {

From 1f2c42fd0be06e7a7ab9cf2c5e70d82988a11856 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Fri, 29 May 2015 17:07:04 +0200
Subject: [PATCH 071/123] Mappings: Refactor core index/query time properties
 into FieldType

Mappers are currently used at both index and query time for deciding
how to "use" a field.  For #8871, we need the index wide view of
mappings to have a unified set of settings for each field of a given
name within the index.

This change moves all the current settings (and methods defining
query time behavior) into subclasses of FieldType. In a future
PR, this will allow storing the field type at the index level,
instead of mappers (which can still have settings that differ
per document type).

The change is quite large (I'm sorry). I could not see a way to
migrate to this in a more piecemeal way. I did leave out cutting
over callers of the query methods to using the field type, as
that can be done in a follow up.
---
 .../classic/MapperQueryParser.java            |   8 +-
 .../analyze/TransportAnalyzeAction.java       |   4 +-
 .../TransportGetFieldMappingsIndexAction.java |  16 +-
 .../cluster/metadata/MappingMetaData.java     |   2 +-
 .../common/geo/builders/ShapeBuilder.java     |   2 +-
 .../index/fielddata/FieldDataType.java        |   2 +-
 .../index/fielddata/IndexFieldData.java       |   3 +-
 .../index/fielddata/IndexFieldDataCache.java  |   5 +-
 .../fielddata/IndexFieldDataService.java      |   9 +-
 .../index/fielddata/ShardFieldData.java       |   6 +-
 .../GlobalOrdinalsIndexFieldData.java         |   7 +-
 .../InternalGlobalOrdinalsIndexFieldData.java |   3 +-
 .../plain/AbstractIndexFieldData.java         |   7 +-
 .../plain/AbstractIndexGeoPointFieldData.java |   2 +-
 .../plain/AbstractIndexOrdinalsFieldData.java |   2 +-
 .../plain/BinaryDVIndexFieldData.java         |   2 +-
 .../plain/BinaryDVNumericIndexFieldData.java  |   2 +-
 .../plain/BytesBinaryDVIndexFieldData.java    |   6 +-
 .../plain/DisabledIndexFieldData.java         |   4 +-
 .../plain/DocValuesIndexFieldData.java        |  17 +-
 .../plain/DoubleArrayIndexFieldData.java      |   5 +-
 .../plain/FSTBytesIndexFieldData.java         |   5 +-
 .../plain/FloatArrayIndexFieldData.java       |   5 +-
 .../plain/GeoPointBinaryDVIndexFieldData.java |   7 +-
 .../GeoPointCompressedIndexFieldData.java     |   7 +-
 .../GeoPointDoubleArrayIndexFieldData.java    |   5 +-
 .../fielddata/plain/IndexIndexFieldData.java  |   5 +-
 .../plain/NumericDVIndexFieldData.java        |   2 +-
 .../plain/PackedArrayIndexFieldData.java      |   5 +-
 .../plain/PagedBytesIndexFieldData.java       |   5 +-
 .../plain/ParentChildIndexFieldData.java      |   9 +-
 .../plain/SortedNumericDVIndexFieldData.java  |   2 +-
 .../SortedSetDVOrdinalsIndexFieldData.java    |   2 +-
 .../fieldvisitor/SingleFieldsVisitor.java     |   2 +-
 .../index/mapper/DocumentFieldMappers.java    |   6 +-
 .../index/mapper/FieldMapper.java             | 152 +-----
 .../index/mapper/FieldMappersLookup.java      |  22 +-
 .../index/mapper/MappedFieldType.java         | 368 +++++++++++++
 .../index/mapper/MapperService.java           |   8 +-
 .../mapper/core/AbstractFieldMapper.java      | 373 +++++--------
 .../index/mapper/core/BinaryFieldMapper.java  | 126 +++--
 .../index/mapper/core/BooleanFieldMapper.java | 152 +++---
 .../index/mapper/core/ByteFieldMapper.java    | 174 ++++---
 .../mapper/core/CompletionFieldMapper.java    |  79 +--
 .../index/mapper/core/DateFieldMapper.java    | 491 +++++++++---------
 .../index/mapper/core/DoubleFieldMapper.java  | 189 +++----
 .../index/mapper/core/FloatFieldMapper.java   | 189 +++----
 .../index/mapper/core/IntegerFieldMapper.java | 167 +++---
 .../index/mapper/core/LongFieldMapper.java    | 168 +++---
 .../index/mapper/core/Murmur3FieldMapper.java |  33 +-
 .../index/mapper/core/NumberFieldMapper.java  | 167 +++---
 .../index/mapper/core/ShortFieldMapper.java   | 174 ++++---
 .../index/mapper/core/StringFieldMapper.java  | 120 ++---
 .../mapper/core/TokenCountFieldMapper.java    |  43 +-
 .../index/mapper/core/TypeParsers.java        |   2 +-
 .../index/mapper/geo/GeoPointFieldMapper.java | 381 ++++++++------
 .../index/mapper/geo/GeoShapeFieldMapper.java | 186 ++++---
 .../index/mapper/internal/AllFieldMapper.java |  84 +--
 .../internal/FieldNamesFieldMapper.java       |  67 ++-
 .../index/mapper/internal/IdFieldMapper.java  | 197 +++----
 .../mapper/internal/IndexFieldMapper.java     |  62 ++-
 .../mapper/internal/ParentFieldMapper.java    | 223 ++++----
 .../mapper/internal/RoutingFieldMapper.java   |  55 +-
 .../mapper/internal/SizeFieldMapper.java      |  31 +-
 .../mapper/internal/SourceFieldMapper.java    |  71 ++-
 .../index/mapper/internal/TTLFieldMapper.java |  75 ++-
 .../mapper/internal/TimestampFieldMapper.java | 122 +++--
 .../mapper/internal/TypeFieldMapper.java      |  86 +--
 .../index/mapper/internal/UidFieldMapper.java |  63 ++-
 .../mapper/internal/VersionFieldMapper.java   |  49 +-
 .../index/mapper/ip/IpFieldMapper.java        | 182 ++++---
 .../index/query/CommonTermsQueryParser.java   |   4 +-
 .../index/query/ExistsQueryParser.java        |   2 +-
 .../query/FieldMaskingSpanQueryParser.java    |   2 +-
 .../index/query/GeoShapeQueryParser.java      |   4 +-
 .../index/query/GeohashCellQuery.java         |   7 +-
 .../index/query/MissingQueryParser.java       |   2 +-
 .../index/query/MoreLikeThisQueryParser.java  |   2 +-
 .../index/query/QueryParseContext.java        |   8 +-
 .../index/query/RangeQueryParser.java         |   2 +-
 .../index/query/SimpleQueryStringParser.java  |   2 +-
 .../index/query/SpanTermQueryParser.java      |   2 +-
 .../index/query/TermsQueryParser.java         |   2 +-
 .../index/query/WildcardQueryParser.java      |   2 +-
 .../functionscore/DecayFunctionParser.java    |   2 +-
 .../index/search/MatchQuery.java              |   2 +-
 .../index/search/MultiMatchQuery.java         |   2 +-
 .../geo/IndexedGeoBoundingBoxQuery.java       |  12 +-
 .../index/similarity/SimilarityService.java   |   2 +-
 .../termvectors/ShardTermVectorsService.java  |   2 +-
 .../cache/IndicesFieldDataCache.java          |   7 +-
 .../cache/IndicesFieldDataCacheListener.java  |   6 +-
 .../SingleDocumentPercolatorIndex.java        |   4 +-
 .../elasticsearch/search/SearchService.java   |  26 +-
 .../bucket/children/ChildrenParser.java       |   2 +-
 .../support/AggregationContext.java           |   2 +-
 .../support/format/ValueFormat.java           |   2 +-
 .../support/format/ValueFormatter.java        |   2 +-
 .../support/format/ValueParser.java           |   2 +-
 .../search/fetch/FetchPhase.java              |   2 +-
 .../highlight/FastVectorHighlighter.java      |   6 +-
 .../search/highlight/HighlightUtils.java      |   6 +-
 .../search/highlight/PlainHighlighter.java    |   6 +-
 .../search/highlight/PostingsHighlighter.java |   2 +-
 .../FragmentBuilderHelper.java                |   4 +-
 .../SourceScoreOrderFragmentsBuilder.java     |   4 +-
 .../SourceSimpleFragmentsBuilder.java         |   4 +-
 .../search/lookup/FieldLookup.java            |   4 +-
 .../search/lookup/LeafFieldsLookup.java       |   4 +-
 .../search/sort/SortParseElement.java         |   2 +-
 .../AnalyzingCompletionLookupProvider.java    |  28 +-
 .../suggest/phrase/PhraseSuggestParser.java   |   4 +-
 .../index/analysis/PreBuiltAnalyzerTests.java |   4 +-
 .../NoOrdinalsStringFieldDataTests.java       |   2 +-
 .../index/mapper/FieldMappersLookupTests.java |  11 +-
 .../mapper/all/SimpleAllMapperTests.java      |   4 +-
 .../mapper/core/Murmur3FieldMapperTests.java  |   2 +-
 .../mapper/externalvalues/ExternalMapper.java |  24 +-
 .../mapper/geo/GeoShapeFieldMapperTests.java  |  34 +-
 .../geo/GeohashMappingGeoPointTests.java      |   8 +-
 .../internal/FieldNamesFieldMapperTests.java  |   2 +-
 .../mapper/merge/TestMergeMapperTests.java    |   8 +-
 .../mapper/multifield/MultiFieldTests.java    |  20 +-
 .../MultiFieldsIntegrationTests.java          |   1 +
 .../mapper/simple/SimpleMapperTests.java      |  14 +-
 .../string/SimpleStringMappingTests.java      |  17 +-
 .../timestamp/TimestampMappingTests.java      |  28 +-
 .../mapper/update/UpdateMappingTests.java     |   4 +-
 .../index/similarity/SimilarityTests.java     |  24 +-
 .../warmer/SimpleIndicesWarmerTests.java      |   2 +-
 .../search/child/ParentFieldLoadingTest.java  |  18 +-
 .../child/SimpleChildQuerySearchTests.java    |   2 +-
 .../search/geo/GeoShapeIntegrationTests.java  |   4 +-
 .../AnalyzingCompletionLookupProviderV1.java  |  28 +-
 .../CompletionPostingsFormatTest.java         |  35 +-
 .../test/ElasticsearchIntegrationTest.java    |   5 +-
 136 files changed, 3247 insertions(+), 2558 deletions(-)
 create mode 100644 src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java

diff --git a/src/main/java/org/apache/lucene/queryparser/classic/MapperQueryParser.java b/src/main/java/org/apache/lucene/queryparser/classic/MapperQueryParser.java
index 84fcc62af81..593c8aa80cd 100644
--- a/src/main/java/org/apache/lucene/queryparser/classic/MapperQueryParser.java
+++ b/src/main/java/org/apache/lucene/queryparser/classic/MapperQueryParser.java
@@ -260,7 +260,7 @@ public class MapperQueryParser extends QueryParser {
                         }
                     }
                     if (query == null) {
-                        query = super.getFieldQuery(currentMapper.names().indexName(), queryText, quoted);
+                        query = super.getFieldQuery(currentMapper.fieldType().names().indexName(), queryText, quoted);
                     }
                     return query;
                 }
@@ -372,7 +372,7 @@ public class MapperQueryParser extends QueryParser {
                 Query rangeQuery;
                 if (currentMapper instanceof DateFieldMapper && settings.timeZone() != null) {
                     DateFieldMapper dateFieldMapper = (DateFieldMapper) this.currentMapper;
-                    rangeQuery = dateFieldMapper.rangeQuery(part1, part2, startInclusive, endInclusive, settings.timeZone(), null, parseContext);
+                    rangeQuery = dateFieldMapper.fieldType().rangeQuery(part1, part2, startInclusive, endInclusive, settings.timeZone(), null, parseContext);
                 } else {
                     rangeQuery = currentMapper.rangeQuery(part1, part2, startInclusive, endInclusive, parseContext);
                 }
@@ -508,7 +508,7 @@ public class MapperQueryParser extends QueryParser {
                     query = currentMapper.prefixQuery(termStr, multiTermRewriteMethod, parseContext);
                 }
                 if (query == null) {
-                    query = getPossiblyAnalyzedPrefixQuery(currentMapper.names().indexName(), termStr);
+                    query = getPossiblyAnalyzedPrefixQuery(currentMapper.fieldType().names().indexName(), termStr);
                 }
                 return query;
             }
@@ -644,7 +644,7 @@ public class MapperQueryParser extends QueryParser {
                 if (!forcedAnalyzer) {
                     setAnalyzer(parseContext.getSearchAnalyzer(currentMapper));
                 }
-                indexedNameField = currentMapper.names().indexName();
+                indexedNameField = currentMapper.fieldType().names().indexName();
                 return getPossiblyAnalyzedWildcardQuery(indexedNameField, termStr);
             }
             return getPossiblyAnalyzedWildcardQuery(indexedNameField, termStr);
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java b/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java
index bf18ee1ab8a..0b44c9484ce 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/analyze/TransportAnalyzeAction.java
@@ -113,8 +113,8 @@ public class TransportAnalyzeAction extends TransportSingleCustomOperationAction
                 if (fieldMapper.isNumeric()) {
                     throw new IllegalArgumentException("Can't process field [" + request.field() + "], Analysis requests are not supported on numeric fields");
                 }
-                analyzer = fieldMapper.indexAnalyzer();
-                field = fieldMapper.names().indexName();
+                analyzer = fieldMapper.fieldType().indexAnalyzer();
+                field = fieldMapper.fieldType().names().indexName();
                 
             }
         }
diff --git a/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java b/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java
index 5ded196f0f3..e9ef1538df2 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java
@@ -179,7 +179,7 @@ public class TransportGetFieldMappingsIndexAction extends TransportSingleCustomO
         for (String field : request.fields()) {
             if (Regex.isMatchAllPattern(field)) {
                 for (FieldMapper fieldMapper : allFieldMappers) {
-                    addFieldMapper(fieldMapper.names().fullName(), fieldMapper, fieldMappings, request.includeDefaults());
+                    addFieldMapper(fieldMapper.fieldType().names().fullName(), fieldMapper, fieldMappings, request.includeDefaults());
                 }
             } else if (Regex.isSimpleMatchPattern(field)) {
                 // go through the field mappers 3 times, to make sure we give preference to the resolve order: full name, index name, name.
@@ -187,22 +187,22 @@ public class TransportGetFieldMappingsIndexAction extends TransportSingleCustomO
                 Collection<FieldMapper> remainingFieldMappers = Lists.newLinkedList(allFieldMappers);
                 for (Iterator<FieldMapper> it = remainingFieldMappers.iterator(); it.hasNext(); ) {
                     final FieldMapper fieldMapper = it.next();
-                    if (Regex.simpleMatch(field, fieldMapper.names().fullName())) {
-                        addFieldMapper(fieldMapper.names().fullName(), fieldMapper, fieldMappings, request.includeDefaults());
+                    if (Regex.simpleMatch(field, fieldMapper.fieldType().names().fullName())) {
+                        addFieldMapper(fieldMapper.fieldType().names().fullName(), fieldMapper, fieldMappings, request.includeDefaults());
                         it.remove();
                     }
                 }
                 for (Iterator<FieldMapper> it = remainingFieldMappers.iterator(); it.hasNext(); ) {
                     final FieldMapper fieldMapper = it.next();
-                    if (Regex.simpleMatch(field, fieldMapper.names().indexName())) {
-                        addFieldMapper(fieldMapper.names().indexName(), fieldMapper, fieldMappings, request.includeDefaults());
+                    if (Regex.simpleMatch(field, fieldMapper.fieldType().names().indexName())) {
+                        addFieldMapper(fieldMapper.fieldType().names().indexName(), fieldMapper, fieldMappings, request.includeDefaults());
                         it.remove();
                     }
                 }
                 for (Iterator<FieldMapper> it = remainingFieldMappers.iterator(); it.hasNext(); ) {
                     final FieldMapper fieldMapper = it.next();
-                    if (Regex.simpleMatch(field, fieldMapper.names().shortName())) {
-                        addFieldMapper(fieldMapper.names().shortName(), fieldMapper, fieldMappings, request.includeDefaults());
+                    if (Regex.simpleMatch(field, fieldMapper.fieldType().names().shortName())) {
+                        addFieldMapper(fieldMapper.fieldType().names().shortName(), fieldMapper, fieldMappings, request.includeDefaults());
                         it.remove();
                     }
                 }
@@ -229,7 +229,7 @@ public class TransportGetFieldMappingsIndexAction extends TransportSingleCustomO
             builder.startObject();
             fieldMapper.toXContent(builder, includeDefaults ? includeDefaultsParams : ToXContent.EMPTY_PARAMS);
             builder.endObject();
-            fieldMappings.put(field, new FieldMappingMetaData(fieldMapper.names().fullName(), builder.bytes()));
+            fieldMappings.put(field, new FieldMappingMetaData(fieldMapper.fieldType().names().fullName(), builder.bytes()));
         } catch (IOException e) {
             throw new ElasticsearchException("failed to serialize XContent of field [" + field + "]", e);
         }
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
index e6067c46817..4c376465b66 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
@@ -289,7 +289,7 @@ public class MappingMetaData extends AbstractDiffable<MappingMetaData> {
         this.id = new Id(docMapper.idFieldMapper().path());
         this.routing = new Routing(docMapper.routingFieldMapper().required(), docMapper.routingFieldMapper().path());
         this.timestamp = new Timestamp(docMapper.timestampFieldMapper().enabled(), docMapper.timestampFieldMapper().path(),
-                docMapper.timestampFieldMapper().dateTimeFormatter().format(), docMapper.timestampFieldMapper().defaultTimestamp(),
+                docMapper.timestampFieldMapper().fieldType().dateTimeFormatter().format(), docMapper.timestampFieldMapper().defaultTimestamp(),
                 docMapper.timestampFieldMapper().ignoreMissing());
         this.hasParentField = docMapper.parentFieldMapper().active();
     }
diff --git a/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java b/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java
index 07ceaf1b762..3e733dbd619 100644
--- a/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java
+++ b/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java
@@ -728,7 +728,7 @@ public abstract class ShapeBuilder implements ToXContent {
             Distance radius = null;
             CoordinateNode node = null;
             GeometryCollectionBuilder geometryCollections = null;
-            Orientation requestedOrientation = (shapeMapper == null) ? Orientation.RIGHT : shapeMapper.orientation();
+            Orientation requestedOrientation = (shapeMapper == null) ? Orientation.RIGHT : shapeMapper.fieldType().orientation();
 
             XContentParser.Token token;
             while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
diff --git a/src/main/java/org/elasticsearch/index/fielddata/FieldDataType.java b/src/main/java/org/elasticsearch/index/fielddata/FieldDataType.java
index f42ba96b762..371b802dc0c 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/FieldDataType.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/FieldDataType.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.index.fielddata;
 
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.index.mapper.FieldMapper.Loading;
+import org.elasticsearch.index.mapper.MappedFieldType.Loading;
 
 /**
  */
diff --git a/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java
index daca8e1bfbc..3070c1e56ad 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java
@@ -32,6 +32,7 @@ import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexComponent;
 import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
@@ -77,7 +78,7 @@ public interface IndexFieldData<FD extends AtomicFieldData> extends IndexCompone
     /**
      * The field name.
      */
-    FieldMapper.Names getFieldNames();
+    MappedFieldType.Names getFieldNames();
 
     /**
      * The field data type.
diff --git a/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java b/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java
index a2b73221d91..76d9c24da29 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataCache.java
@@ -23,6 +23,7 @@ import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.util.Accountable;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 
 /**
  * A simple field data cache abstraction on the *index* level.
@@ -47,9 +48,9 @@ public interface IndexFieldDataCache {
 
     interface Listener {
 
-        void onLoad(FieldMapper.Names fieldNames, FieldDataType fieldDataType, Accountable ramUsage);
+        void onLoad(MappedFieldType.Names fieldNames, FieldDataType fieldDataType, Accountable ramUsage);
 
-        void onUnload(FieldMapper.Names fieldNames, FieldDataType fieldDataType, boolean wasEvicted, long sizeInBytes);
+        void onUnload(MappedFieldType.Names fieldNames, FieldDataType fieldDataType, boolean wasEvicted, long sizeInBytes);
     }
 
     class None implements IndexFieldDataCache {
diff --git a/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java b/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java
index 847fa59df48..c3fb6309907 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java
@@ -32,6 +32,7 @@ import org.elasticsearch.index.AbstractIndexComponent;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.fielddata.plain.*;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.core.BooleanFieldMapper;
 import org.elasticsearch.index.mapper.internal.IndexFieldMapper;
 import org.elasticsearch.index.mapper.internal.ParentFieldMapper;
@@ -46,6 +47,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentMap;
 
+import static org.elasticsearch.index.mapper.MappedFieldType.Names;
+
 /**
  */
 public class IndexFieldDataService extends AbstractIndexComponent {
@@ -226,12 +229,12 @@ public class IndexFieldDataService extends AbstractIndexComponent {
 
     @SuppressWarnings("unchecked")
     public <IFD extends IndexFieldData<?>> IFD getForField(FieldMapper mapper) {
-        final FieldMapper.Names fieldNames = mapper.names();
-        final FieldDataType type = mapper.fieldDataType();
+        final Names fieldNames = mapper.fieldType().names();
+        final FieldDataType type = mapper.fieldType().fieldDataType();
         if (type == null) {
             throw new IllegalArgumentException("found no fielddata type for field [" + fieldNames.fullName() + "]");
         }
-        final boolean docValues = mapper.hasDocValues();
+        final boolean docValues = mapper.fieldType().hasDocValues();
         final String key = fieldNames.indexName();
         IndexFieldData<?> fieldData = loadedFieldData.get(key);
         if (fieldData == null) {
diff --git a/src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java
index 70d8bb18534..f5edf6e21de 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/ShardFieldData.java
@@ -26,7 +26,7 @@ import org.elasticsearch.common.metrics.CounterMetric;
 import org.elasticsearch.common.regex.Regex;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
-import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.index.shard.AbstractIndexShardComponent;
 import org.elasticsearch.index.shard.ShardId;
@@ -62,7 +62,7 @@ public class ShardFieldData extends AbstractIndexShardComponent implements Index
     }
 
     @Override
-    public void onLoad(FieldMapper.Names fieldNames, FieldDataType fieldDataType, Accountable ramUsage) {
+    public void onLoad(MappedFieldType.Names fieldNames, FieldDataType fieldDataType, Accountable ramUsage) {
         totalMetric.inc(ramUsage.ramBytesUsed());
         String keyFieldName = fieldNames.indexName();
         CounterMetric total = perFieldTotals.get(keyFieldName);
@@ -79,7 +79,7 @@ public class ShardFieldData extends AbstractIndexShardComponent implements Index
     }
 
     @Override
-    public void onUnload(FieldMapper.Names fieldNames, FieldDataType fieldDataType, boolean wasEvicted, long sizeInBytes) {
+    public void onUnload(MappedFieldType.Names fieldNames, FieldDataType fieldDataType, boolean wasEvicted, long sizeInBytes) {
         if (wasEvicted) {
             evictionsMetric.inc();
         }
diff --git a/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java
index bf06cb3433d..3b4db994a8e 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java
@@ -31,6 +31,7 @@ import org.elasticsearch.index.fielddata.IndexFieldData;
 import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
 import org.elasticsearch.index.fielddata.IndexOrdinalsFieldData;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.search.MultiValueMode;
 
 import java.util.Collection;
@@ -41,11 +42,11 @@ import java.util.Collections;
  */
 public abstract class GlobalOrdinalsIndexFieldData extends AbstractIndexComponent implements IndexOrdinalsFieldData, Accountable {
 
-    private final FieldMapper.Names fieldNames;
+    private final MappedFieldType.Names fieldNames;
     private final FieldDataType fieldDataType;
     private final long memorySizeInBytes;
 
-    protected GlobalOrdinalsIndexFieldData(Index index, Settings settings, FieldMapper.Names fieldNames, FieldDataType fieldDataType, long memorySizeInBytes) {
+    protected GlobalOrdinalsIndexFieldData(Index index, Settings settings, MappedFieldType.Names fieldNames, FieldDataType fieldDataType, long memorySizeInBytes) {
         super(index, settings);
         this.fieldNames = fieldNames;
         this.fieldDataType = fieldDataType;
@@ -68,7 +69,7 @@ public abstract class GlobalOrdinalsIndexFieldData extends AbstractIndexComponen
     }
 
     @Override
-    public FieldMapper.Names getFieldNames() {
+    public MappedFieldType.Names getFieldNames() {
         return fieldNames;
     }
 
diff --git a/src/main/java/org/elasticsearch/index/fielddata/ordinals/InternalGlobalOrdinalsIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/ordinals/InternalGlobalOrdinalsIndexFieldData.java
index 69a39465df6..b91d98f4a62 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/ordinals/InternalGlobalOrdinalsIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/ordinals/InternalGlobalOrdinalsIndexFieldData.java
@@ -28,6 +28,7 @@ import org.elasticsearch.index.fielddata.AtomicOrdinalsFieldData;
 import org.elasticsearch.index.fielddata.FieldDataType;
 import org.elasticsearch.index.fielddata.plain.AbstractAtomicOrdinalsFieldData;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 
 import java.util.Collection;
 
@@ -38,7 +39,7 @@ final class InternalGlobalOrdinalsIndexFieldData extends GlobalOrdinalsIndexFiel
 
     private final Atomic[] atomicReaders;
 
-    InternalGlobalOrdinalsIndexFieldData(Index index, Settings settings, FieldMapper.Names fieldNames, FieldDataType fieldDataType, AtomicOrdinalsFieldData[] segmentAfd, OrdinalMap ordinalMap, long memorySizeInBytes) {
+    InternalGlobalOrdinalsIndexFieldData(Index index, Settings settings, MappedFieldType.Names fieldNames, FieldDataType fieldDataType, AtomicOrdinalsFieldData[] segmentAfd, OrdinalMap ordinalMap, long memorySizeInBytes) {
         super(index, settings, fieldNames, fieldDataType, memorySizeInBytes);
         this.atomicReaders = new Atomic[segmentAfd.length];
         for (int i = 0; i < segmentAfd.length; i++) {
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java
index c78a10d4786..f5038c2a17c 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java
@@ -30,6 +30,7 @@ import org.elasticsearch.index.AbstractIndexComponent;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.fielddata.*;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.settings.IndexSettings;
 
 import java.io.IOException;
@@ -38,11 +39,11 @@ import java.io.IOException;
  */
 public abstract class AbstractIndexFieldData<FD extends AtomicFieldData> extends AbstractIndexComponent implements IndexFieldData<FD> {
 
-    private final FieldMapper.Names fieldNames;
+    private final MappedFieldType.Names fieldNames;
     protected final FieldDataType fieldDataType;
     protected final IndexFieldDataCache cache;
 
-    public AbstractIndexFieldData(Index index, @IndexSettings Settings indexSettings, FieldMapper.Names fieldNames, FieldDataType fieldDataType, IndexFieldDataCache cache) {
+    public AbstractIndexFieldData(Index index, @IndexSettings Settings indexSettings, MappedFieldType.Names fieldNames, FieldDataType fieldDataType, IndexFieldDataCache cache) {
         super(index, indexSettings);
         this.fieldNames = fieldNames;
         this.fieldDataType = fieldDataType;
@@ -50,7 +51,7 @@ public abstract class AbstractIndexFieldData<FD extends AtomicFieldData> extends
     }
 
     @Override
-    public FieldMapper.Names getFieldNames() {
+    public MappedFieldType.Names getFieldNames() {
         return this.fieldNames;
     }
 
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexGeoPointFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexGeoPointFieldData.java
index 1759067f780..b225ba2e6d2 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexGeoPointFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexGeoPointFieldData.java
@@ -28,7 +28,7 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.fielddata.*;
 import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
-import org.elasticsearch.index.mapper.FieldMapper.Names;
+import org.elasticsearch.index.mapper.MappedFieldType.Names;
 import org.elasticsearch.search.MultiValueMode;
 
 import java.io.IOException;
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java
index 74e77d6e921..893efa69ceb 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexOrdinalsFieldData.java
@@ -29,7 +29,7 @@ import org.elasticsearch.index.fielddata.*;
 import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
 import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource;
 import org.elasticsearch.index.fielddata.ordinals.GlobalOrdinalsBuilder;
-import org.elasticsearch.index.mapper.FieldMapper.Names;
+import org.elasticsearch.index.mapper.MappedFieldType.Names;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import org.elasticsearch.search.MultiValueMode;
 
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVIndexFieldData.java
index f731cd8eb29..2e03b74a41f 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVIndexFieldData.java
@@ -25,7 +25,7 @@ import org.elasticsearch.index.fielddata.FieldDataType;
 import org.elasticsearch.index.fielddata.IndexFieldData;
 import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
 import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource;
-import org.elasticsearch.index.mapper.FieldMapper.Names;
+import org.elasticsearch.index.mapper.MappedFieldType.Names;
 import org.elasticsearch.search.MultiValueMode;
 
 public class BinaryDVIndexFieldData extends DocValuesIndexFieldData implements IndexFieldData<BinaryDVAtomicFieldData> {
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVNumericIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVNumericIndexFieldData.java
index 4404ae461df..c78da7c6446 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVNumericIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVNumericIndexFieldData.java
@@ -39,7 +39,7 @@ import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
 import org.elasticsearch.index.fielddata.fieldcomparator.DoubleValuesComparatorSource;
 import org.elasticsearch.index.fielddata.fieldcomparator.FloatValuesComparatorSource;
 import org.elasticsearch.index.fielddata.fieldcomparator.LongValuesComparatorSource;
-import org.elasticsearch.index.mapper.FieldMapper.Names;
+import org.elasticsearch.index.mapper.MappedFieldType.Names;
 import org.elasticsearch.search.MultiValueMode;
 
 import java.io.IOException;
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java
index feabfce0092..369682f377c 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVIndexFieldData.java
@@ -29,7 +29,7 @@ import org.elasticsearch.index.fielddata.IndexFieldData;
 import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
 import org.elasticsearch.index.fielddata.IndexFieldDataCache;
 import org.elasticsearch.index.mapper.FieldMapper;
-import org.elasticsearch.index.mapper.FieldMapper.Names;
+import org.elasticsearch.index.mapper.MappedFieldType.Names;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import org.elasticsearch.search.MultiValueMode;
@@ -67,8 +67,8 @@ public class BytesBinaryDVIndexFieldData extends DocValuesIndexFieldData impleme
         public IndexFieldData<?> build(Index index, Settings indexSettings, FieldMapper mapper, IndexFieldDataCache cache,
                                        CircuitBreakerService breakerService, MapperService mapperService) {
             // Ignore breaker
-            final Names fieldNames = mapper.names();
-            return new BytesBinaryDVIndexFieldData(index, fieldNames, mapper.fieldDataType());
+            final Names fieldNames = mapper.fieldType().names();
+            return new BytesBinaryDVIndexFieldData(index, fieldNames, mapper.fieldType().fieldDataType());
         }
 
     }
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/DisabledIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/DisabledIndexFieldData.java
index c1dfe339131..e0c82e2f7c2 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/DisabledIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/DisabledIndexFieldData.java
@@ -25,7 +25,7 @@ import org.elasticsearch.index.Index;
 import org.elasticsearch.index.fielddata.*;
 import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
 import org.elasticsearch.index.mapper.FieldMapper;
-import org.elasticsearch.index.mapper.FieldMapper.Names;
+import org.elasticsearch.index.mapper.MappedFieldType.Names;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.search.MultiValueMode;
@@ -42,7 +42,7 @@ public final class DisabledIndexFieldData extends AbstractIndexFieldData<AtomicF
         public IndexFieldData<AtomicFieldData> build(Index index, @IndexSettings Settings indexSettings, FieldMapper mapper,
                                                         IndexFieldDataCache cache, CircuitBreakerService breakerService, MapperService mapperService) {
             // Ignore Circuit Breaker
-            return new DisabledIndexFieldData(index, indexSettings, mapper.names(), mapper.fieldDataType(), cache);
+            return new DisabledIndexFieldData(index, indexSettings, mapper.fieldType().names(), mapper.fieldType().fieldDataType(), cache);
         }
     }
 
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java
index d3bea6283eb..d2343b36bf5 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/DocValuesIndexFieldData.java
@@ -31,7 +31,8 @@ import org.elasticsearch.index.fielddata.IndexFieldData;
 import org.elasticsearch.index.fielddata.IndexFieldDataCache;
 import org.elasticsearch.index.fielddata.IndexNumericFieldData.NumericType;
 import org.elasticsearch.index.mapper.FieldMapper;
-import org.elasticsearch.index.mapper.FieldMapper.Names;
+import org.elasticsearch.index.mapper.MappedFieldType;
+import org.elasticsearch.index.mapper.MappedFieldType.Names;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.internal.IdFieldMapper;
 import org.elasticsearch.index.mapper.internal.TimestampFieldMapper;
@@ -93,8 +94,8 @@ public abstract class DocValuesIndexFieldData {
         public IndexFieldData<?> build(Index index, Settings indexSettings, FieldMapper mapper, IndexFieldDataCache cache,
                                        CircuitBreakerService breakerService, MapperService mapperService) {
             // Ignore Circuit Breaker
-            final FieldMapper.Names fieldNames = mapper.names();
-            final Settings fdSettings = mapper.fieldDataType().getSettings();
+            final Names fieldNames = mapper.fieldType().names();
+            final Settings fdSettings = mapper.fieldType().fieldDataType().getSettings();
             final Map<String, Settings> filter = fdSettings.getGroups("filter");
             if (filter != null && !filter.isEmpty()) {
                 throw new IllegalArgumentException("Doc values field data doesn't support filters [" + fieldNames.fullName() + "]");
@@ -102,19 +103,19 @@ public abstract class DocValuesIndexFieldData {
 
             if (BINARY_INDEX_FIELD_NAMES.contains(fieldNames.indexName())) {
                 assert numericType == null;
-                return new BinaryDVIndexFieldData(index, fieldNames, mapper.fieldDataType());
+                return new BinaryDVIndexFieldData(index, fieldNames, mapper.fieldType().fieldDataType());
             } else if (NUMERIC_INDEX_FIELD_NAMES.contains(fieldNames.indexName())) {
                 assert !numericType.isFloatingPoint();
-                return new NumericDVIndexFieldData(index, fieldNames, mapper.fieldDataType());
+                return new NumericDVIndexFieldData(index, fieldNames, mapper.fieldType().fieldDataType());
             } else if (numericType != null) {
                 if (Version.indexCreated(indexSettings).onOrAfter(Version.V_1_4_0_Beta1)) {
-                    return new SortedNumericDVIndexFieldData(index, fieldNames, numericType, mapper.fieldDataType());
+                    return new SortedNumericDVIndexFieldData(index, fieldNames, numericType, mapper.fieldType().fieldDataType());
                 } else {
                     // prior to ES 1.4: multi-valued numerics were boxed inside a byte[] as BINARY
-                    return new BinaryDVNumericIndexFieldData(index, fieldNames, numericType, mapper.fieldDataType());
+                    return new BinaryDVNumericIndexFieldData(index, fieldNames, numericType, mapper.fieldType().fieldDataType());
                 }
             } else {
-                return new SortedSetDVOrdinalsIndexFieldData(index, cache, indexSettings, fieldNames, breakerService, mapper.fieldDataType());
+                return new SortedSetDVOrdinalsIndexFieldData(index, cache, indexSettings, fieldNames, breakerService, mapper.fieldType().fieldDataType());
             }
         }
 
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/DoubleArrayIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/DoubleArrayIndexFieldData.java
index 6d4b9dbc1db..6b99ad05771 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/DoubleArrayIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/DoubleArrayIndexFieldData.java
@@ -53,6 +53,7 @@ import org.elasticsearch.index.fielddata.fieldcomparator.DoubleValuesComparatorS
 import org.elasticsearch.index.fielddata.ordinals.Ordinals;
 import org.elasticsearch.index.fielddata.ordinals.OrdinalsBuilder;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
@@ -74,11 +75,11 @@ public class DoubleArrayIndexFieldData extends AbstractIndexFieldData<AtomicNume
         @Override
         public IndexFieldData<?> build(Index index, @IndexSettings Settings indexSettings, FieldMapper mapper, IndexFieldDataCache cache,
                                        CircuitBreakerService breakerService, MapperService mapperService) {
-            return new DoubleArrayIndexFieldData(index, indexSettings, mapper.names(), mapper.fieldDataType(), cache, breakerService);
+            return new DoubleArrayIndexFieldData(index, indexSettings, mapper.fieldType().names(), mapper.fieldType().fieldDataType(), cache, breakerService);
         }
     }
 
-    public DoubleArrayIndexFieldData(Index index, @IndexSettings Settings indexSettings, FieldMapper.Names fieldNames,
+    public DoubleArrayIndexFieldData(Index index, @IndexSettings Settings indexSettings, MappedFieldType.Names fieldNames,
                                      FieldDataType fieldDataType, IndexFieldDataCache cache, CircuitBreakerService breakerService) {
         super(index, indexSettings, fieldNames, fieldDataType, cache);
         this.breakerService = breakerService;
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/FSTBytesIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/FSTBytesIndexFieldData.java
index 3f460376e5c..1aa45a517c0 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/FSTBytesIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/FSTBytesIndexFieldData.java
@@ -33,6 +33,7 @@ import org.elasticsearch.index.fielddata.*;
 import org.elasticsearch.index.fielddata.ordinals.Ordinals;
 import org.elasticsearch.index.fielddata.ordinals.OrdinalsBuilder;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
@@ -48,11 +49,11 @@ public class FSTBytesIndexFieldData extends AbstractIndexOrdinalsFieldData {
         @Override
         public IndexOrdinalsFieldData build(Index index, @IndexSettings Settings indexSettings, FieldMapper mapper,
                                                              IndexFieldDataCache cache, CircuitBreakerService breakerService, MapperService mapperService) {
-            return new FSTBytesIndexFieldData(index, indexSettings, mapper.names(), mapper.fieldDataType(), cache, breakerService);
+            return new FSTBytesIndexFieldData(index, indexSettings, mapper.fieldType().names(), mapper.fieldType().fieldDataType(), cache, breakerService);
         }
     }
 
-    FSTBytesIndexFieldData(Index index, @IndexSettings Settings indexSettings, FieldMapper.Names fieldNames, FieldDataType fieldDataType,
+    FSTBytesIndexFieldData(Index index, @IndexSettings Settings indexSettings, MappedFieldType.Names fieldNames, FieldDataType fieldDataType,
                            IndexFieldDataCache cache, CircuitBreakerService breakerService) {
         super(index, indexSettings, fieldNames, fieldDataType, cache, breakerService);
         this.breakerService = breakerService;
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/FloatArrayIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/FloatArrayIndexFieldData.java
index 8f7bee30247..b50c742e15e 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/FloatArrayIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/FloatArrayIndexFieldData.java
@@ -52,6 +52,7 @@ import org.elasticsearch.index.fielddata.fieldcomparator.FloatValuesComparatorSo
 import org.elasticsearch.index.fielddata.ordinals.Ordinals;
 import org.elasticsearch.index.fielddata.ordinals.OrdinalsBuilder;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
@@ -73,11 +74,11 @@ public class FloatArrayIndexFieldData extends AbstractIndexFieldData<AtomicNumer
         @Override
         public IndexFieldData<?> build(Index index, @IndexSettings Settings indexSettings, FieldMapper mapper, IndexFieldDataCache cache,
                                        CircuitBreakerService breakerService, MapperService mapperService) {
-            return new FloatArrayIndexFieldData(index, indexSettings, mapper.names(), mapper.fieldDataType(), cache, breakerService);
+            return new FloatArrayIndexFieldData(index, indexSettings, mapper.fieldType().names(), mapper.fieldType().fieldDataType(), cache, breakerService);
         }
     }
 
-    public FloatArrayIndexFieldData(Index index, @IndexSettings Settings indexSettings, FieldMapper.Names fieldNames,
+    public FloatArrayIndexFieldData(Index index, @IndexSettings Settings indexSettings, MappedFieldType.Names fieldNames,
                                     FieldDataType fieldDataType, IndexFieldDataCache cache, CircuitBreakerService breakerService) {
         super(index, indexSettings, fieldNames, fieldDataType, cache);
         this.breakerService = breakerService;
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVIndexFieldData.java
index 37a3fccd0eb..e33512a668f 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVIndexFieldData.java
@@ -27,7 +27,8 @@ import org.elasticsearch.index.Index;
 import org.elasticsearch.index.fielddata.*;
 import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
 import org.elasticsearch.index.mapper.FieldMapper;
-import org.elasticsearch.index.mapper.FieldMapper.Names;
+import org.elasticsearch.index.mapper.MappedFieldType;
+import org.elasticsearch.index.mapper.MappedFieldType.Names;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import org.elasticsearch.search.MultiValueMode;
@@ -65,8 +66,8 @@ public class GeoPointBinaryDVIndexFieldData extends DocValuesIndexFieldData impl
         public IndexFieldData<?> build(Index index, Settings indexSettings, FieldMapper mapper, IndexFieldDataCache cache,
                                        CircuitBreakerService breakerService, MapperService mapperService) {
             // Ignore breaker
-            final FieldMapper.Names fieldNames = mapper.names();
-            return new GeoPointBinaryDVIndexFieldData(index, fieldNames, mapper.fieldDataType());
+            final Names fieldNames = mapper.fieldType().names();
+            return new GeoPointBinaryDVIndexFieldData(index, fieldNames, mapper.fieldType().fieldDataType());
         }
 
     }
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointCompressedIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointCompressedIndexFieldData.java
index 1b48b014239..6bea9d873e5 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointCompressedIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointCompressedIndexFieldData.java
@@ -36,6 +36,7 @@ import org.elasticsearch.index.fielddata.*;
 import org.elasticsearch.index.fielddata.ordinals.Ordinals;
 import org.elasticsearch.index.fielddata.ordinals.OrdinalsBuilder;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.geo.GeoPointFieldMapper;
 import org.elasticsearch.index.settings.IndexSettings;
@@ -54,7 +55,7 @@ public class GeoPointCompressedIndexFieldData extends AbstractIndexGeoPointField
         @Override
         public IndexFieldData<?> build(Index index, @IndexSettings Settings indexSettings, FieldMapper mapper, IndexFieldDataCache cache,
                                        CircuitBreakerService breakerService, MapperService mapperService) {
-            FieldDataType type = mapper.fieldDataType();
+            FieldDataType type = mapper.fieldType().fieldDataType();
             final String precisionAsString = type.getSettings().get(PRECISION_KEY);
             final Distance precision;
             if (precisionAsString != null) {
@@ -62,13 +63,13 @@ public class GeoPointCompressedIndexFieldData extends AbstractIndexGeoPointField
             } else {
                 precision = DEFAULT_PRECISION_VALUE;
             }
-            return new GeoPointCompressedIndexFieldData(index, indexSettings, mapper.names(), mapper.fieldDataType(), cache, precision, breakerService);
+            return new GeoPointCompressedIndexFieldData(index, indexSettings, mapper.fieldType().names(), mapper.fieldType().fieldDataType(), cache, precision, breakerService);
         }
     }
 
     private final GeoPointFieldMapper.Encoding encoding;
 
-    public GeoPointCompressedIndexFieldData(Index index, @IndexSettings Settings indexSettings, FieldMapper.Names fieldNames,
+    public GeoPointCompressedIndexFieldData(Index index, @IndexSettings Settings indexSettings, MappedFieldType.Names fieldNames,
                                             FieldDataType fieldDataType, IndexFieldDataCache cache, Distance precision,
                                             CircuitBreakerService breakerService) {
         super(index, indexSettings, fieldNames, fieldDataType, cache);
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointDoubleArrayIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointDoubleArrayIndexFieldData.java
index 7a0beb06353..ae41404d53a 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointDoubleArrayIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointDoubleArrayIndexFieldData.java
@@ -33,6 +33,7 @@ import org.elasticsearch.index.fielddata.*;
 import org.elasticsearch.index.fielddata.ordinals.Ordinals;
 import org.elasticsearch.index.fielddata.ordinals.OrdinalsBuilder;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
@@ -48,11 +49,11 @@ public class GeoPointDoubleArrayIndexFieldData extends AbstractIndexGeoPointFiel
         @Override
         public IndexFieldData<?> build(Index index, @IndexSettings Settings indexSettings, FieldMapper mapper, IndexFieldDataCache cache,
                                        CircuitBreakerService breakerService, MapperService mapperService) {
-            return new GeoPointDoubleArrayIndexFieldData(index, indexSettings, mapper.names(), mapper.fieldDataType(), cache, breakerService);
+            return new GeoPointDoubleArrayIndexFieldData(index, indexSettings, mapper.fieldType().names(), mapper.fieldType().fieldDataType(), cache, breakerService);
         }
     }
 
-    public GeoPointDoubleArrayIndexFieldData(Index index, @IndexSettings Settings indexSettings, FieldMapper.Names fieldNames,
+    public GeoPointDoubleArrayIndexFieldData(Index index, @IndexSettings Settings indexSettings, MappedFieldType.Names fieldNames,
                                              FieldDataType fieldDataType, IndexFieldDataCache cache, CircuitBreakerService breakerService) {
         super(index, indexSettings, fieldNames, fieldDataType, cache);
         this.breakerService = breakerService;
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/IndexIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/IndexIndexFieldData.java
index 3fb3a82eb6a..1789d2e148b 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/IndexIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/IndexIndexFieldData.java
@@ -34,6 +34,7 @@ import org.elasticsearch.index.fielddata.IndexFieldData;
 import org.elasticsearch.index.fielddata.IndexFieldDataCache;
 import org.elasticsearch.index.fielddata.IndexOrdinalsFieldData;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
 
@@ -47,7 +48,7 @@ public class IndexIndexFieldData extends AbstractIndexOrdinalsFieldData {
         @Override
         public IndexFieldData<?> build(Index index, Settings indexSettings, FieldMapper mapper, IndexFieldDataCache cache,
                 CircuitBreakerService breakerService, MapperService mapperService) {
-            return new IndexIndexFieldData(index, mapper.names());
+            return new IndexIndexFieldData(index, mapper.fieldType().names());
         }
 
     }
@@ -101,7 +102,7 @@ public class IndexIndexFieldData extends AbstractIndexOrdinalsFieldData {
 
     private final AtomicOrdinalsFieldData atomicFieldData;
 
-    private IndexIndexFieldData(Index index, FieldMapper.Names names) {
+    private IndexIndexFieldData(Index index, MappedFieldType.Names names) {
         super(index, Settings.EMPTY, names, new FieldDataType("string"), null, null);
         atomicFieldData = new IndexAtomicFieldData(index().name());
     }
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVIndexFieldData.java
index 710ddba04a4..49e03015cba 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVIndexFieldData.java
@@ -31,7 +31,7 @@ import org.elasticsearch.index.fielddata.FieldDataType;
 import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
 import org.elasticsearch.index.fielddata.IndexNumericFieldData;
 import org.elasticsearch.index.fielddata.fieldcomparator.LongValuesComparatorSource;
-import org.elasticsearch.index.mapper.FieldMapper.Names;
+import org.elasticsearch.index.mapper.MappedFieldType.Names;
 import org.elasticsearch.search.MultiValueMode;
 
 import java.io.IOException;
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/PackedArrayIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/PackedArrayIndexFieldData.java
index 50f6e631e84..71af0e0de60 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/PackedArrayIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/PackedArrayIndexFieldData.java
@@ -57,6 +57,7 @@ import org.elasticsearch.index.fielddata.fieldcomparator.LongValuesComparatorSou
 import org.elasticsearch.index.fielddata.ordinals.Ordinals;
 import org.elasticsearch.index.fielddata.ordinals.OrdinalsBuilder;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
@@ -86,14 +87,14 @@ public class PackedArrayIndexFieldData extends AbstractIndexFieldData<AtomicNume
         @Override
         public IndexFieldData<AtomicNumericFieldData> build(Index index, @IndexSettings Settings indexSettings, FieldMapper mapper,
                                                             IndexFieldDataCache cache, CircuitBreakerService breakerService, MapperService mapperService) {
-            return new PackedArrayIndexFieldData(index, indexSettings, mapper.names(), mapper.fieldDataType(), cache, numericType, breakerService);
+            return new PackedArrayIndexFieldData(index, indexSettings, mapper.fieldType().names(), mapper.fieldType().fieldDataType(), cache, numericType, breakerService);
         }
     }
 
     private final NumericType numericType;
     private final CircuitBreakerService breakerService;
 
-    public PackedArrayIndexFieldData(Index index, @IndexSettings Settings indexSettings, FieldMapper.Names fieldNames,
+    public PackedArrayIndexFieldData(Index index, @IndexSettings Settings indexSettings, MappedFieldType.Names fieldNames,
                                      FieldDataType fieldDataType, IndexFieldDataCache cache, NumericType numericType,
                                      CircuitBreakerService breakerService) {
         super(index, indexSettings, fieldNames, fieldDataType, cache);
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java
index 8d91132b698..91487fe3e69 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesIndexFieldData.java
@@ -33,6 +33,7 @@ import org.elasticsearch.index.fielddata.*;
 import org.elasticsearch.index.fielddata.ordinals.Ordinals;
 import org.elasticsearch.index.fielddata.ordinals.OrdinalsBuilder;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
@@ -49,11 +50,11 @@ public class PagedBytesIndexFieldData extends AbstractIndexOrdinalsFieldData {
         @Override
         public IndexOrdinalsFieldData build(Index index, @IndexSettings Settings indexSettings, FieldMapper mapper,
                                                                IndexFieldDataCache cache, CircuitBreakerService breakerService, MapperService mapperService) {
-            return new PagedBytesIndexFieldData(index, indexSettings, mapper.names(), mapper.fieldDataType(), cache, breakerService);
+            return new PagedBytesIndexFieldData(index, indexSettings, mapper.fieldType().names(), mapper.fieldType().fieldDataType(), cache, breakerService);
         }
     }
 
-    public PagedBytesIndexFieldData(Index index, @IndexSettings Settings indexSettings, FieldMapper.Names fieldNames,
+    public PagedBytesIndexFieldData(Index index, @IndexSettings Settings indexSettings, MappedFieldType.Names fieldNames,
                                     FieldDataType fieldDataType, IndexFieldDataCache cache, CircuitBreakerService breakerService) {
         super(index, indexSettings, fieldNames, fieldDataType, cache, breakerService);
     }
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java
index e748805e329..51460fa8b73 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java
@@ -61,7 +61,8 @@ import org.elasticsearch.index.fielddata.ordinals.OrdinalsBuilder;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.DocumentTypeListener;
 import org.elasticsearch.index.mapper.FieldMapper;
-import org.elasticsearch.index.mapper.FieldMapper.Names;
+import org.elasticsearch.index.mapper.MappedFieldType;
+import org.elasticsearch.index.mapper.MappedFieldType.Names;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.internal.ParentFieldMapper;
 import org.elasticsearch.index.mapper.internal.UidFieldMapper;
@@ -96,7 +97,7 @@ public class ParentChildIndexFieldData extends AbstractIndexFieldData<AtomicPare
     // while loading.
     private final Object lock = new Object();
 
-    public ParentChildIndexFieldData(Index index, @IndexSettings Settings indexSettings, FieldMapper.Names fieldNames,
+    public ParentChildIndexFieldData(Index index, @IndexSettings Settings indexSettings, MappedFieldType.Names fieldNames,
                                      FieldDataType fieldDataType, IndexFieldDataCache cache, MapperService mapperService,
                                      CircuitBreakerService breakerService) {
         super(index, indexSettings, fieldNames, fieldDataType, cache);
@@ -228,8 +229,8 @@ public class ParentChildIndexFieldData extends AbstractIndexFieldData<AtomicPare
         public IndexFieldData<?> build(Index index, @IndexSettings Settings indexSettings, FieldMapper mapper,
                                        IndexFieldDataCache cache, CircuitBreakerService breakerService,
                                        MapperService mapperService) {
-            return new ParentChildIndexFieldData(index, indexSettings, mapper.names(), mapper.fieldDataType(), cache,
-                    mapperService, breakerService);
+            return new ParentChildIndexFieldData(index, indexSettings, mapper.fieldType().names(), mapper.fieldType().fieldDataType(), cache,
+                mapperService, breakerService);
         }
     }
 
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java
index 18995573ee4..32bd21c3759 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericDVIndexFieldData.java
@@ -40,7 +40,7 @@ import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
 import org.elasticsearch.index.fielddata.fieldcomparator.DoubleValuesComparatorSource;
 import org.elasticsearch.index.fielddata.fieldcomparator.FloatValuesComparatorSource;
 import org.elasticsearch.index.fielddata.fieldcomparator.LongValuesComparatorSource;
-import org.elasticsearch.index.mapper.FieldMapper.Names;
+import org.elasticsearch.index.mapper.MappedFieldType.Names;
 import org.elasticsearch.search.MultiValueMode;
 
 import java.io.IOException;
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java
index 7ca547f6159..9d29b3b1a8a 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVOrdinalsIndexFieldData.java
@@ -28,7 +28,7 @@ import org.elasticsearch.index.fielddata.*;
 import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
 import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource;
 import org.elasticsearch.index.fielddata.ordinals.GlobalOrdinalsBuilder;
-import org.elasticsearch.index.mapper.FieldMapper.Names;
+import org.elasticsearch.index.mapper.MappedFieldType.Names;
 import org.elasticsearch.search.MultiValueMode;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
 
diff --git a/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java b/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java
index 945dee616ca..74572f21bd8 100644
--- a/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java
+++ b/src/main/java/org/elasticsearch/index/fieldvisitor/SingleFieldsVisitor.java
@@ -67,7 +67,7 @@ public class SingleFieldsVisitor extends FieldsVisitor {
         if (fieldsValues == null) {
             return;
         }
-        List<Object> fieldValues = fieldsValues.get(mapper.names().indexName());
+        List<Object> fieldValues = fieldsValues.get(mapper.fieldType().names().indexName());
         if (fieldValues == null) {
             return;
         }
diff --git a/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java b/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java
index e4f61db2df1..f7166ad769a 100644
--- a/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java
+++ b/src/main/java/org/elasticsearch/index/mapper/DocumentFieldMappers.java
@@ -59,19 +59,19 @@ public final class DocumentFieldMappers implements Iterable<FieldMapper> {
         FieldNameAnalyzer indexAnalyzer = this.indexAnalyzer.copyAndAddAll(Collections2.transform(newMappers, new Function<FieldMapper, Map.Entry<String, Analyzer>>() {
             @Override
             public Map.Entry<String, Analyzer> apply(FieldMapper input) {
-                return Maps.immutableEntry(input.names().indexName(), input.indexAnalyzer());
+                return Maps.immutableEntry(input.fieldType().names().indexName(), (Analyzer)input.fieldType().indexAnalyzer());
             }
         }));
         FieldNameAnalyzer searchAnalyzer = this.searchAnalyzer.copyAndAddAll(Collections2.transform(newMappers, new Function<FieldMapper, Map.Entry<String, Analyzer>>() {
             @Override
             public Map.Entry<String, Analyzer> apply(FieldMapper input) {
-                return Maps.immutableEntry(input.names().indexName(), input.searchAnalyzer());
+                return Maps.immutableEntry(input.fieldType().names().indexName(), (Analyzer)input.fieldType().searchAnalyzer());
             }
         }));
         FieldNameAnalyzer searchQuoteAnalyzer = this.searchQuoteAnalyzer.copyAndAddAll(Collections2.transform(newMappers, new Function<FieldMapper, Map.Entry<String, Analyzer>>() {
             @Override
             public Map.Entry<String, Analyzer> apply(FieldMapper input) {
-                return Maps.immutableEntry(input.names().indexName(), input.searchQuoteAnalyzer());
+                return Maps.immutableEntry(input.fieldType().names().indexName(), (Analyzer)input.fieldType().searchQuoteAnalyzer());
             }
         }));
         return new DocumentFieldMappers(fieldMappers, indexAnalyzer, searchAnalyzer, searchQuoteAnalyzer);
diff --git a/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java
index 172c05c32ba..02f6459b76b 100644
--- a/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java
@@ -19,9 +19,6 @@
 
 package org.elasticsearch.index.mapper;
 
-import com.google.common.base.Strings;
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.index.Terms;
 import org.apache.lucene.search.MultiTermQuery;
@@ -30,10 +27,8 @@ import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.action.fieldstats.FieldStats;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.unit.Fuzziness;
-import org.elasticsearch.index.fielddata.FieldDataType;
 import org.elasticsearch.index.mapper.core.AbstractFieldMapper;
 import org.elasticsearch.index.query.QueryParseContext;
-import org.elasticsearch.index.similarity.SimilarityProvider;
 
 import java.io.IOException;
 import java.util.List;
@@ -45,146 +40,7 @@ public interface FieldMapper extends Mapper {
 
     String DOC_VALUES_FORMAT = "doc_values_format";
 
-    class Names {
-
-        private final String shortName;
-
-        private final String indexName;
-
-        private final String originalIndexName;
-
-        private final String fullName;
-
-        public Names(String name) {
-            this(name, name, name, name);
-        }
-
-        public Names(String shortName, String indexName, String originalIndexName, String fullName) {
-            this.shortName = shortName;
-            this.indexName = indexName;
-            this.originalIndexName = originalIndexName;
-            this.fullName = fullName;
-        }
-
-        /**
-         * The logical name of the field.
-         */
-        public String shortName() {
-            return shortName;
-        }
-
-        /**
-         * The indexed name of the field. This is the name under which we will
-         * store it in the index.
-         */
-        public String indexName() {
-            return indexName;
-        }
-
-        /**
-         * The original index name, before any "path" modifications performed on it.
-         */
-        public String originalIndexName() {
-            return originalIndexName;
-        }
-
-        /**
-         * The full name, including dot path.
-         */
-        public String fullName() {
-            return fullName;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (o == null || getClass() != o.getClass()) return false;
-
-            Names names = (Names) o;
-
-            if (!fullName.equals(names.fullName)) return false;
-            if (!indexName.equals(names.indexName)) return false;
-            if (!originalIndexName.equals(names.originalIndexName)) return false;
-            if (!shortName.equals(names.shortName)) return false;
-
-            return true;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = shortName.hashCode();
-            result = 31 * result + indexName.hashCode();
-            result = 31 * result + originalIndexName.hashCode();
-            result = 31 * result + fullName.hashCode();
-            return result;
-        }
-    }
-
-    enum Loading {
-        LAZY {
-            @Override
-            public String toString() {
-                return LAZY_VALUE;
-            }
-        },
-        EAGER {
-            @Override
-            public String toString() {
-                return EAGER_VALUE;
-            }
-        },
-        EAGER_GLOBAL_ORDINALS {
-            @Override
-            public String toString() {
-                return EAGER_GLOBAL_ORDINALS_VALUE;
-            }
-        };
-
-        public static final String KEY = "loading";
-        public static final String EAGER_GLOBAL_ORDINALS_VALUE = "eager_global_ordinals";
-        public static final String EAGER_VALUE = "eager";
-        public static final String LAZY_VALUE = "lazy";
-
-        public static Loading parse(String loading, Loading defaultValue) {
-            if (Strings.isNullOrEmpty(loading)) {
-                return defaultValue;
-            } else if (EAGER_GLOBAL_ORDINALS_VALUE.equalsIgnoreCase(loading)) {
-                return EAGER_GLOBAL_ORDINALS;
-            } else if (EAGER_VALUE.equalsIgnoreCase(loading)) {
-                return EAGER;
-            } else if (LAZY_VALUE.equalsIgnoreCase(loading)) {
-                return LAZY;
-            } else {
-                throw new MapperParsingException("Unknown [" + KEY + "] value: [" + loading + "]");
-            }
-        }
-
-    }
-
-    Names names();
-
-    FieldType fieldType();
-
-    float boost();
-
-    /**
-     * The analyzer that will be used to index the field.
-     */
-    Analyzer indexAnalyzer();
-
-    /**
-     * The analyzer that will be used to search the field.
-     */
-    Analyzer searchAnalyzer();
-
-    /**
-     * The analyzer that will be used for quoted search on the field.
-     */
-    Analyzer searchQuoteAnalyzer();
-
-    /**
-     * Similarity used for scoring queries on the field
-     */
-    SimilarityProvider similarity();
+    MappedFieldType fieldType();
 
     /**
      * List of fields where this field should be copied to
@@ -236,18 +92,12 @@ public interface FieldMapper extends Mapper {
     @Nullable
     Query nullValueFilter();
 
-    FieldDataType fieldDataType();
-
     boolean isNumeric();
 
     boolean isSortable();
 
     boolean supportsNullValue();
 
-    boolean hasDocValues();
-
-    Loading normsLoading(Loading defaultLoading);
-
     /**
      * Fields might not be available before indexing, for example _all, token_count,...
      * When get is called and these fields are requested, this case needs special treatment.
diff --git a/src/main/java/org/elasticsearch/index/mapper/FieldMappersLookup.java b/src/main/java/org/elasticsearch/index/mapper/FieldMappersLookup.java
index d751c95910e..eda694a939d 100644
--- a/src/main/java/org/elasticsearch/index/mapper/FieldMappersLookup.java
+++ b/src/main/java/org/elasticsearch/index/mapper/FieldMappersLookup.java
@@ -53,7 +53,7 @@ class FieldMappersLookup implements Iterable<FieldMapper> {
         CopyOnWriteHashMap<String, FieldMappers> map = this.mappers;
 
         for (FieldMapper mapper : newMappers) {
-            String key = mapper.names().fullName();
+            String key = mapper.fieldType().names().fullName();
             FieldMappers mappers = map.get(key);
 
             if (mappers == null) {
@@ -76,13 +76,13 @@ class FieldMappersLookup implements Iterable<FieldMapper> {
     public FieldMappers indexName(String indexName) {
         FieldMappers fieldMappers = fullName(indexName);
         if (fieldMappers != null) {
-            if (fieldMappers.mapper().names().indexName().equals(indexName)) {
+            if (fieldMappers.mapper().fieldType().names().indexName().equals(indexName)) {
                 return fieldMappers;
             }
         }
         fieldMappers = new FieldMappers();
         for (FieldMapper mapper : this) {
-            if (mapper.names().indexName().equals(indexName)) {
+            if (mapper.fieldType().names().indexName().equals(indexName)) {
                 fieldMappers = fieldMappers.concat(mapper);
             }
         }
@@ -117,10 +117,10 @@ class FieldMappersLookup implements Iterable<FieldMapper> {
     public Collection<String> simpleMatchToIndexNames(String pattern) {
         Set<String> fields = Sets.newHashSet();
         for (FieldMapper fieldMapper : this) {
-            if (Regex.simpleMatch(pattern, fieldMapper.names().fullName())) {
-                fields.add(fieldMapper.names().indexName());
-            } else if (Regex.simpleMatch(pattern, fieldMapper.names().indexName())) {
-                fields.add(fieldMapper.names().indexName());
+            if (Regex.simpleMatch(pattern, fieldMapper.fieldType().names().fullName())) {
+                fields.add(fieldMapper.fieldType().names().indexName());
+            } else if (Regex.simpleMatch(pattern, fieldMapper.fieldType().names().indexName())) {
+                fields.add(fieldMapper.fieldType().names().indexName());
             }
         }
         return fields;
@@ -132,10 +132,10 @@ class FieldMappersLookup implements Iterable<FieldMapper> {
     public Collection<String> simpleMatchToFullName(String pattern) {
         Set<String> fields = Sets.newHashSet();
         for (FieldMapper fieldMapper : this) {
-            if (Regex.simpleMatch(pattern, fieldMapper.names().fullName())) {
-                fields.add(fieldMapper.names().fullName());
-            } else if (Regex.simpleMatch(pattern, fieldMapper.names().indexName())) {
-                fields.add(fieldMapper.names().fullName());
+            if (Regex.simpleMatch(pattern, fieldMapper.fieldType().names().fullName())) {
+                fields.add(fieldMapper.fieldType().names().fullName());
+            } else if (Regex.simpleMatch(pattern, fieldMapper.fieldType().names().indexName())) {
+                fields.add(fieldMapper.fieldType().names().fullName());
             }
         }
         return fields;
diff --git a/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java b/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java
new file mode 100644
index 00000000000..644af16991b
--- /dev/null
+++ b/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java
@@ -0,0 +1,368 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.index.mapper;
+
+import com.google.common.base.Strings;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.index.Terms;
+import org.apache.lucene.queries.TermsQuery;
+import org.apache.lucene.search.FuzzyQuery;
+import org.apache.lucene.search.MultiTermQuery;
+import org.apache.lucene.search.PrefixQuery;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.RegexpQuery;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TermRangeQuery;
+import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.action.fieldstats.FieldStats;
+import org.elasticsearch.common.Nullable;
+import org.elasticsearch.common.lucene.BytesRefs;
+import org.elasticsearch.common.lucene.search.Queries;
+import org.elasticsearch.common.unit.Fuzziness;
+import org.elasticsearch.index.analysis.NamedAnalyzer;
+import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.query.QueryParseContext;
+import org.elasticsearch.index.similarity.SimilarityProvider;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * This defines the core properties and functions to operate on a field.
+ */
+public class MappedFieldType extends FieldType {
+
+    public static class Names {
+
+        private final String shortName;
+
+        private final String indexName;
+
+        private final String originalIndexName;
+
+        private final String fullName;
+
+        public Names(String name) {
+            this(name, name, name, name);
+        }
+
+        public Names(String shortName, String indexName, String originalIndexName, String fullName) {
+            this.shortName = shortName;
+            this.indexName = indexName;
+            this.originalIndexName = originalIndexName;
+            this.fullName = fullName;
+        }
+
+        /**
+         * The logical name of the field.
+         */
+        public String shortName() {
+            return shortName;
+        }
+
+        /**
+         * The indexed name of the field. This is the name under which we will
+         * store it in the index.
+         */
+        public String indexName() {
+            return indexName;
+        }
+
+        /**
+         * The original index name, before any "path" modifications performed on it.
+         */
+        public String originalIndexName() {
+            return originalIndexName;
+        }
+
+        /**
+         * The full name, including dot path.
+         */
+        public String fullName() {
+            return fullName;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o == null || getClass() != o.getClass()) return false;
+
+            Names names = (Names) o;
+
+            if (!fullName.equals(names.fullName)) return false;
+            if (!indexName.equals(names.indexName)) return false;
+            if (!originalIndexName.equals(names.originalIndexName)) return false;
+            if (!shortName.equals(names.shortName)) return false;
+
+            return true;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = shortName.hashCode();
+            result = 31 * result + indexName.hashCode();
+            result = 31 * result + originalIndexName.hashCode();
+            result = 31 * result + fullName.hashCode();
+            return result;
+        }
+    }
+
+    public enum Loading {
+        LAZY {
+            @Override
+            public String toString() {
+                return LAZY_VALUE;
+            }
+        },
+        EAGER {
+            @Override
+            public String toString() {
+                return EAGER_VALUE;
+            }
+        },
+        EAGER_GLOBAL_ORDINALS {
+            @Override
+            public String toString() {
+                return EAGER_GLOBAL_ORDINALS_VALUE;
+            }
+        };
+
+        public static final String KEY = "loading";
+        public static final String EAGER_GLOBAL_ORDINALS_VALUE = "eager_global_ordinals";
+        public static final String EAGER_VALUE = "eager";
+        public static final String LAZY_VALUE = "lazy";
+
+        public static Loading parse(String loading, Loading defaultValue) {
+            if (Strings.isNullOrEmpty(loading)) {
+                return defaultValue;
+            } else if (EAGER_GLOBAL_ORDINALS_VALUE.equalsIgnoreCase(loading)) {
+                return EAGER_GLOBAL_ORDINALS;
+            } else if (EAGER_VALUE.equalsIgnoreCase(loading)) {
+                return EAGER;
+            } else if (LAZY_VALUE.equalsIgnoreCase(loading)) {
+                return LAZY;
+            } else {
+                throw new MapperParsingException("Unknown [" + KEY + "] value: [" + loading + "]");
+            }
+        }
+    }
+
+    private Names names;
+    private float boost;
+    // TODO: remove this docvalues flag and use docValuesType
+    private boolean docValues;
+    private NamedAnalyzer indexAnalyzer;
+    private NamedAnalyzer searchAnalyzer;
+    private NamedAnalyzer searchQuoteAnalyzer;
+    private SimilarityProvider similarity;
+    private Loading normsLoading;
+    private FieldDataType fieldDataType;
+
+    protected MappedFieldType(MappedFieldType ref) {
+        super(ref);
+        this.names = ref.names();
+        this.boost = ref.boost();
+        this.docValues = ref.hasDocValues();
+        this.indexAnalyzer = ref.indexAnalyzer();
+        this.searchAnalyzer = ref.searchAnalyzer();
+        this.searchQuoteAnalyzer = ref.searchQuoteAnalyzer();
+        this.similarity = ref.similarity();
+        this.normsLoading = ref.normsLoading();
+        this.fieldDataType = ref.fieldDataType();
+    }
+
+    public MappedFieldType() {}
+
+    public MappedFieldType clone() {
+        return new MappedFieldType(this);
+    }
+
+    public boolean isNumeric() {
+        return false;
+    }
+
+    public boolean isSortable() {
+        return true;
+    }
+
+    public Names names() {
+        return names;
+    }
+
+    public void setNames(Names names) {
+        checkIfFrozen();
+        this.names = names;
+    }
+
+    public float boost() {
+        return boost;
+    }
+
+    public void setBoost(float boost) {
+        checkIfFrozen();
+        this.boost = boost;
+    }
+
+    public FieldDataType fieldDataType() {
+        return fieldDataType;
+    }
+
+    public void setFieldDataType(FieldDataType fieldDataType) {
+        checkIfFrozen();
+        this.fieldDataType = fieldDataType;
+    }
+
+    public boolean hasDocValues() {
+        return docValues;
+    }
+
+    public void setHasDocValues(boolean hasDocValues) {
+        checkIfFrozen();
+        this.docValues = hasDocValues;
+    }
+
+    public Loading normsLoading() {
+        return normsLoading;
+    }
+
+    public void setNormsLoading(Loading normsLoading) {
+        checkIfFrozen();
+        this.normsLoading = normsLoading;
+    }
+
+    public NamedAnalyzer indexAnalyzer() {
+        return indexAnalyzer;
+    }
+
+    public void setIndexAnalyzer(NamedAnalyzer analyzer) {
+        checkIfFrozen();
+        this.indexAnalyzer = analyzer;
+    }
+
+    public NamedAnalyzer searchAnalyzer() {
+        return searchAnalyzer;
+    }
+
+    public void setSearchAnalyzer(NamedAnalyzer analyzer) {
+        checkIfFrozen();
+        this.searchAnalyzer = analyzer;
+    }
+
+    public NamedAnalyzer searchQuoteAnalyzer() {
+        return searchQuoteAnalyzer == null ? searchAnalyzer : searchQuoteAnalyzer;
+    }
+
+    public void setSearchQuoteAnalyzer(NamedAnalyzer analyzer) {
+        checkIfFrozen();
+        this.searchQuoteAnalyzer = analyzer;
+    }
+
+    public SimilarityProvider similarity() {
+        return similarity;
+    }
+
+    public void setSimilarity(SimilarityProvider similarity) {
+        checkIfFrozen();
+        this.similarity = similarity;
+    }
+
+    /** Returns the actual value of the field. */
+    public Object value(Object value) {
+        return value;
+    }
+
+    /** Returns the value that will be used as a result for search. Can be only of specific types... */
+    public Object valueForSearch(Object value) {
+        return value;
+    }
+
+    /** Returns the indexed value used to construct search "values". */
+    public BytesRef indexedValueForSearch(Object value) {
+        return BytesRefs.toBytesRef(value);
+    }
+
+    /**
+     * Should the field query {@link #termQuery(Object, org.elasticsearch.index.query.QueryParseContext)}  be used when detecting this
+     * field in query string.
+     */
+    public boolean useTermQueryWithQueryString() {
+        return false;
+    }
+
+    /** Creates a term associated with the field of this mapper for the given value */
+    protected Term createTerm(Object value) {
+        return new Term(names().indexName(), indexedValueForSearch(value));
+    }
+
+    public Query termQuery(Object value, @Nullable QueryParseContext context) {
+        return new TermQuery(createTerm(value));
+    }
+
+    public Query termsQuery(List values, @Nullable QueryParseContext context) {
+        BytesRef[] bytesRefs = new BytesRef[values.size()];
+        for (int i = 0; i < bytesRefs.length; i++) {
+            bytesRefs[i] = indexedValueForSearch(values.get(i));
+        }
+        return new TermsQuery(names.indexName(), bytesRefs);
+    }
+
+    public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
+        return new TermRangeQuery(names().indexName(),
+            lowerTerm == null ? null : indexedValueForSearch(lowerTerm),
+            upperTerm == null ? null : indexedValueForSearch(upperTerm),
+            includeLower, includeUpper);
+    }
+
+    public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
+        return new FuzzyQuery(createTerm(value), fuzziness.asDistance(value), prefixLength, maxExpansions, transpositions);
+    }
+
+    public Query prefixQuery(Object value, @Nullable MultiTermQuery.RewriteMethod method, @Nullable QueryParseContext context) {
+        PrefixQuery query = new PrefixQuery(createTerm(value));
+        if (method != null) {
+            query.setRewriteMethod(method);
+        }
+        return query;
+    }
+
+    public Query regexpQuery(Object value, int flags, int maxDeterminizedStates, @Nullable MultiTermQuery.RewriteMethod method, @Nullable QueryParseContext context) {
+        RegexpQuery query = new RegexpQuery(createTerm(value), flags, maxDeterminizedStates);
+        if (method != null) {
+            query.setRewriteMethod(method);
+        }
+        return query;
+    }
+
+    /**
+     * @return a {@link FieldStats} instance that maps to the type of this field based on the provided {@link Terms} instance.
+     */
+    public FieldStats stats(Terms terms, int maxDoc) throws IOException {
+        return new FieldStats.Text(
+            maxDoc, terms.getDocCount(), terms.getSumDocFreq(), terms.getSumTotalTermFreq(), terms.getMin(), terms.getMax()
+        );
+    }
+
+    /** A term query to use when parsing a query string. Can return <tt>null</tt>. */
+    @Nullable
+    public Query queryStringTermQuery(Term term) {
+        return null;
+    }
+}
diff --git a/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/src/main/java/org/elasticsearch/index/mapper/MapperService.java
index b63df2d6cc4..3b223007268 100755
--- a/src/main/java/org/elasticsearch/index/mapper/MapperService.java
+++ b/src/main/java/org/elasticsearch/index/mapper/MapperService.java
@@ -690,8 +690,8 @@ public class MapperService extends AbstractIndexComponent  {
         @Override
         protected Analyzer getWrappedAnalyzer(String fieldName) {
             FieldMapper mapper = smartNameFieldMapper(fieldName);
-            if (mapper != null && mapper.searchAnalyzer() != null) {
-                return mapper.searchAnalyzer();
+            if (mapper != null && mapper.fieldType().searchAnalyzer() != null) {
+                return mapper.fieldType().searchAnalyzer();
             }
             return defaultAnalyzer;
         }
@@ -709,8 +709,8 @@ public class MapperService extends AbstractIndexComponent  {
         @Override
         protected Analyzer getWrappedAnalyzer(String fieldName) {
             FieldMapper mapper = smartNameFieldMapper(fieldName);
-            if (mapper != null && mapper.searchQuoteAnalyzer() != null) {
-                return mapper.searchQuoteAnalyzer();
+            if (mapper != null && mapper.fieldType().searchQuoteAnalyzer() != null) {
+                return mapper.fieldType().searchQuoteAnalyzer();
             }
             return defaultAnalyzer;
         }
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java
index f7217a5b8e0..db0be598d91 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java
@@ -25,28 +25,19 @@ import com.google.common.base.Function;
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;
-import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.index.Terms;
-import org.apache.lucene.queries.TermsQuery;
-import org.apache.lucene.search.FuzzyQuery;
 import org.apache.lucene.search.MultiTermQuery;
-import org.apache.lucene.search.PrefixQuery;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.search.RegexpQuery;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.TermRangeQuery;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.fieldstats.FieldStats;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.collect.ImmutableOpenMap;
-import org.elasticsearch.common.lucene.BytesRefs;
 import org.elasticsearch.common.lucene.Lucene;
-import org.elasticsearch.common.lucene.search.Queries;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.Fuzziness;
 import org.elasticsearch.common.xcontent.XContentBuilder;
@@ -54,6 +45,7 @@ import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.fielddata.FieldDataType;
 import org.elasticsearch.index.mapper.ContentPath;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
@@ -74,14 +66,12 @@ import java.util.List;
 import java.util.Locale;
 import java.util.TreeMap;
 
-/**
- *
- */
+import static org.elasticsearch.index.mapper.core.TypeParsers.DOC_VALUES;
+
 public abstract class AbstractFieldMapper implements FieldMapper {
 
     public static class Defaults {
-        public static final FieldType FIELD_TYPE = new FieldType();
-        public static final boolean PRE_2X_DOC_VALUES = false;
+        public static final MappedFieldType FIELD_TYPE = new MappedFieldType();
 
         static {
             FIELD_TYPE.setTokenized(true);
@@ -89,6 +79,7 @@ public abstract class AbstractFieldMapper implements FieldMapper {
             FIELD_TYPE.setStoreTermVectors(false);
             FIELD_TYPE.setOmitNorms(false);
             FIELD_TYPE.setIndexOptions(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS);
+            FIELD_TYPE.setBoost(Defaults.BOOST);
             FIELD_TYPE.freeze();
         }
 
@@ -98,26 +89,21 @@ public abstract class AbstractFieldMapper implements FieldMapper {
 
     public abstract static class Builder<T extends Builder, Y extends AbstractFieldMapper> extends Mapper.Builder<T, Y> {
 
-        protected final FieldType fieldType;
+        protected final MappedFieldType fieldType;
         private final IndexOptions defaultOptions;
         protected Boolean docValues;
-        protected float boost = Defaults.BOOST;
         protected boolean omitNormsSet = false;
         protected String indexName;
-        protected NamedAnalyzer indexAnalyzer;
-        protected NamedAnalyzer searchAnalyzer;
         protected Boolean includeInAll;
         protected boolean indexOptionsSet = false;
-        protected SimilarityProvider similarity;
-        protected Loading normsLoading;
         @Nullable
         protected Settings fieldDataSettings;
         protected final MultiFields.Builder multiFieldsBuilder;
         protected CopyTo copyTo;
 
-        protected Builder(String name, FieldType fieldType) {
+        protected Builder(String name, MappedFieldType fieldType) {
             super(name);
-            this.fieldType = fieldType;
+            this.fieldType = fieldType.clone();
             this.defaultOptions = fieldType.indexOptions(); // we have to store it the fieldType is mutable
             multiFieldsBuilder = new MultiFields.Builder();
         }
@@ -191,7 +177,7 @@ public abstract class AbstractFieldMapper implements FieldMapper {
         }
 
         public T boost(float boost) {
-            this.boost = boost;
+            this.fieldType.setBoost(boost);
             return builder;
         }
 
@@ -213,12 +199,12 @@ public abstract class AbstractFieldMapper implements FieldMapper {
         }
 
         public T indexAnalyzer(NamedAnalyzer indexAnalyzer) {
-            this.indexAnalyzer = indexAnalyzer;
+            this.fieldType.setIndexAnalyzer(indexAnalyzer);
             return builder;
         }
 
         public T searchAnalyzer(NamedAnalyzer searchAnalyzer) {
-            this.searchAnalyzer = searchAnalyzer;
+            this.fieldType.setSearchAnalyzer(searchAnalyzer);
             return builder;
         }
 
@@ -228,12 +214,12 @@ public abstract class AbstractFieldMapper implements FieldMapper {
         }
 
         public T similarity(SimilarityProvider similarity) {
-            this.similarity = similarity;
+            this.fieldType.setSimilarity(similarity);
             return builder;
         }
 
-        public T normsLoading(Loading normsLoading) {
-            this.normsLoading = normsLoading;
+        public T normsLoading(MappedFieldType.Loading normsLoading) {
+            this.fieldType.setNormsLoading(normsLoading);
             return builder;
         }
 
@@ -257,8 +243,8 @@ public abstract class AbstractFieldMapper implements FieldMapper {
             return builder;
         }
 
-        protected Names buildNames(BuilderContext context) {
-            return new Names(name, buildIndexName(context), buildIndexNameClean(context), buildFullName(context));
+        protected MappedFieldType.Names buildNames(BuilderContext context) {
+            return new MappedFieldType.Names(name, buildIndexName(context), buildIndexNameClean(context), buildFullName(context));
         }
 
         protected String buildIndexName(BuilderContext context) {
@@ -279,136 +265,82 @@ public abstract class AbstractFieldMapper implements FieldMapper {
         protected String buildFullName(BuilderContext context) {
             return context.path().fullPathAsText(name);
         }
+
+        protected void setupFieldType(BuilderContext context) {
+            fieldType.setNames(buildNames(context));
+        }
     }
 
-    protected final Names names;
-    protected float boost;
-    protected FieldType fieldType;
-    protected final Boolean docValues;
-    protected final NamedAnalyzer indexAnalyzer;
-    protected NamedAnalyzer searchAnalyzer;
-    protected final SimilarityProvider similarity;
-    protected Loading normsLoading;
+    protected MappedFieldType fieldType;
+    protected final boolean hasDefaultDocValues;
     protected Settings customFieldDataSettings;
-    protected FieldDataType fieldDataType;
     protected final MultiFields multiFields;
     protected CopyTo copyTo;
     protected final boolean indexCreatedBefore2x;
 
-    protected AbstractFieldMapper(Names names, float boost, FieldType fieldType, Boolean docValues, NamedAnalyzer indexAnalyzer,
-                                  NamedAnalyzer searchAnalyzer, SimilarityProvider similarity,
-                                  Loading normsLoading, @Nullable Settings fieldDataSettings, Settings indexSettings) {
-        this(names, boost, fieldType, docValues, indexAnalyzer, searchAnalyzer, similarity,
-                normsLoading, fieldDataSettings, indexSettings, MultiFields.empty(), null);
+    protected AbstractFieldMapper(MappedFieldType fieldType, Boolean docValues, @Nullable Settings fieldDataSettings, Settings indexSettings) {
+        this(fieldType, docValues, fieldDataSettings, indexSettings, MultiFields.empty(), null);
     }
 
-    protected AbstractFieldMapper(Names names, float boost, FieldType fieldType, Boolean docValues, NamedAnalyzer indexAnalyzer,
-                                  NamedAnalyzer searchAnalyzer, SimilarityProvider similarity,
-                                  Loading normsLoading, @Nullable Settings fieldDataSettings, Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
+    protected AbstractFieldMapper(MappedFieldType fieldType, Boolean docValues, @Nullable Settings fieldDataSettings, Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
         assert indexSettings != null;
-        this.names = names;
-        this.boost = boost;
-        this.fieldType = fieldType;
-        this.fieldType.freeze();
         this.indexCreatedBefore2x = Version.indexCreated(indexSettings).before(Version.V_2_0_0);
-
-        boolean indexedNotAnalyzed = this.fieldType.tokenized() == false && this.fieldType.indexOptions() != IndexOptions.NONE;
-        if (indexAnalyzer == null && indexedNotAnalyzed) {
-            this.indexAnalyzer = this.searchAnalyzer = Lucene.KEYWORD_ANALYZER;
-        } else {
-            this.indexAnalyzer = indexAnalyzer;
-            this.searchAnalyzer = searchAnalyzer;
-        }
-
-        this.similarity = similarity;
-        this.normsLoading = normsLoading;
-
         this.customFieldDataSettings = fieldDataSettings;
+        FieldDataType fieldDataType;
         if (fieldDataSettings == null) {
-            this.fieldDataType = defaultFieldDataType();
+            fieldDataType = defaultFieldDataType();
         } else {
             // create a new field data type, with the default settings as well as the "new ones"
-            this.fieldDataType = new FieldDataType(defaultFieldDataType().getType(),
-                    Settings.builder().put(defaultFieldDataType().getSettings()).put(fieldDataSettings)
+            fieldDataType = new FieldDataType(defaultFieldDataType().getType(),
+                Settings.builder().put(defaultFieldDataType().getSettings()).put(fieldDataSettings)
             );
         }
-        
-        if (docValues != null) {
-            // explicitly set
-            this.docValues = docValues;
-        } else if (fieldDataType != null && FieldDataType.DOC_VALUES_FORMAT_VALUE.equals(fieldDataType.getFormat(indexSettings))) {
-            // convoluted way to enable doc values, should be removed in the future
-            this.docValues = true;
-        } else {
-            this.docValues = null; // use the default
+
+        // TODO: hasDocValues should just be set directly on the field type by callers of this ctor, but
+        // then we need to eliminate defaultDocValues() (only needed by geo, which needs to be fixed with passing
+        // doc values setting down to lat/lon) and get rid of specifying doc values in fielddata (which
+        // complicates whether we can just compare to the default value to know whether to write the setting)
+        if (docValues == null && fieldDataType != null && FieldDataType.DOC_VALUES_FORMAT_VALUE.equals(fieldDataType.getFormat(indexSettings))) {
+            docValues = true;
         }
+        hasDefaultDocValues = docValues == null;
+
+        this.fieldType = fieldType.clone();
+        if (fieldType.indexAnalyzer() == null && fieldType.tokenized() == false && fieldType.indexOptions() != IndexOptions.NONE) {
+            this.fieldType.setIndexAnalyzer(Lucene.KEYWORD_ANALYZER);
+            this.fieldType.setSearchAnalyzer(Lucene.KEYWORD_ANALYZER);
+        }
+        this.fieldType.setHasDocValues(docValues == null ? defaultDocValues() : docValues);
+        this.fieldType.setFieldDataType(fieldDataType);
+        this.fieldType.freeze();
+
         this.multiFields = multiFields;
         this.copyTo = copyTo;
     }
     
     protected boolean defaultDocValues() {
         if (indexCreatedBefore2x) {
-            return Defaults.PRE_2X_DOC_VALUES;
+            return false;
         } else {
             return fieldType.tokenized() == false && fieldType.indexOptions() != IndexOptions.NONE;
         }
     }
 
-    @Override
-    public final boolean hasDocValues() {
-        return docValues == null ? defaultDocValues() : docValues;
-    }
-
     @Override
     public String name() {
         // TODO: cleanup names so Mapper knows about paths, so that it is always clear whether we are using short or full name
-        return names.shortName();
+        return fieldType.names().shortName();
     }
 
-    @Override
-    public Names names() {
-        return this.names;
-    }
-
-    public abstract FieldType defaultFieldType();
+    public abstract MappedFieldType defaultFieldType();
 
     public abstract FieldDataType defaultFieldDataType();
 
     @Override
-    public final FieldDataType fieldDataType() {
-        return fieldDataType;
-    }
-
-    @Override
-    public FieldType fieldType() {
+    public MappedFieldType fieldType() {
         return fieldType;
     }
 
-    @Override
-    public float boost() {
-        return this.boost;
-    }
-
-    @Override
-    public Analyzer indexAnalyzer() {
-        return this.indexAnalyzer;
-    }
-
-    @Override
-    public Analyzer searchAnalyzer() {
-        return this.searchAnalyzer;
-    }
-
-    @Override
-    public Analyzer searchQuoteAnalyzer() {
-        return this.searchAnalyzer;
-    }
-
-    @Override
-    public SimilarityProvider similarity() {
-        return similarity;
-    }
-
     @Override
     public CopyTo copyTo() {
         return copyTo;
@@ -421,12 +353,12 @@ public abstract class AbstractFieldMapper implements FieldMapper {
             parseCreateField(context, fields);
             for (Field field : fields) {
                 if (!customBoost()) {
-                    field.setBoost(boost);
+                    field.setBoost(fieldType.boost());
                 }
                 context.doc().add(field);
             }
         } catch (Exception e) {
-            throw new MapperParsingException("failed to parse [" + names.fullName() + "]", e);
+            throw new MapperParsingException("failed to parse [" + fieldType.names().fullName() + "]", e);
         }
         multiFields.parse(this, context);
         return null;
@@ -452,72 +384,59 @@ public abstract class AbstractFieldMapper implements FieldMapper {
     }
 
     @Override
-    public Object valueForSearch(Object value) {
-        return value;
+    public final Object value(Object value) {
+        return fieldType().value(value);
     }
 
+    @Override
+    public final Object valueForSearch(Object value) {
+        return fieldType().valueForSearch(value);
+    }
+
+    // TODO: this is not final so ParentFieldMapper can have custom behavior, per type...
     @Override
     public BytesRef indexedValueForSearch(Object value) {
-        return BytesRefs.toBytesRef(value);
+        return fieldType().indexedValueForSearch(value);
     }
 
     @Override
-    public Query queryStringTermQuery(Term term) {
-        return null;
+    public final Query queryStringTermQuery(Term term) {
+        return fieldType().queryStringTermQuery(term);
     }
 
     @Override
-    public boolean useTermQueryWithQueryString() {
-        return false;
+    public final boolean useTermQueryWithQueryString() {
+        return fieldType().useTermQueryWithQueryString();
     }
 
     @Override
-    public Query termQuery(Object value, @Nullable QueryParseContext context) {
-        return new TermQuery(createTerm(value));
+    public final Query termQuery(Object value, @Nullable QueryParseContext context) {
+        return fieldType().termQuery(value, context);
     }
 
     @Override
-    public Query termsQuery(List values, @Nullable QueryParseContext context) {
-        BytesRef[] bytesRefs = new BytesRef[values.size()];
-        for (int i = 0; i < bytesRefs.length; i++) {
-            bytesRefs[i] = indexedValueForSearch(values.get(i));
-        }
-        return new TermsQuery(names.indexName(), bytesRefs);
+    public final Query termsQuery(List values, @Nullable QueryParseContext context) {
+        return fieldType().termsQuery(values, context);
     }
 
     @Override
-    public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
-        return new TermRangeQuery(names.indexName(),
-                lowerTerm == null ? null : indexedValueForSearch(lowerTerm),
-                upperTerm == null ? null : indexedValueForSearch(upperTerm),
-                includeLower, includeUpper);
+    public final Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
+        return fieldType().rangeQuery(lowerTerm, upperTerm, includeLower, includeUpper, context);
     }
 
     @Override
-    public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
-        return new FuzzyQuery(createTerm(value), fuzziness.asDistance(value), prefixLength, maxExpansions, transpositions);
+    public final Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
+        return fieldType().fuzzyQuery(value, fuzziness, prefixLength, maxExpansions, transpositions);
     }
 
     @Override
-    public Query prefixQuery(Object value, @Nullable MultiTermQuery.RewriteMethod method, @Nullable QueryParseContext context) {
-        PrefixQuery query = new PrefixQuery(createTerm(value));
-        if (method != null) {
-            query.setRewriteMethod(method);
-        }
-        return query;
+    public final Query prefixQuery(Object value, @Nullable MultiTermQuery.RewriteMethod method, @Nullable QueryParseContext context) {
+        return fieldType().prefixQuery(value, method, context);
     }
 
     @Override
-    public Query regexpQuery(Object value, int flags, int maxDeterminizedStates, @Nullable MultiTermQuery.RewriteMethod method, @Nullable QueryParseContext context) {
-        RegexpQuery query = new RegexpQuery(createTerm(value), flags, maxDeterminizedStates);
-        if (method != null) {
-            query.setRewriteMethod(method);
-        }
-        return query;
-    }
-
-    protected Term createTerm(Object value) {
-        return new Term(names.indexName(), indexedValueForSearch(value));
+    public final Query regexpQuery(Object value, int flags, int maxDeterminizedStates, @Nullable MultiTermQuery.RewriteMethod method, @Nullable QueryParseContext context) {
+        return fieldType().regexpQuery(value, flags, maxDeterminizedStates, method, context);
     }
 
     @Override
@@ -532,7 +451,7 @@ public abstract class AbstractFieldMapper implements FieldMapper {
             if (mergeWith instanceof AbstractFieldMapper) {
                 mergedType = ((AbstractFieldMapper) mergeWith).contentType();
             }
-            mergeResult.addConflict("mapper [" + names.fullName() + "] of different type, current_type [" + contentType() + "], merged_type [" + mergedType + "]");
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] of different type, current_type [" + contentType() + "], merged_type [" + mergedType + "]");
             // different types, return
             return;
         }
@@ -540,86 +459,86 @@ public abstract class AbstractFieldMapper implements FieldMapper {
         boolean indexed =  fieldType.indexOptions() != IndexOptions.NONE;
         boolean mergeWithIndexed = fieldMergeWith.fieldType().indexOptions() != IndexOptions.NONE;
         if (indexed != mergeWithIndexed || this.fieldType().tokenized() != fieldMergeWith.fieldType().tokenized()) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different index values");
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different index values");
         }
         if (this.fieldType().stored() != fieldMergeWith.fieldType().stored()) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different store values");
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different store values");
         }
-        if (!this.hasDocValues() && fieldMergeWith.hasDocValues()) {
+        if (!this.fieldType().hasDocValues() && fieldMergeWith.fieldType().hasDocValues()) {
             // don't add conflict if this mapper has doc values while the mapper to merge doesn't since doc values are implicitely set
             // when the doc_values field data format is configured
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different " + TypeParsers.DOC_VALUES + " values");
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different " + TypeParsers.DOC_VALUES + " values");
         }
         if (this.fieldType().omitNorms() && !fieldMergeWith.fieldType.omitNorms()) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] cannot enable norms (`norms.enabled`)");
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] cannot enable norms (`norms.enabled`)");
         }
         if (this.fieldType().tokenized() != fieldMergeWith.fieldType().tokenized()) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different tokenize values");
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different tokenize values");
         }
         if (this.fieldType().storeTermVectors() != fieldMergeWith.fieldType().storeTermVectors()) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different store_term_vector values");
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different store_term_vector values");
         }
         if (this.fieldType().storeTermVectorOffsets() != fieldMergeWith.fieldType().storeTermVectorOffsets()) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different store_term_vector_offsets values");
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different store_term_vector_offsets values");
         }
         if (this.fieldType().storeTermVectorPositions() != fieldMergeWith.fieldType().storeTermVectorPositions()) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different store_term_vector_positions values");
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different store_term_vector_positions values");
         }
         if (this.fieldType().storeTermVectorPayloads() != fieldMergeWith.fieldType().storeTermVectorPayloads()) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different store_term_vector_payloads values");
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different store_term_vector_payloads values");
         }
         
         // null and "default"-named index analyzers both mean the default is used
-        if (this.indexAnalyzer == null || "default".equals(this.indexAnalyzer.name())) {
-            if (fieldMergeWith.indexAnalyzer != null && !"default".equals(fieldMergeWith.indexAnalyzer.name())) {
-                mergeResult.addConflict("mapper [" + names.fullName() + "] has different analyzer");
+        if (this.fieldType.indexAnalyzer() == null || "default".equals(this.fieldType.indexAnalyzer().name())) {
+            if (fieldMergeWith.fieldType.indexAnalyzer() != null && "default".equals(fieldMergeWith.fieldType.indexAnalyzer().name()) == false) {
+                mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different analyzer");
             }
-        } else if (fieldMergeWith.indexAnalyzer == null || "default".equals(fieldMergeWith.indexAnalyzer.name())) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different analyzer");
-        } else if (!this.indexAnalyzer.name().equals(fieldMergeWith.indexAnalyzer.name())) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different analyzer");
+        } else if (fieldMergeWith.fieldType.indexAnalyzer() == null || "default".equals(fieldMergeWith.fieldType.indexAnalyzer().name())) {
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different analyzer");
+        } else if (this.fieldType.indexAnalyzer().name().equals(fieldMergeWith.fieldType.indexAnalyzer().name()) == false) {
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different analyzer");
         }
         
-        if (!this.names().equals(fieldMergeWith.names())) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different index_name");
+        if (!this.fieldType().names().equals(fieldMergeWith.fieldType().names())) {
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different index_name");
         }
 
-        if (this.similarity == null) {
-            if (fieldMergeWith.similarity() != null) {
-                mergeResult.addConflict("mapper [" + names.fullName() + "] has different similarity");
+        if (this.fieldType.similarity() == null) {
+            if (fieldMergeWith.fieldType.similarity() != null) {
+                mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different similarity");
             }
-        } else if (fieldMergeWith.similarity() == null) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different similarity");
-        } else if (!this.similarity().equals(fieldMergeWith.similarity())) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different similarity");
+        } else if (fieldMergeWith.fieldType().similarity() == null) {
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different similarity");
+        } else if (!this.fieldType().similarity().equals(fieldMergeWith.fieldType().similarity())) {
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different similarity");
         }
         multiFields.merge(mergeWith, mergeResult);
 
         if (!mergeResult.simulate()) {
             // apply changeable values
-            this.fieldType = new FieldType(this.fieldType);
+            this.fieldType = this.fieldType.clone();
             this.fieldType.setOmitNorms(fieldMergeWith.fieldType.omitNorms());
-            this.fieldType.freeze();
-            this.boost = fieldMergeWith.boost;
-            this.normsLoading = fieldMergeWith.normsLoading;
-            this.copyTo = fieldMergeWith.copyTo;
-            if (fieldMergeWith.searchAnalyzer != null) {
-                this.searchAnalyzer = fieldMergeWith.searchAnalyzer;
+            this.fieldType.setBoost(fieldMergeWith.fieldType.boost());
+            this.fieldType.setNormsLoading(fieldMergeWith.fieldType.normsLoading());
+            if (fieldMergeWith.fieldType.searchAnalyzer() != null) {
+                this.fieldType.setSearchAnalyzer(fieldMergeWith.fieldType.searchAnalyzer());
             }
             if (fieldMergeWith.customFieldDataSettings != null) {
                 if (!Objects.equal(fieldMergeWith.customFieldDataSettings, this.customFieldDataSettings)) {
                     this.customFieldDataSettings = fieldMergeWith.customFieldDataSettings;
-                    this.fieldDataType = new FieldDataType(defaultFieldDataType().getType(),
-                            Settings.builder().put(defaultFieldDataType().getSettings()).put(this.customFieldDataSettings)
-                    );
+                    this.fieldType.setFieldDataType(new FieldDataType(defaultFieldDataType().getType(),
+                        Settings.builder().put(defaultFieldDataType().getSettings()).put(this.customFieldDataSettings)
+                    ));
                 }
             }
+            this.fieldType.freeze();
+            this.copyTo = fieldMergeWith.copyTo;
         }
     }
 
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.startObject(names.shortName());
+        builder.startObject(fieldType.names().shortName());
         boolean includeDefaults = params.paramAsBoolean("include_defaults", false);
         doXContentBody(builder, includeDefaults, params);
         return builder.endObject();
@@ -628,12 +547,12 @@ public abstract class AbstractFieldMapper implements FieldMapper {
     protected void doXContentBody(XContentBuilder builder, boolean includeDefaults, Params params) throws IOException {
 
         builder.field("type", contentType());
-        if (indexCreatedBefore2x && (includeDefaults || !names.shortName().equals(names.originalIndexName()))) {
-            builder.field("index_name", names.originalIndexName());
+        if (indexCreatedBefore2x && (includeDefaults || !fieldType.names().shortName().equals(fieldType.names().originalIndexName()))) {
+            builder.field("index_name", fieldType.names().originalIndexName());
         }
 
-        if (includeDefaults || boost != 1.0f) {
-            builder.field("boost", boost);
+        if (includeDefaults || fieldType.boost() != 1.0f) {
+            builder.field("boost", fieldType.boost());
         }
 
         FieldType defaultFieldType = defaultFieldType();
@@ -650,13 +569,13 @@ public abstract class AbstractFieldMapper implements FieldMapper {
         if (includeDefaults || fieldType.storeTermVectors() != defaultFieldType.storeTermVectors()) {
             builder.field("term_vector", termVectorOptionsToString(fieldType));
         }
-        if (includeDefaults || fieldType.omitNorms() != defaultFieldType.omitNorms() || normsLoading != null) {
+        if (includeDefaults || fieldType.omitNorms() != defaultFieldType.omitNorms() || fieldType.normsLoading() != null) {
             builder.startObject("norms");
             if (includeDefaults || fieldType.omitNorms() != defaultFieldType.omitNorms()) {
                 builder.field("enabled", !fieldType.omitNorms());
             }
-            if (normsLoading != null) {
-                builder.field(Loading.KEY, normsLoading);
+            if (fieldType.normsLoading() != null) {
+                builder.field(MappedFieldType.Loading.KEY, fieldType.normsLoading());
             }
             builder.endObject();
         }
@@ -666,8 +585,8 @@ public abstract class AbstractFieldMapper implements FieldMapper {
 
         doXContentAnalyzers(builder, includeDefaults);
 
-        if (similarity() != null) {
-            builder.field("similarity", similarity().name());
+        if (fieldType().similarity() != null) {
+            builder.field("similarity", fieldType().similarity().name());
         } else if (includeDefaults) {
             builder.field("similarity", SimilarityLookupService.DEFAULT_SIMILARITY);
         }
@@ -677,7 +596,7 @@ public abstract class AbstractFieldMapper implements FieldMapper {
             orderedFielddataSettings.putAll(customFieldDataSettings.getAsMap());
             builder.field("fielddata", orderedFielddataSettings);
         } else if (includeDefaults) {
-            orderedFielddataSettings.putAll(fieldDataType.getSettings().getAsMap());
+            orderedFielddataSettings.putAll(fieldType.fieldDataType().getSettings().getAsMap());
             builder.field("fielddata", orderedFielddataSettings);
         }
         multiFields.toXContent(builder, params);
@@ -688,21 +607,21 @@ public abstract class AbstractFieldMapper implements FieldMapper {
     }
     
     protected void doXContentAnalyzers(XContentBuilder builder, boolean includeDefaults) throws IOException {
-        if (indexAnalyzer == null) {
+        if (fieldType.indexAnalyzer() == null) {
             if (includeDefaults) {
                 builder.field("analyzer", "default");
             }
-        } else if (includeDefaults || indexAnalyzer.name().startsWith("_") == false && indexAnalyzer.name().equals("default") == false) {
-            builder.field("analyzer", indexAnalyzer.name());
-            if (searchAnalyzer.name().equals(indexAnalyzer.name()) == false) {
-                builder.field("search_analyzer", searchAnalyzer.name());
+        } else if (includeDefaults || fieldType.indexAnalyzer().name().startsWith("_") == false && fieldType.indexAnalyzer().name().equals("default") == false) {
+            builder.field("analyzer", fieldType.indexAnalyzer().name());
+            if (fieldType.searchAnalyzer().name().equals(fieldType.indexAnalyzer().name()) == false) {
+                builder.field("search_analyzer", fieldType.searchAnalyzer().name());
             }
         }
     }
     
     protected void doXContentDocValues(XContentBuilder builder, boolean includeDefaults) throws IOException {
-        if (includeDefaults || docValues != null) {
-            builder.field(TypeParsers.DOC_VALUES, hasDocValues());
+        if (includeDefaults || hasDefaultDocValues == false) {
+            builder.field(DOC_VALUES, fieldType().hasDocValues());
         }
     }
 
@@ -753,7 +672,6 @@ public abstract class AbstractFieldMapper implements FieldMapper {
         }
     }
 
-
     protected abstract String contentType();
 
     @Override
@@ -762,13 +680,13 @@ public abstract class AbstractFieldMapper implements FieldMapper {
     }
 
     @Override
-    public boolean isNumeric() {
-        return false;
+    public final boolean isNumeric() {
+        return fieldType().isNumeric();
     }
 
     @Override
-    public boolean isSortable() {
-        return true;
+    public final boolean isSortable() {
+        return fieldType().isSortable();
     }
 
     @Override
@@ -776,11 +694,6 @@ public abstract class AbstractFieldMapper implements FieldMapper {
         return true;
     }
 
-    @Override
-    public Loading normsLoading(Loading defaultLoading) {
-        return normsLoading == null ? defaultLoading : normsLoading;
-    }
-
     public static class MultiFields {
 
         public static MultiFields empty() {
@@ -854,7 +767,7 @@ public abstract class AbstractFieldMapper implements FieldMapper {
             ContentPath.Type origPathType = context.path().pathType();
             context.path().pathType(pathType);
 
-            context.path().add(mainField.names().shortName());
+            context.path().add(mainField.fieldType().names().shortName());
             for (ObjectCursor<FieldMapper> cursor : mappers.values()) {
                 cursor.value.parse(context);
             }
@@ -871,7 +784,7 @@ public abstract class AbstractFieldMapper implements FieldMapper {
 
             for (ObjectCursor<FieldMapper> cursor : mergeWithMultiField.multiFields.mappers.values()) {
                 FieldMapper mergeWithMapper = cursor.value;
-                Mapper mergeIntoMapper = mappers.get(mergeWithMapper.names().shortName());
+                Mapper mergeIntoMapper = mappers.get(mergeWithMapper.fieldType().names().shortName());
                 if (mergeIntoMapper == null) {
                     // no mapping, simply add it if not simulating
                     if (!mergeResult.simulate()) {
@@ -882,7 +795,7 @@ public abstract class AbstractFieldMapper implements FieldMapper {
                         if (newMappersBuilder == null) {
                             newMappersBuilder = ImmutableOpenMap.builder(mappers);
                         }
-                        newMappersBuilder.put(mergeWithMapper.names().shortName(), mergeWithMapper);
+                        newMappersBuilder.put(mergeWithMapper.fieldType().names().shortName(), mergeWithMapper);
                         if (mergeWithMapper instanceof AbstractFieldMapper) {
                             if (newFieldMappers == null) {
                                 newFieldMappers = new ArrayList<>(2);
@@ -992,9 +905,7 @@ public abstract class AbstractFieldMapper implements FieldMapper {
     }
 
     @Override
-    public FieldStats stats(Terms terms, int maxDoc) throws IOException {
-        return new FieldStats.Text(
-                maxDoc, terms.getDocCount(), terms.getSumDocFreq(), terms.getSumTotalTermFreq(), terms.getMin(), terms.getMax()
-        );
+    public final FieldStats stats(Terms terms, int maxDoc) throws IOException {
+        return fieldType().stats(terms, maxDoc);
     }
 }
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java
index 9972ca45cbd..12b053b4b11 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.index.mapper.core;
 
 import com.carrotsearch.hppc.ObjectArrayList;
-
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.DocValuesType;
@@ -40,6 +39,7 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.ParseContext;
@@ -63,7 +63,7 @@ public class BinaryFieldMapper extends AbstractFieldMapper {
 
 
     public static class Defaults extends AbstractFieldMapper.Defaults {
-        public static final FieldType FIELD_TYPE = new FieldType(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new BinaryFieldType();
 
         static {
             FIELD_TYPE.setIndexOptions(IndexOptions.NONE);
@@ -74,13 +74,15 @@ public class BinaryFieldMapper extends AbstractFieldMapper {
     public static class Builder extends AbstractFieldMapper.Builder<Builder, BinaryFieldMapper> {
 
         public Builder(String name) {
-            super(name, new FieldType(Defaults.FIELD_TYPE));
+            super(name, Defaults.FIELD_TYPE);
             builder = this;
         }
 
         @Override
         public BinaryFieldMapper build(BuilderContext context) {
-            return new BinaryFieldMapper(buildNames(context), fieldType, docValues,
+            setupFieldType(context);
+            ((BinaryFieldType)fieldType).tryUncompressing = context.indexCreatedVersion().before(Version.V_2_0_0);
+            return new BinaryFieldMapper(fieldType, docValues,
                     fieldDataSettings, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
         }
     }
@@ -102,13 +104,67 @@ public class BinaryFieldMapper extends AbstractFieldMapper {
         }
     }
 
-    protected BinaryFieldMapper(Names names, FieldType fieldType, Boolean docValues,
+    public static class BinaryFieldType extends MappedFieldType {
+        protected boolean tryUncompressing = false;
+
+        public BinaryFieldType() {
+            super(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        }
+
+        protected BinaryFieldType(BinaryFieldType ref) {
+            super(ref);
+            this.tryUncompressing = ref.tryUncompressing;
+        }
+
+        @Override
+        public MappedFieldType clone() {
+            return new BinaryFieldType(this);
+        }
+
+        @Override
+        public BytesReference value(Object value) {
+            if (value == null) {
+                return null;
+            }
+
+            BytesReference bytes;
+            if (value instanceof BytesRef) {
+                bytes = new BytesArray((BytesRef) value);
+            } else if (value instanceof BytesReference) {
+                bytes = (BytesReference) value;
+            } else if (value instanceof byte[]) {
+                bytes = new BytesArray((byte[]) value);
+            } else {
+                try {
+                    bytes = new BytesArray(Base64.decode(value.toString()));
+                } catch (IOException e) {
+                    throw new ElasticsearchParseException("failed to convert bytes", e);
+                }
+            }
+            try {
+                if (tryUncompressing) { // backcompat behavior
+                    return CompressorFactory.uncompressIfNeeded(bytes);
+                } else {
+                    return bytes;
+                }
+            } catch (IOException e) {
+                throw new ElasticsearchParseException("failed to decompress source", e);
+            }
+        }
+
+        @Override
+        public Object valueForSearch(Object value) {
+            return value(value);
+        }
+    }
+
+    protected BinaryFieldMapper(MappedFieldType fieldType, Boolean docValues,
                                 @Nullable Settings fieldDataSettings, Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
-        super(names, 1.0f, fieldType, docValues, null, null, null, null, fieldDataSettings, indexSettings, multiFields, copyTo);
+        super(fieldType, docValues, fieldDataSettings, indexSettings, multiFields, copyTo);
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -117,45 +173,9 @@ public class BinaryFieldMapper extends AbstractFieldMapper {
         return new FieldDataType("binary");
     }
 
-    @Override
-    public Object valueForSearch(Object value) {
-        return value(value);
-    }
-
-    @Override
-    public BytesReference value(Object value) {
-        if (value == null) {
-            return null;
-        }
-
-        BytesReference bytes;
-        if (value instanceof BytesRef) {
-            bytes = new BytesArray((BytesRef) value);
-        } else if (value instanceof BytesReference) {
-            bytes = (BytesReference) value;
-        } else if (value instanceof byte[]) {
-            bytes = new BytesArray((byte[]) value);
-        } else {
-            try {
-                bytes = new BytesArray(Base64.decode(value.toString()));
-            } catch (IOException e) {
-                throw new ElasticsearchParseException("failed to convert bytes", e);
-            }
-        }
-        try {
-            if (indexCreatedBefore2x) {
-                return CompressorFactory.uncompressIfNeeded(bytes);
-            } else {
-                return bytes;
-            }
-        } catch (IOException e) {
-            throw new ElasticsearchParseException("failed to decompress source", e);
-        }
-    }
-
     @Override
     protected void parseCreateField(ParseContext context, List<Field> fields) throws IOException {
-        if (!fieldType().stored() && !hasDocValues()) {
+        if (!fieldType().stored() && !fieldType().hasDocValues()) {
             return;
         }
         byte[] value = context.parseExternalValue(byte[].class);
@@ -170,14 +190,14 @@ public class BinaryFieldMapper extends AbstractFieldMapper {
             return;
         }
         if (fieldType().stored()) {
-            fields.add(new Field(names.indexName(), value, fieldType));
+            fields.add(new Field(fieldType().names().indexName(), value, fieldType()));
         }
 
-        if (hasDocValues()) {
-            CustomBinaryDocValuesField field = (CustomBinaryDocValuesField) context.doc().getByKey(names().indexName());
+        if (fieldType().hasDocValues()) {
+            CustomBinaryDocValuesField field = (CustomBinaryDocValuesField) context.doc().getByKey(fieldType().names().indexName());
             if (field == null) {
-                field = new CustomBinaryDocValuesField(names().indexName(), value);
-                context.doc().addWithKey(names().indexName(), field);
+                field = new CustomBinaryDocValuesField(fieldType().names().indexName(), value);
+                context.doc().addWithKey(fieldType().names().indexName(), field);
             } else {
                 field.add(value);
             }
@@ -192,17 +212,11 @@ public class BinaryFieldMapper extends AbstractFieldMapper {
 
     public static class CustomBinaryDocValuesField extends NumberFieldMapper.CustomNumericDocValuesField {
 
-        public static final FieldType TYPE = new FieldType();
-        static {
-            TYPE.setDocValuesType(DocValuesType.BINARY);
-            TYPE.freeze();
-        }
-
         private final ObjectArrayList<byte[]> bytesList;
 
         private int totalSize = 0;
 
-        public CustomBinaryDocValuesField(String  name, byte[] bytes) {
+        public CustomBinaryDocValuesField(String name, byte[] bytes) {
             super(name);
             bytesList = new ObjectArrayList<>();
             add(bytes);
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java
index a9850b466b4..cfbcbc45ef1 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.index.mapper.core;
 
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.document.SortedNumericDocValuesField;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.search.ConstantScoreQuery;
@@ -34,6 +33,7 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
@@ -58,12 +58,14 @@ public class BooleanFieldMapper extends AbstractFieldMapper {
     public static final String CONTENT_TYPE = "boolean";
 
     public static class Defaults extends AbstractFieldMapper.Defaults {
-        public static final FieldType FIELD_TYPE = new FieldType(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new BooleanFieldType();
 
         static {
             FIELD_TYPE.setOmitNorms(true);
             FIELD_TYPE.setIndexOptions(IndexOptions.DOCS);
             FIELD_TYPE.setTokenized(false);
+            FIELD_TYPE.setIndexAnalyzer(Lucene.KEYWORD_ANALYZER);
+            FIELD_TYPE.setSearchAnalyzer(Lucene.KEYWORD_ANALYZER);
             FIELD_TYPE.freeze();
         }
 
@@ -80,7 +82,7 @@ public class BooleanFieldMapper extends AbstractFieldMapper {
         private Boolean nullValue = Defaults.NULL_VALUE;
 
         public Builder(String name) {
-            super(name, new FieldType(Defaults.FIELD_TYPE));
+            super(name, Defaults.FIELD_TYPE);
             this.builder = this;
         }
 
@@ -99,8 +101,9 @@ public class BooleanFieldMapper extends AbstractFieldMapper {
 
         @Override
         public BooleanFieldMapper build(BuilderContext context) {
-            return new BooleanFieldMapper(buildNames(context), boost, fieldType, docValues, nullValue,
-                    similarity, normsLoading, fieldDataSettings, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
+            setupFieldType(context);
+            return new BooleanFieldMapper(fieldType, docValues, nullValue,
+                    fieldDataSettings, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
         }
     }
 
@@ -125,17 +128,86 @@ public class BooleanFieldMapper extends AbstractFieldMapper {
         }
     }
 
+    public static class BooleanFieldType extends MappedFieldType {
+
+        public BooleanFieldType() {
+            super(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        }
+
+        protected BooleanFieldType(BooleanFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public MappedFieldType clone() {
+            return new BooleanFieldType(this);
+        }
+
+        @Override
+        public BytesRef indexedValueForSearch(Object value) {
+            if (value == null) {
+                return Values.FALSE;
+            }
+            if (value instanceof Boolean) {
+                return ((Boolean) value) ? Values.TRUE : Values.FALSE;
+            }
+            String sValue;
+            if (value instanceof BytesRef) {
+                sValue = ((BytesRef) value).utf8ToString();
+            } else {
+                sValue = value.toString();
+            }
+            if (sValue.length() == 0) {
+                return Values.FALSE;
+            }
+            if (sValue.length() == 1 && sValue.charAt(0) == 'F') {
+                return Values.FALSE;
+            }
+            if (Booleans.parseBoolean(sValue, false)) {
+                return Values.TRUE;
+            }
+            return Values.FALSE;
+        }
+
+        @Override
+        public Boolean value(Object value) {
+            if (value == null) {
+                return Boolean.FALSE;
+            }
+            String sValue = value.toString();
+            if (sValue.length() == 0) {
+                return Boolean.FALSE;
+            }
+            if (sValue.length() == 1 && sValue.charAt(0) == 'F') {
+                return Boolean.FALSE;
+            }
+            if (Booleans.parseBoolean(sValue, false)) {
+                return Boolean.TRUE;
+            }
+            return Boolean.FALSE;
+        }
+
+        @Override
+        public Object valueForSearch(Object value) {
+            return value(value);
+        }
+        
+        @Override
+        public boolean useTermQueryWithQueryString() {
+            return true;
+        }
+    }
+
     private Boolean nullValue;
 
-    protected BooleanFieldMapper(Names names, float boost, FieldType fieldType, Boolean docValues, Boolean nullValue,
-                                 SimilarityProvider similarity, Loading normsLoading,
+    protected BooleanFieldMapper(MappedFieldType fieldType, Boolean docValues, Boolean nullValue,
                                  @Nullable Settings fieldDataSettings, Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
-        super(names, boost, fieldType, docValues, Lucene.KEYWORD_ANALYZER, Lucene.KEYWORD_ANALYZER, similarity, normsLoading, fieldDataSettings, indexSettings, multiFields, copyTo);
+        super(fieldType, docValues, fieldDataSettings, indexSettings, multiFields, copyTo);
         this.nullValue = nullValue;
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -145,60 +217,6 @@ public class BooleanFieldMapper extends AbstractFieldMapper {
         return new FieldDataType(CONTENT_TYPE);
     }
 
-    @Override
-    public boolean useTermQueryWithQueryString() {
-        return true;
-    }
-
-    @Override
-    public Boolean value(Object value) {
-        if (value == null) {
-            return Boolean.FALSE;
-        }
-        String sValue = value.toString();
-        if (sValue.length() == 0) {
-            return Boolean.FALSE;
-        }
-        if (sValue.length() == 1 && sValue.charAt(0) == 'F') {
-            return Boolean.FALSE;
-        }
-        if (Booleans.parseBoolean(sValue, false)) {
-            return Boolean.TRUE;
-        }
-        return Boolean.FALSE;
-    }
-
-    @Override
-    public Object valueForSearch(Object value) {
-        return value(value);
-    }
-
-    @Override
-    public BytesRef indexedValueForSearch(Object value) {
-        if (value == null) {
-            return Values.FALSE;
-        }
-        if (value instanceof Boolean) {
-            return ((Boolean) value) ? Values.TRUE : Values.FALSE;
-        }
-        String sValue;
-        if (value instanceof BytesRef) {
-            sValue = ((BytesRef) value).utf8ToString();
-        } else {
-            sValue = value.toString();
-        }
-        if (sValue.length() == 0) {
-            return Values.FALSE;
-        }
-        if (sValue.length() == 1 && sValue.charAt(0) == 'F') {
-            return Values.FALSE;
-        }
-        if (Booleans.parseBoolean(sValue, false)) {
-            return Values.TRUE;
-        }
-        return Values.FALSE;
-    }
-
     @Override
     public Query nullValueFilter() {
         if (nullValue == null) {
@@ -209,7 +227,7 @@ public class BooleanFieldMapper extends AbstractFieldMapper {
 
     @Override
     protected void parseCreateField(ParseContext context, List<Field> fields) throws IOException {
-        if (fieldType().indexOptions() == IndexOptions.NONE && !fieldType().stored() && !hasDocValues()) {
+        if (fieldType().indexOptions() == IndexOptions.NONE && !fieldType().stored() && !fieldType().hasDocValues()) {
             return;
         }
 
@@ -228,9 +246,9 @@ public class BooleanFieldMapper extends AbstractFieldMapper {
         if (value == null) {
             return;
         }
-        fields.add(new Field(names.indexName(), value ? "T" : "F", fieldType));
-        if (hasDocValues()) {
-            fields.add(new SortedNumericDocValuesField(names.indexName(), value ? 1 : 0));
+        fields.add(new Field(fieldType.names().indexName(), value ? "T" : "F", fieldType));
+        if (fieldType().hasDocValues()) {
+            fields.add(new SortedNumericDocValuesField(fieldType.names().indexName(), value ? 1 : 0));
         }
     }
 
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java
index b1ad42a4d5c..1a65d58025e 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java
@@ -21,7 +21,6 @@ package org.elasticsearch.index.mapper.core;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.Terms;
 import org.apache.lucene.search.ConstantScoreQuery;
@@ -41,13 +40,13 @@ import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.analysis.NumericIntegerAnalyzer;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
 import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.query.QueryParseContext;
-import org.elasticsearch.index.similarity.SimilarityProvider;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -66,7 +65,7 @@ public class ByteFieldMapper extends NumberFieldMapper {
     public static final String CONTENT_TYPE = "byte";
 
     public static class Defaults extends NumberFieldMapper.Defaults {
-        public static final FieldType FIELD_TYPE = new FieldType(NumberFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new ByteFieldType();
 
         static {
             FIELD_TYPE.freeze();
@@ -80,7 +79,7 @@ public class ByteFieldMapper extends NumberFieldMapper {
         protected Byte nullValue = Defaults.NULL_VALUE;
 
         public Builder(String name) {
-            super(name, new FieldType(Defaults.FIELD_TYPE), Defaults.PRECISION_STEP_8_BIT);
+            super(name, Defaults.FIELD_TYPE, Defaults.PRECISION_STEP_8_BIT);
             builder = this;
         }
 
@@ -91,14 +90,23 @@ public class ByteFieldMapper extends NumberFieldMapper {
 
         @Override
         public ByteFieldMapper build(BuilderContext context) {
-            fieldType.setOmitNorms(fieldType.omitNorms() && boost == 1.0f);
-            ByteFieldMapper fieldMapper = new ByteFieldMapper(buildNames(context),
-                    fieldType.numericPrecisionStep(), boost, fieldType, docValues, nullValue, ignoreMalformed(context),
-                    coerce(context), similarity, normsLoading, 
-                    fieldDataSettings, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
+            setupFieldType(context);
+            ByteFieldMapper fieldMapper = new ByteFieldMapper(fieldType, docValues, nullValue, ignoreMalformed(context),
+                    coerce(context), fieldDataSettings, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
             fieldMapper.includeInAll(includeInAll);
             return fieldMapper;
         }
+
+        @Override
+        protected NamedAnalyzer makeNumberAnalyzer(int precisionStep) {
+            String name = precisionStep == Integer.MAX_VALUE ? "_byte/max" : ("_byte/" + precisionStep);
+            return new NamedAnalyzer(name, new NumericIntegerAnalyzer(precisionStep));
+        }
+
+        @Override
+        protected int maxPrecisionStep() {
+            return 32;
+        }
     }
 
     public static class TypeParser implements Mapper.TypeParser {
@@ -122,24 +130,81 @@ public class ByteFieldMapper extends NumberFieldMapper {
         }
     }
 
+    public static class ByteFieldType extends NumberFieldType {
+        public ByteFieldType() {}
+
+        protected ByteFieldType(ByteFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public NumberFieldType clone() {
+            return new ByteFieldType(this);
+        }
+
+        @Override
+        public Byte value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            if (value instanceof Number) {
+                return ((Number) value).byteValue();
+            }
+            if (value instanceof BytesRef) {
+                return ((BytesRef) value).bytes[((BytesRef) value).offset];
+            }
+            return Byte.parseByte(value.toString());
+        }
+
+        @Override
+        public BytesRef indexedValueForSearch(Object value) {
+            BytesRefBuilder bytesRef = new BytesRefBuilder();
+            NumericUtils.intToPrefixCoded(parseValue(value), 0, bytesRef); // 0 because of exact match
+            return bytesRef.get();
+        }
+
+        @Override
+        public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
+            return NumericRangeQuery.newIntRange(names().indexName(), numericPrecisionStep(),
+                lowerTerm == null ? null : (int)parseValue(lowerTerm),
+                upperTerm == null ? null : (int)parseValue(upperTerm),
+                includeLower, includeUpper);
+        }
+
+        @Override
+        public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
+            byte iValue = Byte.parseByte(value);
+            byte iSim = fuzziness.asByte();
+            return NumericRangeQuery.newIntRange(names().indexName(), numericPrecisionStep(),
+                iValue - iSim,
+                iValue + iSim,
+                true, true);
+        }
+
+        @Override
+        public FieldStats stats(Terms terms, int maxDoc) throws IOException {
+            long minValue = NumericUtils.getMinInt(terms);
+            long maxValue = NumericUtils.getMaxInt(terms);
+            return new FieldStats.Long(
+                maxDoc, terms.getDocCount(), terms.getSumDocFreq(), terms.getSumTotalTermFreq(), minValue, maxValue
+            );
+        }
+    }
+
     private Byte nullValue;
 
     private String nullValueAsString;
 
-    protected ByteFieldMapper(Names names, int precisionStep, float boost, FieldType fieldType, Boolean docValues,
-                              Byte nullValue, Explicit<Boolean> ignoreMalformed, Explicit<Boolean> coerce, 
-                              SimilarityProvider similarity, Loading normsLoading,
+    protected ByteFieldMapper(MappedFieldType fieldType, Boolean docValues,
+                              Byte nullValue, Explicit<Boolean> ignoreMalformed, Explicit<Boolean> coerce,
                               @Nullable Settings fieldDataSettings, Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
-        super(names, precisionStep, boost, fieldType, docValues,
-                ignoreMalformed, coerce, new NamedAnalyzer("_byte/" + precisionStep, new NumericIntegerAnalyzer(precisionStep)),
-                new NamedAnalyzer("_byte/max", new NumericIntegerAnalyzer(Integer.MAX_VALUE)),
-                similarity, normsLoading, fieldDataSettings, indexSettings, multiFields, copyTo);
+        super(fieldType, docValues, ignoreMalformed, coerce, fieldDataSettings, indexSettings, multiFields, copyTo);
         this.nullValue = nullValue;
         this.nullValueAsString = nullValue == null ? null : nullValue.toString();
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -148,33 +213,7 @@ public class ByteFieldMapper extends NumberFieldMapper {
         return new FieldDataType("byte");
     }
 
-    @Override
-    protected int maxPrecisionStep() {
-        return 32;
-    }
-
-    @Override
-    public Byte value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).byteValue();
-        }
-        if (value instanceof BytesRef) {
-            return ((BytesRef) value).bytes[((BytesRef) value).offset];
-        }
-        return Byte.parseByte(value.toString());
-    }
-
-    @Override
-    public BytesRef indexedValueForSearch(Object value) {
-        BytesRefBuilder bytesRef = new BytesRefBuilder();
-        NumericUtils.intToPrefixCoded(parseValue(value), 0, bytesRef); // 0 because of exact match
-        return bytesRef.get();
-    }
-
-    private byte parseValue(Object value) {
+    private static byte parseValue(Object value) {
         if (value instanceof Number) {
             return ((Number) value).byteValue();
         }
@@ -184,28 +223,6 @@ public class ByteFieldMapper extends NumberFieldMapper {
         return Byte.parseByte(value.toString());
     }
 
-    private int parseValueAsInt(Object value) {
-        return parseValue(value);
-    }
-
-    @Override
-    public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
-        byte iValue = Byte.parseByte(value);
-        byte iSim = fuzziness.asByte();
-        return NumericRangeQuery.newIntRange(names.indexName(), precisionStep,
-                iValue - iSim,
-                iValue + iSim,
-                true, true);
-    }
-
-    @Override
-    public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
-        return NumericRangeQuery.newIntRange(names.indexName(), precisionStep,
-                lowerTerm == null ? null : parseValueAsInt(lowerTerm),
-                upperTerm == null ? null : parseValueAsInt(upperTerm),
-                includeLower, includeUpper);
-    }
-
     @Override
     public Query nullValueFilter() {
         if (nullValue == null) {
@@ -222,7 +239,7 @@ public class ByteFieldMapper extends NumberFieldMapper {
     @Override
     protected void innerParseCreateField(ParseContext context, List<Field> fields) throws IOException {
         byte value;
-        float boost = this.boost;
+        float boost = this.fieldType.boost();
         if (context.externalValueSet()) {
             Object externalValue = context.externalValue();
             if (externalValue == null) {
@@ -244,7 +261,7 @@ public class ByteFieldMapper extends NumberFieldMapper {
                 value = ((Number) externalValue).byteValue();
             }
             if (context.includeInAll(includeInAll, this)) {
-                context.allEntries().addText(names.fullName(), Byte.toString(value), boost);
+                context.allEntries().addText(fieldType.names().fullName(), Byte.toString(value), boost);
             }
         } else {
             XContentParser parser = context.parser();
@@ -255,7 +272,7 @@ public class ByteFieldMapper extends NumberFieldMapper {
                 }
                 value = nullValue;
                 if (nullValueAsString != null && (context.includeInAll(includeInAll, this))) {
-                    context.allEntries().addText(names.fullName(), nullValueAsString, boost);
+                    context.allEntries().addText(fieldType.names().fullName(), nullValueAsString, boost);
                 }
             } else if (parser.currentToken() == XContentParser.Token.START_OBJECT) {
                 XContentParser.Token token;
@@ -284,7 +301,7 @@ public class ByteFieldMapper extends NumberFieldMapper {
             } else {
                 value = (byte) parser.shortValue(coerce.value());
                 if (context.includeInAll(includeInAll, this)) {
-                    context.allEntries().addText(names.fullName(), parser.text(), boost);
+                    context.allEntries().addText(fieldType.names().fullName(), parser.text(), boost);
                 }
             }
         }
@@ -293,7 +310,7 @@ public class ByteFieldMapper extends NumberFieldMapper {
             field.setBoost(boost);
             fields.add(field);
         }
-        if (hasDocValues()) {
+        if (fieldType().hasDocValues()) {
             addDocValue(context, fields, value);
         }
     }
@@ -319,8 +336,8 @@ public class ByteFieldMapper extends NumberFieldMapper {
     protected void doXContentBody(XContentBuilder builder, boolean includeDefaults, Params params) throws IOException {
         super.doXContentBody(builder, includeDefaults, params);
 
-        if (includeDefaults || precisionStep != Defaults.PRECISION_STEP_8_BIT) {
-            builder.field("precision_step", precisionStep);
+        if (includeDefaults || fieldType.numericPrecisionStep() != Defaults.PRECISION_STEP_8_BIT) {
+            builder.field("precision_step", fieldType.numericPrecisionStep());
         }
         if (includeDefaults || nullValue != null) {
             builder.field("null_value", nullValue);
@@ -332,22 +349,13 @@ public class ByteFieldMapper extends NumberFieldMapper {
         }
     }
 
-    @Override
-    public FieldStats stats(Terms terms, int maxDoc) throws IOException {
-        long minValue = NumericUtils.getMinInt(terms);
-        long maxValue = NumericUtils.getMaxInt(terms);
-        return new FieldStats.Long(
-                maxDoc, terms.getDocCount(), terms.getSumDocFreq(), terms.getSumTotalTermFreq(), minValue, maxValue
-        );
-    }
-
     public static class CustomByteNumericField extends CustomNumericField {
 
         private final byte number;
 
         private final NumberFieldMapper mapper;
 
-        public CustomByteNumericField(NumberFieldMapper mapper, byte number, FieldType fieldType) {
+        public CustomByteNumericField(NumberFieldMapper mapper, byte number, MappedFieldType fieldType) {
             super(mapper, number, fieldType);
             this.mapper = mapper;
             this.number = number;
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java
index e8d0cf54990..eeb28e24121 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java
@@ -25,7 +25,6 @@ import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.codecs.PostingsFormat;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.search.suggest.analyzing.XAnalyzingSuggester;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.ElasticsearchParseException;
@@ -39,11 +38,12 @@ import org.elasticsearch.common.xcontent.XContentParser.NumberType;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperException;
 import org.elasticsearch.index.mapper.MapperParsingException;
-import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.MergeMappingException;
+import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.similarity.SimilarityProvider;
 import org.elasticsearch.search.suggest.completion.AnalyzingCompletionLookupProvider;
@@ -72,7 +72,7 @@ public class CompletionFieldMapper extends AbstractFieldMapper {
     public static final String CONTENT_TYPE = "completion";
 
     public static class Defaults extends AbstractFieldMapper.Defaults {
-        public static final FieldType FIELD_TYPE = new FieldType(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new CompletionFieldType();
 
         static {
             FIELD_TYPE.setOmitNorms(true);
@@ -114,7 +114,7 @@ public class CompletionFieldMapper extends AbstractFieldMapper {
         private SortedMap<String, ContextMapping> contextMapping = ContextMapping.EMPTY_MAPPING;
 
         public Builder(String name) {
-            super(name, new FieldType(Defaults.FIELD_TYPE));
+            super(name, Defaults.FIELD_TYPE);
             builder = this;
         }
 
@@ -148,7 +148,8 @@ public class CompletionFieldMapper extends AbstractFieldMapper {
 
         @Override
         public CompletionFieldMapper build(Mapper.BuilderContext context) {
-            return new CompletionFieldMapper(buildNames(context), indexAnalyzer, searchAnalyzer, null, similarity, payloads,
+            setupFieldType(context);
+            return new CompletionFieldMapper(fieldType, null, payloads,
                     preserveSeparators, preservePositionIncrements, maxInputLength, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo, this.contextMapping);
         }
 
@@ -219,6 +220,35 @@ public class CompletionFieldMapper extends AbstractFieldMapper {
         }
     }
 
+    public static class CompletionFieldType extends MappedFieldType {
+
+        public CompletionFieldType() {
+            super(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        }
+
+        protected CompletionFieldType(CompletionFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public MappedFieldType clone() {
+            return new CompletionFieldType(this);
+        }
+
+        @Override
+        public String value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            return value.toString();
+        }
+
+        @Override
+        public boolean isSortable() {
+            return false;
+        }
+    }
+
     private static final BytesRef EMPTY = new BytesRef();
 
     private PostingsFormat postingsFormat;
@@ -236,9 +266,9 @@ public class CompletionFieldMapper extends AbstractFieldMapper {
      */
     // Custom postings formats are deprecated but we still accept a postings format here to be able to test backward compatibility
     // with older postings formats such as Elasticsearch090
-    public CompletionFieldMapper(Names names, NamedAnalyzer indexAnalyzer, NamedAnalyzer searchAnalyzer, PostingsFormat wrappedPostingsFormat, SimilarityProvider similarity, boolean payloads,
+    public CompletionFieldMapper(MappedFieldType fieldType, PostingsFormat wrappedPostingsFormat, boolean payloads,
                                  boolean preserveSeparators, boolean preservePositionIncrements, int maxInputLength, Settings indexSettings, MultiFields multiFields, CopyTo copyTo, SortedMap<String, ContextMapping> contextMappings) {
-        super(names, 1.0f, Defaults.FIELD_TYPE, false, indexAnalyzer, searchAnalyzer, similarity, null, null, indexSettings, multiFields, copyTo);
+        super(fieldType, false, null, indexSettings, multiFields, copyTo);
         analyzingSuggestLookupProvider = new AnalyzingCompletionLookupProvider(preserveSeparators, false, preservePositionIncrements, payloads);
         if (wrappedPostingsFormat == null) {
             // delayed until postingsFormat() is called
@@ -424,7 +454,7 @@ public class CompletionFieldMapper extends AbstractFieldMapper {
                         + "] at position " + i + " is a reserved character");
             }
         }
-        return new SuggestField(names.indexName(), ctx, input, this.fieldType, payload, analyzingSuggestLookupProvider);
+        return new SuggestField(fieldType.names().indexName(), ctx, input, this.fieldType, payload, analyzingSuggestLookupProvider);
     }
 
     public static int correctSubStringLen(String input, int len) {
@@ -445,7 +475,7 @@ public class CompletionFieldMapper extends AbstractFieldMapper {
         private final CompletionTokenStream.ToFiniteStrings toFiniteStrings;
         private final ContextMapping.Context ctx;
 
-        public SuggestField(String name, ContextMapping.Context ctx, String value, FieldType type, BytesRef payload, CompletionTokenStream.ToFiniteStrings toFiniteStrings) {
+        public SuggestField(String name, ContextMapping.Context ctx, String value, MappedFieldType type, BytesRef payload, CompletionTokenStream.ToFiniteStrings toFiniteStrings) {
             super(name, value, type);
             this.payload = payload;
             this.toFiniteStrings = toFiniteStrings;
@@ -461,12 +491,12 @@ public class CompletionFieldMapper extends AbstractFieldMapper {
     
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.startObject(names().shortName())
+        builder.startObject(fieldType().names().shortName())
                 .field(Fields.TYPE, CONTENT_TYPE);
         
-        builder.field(Fields.ANALYZER, indexAnalyzer.name());
-        if (indexAnalyzer.name().equals(searchAnalyzer.name()) == false) {
-            builder.field(Fields.SEARCH_ANALYZER.getPreferredName(), searchAnalyzer.name());
+        builder.field(Fields.ANALYZER, fieldType.indexAnalyzer().name());
+        if (fieldType.indexAnalyzer().name().equals(fieldType.searchAnalyzer().name()) == false) {
+            builder.field(Fields.SEARCH_ANALYZER.getPreferredName(), fieldType.searchAnalyzer().name());
         }
         builder.field(Fields.PAYLOADS, this.payloads);
         builder.field(Fields.PRESERVE_SEPARATORS.getPreferredName(), this.preserveSeparators);
@@ -494,18 +524,13 @@ public class CompletionFieldMapper extends AbstractFieldMapper {
         return CONTENT_TYPE;
     }
 
-    @Override
-    public boolean isSortable() {
-        return false;
-    }
-
     @Override
     public boolean supportsNullValue() {
         return false;
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -514,14 +539,6 @@ public class CompletionFieldMapper extends AbstractFieldMapper {
         return null;
     }
 
-    @Override
-    public String value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        return value.toString();
-    }
-
     public boolean isStoringPayloads() {
         return payloads;
     }
@@ -531,16 +548,16 @@ public class CompletionFieldMapper extends AbstractFieldMapper {
         super.merge(mergeWith, mergeResult);
         CompletionFieldMapper fieldMergeWith = (CompletionFieldMapper) mergeWith;
         if (payloads != fieldMergeWith.payloads) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different payload values");
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different payload values");
         }
         if (preservePositionIncrements != fieldMergeWith.preservePositionIncrements) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different 'preserve_position_increments' values");
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different 'preserve_position_increments' values");
         }
         if (preserveSeparators != fieldMergeWith.preserveSeparators) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different 'preserve_separators' values");
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different 'preserve_separators' values");
         }
         if(!ContextMapping.mappingsAreEqual(getContextMapping(), fieldMergeWith.getContextMapping())) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different 'context_mapping' values");
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different 'context_mapping' values");
         }
         if (!mergeResult.simulate()) {
             this.maxInputLength = fieldMergeWith.maxInputLength;
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java
index e3842fe474a..b33182d8b17 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.index.mapper.core;
 
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Terms;
@@ -44,8 +43,10 @@ import org.elasticsearch.common.unit.Fuzziness;
 import org.elasticsearch.common.util.LocaleUtils;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.analysis.NumericDateAnalyzer;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
@@ -53,7 +54,6 @@ import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.mapper.core.LongFieldMapper.CustomLongNumericField;
 import org.elasticsearch.index.query.QueryParseContext;
-import org.elasticsearch.index.similarity.SimilarityProvider;
 import org.elasticsearch.search.internal.SearchContext;
 import org.joda.time.DateTimeZone;
 
@@ -75,37 +75,35 @@ public class DateFieldMapper extends NumberFieldMapper {
 
     public static class Defaults extends NumberFieldMapper.Defaults {
         public static final FormatDateTimeFormatter DATE_TIME_FORMATTER = Joda.forPattern("dateOptionalTime", Locale.ROOT);
-
-        public static final FieldType FIELD_TYPE = new FieldType(NumberFieldMapper.Defaults.FIELD_TYPE);
+        public static final TimeUnit TIME_UNIT = TimeUnit.MILLISECONDS;
+        public static final DateFieldType FIELD_TYPE = new DateFieldType();
 
         static {
             FIELD_TYPE.freeze();
         }
 
         public static final String NULL_VALUE = null;
-
-        public static final TimeUnit TIME_UNIT = TimeUnit.MILLISECONDS;
     }
 
     public static class Builder extends NumberFieldMapper.Builder<Builder, DateFieldMapper> {
 
-        protected TimeUnit timeUnit = Defaults.TIME_UNIT;
-
         protected String nullValue = Defaults.NULL_VALUE;
 
-        protected FormatDateTimeFormatter dateTimeFormatter = Defaults.DATE_TIME_FORMATTER;
-
         private Locale locale;
 
         public Builder(String name) {
-            super(name, new FieldType(Defaults.FIELD_TYPE), Defaults.PRECISION_STEP_64_BIT);
+            super(name, Defaults.FIELD_TYPE, Defaults.PRECISION_STEP_64_BIT);
             builder = this;
             // do *NOT* rely on the default locale
             locale = Locale.ROOT;
         }
 
+        DateFieldType fieldType() {
+            return (DateFieldType)fieldType;
+        }
+
         public Builder timeUnit(TimeUnit timeUnit) {
-            this.timeUnit = timeUnit;
+            fieldType().setTimeUnit(timeUnit);
             return this;
         }
 
@@ -115,28 +113,42 @@ public class DateFieldMapper extends NumberFieldMapper {
         }
 
         public Builder dateTimeFormatter(FormatDateTimeFormatter dateTimeFormatter) {
-            this.dateTimeFormatter = dateTimeFormatter;
+            fieldType().setDateTimeFormatter(dateTimeFormatter);
             return this;
         }
 
         @Override
         public DateFieldMapper build(BuilderContext context) {
-            fieldType.setOmitNorms(fieldType.omitNorms() && boost == 1.0f);
-            if (!locale.equals(dateTimeFormatter.locale())) {
-                dateTimeFormatter = new FormatDateTimeFormatter(dateTimeFormatter.format(), dateTimeFormatter.parser(), dateTimeFormatter.printer(), locale);
-            }
-            DateFieldMapper fieldMapper = new DateFieldMapper(buildNames(context), dateTimeFormatter,
-                    fieldType.numericPrecisionStep(), boost, fieldType, docValues, nullValue, timeUnit, ignoreMalformed(context), coerce(context),
-                    similarity, normsLoading, fieldDataSettings, context.indexSettings(),
-                    multiFieldsBuilder.build(this, context), copyTo);
+            setupFieldType(context);
+            DateFieldMapper fieldMapper = new DateFieldMapper(fieldType,
+                    docValues, nullValue, ignoreMalformed(context), coerce(context),
+                    fieldDataSettings, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
             fieldMapper.includeInAll(includeInAll);
             return fieldMapper;
         }
 
+        protected void setupFieldType(BuilderContext context) {
+            FormatDateTimeFormatter dateTimeFormatter = fieldType().dateTimeFormatter;
+            if (!locale.equals(dateTimeFormatter.locale())) {
+                fieldType().setDateTimeFormatter(new FormatDateTimeFormatter(dateTimeFormatter.format(), dateTimeFormatter.parser(), dateTimeFormatter.printer(), locale));
+            }
+            super.setupFieldType(context);
+        }
+
         public Builder locale(Locale locale) {
             this.locale = locale;
             return this;
         }
+
+        @Override
+        protected NamedAnalyzer makeNumberAnalyzer(int precisionStep) {
+            return NumericDateAnalyzer.buildNamedAnalyzer(fieldType().dateTimeFormatter, precisionStep);
+        }
+
+        @Override
+        protected int maxPrecisionStep() {
+            return 64;
+        }
     }
 
     public static class TypeParser implements Mapper.TypeParser {
@@ -169,37 +181,222 @@ public class DateFieldMapper extends NumberFieldMapper {
         }
     }
 
-    protected FormatDateTimeFormatter dateTimeFormatter;
+    public static class DateFieldType extends NumberFieldType {
 
-    private final DateMathParser dateMathParser;
+        final class LateParsingQuery extends Query {
+
+            final Object lowerTerm;
+            final Object upperTerm;
+            final boolean includeLower;
+            final boolean includeUpper;
+            final DateTimeZone timeZone;
+            final DateMathParser forcedDateParser;
+
+            public LateParsingQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, DateTimeZone timeZone, DateMathParser forcedDateParser) {
+                this.lowerTerm = lowerTerm;
+                this.upperTerm = upperTerm;
+                this.includeLower = includeLower;
+                this.includeUpper = includeUpper;
+                this.timeZone = timeZone;
+                this.forcedDateParser = forcedDateParser;
+            }
+
+            @Override
+            public Query rewrite(IndexReader reader) throws IOException {
+                Query query = innerRangeQuery(lowerTerm, upperTerm, includeLower, includeUpper, timeZone, forcedDateParser);
+                return query.rewrite(reader);
+            }
+
+            @Override
+            public String toString(String s) {
+                final StringBuilder sb = new StringBuilder();
+                return sb.append(names().indexName()).append(':')
+                    .append(includeLower ? '[' : '{')
+                    .append((lowerTerm == null) ? "*" : lowerTerm.toString())
+                    .append(" TO ")
+                    .append((upperTerm == null) ? "*" : upperTerm.toString())
+                    .append(includeUpper ? ']' : '}')
+                    .append(ToStringUtils.boost(getBoost()))
+                    .toString();
+            }
+        }
+
+        protected FormatDateTimeFormatter dateTimeFormatter = Defaults.DATE_TIME_FORMATTER;
+        protected TimeUnit timeUnit = Defaults.TIME_UNIT;
+        protected DateMathParser dateMathParser = new DateMathParser(dateTimeFormatter, timeUnit);
+
+        public DateFieldType() {}
+
+        protected DateFieldType(DateFieldType ref) {
+            super(ref);
+            this.dateTimeFormatter = ref.dateTimeFormatter;
+            this.timeUnit = ref.timeUnit;
+            this.dateMathParser = ref.dateMathParser;
+        }
+
+        public DateFieldType clone() {
+            return new DateFieldType(this);
+        }
+
+        public FormatDateTimeFormatter dateTimeFormatter() {
+            return dateTimeFormatter;
+        }
+
+        public void setDateTimeFormatter(FormatDateTimeFormatter dateTimeFormatter) {
+            checkIfFrozen();
+            this.dateTimeFormatter = dateTimeFormatter;
+            this.dateMathParser = new DateMathParser(dateTimeFormatter, timeUnit);
+        }
+
+        public TimeUnit timeUnit() {
+            return timeUnit;
+        }
+
+        public void setTimeUnit(TimeUnit timeUnit) {
+            checkIfFrozen();
+            this.timeUnit = timeUnit;
+            this.dateMathParser = new DateMathParser(dateTimeFormatter, timeUnit);
+        }
+
+        protected DateMathParser dateMathParser() {
+            return dateMathParser;
+        }
+
+        private long parseValue(Object value) {
+            if (value instanceof Number) {
+                return ((Number) value).longValue();
+            }
+            if (value instanceof BytesRef) {
+                return dateTimeFormatter().parser().parseMillis(((BytesRef) value).utf8ToString());
+            }
+            return dateTimeFormatter().parser().parseMillis(value.toString());
+        }
+
+        protected long parseStringValue(String value) {
+            try {
+                return dateTimeFormatter().parser().parseMillis(value);
+            } catch (RuntimeException e) {
+                try {
+                    return timeUnit().toMillis(Long.parseLong(value));
+                } catch (NumberFormatException e1) {
+                    throw new MapperParsingException("failed to parse date field [" + value + "], tried both date format [" + dateTimeFormatter().format() + "], and timestamp number with locale [" + dateTimeFormatter().locale() + "]", e);
+                }
+            }
+        }
+
+        @Override
+        public Long value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            if (value instanceof Number) {
+                return ((Number) value).longValue();
+            }
+            if (value instanceof BytesRef) {
+                return Numbers.bytesToLong((BytesRef) value);
+            }
+            return parseStringValue(value.toString());
+        }
+
+        @Override
+        public BytesRef indexedValueForSearch(Object value) {
+            BytesRefBuilder bytesRef = new BytesRefBuilder();
+            NumericUtils.longToPrefixCoded(parseValue(value), 0, bytesRef); // 0 because of exact match
+            return bytesRef.get();
+        }
+
+        @Override
+        public Object valueForSearch(Object value) {
+            if (value instanceof String) {
+                // assume its the string that was indexed, just return it... (for example, with get)
+                return value;
+            }
+            Long val = value(value);
+            if (val == null) {
+                return null;
+            }
+            return dateTimeFormatter().printer().print(val);
+        }
+
+        @Override
+        public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
+            return rangeQuery(lowerTerm, upperTerm, includeLower, includeUpper, null, null, context);
+        }
+
+        @Override
+        public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
+            long iValue = dateMathParser().parse(value, now());
+            long iSim;
+            try {
+                iSim = fuzziness.asTimeValue().millis();
+            } catch (Exception e) {
+                // not a time format
+                iSim =  fuzziness.asLong();
+            }
+            return NumericRangeQuery.newLongRange(names().indexName(), numericPrecisionStep(),
+                iValue - iSim,
+                iValue + iSim,
+                true, true);
+        }
+
+        @Override
+        public FieldStats stats(Terms terms, int maxDoc) throws IOException {
+            long minValue = NumericUtils.getMinLong(terms);
+            long maxValue = NumericUtils.getMaxLong(terms);
+            return new FieldStats.Date(
+                maxDoc, terms.getDocCount(), terms.getSumDocFreq(), terms.getSumTotalTermFreq(), minValue, maxValue, dateTimeFormatter()
+            );
+        }
+
+        public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable DateTimeZone timeZone, @Nullable DateMathParser forcedDateParser, @Nullable QueryParseContext context) {
+            // If the current search context is null we're parsing percolator query or a index alias filter.
+            if (SearchContext.current() == null) {
+                return new LateParsingQuery(lowerTerm, upperTerm, includeLower, includeUpper, timeZone, forcedDateParser);
+            } else {
+                return innerRangeQuery(lowerTerm, upperTerm, includeLower, includeUpper, timeZone, forcedDateParser);
+            }
+        }
+
+        private Query innerRangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable DateTimeZone timeZone, @Nullable DateMathParser forcedDateParser) {
+            return NumericRangeQuery.newLongRange(names().indexName(), numericPrecisionStep(),
+                lowerTerm == null ? null : parseToMilliseconds(lowerTerm, !includeLower, timeZone, forcedDateParser == null ? dateMathParser : forcedDateParser),
+                upperTerm == null ? null : parseToMilliseconds(upperTerm, includeUpper, timeZone, forcedDateParser == null ? dateMathParser : forcedDateParser),
+                includeLower, includeUpper);
+        }
+
+        public long parseToMilliseconds(Object value, boolean inclusive, @Nullable DateTimeZone zone, @Nullable DateMathParser forcedDateParser) {
+            if (value instanceof Number) {
+                return ((Number) value).longValue();
+            }
+            DateMathParser dateParser = dateMathParser();
+            if (forcedDateParser != null) {
+                dateParser = forcedDateParser;
+            }
+            String strValue;
+            if (value instanceof BytesRef) {
+                strValue = ((BytesRef) value).utf8ToString();
+            } else {
+                strValue = value.toString();
+            }
+            return dateParser.parse(strValue, now(), inclusive, zone);
+        }
+    }
 
     private String nullValue;
 
-    protected final TimeUnit timeUnit;
-
-    protected DateFieldMapper(Names names, FormatDateTimeFormatter dateTimeFormatter, int precisionStep, float boost, FieldType fieldType, Boolean docValues,
-                              String nullValue, TimeUnit timeUnit, Explicit<Boolean> ignoreMalformed,Explicit<Boolean> coerce,
-                              SimilarityProvider similarity,
-                              Loading normsLoading, @Nullable Settings fieldDataSettings, Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
-        super(names, precisionStep, boost, fieldType, docValues, ignoreMalformed, coerce, NumericDateAnalyzer.buildNamedAnalyzer(dateTimeFormatter, precisionStep),
-                NumericDateAnalyzer.buildNamedAnalyzer(dateTimeFormatter, Integer.MAX_VALUE),
-                similarity, normsLoading, fieldDataSettings, indexSettings, multiFields, copyTo);
-        this.dateTimeFormatter = dateTimeFormatter;
+    protected DateFieldMapper(MappedFieldType fieldType, Boolean docValues, String nullValue, Explicit<Boolean> ignoreMalformed,Explicit<Boolean> coerce,
+                              @Nullable Settings fieldDataSettings, Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
+        super(fieldType, docValues, ignoreMalformed, coerce, fieldDataSettings, indexSettings, multiFields, copyTo);
         this.nullValue = nullValue;
-        this.timeUnit = timeUnit;
-        this.dateMathParser = new DateMathParser(dateTimeFormatter, timeUnit);
-    }
-
-    public FormatDateTimeFormatter dateTimeFormatter() {
-        return dateTimeFormatter;
-    }
-
-    public DateMathParser dateMathParser() {
-        return dateMathParser;
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public DateFieldType fieldType() {
+        return (DateFieldType)fieldType;
+    }
+
+    @Override
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -208,63 +405,6 @@ public class DateFieldMapper extends NumberFieldMapper {
         return new FieldDataType("long");
     }
 
-    @Override
-    protected int maxPrecisionStep() {
-        return 64;
-    }
-
-    @Override
-    public Long value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).longValue();
-        }
-        if (value instanceof BytesRef) {
-            return Numbers.bytesToLong((BytesRef) value);
-        }
-        return parseStringValue(value.toString());
-    }
-
-    /** Dates should return as a string. */
-    @Override
-    public Object valueForSearch(Object value) {
-        if (value instanceof String) {
-            // assume its the string that was indexed, just return it... (for example, with get)
-            return value;
-        }
-        Long val = value(value);
-        if (val == null) {
-            return null;
-        }
-        return dateTimeFormatter.printer().print(val);
-    }
-
-    @Override
-    public BytesRef indexedValueForSearch(Object value) {
-        BytesRefBuilder bytesRef = new BytesRefBuilder();
-        NumericUtils.longToPrefixCoded(parseValue(value), 0, bytesRef); // 0 because of exact match
-        return bytesRef.get();
-    }
-
-    private long parseValue(Object value) {
-        if (value instanceof Number) {
-            return ((Number) value).longValue();
-        }
-        if (value instanceof BytesRef) {
-            return dateTimeFormatter.parser().parseMillis(((BytesRef) value).utf8ToString());
-        }
-        return dateTimeFormatter.parser().parseMillis(value.toString());
-    }
-
-    private String convertToString(Object value) {
-        if (value instanceof BytesRef) {
-            return ((BytesRef) value).utf8ToString();
-        }
-        return value.toString();
-    }
-
     private static Callable<Long> now() {
         return new Callable<Long>() {
             @Override
@@ -277,62 +417,6 @@ public class DateFieldMapper extends NumberFieldMapper {
         };
     }
 
-    @Override
-    public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
-        long iValue = dateMathParser.parse(value, now());
-        long iSim;
-        try {
-            iSim = fuzziness.asTimeValue().millis();
-        } catch (Exception e) {
-            // not a time format
-            iSim =  fuzziness.asLong();
-        }
-        return NumericRangeQuery.newLongRange(names.indexName(), precisionStep,
-                iValue - iSim,
-                iValue + iSim,
-                true, true);
-    }
-
-    public long parseToMilliseconds(Object value) {
-        return parseToMilliseconds(value, false, null, dateMathParser);
-    }
-
-    public long parseToMilliseconds(Object value, boolean inclusive, @Nullable DateTimeZone zone, @Nullable DateMathParser forcedDateParser) {
-        if (value instanceof Number) {
-            return ((Number) value).longValue();
-        }
-        return parseToMilliseconds(convertToString(value), inclusive, zone, forcedDateParser);
-    }
-
-    public long parseToMilliseconds(String value, boolean inclusive, @Nullable DateTimeZone zone, @Nullable DateMathParser forcedDateParser) {
-        DateMathParser dateParser = dateMathParser;
-        if (forcedDateParser != null) {
-            dateParser = forcedDateParser;
-        }
-        return dateParser.parse(value, now(), inclusive, zone);
-    }
-
-    @Override
-    public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
-        return rangeQuery(lowerTerm, upperTerm, includeLower, includeUpper, null, null, context);
-    }
-
-    public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable DateTimeZone timeZone, @Nullable DateMathParser forcedDateParser, @Nullable QueryParseContext context) {
-        // If the current search context is null we're parsing percolator query or a index alias filter.
-        if (SearchContext.current() == null) {
-            return new LateParsingQuery(lowerTerm, upperTerm, includeLower, includeUpper, timeZone, forcedDateParser);
-        } else {
-            return innerRangeQuery(lowerTerm, upperTerm, includeLower, includeUpper, timeZone, forcedDateParser);
-        }
-    }
-
-    private Query innerRangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable DateTimeZone timeZone, @Nullable DateMathParser forcedDateParser) {
-        return NumericRangeQuery.newLongRange(names.indexName(), precisionStep,
-                lowerTerm == null ? null : parseToMilliseconds(lowerTerm, !includeLower, timeZone, forcedDateParser == null ? dateMathParser : forcedDateParser),
-                upperTerm == null ? null : parseToMilliseconds(upperTerm, includeUpper, timeZone, forcedDateParser == null ? dateMathParser : forcedDateParser),
-                includeLower, includeUpper);
-    }
-
     @Override
     public Query nullValueFilter() {
         if (nullValue == null) {
@@ -351,7 +435,7 @@ public class DateFieldMapper extends NumberFieldMapper {
     protected void innerParseCreateField(ParseContext context, List<Field> fields) throws IOException {
         String dateAsString = null;
         Long value = null;
-        float boost = this.boost;
+        float boost = this.fieldType.boost();
         if (context.externalValueSet()) {
             Object externalValue = context.externalValue();
             if (externalValue instanceof Number) {
@@ -398,20 +482,20 @@ public class DateFieldMapper extends NumberFieldMapper {
         if (dateAsString != null) {
             assert value == null;
             if (context.includeInAll(includeInAll, this)) {
-                context.allEntries().addText(names.fullName(), dateAsString, boost);
+                context.allEntries().addText(fieldType.names().fullName(), dateAsString, boost);
             }
-            value = parseStringValue(dateAsString);
+            value = fieldType().parseStringValue(dateAsString);
         } else if (value != null) {
-            value = timeUnit.toMillis(value);
+            value = ((DateFieldType)fieldType).timeUnit().toMillis(value);
         }
 
         if (value != null) {
             if (fieldType.indexOptions() != IndexOptions.NONE || fieldType.stored()) {
-                CustomLongNumericField field = new CustomLongNumericField(this, value, fieldType);
+                CustomLongNumericField field = new CustomLongNumericField(this, value, (NumberFieldType)fieldType);
                 field.setBoost(boost);
                 fields.add(field);
             }
-            if (hasDocValues()) {
+            if (fieldType().hasDocValues()) {
                 addDocValue(context, fields, value);
             }
         }
@@ -430,7 +514,9 @@ public class DateFieldMapper extends NumberFieldMapper {
         }
         if (!mergeResult.simulate()) {
             this.nullValue = ((DateFieldMapper) mergeWith).nullValue;
-            this.dateTimeFormatter = ((DateFieldMapper) mergeWith).dateTimeFormatter;
+            this.fieldType = this.fieldType.clone();
+            fieldType().setDateTimeFormatter(((DateFieldMapper) mergeWith).fieldType().dateTimeFormatter());
+            this.fieldType.freeze();
         }
     }
 
@@ -438,10 +524,10 @@ public class DateFieldMapper extends NumberFieldMapper {
     protected void doXContentBody(XContentBuilder builder, boolean includeDefaults, Params params) throws IOException {
         super.doXContentBody(builder, includeDefaults, params);
 
-        if (includeDefaults || precisionStep != Defaults.PRECISION_STEP_64_BIT) {
-            builder.field("precision_step", precisionStep);
+        if (includeDefaults || fieldType.numericPrecisionStep() != Defaults.PRECISION_STEP_64_BIT) {
+            builder.field("precision_step", fieldType.numericPrecisionStep());
         }
-        builder.field("format", dateTimeFormatter.format());
+        builder.field("format", fieldType().dateTimeFormatter().format());
         if (includeDefaults || nullValue != null) {
             builder.field("null_value", nullValue);
         }
@@ -451,77 +537,18 @@ public class DateFieldMapper extends NumberFieldMapper {
             builder.field("include_in_all", false);
         }
 
-        if (includeDefaults || timeUnit != Defaults.TIME_UNIT) {
-            builder.field("numeric_resolution", timeUnit.name().toLowerCase(Locale.ROOT));
+        if (includeDefaults || fieldType().timeUnit() != Defaults.TIME_UNIT) {
+            builder.field("numeric_resolution", fieldType().timeUnit().name().toLowerCase(Locale.ROOT));
         }
         // only serialize locale if needed, ROOT is the default, so no need to serialize that case as well...
-        if (dateTimeFormatter.locale() != null && dateTimeFormatter.locale() != Locale.ROOT) {
-            builder.field("locale", dateTimeFormatter.locale());
+        if (fieldType().dateTimeFormatter().locale() != null && fieldType().dateTimeFormatter().locale() != Locale.ROOT) {
+            builder.field("locale", fieldType().dateTimeFormatter().locale());
         } else if (includeDefaults) {
-            if (dateTimeFormatter.locale() == null) {
+            if (fieldType().dateTimeFormatter().locale() == null) {
                 builder.field("locale", Locale.ROOT);
             } else {
-                builder.field("locale", dateTimeFormatter.locale());
+                builder.field("locale", fieldType().dateTimeFormatter().locale());
             }
         }
     }
-
-    @Override
-    public FieldStats stats(Terms terms, int maxDoc) throws IOException {
-        long minValue = NumericUtils.getMinLong(terms);
-        long maxValue = NumericUtils.getMaxLong(terms);
-        return new FieldStats.Date(
-                maxDoc, terms.getDocCount(), terms.getSumDocFreq(), terms.getSumTotalTermFreq(), minValue, maxValue, dateTimeFormatter
-        );
-    }
-
-    private long parseStringValue(String value) {
-        try {
-            return dateTimeFormatter.parser().parseMillis(value);
-        } catch (RuntimeException e) {
-            try {
-                return timeUnit.toMillis(Long.parseLong(value));
-            } catch (NumberFormatException e1) {
-                throw new MapperParsingException("failed to parse date field [" + value + "], tried both date format [" + dateTimeFormatter.format() + "], and timestamp number with locale [" + dateTimeFormatter.locale() + "]", e);
-            }
-        }
-    }
-
-    public final class LateParsingQuery extends Query {
-
-        final Object lowerTerm;
-        final Object upperTerm;
-        final boolean includeLower;
-        final boolean includeUpper;
-        final DateTimeZone timeZone;
-        final DateMathParser forcedDateParser;
-
-        public LateParsingQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, DateTimeZone timeZone, DateMathParser forcedDateParser) {
-            this.lowerTerm = lowerTerm;
-            this.upperTerm = upperTerm;
-            this.includeLower = includeLower;
-            this.includeUpper = includeUpper;
-            this.timeZone = timeZone;
-            this.forcedDateParser = forcedDateParser;
-        }
-
-        @Override
-        public Query rewrite(IndexReader reader) throws IOException {
-            Query query = innerRangeQuery(lowerTerm, upperTerm, includeLower, includeUpper, timeZone, forcedDateParser);
-            return query.rewrite(reader);
-        }
-
-        @Override
-        public String toString(String s) {
-            final StringBuilder sb = new StringBuilder();
-            return sb.append(names.indexName()).append(':')
-                    .append(includeLower ? '[' : '{')
-                    .append((lowerTerm == null) ? "*" : lowerTerm.toString())
-                    .append(" TO ")
-                    .append((upperTerm == null) ? "*" : upperTerm.toString())
-                    .append(includeUpper ? ']' : '}')
-                    .append(ToStringUtils.boost(getBoost()))
-                    .toString();
-        }
-    }
 }
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java
index 48282232d28..a8f4a44e6ab 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java
@@ -20,12 +20,10 @@
 package org.elasticsearch.index.mapper.core;
 
 import com.carrotsearch.hppc.DoubleArrayList;
-
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldType;
-import org.apache.lucene.index.DocValuesType;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.Terms;
 import org.apache.lucene.search.ConstantScoreQuery;
@@ -44,21 +42,23 @@ import org.elasticsearch.common.util.ByteUtils;
 import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.analysis.NumericDoubleAnalyzer;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
 import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.query.QueryParseContext;
-import org.elasticsearch.index.similarity.SimilarityProvider;
 
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import static org.apache.lucene.util.NumericUtils.doubleToSortableLong;
 import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeDoubleValue;
 import static org.elasticsearch.index.mapper.MapperBuilders.doubleField;
 import static org.elasticsearch.index.mapper.core.TypeParsers.parseNumberField;
@@ -71,7 +71,7 @@ public class DoubleFieldMapper extends NumberFieldMapper {
     public static final String CONTENT_TYPE = "double";
 
     public static class Defaults extends NumberFieldMapper.Defaults {
-        public static final FieldType FIELD_TYPE = new FieldType(NumberFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new DoubleFieldType();
 
         static {
             FIELD_TYPE.freeze();
@@ -85,7 +85,7 @@ public class DoubleFieldMapper extends NumberFieldMapper {
         protected Double nullValue = Defaults.NULL_VALUE;
 
         public Builder(String name) {
-            super(name, new FieldType(Defaults.FIELD_TYPE), Defaults.PRECISION_STEP_64_BIT);
+            super(name, Defaults.FIELD_TYPE, Defaults.PRECISION_STEP_64_BIT);
             builder = this;
         }
 
@@ -96,13 +96,22 @@ public class DoubleFieldMapper extends NumberFieldMapper {
 
         @Override
         public DoubleFieldMapper build(BuilderContext context) {
-            fieldType.setOmitNorms(fieldType.omitNorms() && boost == 1.0f);
-            DoubleFieldMapper fieldMapper = new DoubleFieldMapper(buildNames(context),
-                    fieldType.numericPrecisionStep(), boost, fieldType, docValues, nullValue, ignoreMalformed(context), coerce(context),
-                    similarity, normsLoading, fieldDataSettings, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
+            setupFieldType(context);
+            DoubleFieldMapper fieldMapper = new DoubleFieldMapper(fieldType, docValues, nullValue, ignoreMalformed(context), coerce(context),
+                    fieldDataSettings, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
             fieldMapper.includeInAll(includeInAll);
             return fieldMapper;
         }
+
+        @Override
+        protected NamedAnalyzer makeNumberAnalyzer(int precisionStep) {
+            return NumericDoubleAnalyzer.buildNamedAnalyzer(precisionStep);
+        }
+
+        @Override
+        protected int maxPrecisionStep() {
+            return 64;
+        }
     }
 
     public static class TypeParser implements Mapper.TypeParser {
@@ -126,24 +135,82 @@ public class DoubleFieldMapper extends NumberFieldMapper {
         }
     }
 
+    public static class DoubleFieldType extends NumberFieldType {
+
+        public DoubleFieldType() {}
+
+        protected DoubleFieldType(DoubleFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public NumberFieldType clone() {
+            return new DoubleFieldType(this);
+        }
+
+        @Override
+        public Double value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            if (value instanceof Number) {
+                return ((Number) value).doubleValue();
+            }
+            if (value instanceof BytesRef) {
+                return Numbers.bytesToDouble((BytesRef) value);
+            }
+            return Double.parseDouble(value.toString());
+        }
+
+        @Override
+        public BytesRef indexedValueForSearch(Object value) {
+            long longValue = NumericUtils.doubleToSortableLong(parseDoubleValue(value));
+            BytesRefBuilder bytesRef = new BytesRefBuilder();
+            NumericUtils.longToPrefixCoded(longValue, 0, bytesRef);   // 0 because of exact match
+            return bytesRef.get();
+        }
+
+        @Override
+        public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
+            return NumericRangeQuery.newDoubleRange(names().indexName(), numericPrecisionStep(),
+                lowerTerm == null ? null : parseDoubleValue(lowerTerm),
+                upperTerm == null ? null : parseDoubleValue(upperTerm),
+                includeLower, includeUpper);
+        }
+
+        @Override
+        public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
+            double iValue = Double.parseDouble(value);
+            double iSim = fuzziness.asDouble();
+            return NumericRangeQuery.newDoubleRange(names().indexName(), numericPrecisionStep(),
+                iValue - iSim,
+                iValue + iSim,
+                true, true);
+        }
+
+        @Override
+        public FieldStats stats(Terms terms, int maxDoc) throws IOException {
+            double minValue = NumericUtils.sortableLongToDouble(NumericUtils.getMinLong(terms));
+            double maxValue = NumericUtils.sortableLongToDouble(NumericUtils.getMaxLong(terms));
+            return new FieldStats.Double(
+                maxDoc, terms.getDocCount(), terms.getSumDocFreq(), terms.getSumTotalTermFreq(), minValue, maxValue
+            );
+        }
+    }
 
     private Double nullValue;
 
     private String nullValueAsString;
 
-    protected DoubleFieldMapper(Names names, int precisionStep, float boost, FieldType fieldType, Boolean docValues,
-                                Double nullValue, Explicit<Boolean> ignoreMalformed,  Explicit<Boolean> coerce,
-                                SimilarityProvider similarity, Loading normsLoading, @Nullable Settings fieldDataSettings,
-                                Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
-        super(names, precisionStep, boost, fieldType, docValues, ignoreMalformed, coerce,
-                NumericDoubleAnalyzer.buildNamedAnalyzer(precisionStep), NumericDoubleAnalyzer.buildNamedAnalyzer(Integer.MAX_VALUE),
-                similarity, normsLoading, fieldDataSettings, indexSettings, multiFields, copyTo);
+    protected DoubleFieldMapper(MappedFieldType fieldType, Boolean docValues, Double nullValue, Explicit<Boolean> ignoreMalformed, Explicit<Boolean> coerce,
+                                @Nullable Settings fieldDataSettings, Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
+        super(fieldType, docValues, ignoreMalformed, coerce, fieldDataSettings, indexSettings, multiFields, copyTo);
         this.nullValue = nullValue;
         this.nullValueAsString = nullValue == null ? null : nullValue.toString();
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -152,53 +219,8 @@ public class DoubleFieldMapper extends NumberFieldMapper {
         return new FieldDataType("double");
     }
 
-    @Override
-    protected int maxPrecisionStep() {
-        return 64;
-    }
-
-    @Override
-    public Double value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).doubleValue();
-        }
-        if (value instanceof BytesRef) {
-            return Numbers.bytesToDouble((BytesRef) value);
-        }
-        return Double.parseDouble(value.toString());
-    }
-
-    @Override
-    public BytesRef indexedValueForSearch(Object value) {
-        long longValue = NumericUtils.doubleToSortableLong(parseDoubleValue(value));
-        BytesRefBuilder bytesRef = new BytesRefBuilder();
-        NumericUtils.longToPrefixCoded(longValue, 0, bytesRef);   // 0 because of exact match
-        return bytesRef.get();
-    }
-
-    @Override
-    public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
-        double iValue = Double.parseDouble(value);
-        double iSim = fuzziness.asDouble();
-        return NumericRangeQuery.newDoubleRange(names.indexName(), precisionStep,
-                iValue - iSim,
-                iValue + iSim,
-                true, true);
-    }
-
-    @Override
-    public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
-        return NumericRangeQuery.newDoubleRange(names.indexName(), precisionStep,
-                lowerTerm == null ? null : parseDoubleValue(lowerTerm),
-                upperTerm == null ? null : parseDoubleValue(upperTerm),
-                includeLower, includeUpper);
-    }
-
     public Query rangeFilter(Double lowerTerm, Double upperTerm, boolean includeLower, boolean includeUpper) {
-        return NumericRangeQuery.newDoubleRange(names.indexName(), precisionStep, lowerTerm, upperTerm, includeLower, includeUpper);
+        return NumericRangeQuery.newDoubleRange(fieldType.names().indexName(), fieldType.numericPrecisionStep(), lowerTerm, upperTerm, includeLower, includeUpper);
     }
 
     @Override
@@ -217,7 +239,7 @@ public class DoubleFieldMapper extends NumberFieldMapper {
     @Override
     protected void innerParseCreateField(ParseContext context, List<Field> fields) throws IOException {
         double value;
-        float boost = this.boost;
+        float boost = this.fieldType.boost();
         if (context.externalValueSet()) {
             Object externalValue = context.externalValue();
             if (externalValue == null) {
@@ -239,7 +261,7 @@ public class DoubleFieldMapper extends NumberFieldMapper {
                 value = ((Number) externalValue).doubleValue();
             }
             if (context.includeInAll(includeInAll, this)) {
-                context.allEntries().addText(names.fullName(), Double.toString(value), boost);
+                context.allEntries().addText(fieldType.names().fullName(), Double.toString(value), boost);
             }
         } else {
             XContentParser parser = context.parser();
@@ -250,7 +272,7 @@ public class DoubleFieldMapper extends NumberFieldMapper {
                 }
                 value = nullValue;
                 if (nullValueAsString != null && (context.includeInAll(includeInAll, this))) {
-                    context.allEntries().addText(names.fullName(), nullValueAsString, boost);
+                    context.allEntries().addText(fieldType.names().fullName(), nullValueAsString, boost);
                 }
             } else if (parser.currentToken() == XContentParser.Token.START_OBJECT) {
                 XContentParser.Token token;
@@ -279,26 +301,26 @@ public class DoubleFieldMapper extends NumberFieldMapper {
             } else {
                 value = parser.doubleValue(coerce.value());
                 if (context.includeInAll(includeInAll, this)) {
-                    context.allEntries().addText(names.fullName(), parser.text(), boost);
+                    context.allEntries().addText(fieldType.names().fullName(), parser.text(), boost);
                 }
             }
         }
 
         if (fieldType.indexOptions() != IndexOptions.NONE || fieldType.stored()) {
-            CustomDoubleNumericField field = new CustomDoubleNumericField(this, value, fieldType);
+            CustomDoubleNumericField field = new CustomDoubleNumericField(this, value, (NumberFieldType)fieldType);
             field.setBoost(boost);
             fields.add(field);
         }
-        if (hasDocValues()) {
+        if (fieldType().hasDocValues()) {
             if (useSortedNumericDocValues) {
-                addDocValue(context, fields, NumericUtils.doubleToSortableLong(value));
+                addDocValue(context, fields, doubleToSortableLong(value));
             } else {
-                CustomDoubleNumericDocValuesField field = (CustomDoubleNumericDocValuesField) context.doc().getByKey(names().indexName());
+                CustomDoubleNumericDocValuesField field = (CustomDoubleNumericDocValuesField) context.doc().getByKey(fieldType().names().indexName());
                 if (field != null) {
                     field.add(value);
                 } else {
-                    field = new CustomDoubleNumericDocValuesField(names().indexName(), value);
-                    context.doc().addWithKey(names().indexName(), field);
+                    field = new CustomDoubleNumericDocValuesField(fieldType().names().indexName(), value);
+                    context.doc().addWithKey(fieldType().names().indexName(), field);
                 }
             }
         }
@@ -325,8 +347,8 @@ public class DoubleFieldMapper extends NumberFieldMapper {
     protected void doXContentBody(XContentBuilder builder, boolean includeDefaults, Params params) throws IOException {
         super.doXContentBody(builder, includeDefaults, params);
 
-        if (includeDefaults || precisionStep != Defaults.PRECISION_STEP_64_BIT) {
-            builder.field("precision_step", precisionStep);
+        if (includeDefaults || fieldType.numericPrecisionStep() != Defaults.PRECISION_STEP_64_BIT) {
+            builder.field("precision_step", fieldType.numericPrecisionStep());
         }
         if (includeDefaults || nullValue != null) {
             builder.field("null_value", nullValue);
@@ -339,22 +361,13 @@ public class DoubleFieldMapper extends NumberFieldMapper {
 
     }
 
-    @Override
-    public FieldStats stats(Terms terms, int maxDoc) throws IOException {
-        double minValue = NumericUtils.sortableLongToDouble(NumericUtils.getMinLong(terms));
-        double maxValue = NumericUtils.sortableLongToDouble(NumericUtils.getMaxLong(terms));
-        return new FieldStats.Double(
-                maxDoc, terms.getDocCount(), terms.getSumDocFreq(), terms.getSumTotalTermFreq(), minValue, maxValue
-        );
-    }
-
     public static class CustomDoubleNumericField extends CustomNumericField {
 
         private final double number;
 
         private final NumberFieldMapper mapper;
 
-        public CustomDoubleNumericField(NumberFieldMapper mapper, double number, FieldType fieldType) {
+        public CustomDoubleNumericField(NumberFieldMapper mapper, double number, NumberFieldType fieldType) {
             super(mapper, number, fieldType);
             this.mapper = mapper;
             this.number = number;
@@ -376,12 +389,6 @@ public class DoubleFieldMapper extends NumberFieldMapper {
 
     public static class CustomDoubleNumericDocValuesField extends CustomNumericDocValuesField {
 
-        public static final FieldType TYPE = new FieldType();
-        static {
-            TYPE.setDocValuesType(DocValuesType.BINARY);
-          TYPE.freeze();
-        }
-
         private final DoubleArrayList values;
 
         public CustomDoubleNumericDocValuesField(String  name, double value) {
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java
index 4a3f6c2e3fc..50c5f578a48 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java
@@ -20,11 +20,9 @@
 package org.elasticsearch.index.mapper.core;
 
 import com.carrotsearch.hppc.FloatArrayList;
-
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.DocValuesType;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.Terms;
@@ -45,21 +43,23 @@ import org.elasticsearch.common.util.ByteUtils;
 import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.analysis.NumericFloatAnalyzer;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
 import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.query.QueryParseContext;
-import org.elasticsearch.index.similarity.SimilarityProvider;
 
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import static org.apache.lucene.util.NumericUtils.floatToSortableInt;
 import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeFloatValue;
 import static org.elasticsearch.index.mapper.MapperBuilders.floatField;
 import static org.elasticsearch.index.mapper.core.TypeParsers.parseNumberField;
@@ -72,7 +72,7 @@ public class FloatFieldMapper extends NumberFieldMapper {
     public static final String CONTENT_TYPE = "float";
 
     public static class Defaults extends NumberFieldMapper.Defaults {
-        public static final FieldType FIELD_TYPE = new FieldType(NumberFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new FloatFieldType();
 
         static {
             FIELD_TYPE.freeze();
@@ -86,7 +86,7 @@ public class FloatFieldMapper extends NumberFieldMapper {
         protected Float nullValue = Defaults.NULL_VALUE;
 
         public Builder(String name) {
-            super(name, new FieldType(Defaults.FIELD_TYPE), Defaults.PRECISION_STEP_32_BIT);
+            super(name, Defaults.FIELD_TYPE, Defaults.PRECISION_STEP_32_BIT);
             builder = this;
         }
 
@@ -97,13 +97,22 @@ public class FloatFieldMapper extends NumberFieldMapper {
 
         @Override
         public FloatFieldMapper build(BuilderContext context) {
-            fieldType.setOmitNorms(fieldType.omitNorms() && boost == 1.0f);
-            FloatFieldMapper fieldMapper = new FloatFieldMapper(buildNames(context),
-                    fieldType.numericPrecisionStep(), boost, fieldType, docValues, nullValue, ignoreMalformed(context), coerce(context),
-                    similarity, normsLoading, fieldDataSettings, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
+            setupFieldType(context);
+            FloatFieldMapper fieldMapper = new FloatFieldMapper(fieldType, docValues, nullValue, ignoreMalformed(context), coerce(context),
+                    fieldDataSettings, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
             fieldMapper.includeInAll(includeInAll);
             return fieldMapper;
         }
+
+        @Override
+        protected NamedAnalyzer makeNumberAnalyzer(int precisionStep) {
+            return NumericFloatAnalyzer.buildNamedAnalyzer(precisionStep);
+        }
+
+        @Override
+        protected int maxPrecisionStep() {
+            return 32;
+        }
     }
 
     public static class TypeParser implements Mapper.TypeParser {
@@ -127,23 +136,83 @@ public class FloatFieldMapper extends NumberFieldMapper {
         }
     }
 
+    public static class FloatFieldType extends NumberFieldType {
+
+        public FloatFieldType() {}
+
+        protected FloatFieldType(FloatFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public NumberFieldType clone() {
+            return new FloatFieldType(this);
+        }
+
+        @Override
+        public Float value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            if (value instanceof Number) {
+                return ((Number) value).floatValue();
+            }
+            if (value instanceof BytesRef) {
+                return Numbers.bytesToFloat((BytesRef) value);
+            }
+            return Float.parseFloat(value.toString());
+        }
+
+        @Override
+        public BytesRef indexedValueForSearch(Object value) {
+            int intValue = NumericUtils.floatToSortableInt(parseValue(value));
+            BytesRefBuilder bytesRef = new BytesRefBuilder();
+            NumericUtils.intToPrefixCoded(intValue, 0, bytesRef);   // 0 because of exact match
+            return bytesRef.get();
+        }
+
+        @Override
+        public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
+            return NumericRangeQuery.newFloatRange(names().indexName(), numericPrecisionStep(),
+                lowerTerm == null ? null : parseValue(lowerTerm),
+                upperTerm == null ? null : parseValue(upperTerm),
+                includeLower, includeUpper);
+        }
+
+        @Override
+        public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
+            float iValue = Float.parseFloat(value);
+            final float iSim = fuzziness.asFloat();
+            return NumericRangeQuery.newFloatRange(names().indexName(), numericPrecisionStep(),
+                iValue - iSim,
+                iValue + iSim,
+                true, true);
+        }
+
+        @Override
+        public FieldStats stats(Terms terms, int maxDoc) throws IOException {
+            float minValue = NumericUtils.sortableIntToFloat(NumericUtils.getMinInt(terms));
+            float maxValue = NumericUtils.sortableIntToFloat(NumericUtils.getMaxInt(terms));
+            return new FieldStats.Float(
+                maxDoc, terms.getDocCount(), terms.getSumDocFreq(), terms.getSumTotalTermFreq(), minValue, maxValue
+            );
+        }
+    }
+
     private Float nullValue;
 
     private String nullValueAsString;
 
-    protected FloatFieldMapper(Names names, int precisionStep, float boost, FieldType fieldType, Boolean docValues,
+    protected FloatFieldMapper(MappedFieldType fieldType, Boolean docValues,
                                Float nullValue, Explicit<Boolean> ignoreMalformed, Explicit<Boolean> coerce,
-                               SimilarityProvider similarity, Loading normsLoading, @Nullable Settings fieldDataSettings,
-                               Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
-        super(names, precisionStep, boost, fieldType, docValues, ignoreMalformed, coerce,
-                NumericFloatAnalyzer.buildNamedAnalyzer(precisionStep), NumericFloatAnalyzer.buildNamedAnalyzer(Integer.MAX_VALUE),
-                similarity, normsLoading, fieldDataSettings, indexSettings, multiFields, copyTo);
+                               @Nullable Settings fieldDataSettings, Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
+        super(fieldType, docValues, ignoreMalformed, coerce, fieldDataSettings, indexSettings, multiFields, copyTo);
         this.nullValue = nullValue;
         this.nullValueAsString = nullValue == null ? null : nullValue.toString();
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -152,34 +221,7 @@ public class FloatFieldMapper extends NumberFieldMapper {
         return new FieldDataType("float");
     }
 
-    @Override
-    protected int maxPrecisionStep() {
-        return 32;
-    }
-
-    @Override
-    public Float value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).floatValue();
-        }
-        if (value instanceof BytesRef) {
-            return Numbers.bytesToFloat((BytesRef) value);
-        }
-        return Float.parseFloat(value.toString());
-    }
-
-    @Override
-    public BytesRef indexedValueForSearch(Object value) {
-        int intValue = NumericUtils.floatToSortableInt(parseValue(value));
-        BytesRefBuilder bytesRef = new BytesRefBuilder();
-        NumericUtils.intToPrefixCoded(intValue, 0, bytesRef);   // 0 because of exact match
-        return bytesRef.get();
-    }
-
-    private float parseValue(Object value) {
+    private static float parseValue(Object value) {
         if (value instanceof Number) {
             return ((Number) value).floatValue();
         }
@@ -189,24 +231,6 @@ public class FloatFieldMapper extends NumberFieldMapper {
         return Float.parseFloat(value.toString());
     }
 
-    @Override
-    public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
-        float iValue = Float.parseFloat(value);
-        final float iSim = fuzziness.asFloat();
-        return NumericRangeQuery.newFloatRange(names.indexName(), precisionStep,
-                iValue - iSim,
-                iValue + iSim,
-                true, true);
-    }
-
-    @Override
-    public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
-        return NumericRangeQuery.newFloatRange(names.indexName(), precisionStep,
-                lowerTerm == null ? null : parseValue(lowerTerm),
-                upperTerm == null ? null : parseValue(upperTerm),
-                includeLower, includeUpper);
-    }
-
     @Override
     public Query nullValueFilter() {
         if (nullValue == null) {
@@ -223,7 +247,7 @@ public class FloatFieldMapper extends NumberFieldMapper {
     @Override
     protected void innerParseCreateField(ParseContext context, List<Field> fields) throws IOException {
         float value;
-        float boost = this.boost;
+        float boost = this.fieldType.boost();
         if (context.externalValueSet()) {
             Object externalValue = context.externalValue();
             if (externalValue == null) {
@@ -245,7 +269,7 @@ public class FloatFieldMapper extends NumberFieldMapper {
                 value = ((Number) externalValue).floatValue();
             }
             if (context.includeInAll(includeInAll, this)) {
-                context.allEntries().addText(names.fullName(), Float.toString(value), boost);
+                context.allEntries().addText(fieldType.names().fullName(), Float.toString(value), boost);
             }
         } else {
             XContentParser parser = context.parser();
@@ -256,7 +280,7 @@ public class FloatFieldMapper extends NumberFieldMapper {
                 }
                 value = nullValue;
                 if (nullValueAsString != null && (context.includeInAll(includeInAll, this))) {
-                    context.allEntries().addText(names.fullName(), nullValueAsString, boost);
+                    context.allEntries().addText(fieldType.names().fullName(), nullValueAsString, boost);
                 }
             } else if (parser.currentToken() == XContentParser.Token.START_OBJECT) {
                 XContentParser.Token token;
@@ -285,26 +309,26 @@ public class FloatFieldMapper extends NumberFieldMapper {
             } else {
                 value = parser.floatValue(coerce.value());
                 if (context.includeInAll(includeInAll, this)) {
-                    context.allEntries().addText(names.fullName(), parser.text(), boost);
+                    context.allEntries().addText(fieldType.names().fullName(), parser.text(), boost);
                 }
             }
         }
 
         if (fieldType.indexOptions() != IndexOptions.NONE || fieldType.stored()) {
-            CustomFloatNumericField field = new CustomFloatNumericField(this, value, fieldType);
+            CustomFloatNumericField field = new CustomFloatNumericField(this, value, (NumberFieldType)fieldType);
             field.setBoost(boost);
             fields.add(field);
         }
-        if (hasDocValues()) {
+        if (fieldType().hasDocValues()) {
             if (useSortedNumericDocValues) {
-                addDocValue(context, fields, NumericUtils.floatToSortableInt(value));
+                addDocValue(context, fields, floatToSortableInt(value));
             } else {
-                CustomFloatNumericDocValuesField field = (CustomFloatNumericDocValuesField) context.doc().getByKey(names().indexName());
+                CustomFloatNumericDocValuesField field = (CustomFloatNumericDocValuesField) context.doc().getByKey(fieldType().names().indexName());
                 if (field != null) {
                     field.add(value);
                 } else {
-                    field = new CustomFloatNumericDocValuesField(names().indexName(), value);
-                    context.doc().addWithKey(names().indexName(), field);
+                    field = new CustomFloatNumericDocValuesField(fieldType().names().indexName(), value);
+                    context.doc().addWithKey(fieldType().names().indexName(), field);
                 }
             }
         }
@@ -332,8 +356,8 @@ public class FloatFieldMapper extends NumberFieldMapper {
     protected void doXContentBody(XContentBuilder builder, boolean includeDefaults, Params params) throws IOException {
         super.doXContentBody(builder, includeDefaults, params);
 
-        if (includeDefaults || precisionStep != Defaults.PRECISION_STEP_32_BIT) {
-            builder.field("precision_step", precisionStep);
+        if (includeDefaults || fieldType.numericPrecisionStep() != Defaults.PRECISION_STEP_32_BIT) {
+            builder.field("precision_step", fieldType.numericPrecisionStep());
         }
         if (includeDefaults || nullValue != null) {
             builder.field("null_value", nullValue);
@@ -346,22 +370,13 @@ public class FloatFieldMapper extends NumberFieldMapper {
 
     }
 
-    @Override
-    public FieldStats stats(Terms terms, int maxDoc) throws IOException {
-        float minValue = NumericUtils.sortableIntToFloat(NumericUtils.getMinInt(terms));
-        float maxValue = NumericUtils.sortableIntToFloat(NumericUtils.getMaxInt(terms));
-        return new FieldStats.Float(
-                maxDoc, terms.getDocCount(), terms.getSumDocFreq(), terms.getSumTotalTermFreq(), minValue, maxValue
-        );
-    }
-
     public static class CustomFloatNumericField extends CustomNumericField {
 
         private final float number;
 
         private final NumberFieldMapper mapper;
 
-        public CustomFloatNumericField(NumberFieldMapper mapper, float number, FieldType fieldType) {
+        public CustomFloatNumericField(NumberFieldMapper mapper, float number, NumberFieldType fieldType) {
             super(mapper, number, fieldType);
             this.mapper = mapper;
             this.number = number;
@@ -383,12 +398,6 @@ public class FloatFieldMapper extends NumberFieldMapper {
 
     public static class CustomFloatNumericDocValuesField extends CustomNumericDocValuesField {
 
-        public static final FieldType TYPE = new FieldType();
-        static {
-          TYPE.setDocValuesType(DocValuesType.BINARY);
-          TYPE.freeze();
-        }
-
         private final FloatArrayList values;
 
         public CustomFloatNumericDocValuesField(String  name, float value) {
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java
index 5f05e72b4d3..893722d5a0a 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java
@@ -22,7 +22,6 @@ package org.elasticsearch.index.mapper.core;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.Terms;
 import org.apache.lucene.search.ConstantScoreQuery;
@@ -40,15 +39,16 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.Fuzziness;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.analysis.NumericIntegerAnalyzer;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
 import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.query.QueryParseContext;
-import org.elasticsearch.index.similarity.SimilarityProvider;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -67,7 +67,7 @@ public class IntegerFieldMapper extends NumberFieldMapper {
     public static final String CONTENT_TYPE = "integer";
 
     public static class Defaults extends NumberFieldMapper.Defaults {
-        public static final FieldType FIELD_TYPE = new FieldType(NumberFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new IntegerFieldType();
 
         static {
             FIELD_TYPE.freeze();
@@ -81,7 +81,7 @@ public class IntegerFieldMapper extends NumberFieldMapper {
         protected Integer nullValue = Defaults.NULL_VALUE;
 
         public Builder(String name) {
-            super(name, new FieldType(Defaults.FIELD_TYPE), Defaults.PRECISION_STEP_32_BIT);
+            super(name, Defaults.FIELD_TYPE, Defaults.PRECISION_STEP_32_BIT);
             builder = this;
         }
 
@@ -92,13 +92,23 @@ public class IntegerFieldMapper extends NumberFieldMapper {
 
         @Override
         public IntegerFieldMapper build(BuilderContext context) {
-            fieldType.setOmitNorms(fieldType.omitNorms() && boost == 1.0f);
-            IntegerFieldMapper fieldMapper = new IntegerFieldMapper(buildNames(context), fieldType.numericPrecisionStep(), boost, fieldType, docValues,
-                    nullValue, ignoreMalformed(context), coerce(context), similarity, normsLoading, fieldDataSettings, 
+            setupFieldType(context);
+            IntegerFieldMapper fieldMapper = new IntegerFieldMapper(fieldType, docValues,
+                    nullValue, ignoreMalformed(context), coerce(context), fieldDataSettings,
                     context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
             fieldMapper.includeInAll(includeInAll);
             return fieldMapper;
         }
+
+        @Override
+        protected NamedAnalyzer makeNumberAnalyzer(int precisionStep) {
+            return NumericIntegerAnalyzer.buildNamedAnalyzer(precisionStep);
+        }
+
+        @Override
+        protected int maxPrecisionStep() {
+            return 32;
+        }
     }
 
     public static class TypeParser implements Mapper.TypeParser {
@@ -122,23 +132,83 @@ public class IntegerFieldMapper extends NumberFieldMapper {
         }
     }
 
+    public static class IntegerFieldType extends NumberFieldType {
+
+        public IntegerFieldType() {}
+
+        protected IntegerFieldType(IntegerFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public NumberFieldType clone() {
+            return new IntegerFieldType(this);
+        }
+
+        @Override
+        public Integer value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            if (value instanceof Number) {
+                return ((Number) value).intValue();
+            }
+            if (value instanceof BytesRef) {
+                return Numbers.bytesToInt((BytesRef) value);
+            }
+            return Integer.parseInt(value.toString());
+        }
+
+        @Override
+        public BytesRef indexedValueForSearch(Object value) {
+            BytesRefBuilder bytesRef = new BytesRefBuilder();
+            NumericUtils.intToPrefixCoded(parseValue(value), 0, bytesRef); // 0 because of exact match
+            return bytesRef.get();
+        }
+
+        @Override
+        public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
+            return NumericRangeQuery.newIntRange(names().indexName(), numericPrecisionStep(),
+                lowerTerm == null ? null : parseValue(lowerTerm),
+                upperTerm == null ? null : parseValue(upperTerm),
+                includeLower, includeUpper);
+        }
+
+        @Override
+        public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
+            int iValue = Integer.parseInt(value);
+            int iSim = fuzziness.asInt();
+            return NumericRangeQuery.newIntRange(names().indexName(), numericPrecisionStep(),
+                iValue - iSim,
+                iValue + iSim,
+                true, true);
+        }
+
+        @Override
+        public FieldStats stats(Terms terms, int maxDoc) throws IOException {
+            long minValue = NumericUtils.getMinInt(terms);
+            long maxValue = NumericUtils.getMaxInt(terms);
+            return new FieldStats.Long(
+                maxDoc, terms.getDocCount(), terms.getSumDocFreq(), terms.getSumTotalTermFreq(), minValue, maxValue
+            );
+        }
+    }
+
     private Integer nullValue;
 
     private String nullValueAsString;
 
-    protected IntegerFieldMapper(Names names, int precisionStep, float boost, FieldType fieldType, Boolean docValues,
+    protected IntegerFieldMapper(MappedFieldType fieldType, Boolean docValues,
                                  Integer nullValue, Explicit<Boolean> ignoreMalformed, Explicit<Boolean> coerce,
-                                 SimilarityProvider similarity, Loading normsLoading, @Nullable Settings fieldDataSettings,
+                                 @Nullable Settings fieldDataSettings,
                                  Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
-        super(names, precisionStep, boost, fieldType, docValues, ignoreMalformed, coerce,
-                NumericIntegerAnalyzer.buildNamedAnalyzer(precisionStep), NumericIntegerAnalyzer.buildNamedAnalyzer(Integer.MAX_VALUE),
-                similarity, normsLoading, fieldDataSettings, indexSettings, multiFields, copyTo);
+        super(fieldType, docValues, ignoreMalformed, coerce, fieldDataSettings, indexSettings, multiFields, copyTo);
         this.nullValue = nullValue;
         this.nullValueAsString = nullValue == null ? null : nullValue.toString();
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -147,33 +217,9 @@ public class IntegerFieldMapper extends NumberFieldMapper {
         return new FieldDataType("int");
     }
 
-    @Override
-    protected int maxPrecisionStep() {
-        return 32;
-    }
 
-    @Override
-    public Integer value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).intValue();
-        }
-        if (value instanceof BytesRef) {
-            return Numbers.bytesToInt((BytesRef) value);
-        }
-        return Integer.parseInt(value.toString());
-    }
 
-    @Override
-    public BytesRef indexedValueForSearch(Object value) {
-        BytesRefBuilder bytesRef = new BytesRefBuilder();
-        NumericUtils.intToPrefixCoded(parseValue(value), 0, bytesRef); // 0 because of exact match
-        return bytesRef.get();
-    }
-
-    private int parseValue(Object value) {
+    private static int parseValue(Object value) {
         if (value instanceof Number) {
             return ((Number) value).intValue();
         }
@@ -183,24 +229,6 @@ public class IntegerFieldMapper extends NumberFieldMapper {
         return Integer.parseInt(value.toString());
     }
 
-    @Override
-    public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
-        int iValue = Integer.parseInt(value);
-        int iSim = fuzziness.asInt();
-        return NumericRangeQuery.newIntRange(names.indexName(), precisionStep,
-                iValue - iSim,
-                iValue + iSim,
-                true, true);
-    }
-
-    @Override
-    public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
-        return NumericRangeQuery.newIntRange(names.indexName(), precisionStep,
-                lowerTerm == null ? null : parseValue(lowerTerm),
-                upperTerm == null ? null : parseValue(upperTerm),
-                includeLower, includeUpper);
-    }
-
     @Override
     public Query nullValueFilter() {
         if (nullValue == null) {
@@ -217,7 +245,7 @@ public class IntegerFieldMapper extends NumberFieldMapper {
     @Override
     protected void innerParseCreateField(ParseContext context, List<Field> fields) throws IOException {
         int value;
-        float boost = this.boost;
+        float boost = this.fieldType.boost();
         if (context.externalValueSet()) {
             Object externalValue = context.externalValue();
             if (externalValue == null) {
@@ -239,7 +267,7 @@ public class IntegerFieldMapper extends NumberFieldMapper {
                 value = ((Number) externalValue).intValue();
             }
             if (context.includeInAll(includeInAll, this)) {
-                context.allEntries().addText(names.fullName(), Integer.toString(value), boost);
+                context.allEntries().addText(fieldType.names().fullName(), Integer.toString(value), boost);
             }
         } else {
             XContentParser parser = context.parser();
@@ -250,7 +278,7 @@ public class IntegerFieldMapper extends NumberFieldMapper {
                 }
                 value = nullValue;
                 if (nullValueAsString != null && (context.includeInAll(includeInAll, this))) {
-                    context.allEntries().addText(names.fullName(), nullValueAsString, boost);
+                    context.allEntries().addText(fieldType.names().fullName(), nullValueAsString, boost);
                 }
             } else if (parser.currentToken() == XContentParser.Token.START_OBJECT) {
                 XContentParser.Token token;
@@ -279,7 +307,7 @@ public class IntegerFieldMapper extends NumberFieldMapper {
             } else {
                 value = parser.intValue(coerce.value());
                 if (context.includeInAll(includeInAll, this)) {
-                    context.allEntries().addText(names.fullName(), parser.text(), boost);
+                    context.allEntries().addText(fieldType.names().fullName(), parser.text(), boost);
                 }
             }
         }
@@ -288,11 +316,11 @@ public class IntegerFieldMapper extends NumberFieldMapper {
 
     protected void addIntegerFields(ParseContext context, List<Field> fields, int value, float boost) {
         if (fieldType.indexOptions() != IndexOptions.NONE || fieldType.stored()) {
-            CustomIntegerNumericField field = new CustomIntegerNumericField(this, value, fieldType);
+            CustomIntegerNumericField field = new CustomIntegerNumericField(this, value, (NumberFieldType)fieldType);
             field.setBoost(boost);
             fields.add(field);
         }
-        if (hasDocValues()) {
+        if (fieldType().hasDocValues()) {
             addDocValue(context, fields, value);
         }
     }
@@ -322,8 +350,8 @@ public class IntegerFieldMapper extends NumberFieldMapper {
     protected void doXContentBody(XContentBuilder builder, boolean includeDefaults, Params params) throws IOException {
         super.doXContentBody(builder, includeDefaults, params);
 
-        if (includeDefaults || precisionStep != Defaults.PRECISION_STEP_32_BIT) {
-            builder.field("precision_step", precisionStep);
+        if (includeDefaults || fieldType.numericPrecisionStep() != Defaults.PRECISION_STEP_32_BIT) {
+            builder.field("precision_step", fieldType.numericPrecisionStep());
         }
         if (includeDefaults || nullValue != null) {
             builder.field("null_value", nullValue);
@@ -336,22 +364,13 @@ public class IntegerFieldMapper extends NumberFieldMapper {
 
     }
 
-    @Override
-    public FieldStats stats(Terms terms, int maxDoc) throws IOException {
-        long minValue = NumericUtils.getMinInt(terms);
-        long maxValue = NumericUtils.getMaxInt(terms);
-        return new FieldStats.Long(
-                maxDoc, terms.getDocCount(), terms.getSumDocFreq(), terms.getSumTotalTermFreq(), minValue, maxValue
-        );
-    }
-
     public static class CustomIntegerNumericField extends CustomNumericField {
 
         private final int number;
 
         private final NumberFieldMapper mapper;
 
-        public CustomIntegerNumericField(NumberFieldMapper mapper, int number, FieldType fieldType) {
+        public CustomIntegerNumericField(NumberFieldMapper mapper, int number, MappedFieldType fieldType) {
             super(mapper, number, fieldType);
             this.mapper = mapper;
             this.number = number;
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java
index cd9b9ca5df1..ccf20f976f1 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/LongFieldMapper.java
@@ -22,7 +22,6 @@ package org.elasticsearch.index.mapper.core;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.Terms;
 import org.apache.lucene.search.ConstantScoreQuery;
@@ -40,15 +39,16 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.Fuzziness;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.analysis.NumericLongAnalyzer;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
 import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.query.QueryParseContext;
-import org.elasticsearch.index.similarity.SimilarityProvider;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -67,7 +67,7 @@ public class LongFieldMapper extends NumberFieldMapper {
     public static final String CONTENT_TYPE = "long";
 
     public static class Defaults extends NumberFieldMapper.Defaults {
-        public static final FieldType FIELD_TYPE = new FieldType(NumberFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new LongFieldType();
 
         static {
             FIELD_TYPE.freeze();
@@ -81,7 +81,7 @@ public class LongFieldMapper extends NumberFieldMapper {
         protected Long nullValue = Defaults.NULL_VALUE;
 
         public Builder(String name) {
-            super(name, new FieldType(Defaults.FIELD_TYPE), Defaults.PRECISION_STEP_64_BIT);
+            super(name, Defaults.FIELD_TYPE, Defaults.PRECISION_STEP_64_BIT);
             builder = this;
         }
 
@@ -92,13 +92,22 @@ public class LongFieldMapper extends NumberFieldMapper {
 
         @Override
         public LongFieldMapper build(BuilderContext context) {
-            fieldType.setOmitNorms(fieldType.omitNorms() && boost == 1.0f);
-            LongFieldMapper fieldMapper = new LongFieldMapper(buildNames(context), fieldType.numericPrecisionStep(), boost, fieldType, docValues, nullValue,
-                    ignoreMalformed(context), coerce(context), similarity, normsLoading, 
-                    fieldDataSettings, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
+            setupFieldType(context);
+            LongFieldMapper fieldMapper = new LongFieldMapper(fieldType, docValues, nullValue,
+                    ignoreMalformed(context), coerce(context), fieldDataSettings, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
             fieldMapper.includeInAll(includeInAll);
             return fieldMapper;
         }
+
+        @Override
+        protected NamedAnalyzer makeNumberAnalyzer(int precisionStep) {
+            return NumericLongAnalyzer.buildNamedAnalyzer(precisionStep);
+        }
+
+        @Override
+        protected int maxPrecisionStep() {
+            return 64;
+        }
     }
 
     public static class TypeParser implements Mapper.TypeParser {
@@ -122,23 +131,83 @@ public class LongFieldMapper extends NumberFieldMapper {
         }
     }
 
+    public static class LongFieldType extends NumberFieldType {
+
+        public LongFieldType() {}
+
+        protected LongFieldType(LongFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public NumberFieldType clone() {
+            return new LongFieldType(this);
+        }
+
+        @Override
+        public Long value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            if (value instanceof Number) {
+                return ((Number) value).longValue();
+            }
+            if (value instanceof BytesRef) {
+                return Numbers.bytesToLong((BytesRef) value);
+            }
+            return Long.parseLong(value.toString());
+        }
+
+        @Override
+        public BytesRef indexedValueForSearch(Object value) {
+            BytesRefBuilder bytesRef = new BytesRefBuilder();
+            NumericUtils.longToPrefixCoded(parseLongValue(value), 0, bytesRef);  // 0 because of exact match
+            return bytesRef.get();
+        }
+
+        @Override
+        public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
+            return NumericRangeQuery.newLongRange(names().indexName(), numericPrecisionStep(),
+                lowerTerm == null ? null : parseLongValue(lowerTerm),
+                upperTerm == null ? null : parseLongValue(upperTerm),
+                includeLower, includeUpper);
+        }
+
+        @Override
+        public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
+            long iValue = Long.parseLong(value);
+            final long iSim = fuzziness.asLong();
+            return NumericRangeQuery.newLongRange(names().indexName(), numericPrecisionStep(),
+                iValue - iSim,
+                iValue + iSim,
+                true, true);
+        }
+
+        @Override
+        public FieldStats stats(Terms terms, int maxDoc) throws IOException {
+            long minValue = NumericUtils.getMinLong(terms);
+            long maxValue = NumericUtils.getMaxLong(terms);
+            return new FieldStats.Long(
+                maxDoc, terms.getDocCount(), terms.getSumDocFreq(), terms.getSumTotalTermFreq(), minValue, maxValue
+            );
+        }
+    }
+
     private Long nullValue;
 
     private String nullValueAsString;
 
-    protected LongFieldMapper(Names names, int precisionStep, float boost, FieldType fieldType, Boolean docValues,
+    protected LongFieldMapper(MappedFieldType fieldType, Boolean docValues,
                               Long nullValue, Explicit<Boolean> ignoreMalformed, Explicit<Boolean> coerce,
-                              SimilarityProvider similarity, Loading normsLoading, @Nullable Settings fieldDataSettings,
+                              @Nullable Settings fieldDataSettings,
                               Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
-        super(names, precisionStep, boost, fieldType, docValues, ignoreMalformed, coerce,
-                NumericLongAnalyzer.buildNamedAnalyzer(precisionStep), NumericLongAnalyzer.buildNamedAnalyzer(Integer.MAX_VALUE),
-                similarity, normsLoading, fieldDataSettings, indexSettings, multiFields, copyTo);
+        super(fieldType, docValues, ignoreMalformed, coerce, fieldDataSettings, indexSettings, multiFields, copyTo);
         this.nullValue = nullValue;
         this.nullValueAsString = nullValue == null ? null : nullValue.toString();
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -147,50 +216,6 @@ public class LongFieldMapper extends NumberFieldMapper {
         return new FieldDataType("long");
     }
 
-    @Override
-    protected int maxPrecisionStep() {
-        return 64;
-    }
-
-    @Override
-    public Long value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).longValue();
-        }
-        if (value instanceof BytesRef) {
-            return Numbers.bytesToLong((BytesRef) value);
-        }
-        return Long.parseLong(value.toString());
-    }
-
-    @Override
-    public BytesRef indexedValueForSearch(Object value) {
-        BytesRefBuilder bytesRef = new BytesRefBuilder();
-        NumericUtils.longToPrefixCoded(parseLongValue(value), 0, bytesRef);  // 0 because of exact match
-        return bytesRef.get();
-    }
-
-    @Override
-    public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
-        long iValue = Long.parseLong(value);
-        final long iSim = fuzziness.asLong();
-        return NumericRangeQuery.newLongRange(names.indexName(), precisionStep,
-                iValue - iSim,
-                iValue + iSim,
-                true, true);
-    }
-
-    @Override
-    public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
-        return NumericRangeQuery.newLongRange(names.indexName(), precisionStep,
-                lowerTerm == null ? null : parseLongValue(lowerTerm),
-                upperTerm == null ? null : parseLongValue(upperTerm),
-                includeLower, includeUpper);
-    }
-
     @Override
     public Query nullValueFilter() {
         if (nullValue == null) {
@@ -207,7 +232,7 @@ public class LongFieldMapper extends NumberFieldMapper {
     @Override
     protected void innerParseCreateField(ParseContext context, List<Field> fields) throws IOException {
         long value;
-        float boost = this.boost;
+        float boost = this.fieldType.boost();
         if (context.externalValueSet()) {
             Object externalValue = context.externalValue();
             if (externalValue == null) {
@@ -229,7 +254,7 @@ public class LongFieldMapper extends NumberFieldMapper {
                 value = ((Number) externalValue).longValue();
             }
             if (context.includeInAll(includeInAll, this)) {
-                context.allEntries().addText(names.fullName(), Long.toString(value), boost);
+                context.allEntries().addText(fieldType.names().fullName(), Long.toString(value), boost);
             }
         } else {
             XContentParser parser = context.parser();
@@ -240,7 +265,7 @@ public class LongFieldMapper extends NumberFieldMapper {
                 }
                 value = nullValue;
                 if (nullValueAsString != null && (context.includeInAll(includeInAll, this))) {
-                    context.allEntries().addText(names.fullName(), nullValueAsString, boost);
+                    context.allEntries().addText(fieldType.names().fullName(), nullValueAsString, boost);
                 }
             } else if (parser.currentToken() == XContentParser.Token.START_OBJECT) {
                 XContentParser.Token token;
@@ -269,16 +294,16 @@ public class LongFieldMapper extends NumberFieldMapper {
             } else {
                 value = parser.longValue(coerce.value());
                 if (context.includeInAll(includeInAll, this)) {
-                    context.allEntries().addText(names.fullName(), parser.text(), boost);
+                    context.allEntries().addText(fieldType.names().fullName(), parser.text(), boost);
                 }
             }
         }
         if (fieldType.indexOptions() != IndexOptions.NONE || fieldType.stored()) {
-            CustomLongNumericField field = new CustomLongNumericField(this, value, fieldType);
+            CustomLongNumericField field = new CustomLongNumericField(this, value, (NumberFieldType)fieldType);
             field.setBoost(boost);
             fields.add(field);
         }
-        if (hasDocValues()) {
+        if (fieldType().hasDocValues()) {
             addDocValue(context, fields, value);
         }
     }
@@ -304,8 +329,8 @@ public class LongFieldMapper extends NumberFieldMapper {
     protected void doXContentBody(XContentBuilder builder, boolean includeDefaults, Params params) throws IOException {
         super.doXContentBody(builder, includeDefaults, params);
 
-        if (includeDefaults || precisionStep != Defaults.PRECISION_STEP_64_BIT) {
-            builder.field("precision_step", precisionStep);
+        if (includeDefaults || fieldType.numericPrecisionStep() != Defaults.PRECISION_STEP_64_BIT) {
+            builder.field("precision_step", fieldType.numericPrecisionStep());
         }
         if (includeDefaults || nullValue != null) {
             builder.field("null_value", nullValue);
@@ -317,22 +342,13 @@ public class LongFieldMapper extends NumberFieldMapper {
         }
     }
 
-    @Override
-    public FieldStats stats(Terms terms, int maxDoc) throws IOException {
-        long minValue = NumericUtils.getMinLong(terms);
-        long maxValue = NumericUtils.getMaxLong(terms);
-        return new FieldStats.Long(
-                maxDoc, terms.getDocCount(), terms.getSumDocFreq(), terms.getSumTotalTermFreq(), minValue, maxValue
-        );
-    }
-
     public static class CustomLongNumericField extends CustomNumericField {
 
         private final long number;
 
         private final NumberFieldMapper mapper;
 
-        public CustomLongNumericField(NumberFieldMapper mapper, long number, FieldType fieldType) {
+        public CustomLongNumericField(NumberFieldMapper mapper, long number, MappedFieldType fieldType) {
             super(mapper, number, fieldType);
             this.mapper = mapper;
             this.number = number;
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapper.java
index 7c9c920a3c6..9401081a79f 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapper.java
@@ -20,13 +20,16 @@
 package org.elasticsearch.index.mapper.core;
 
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.Version;
 import org.elasticsearch.common.Explicit;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.hash.MurmurHash3;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.index.analysis.NamedAnalyzer;
+import org.elasticsearch.index.analysis.NumericDateAnalyzer;
+import org.elasticsearch.index.analysis.NumericLongAnalyzer;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.ParseContext;
@@ -36,7 +39,6 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
-import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeBooleanValue;
 import static org.elasticsearch.index.mapper.MapperBuilders.murmur3Field;
 import static org.elasticsearch.index.mapper.core.TypeParsers.parseNumberField;
 
@@ -50,20 +52,30 @@ public class Murmur3FieldMapper extends LongFieldMapper {
     public static class Builder extends NumberFieldMapper.Builder<Builder, Murmur3FieldMapper> {
 
         public Builder(String name) {
-            super(name, new FieldType(Defaults.FIELD_TYPE), Integer.MAX_VALUE);
+            super(name, Defaults.FIELD_TYPE, Integer.MAX_VALUE);
             builder = this;
             builder.precisionStep(Integer.MAX_VALUE);
         }
 
         @Override
         public Murmur3FieldMapper build(BuilderContext context) {
-            fieldType.setOmitNorms(fieldType.omitNorms() && boost == 1.0f);
-            Murmur3FieldMapper fieldMapper = new Murmur3FieldMapper(buildNames(context), fieldType.numericPrecisionStep(), boost, fieldType, docValues, null,
-                    ignoreMalformed(context), coerce(context), similarity, normsLoading,
+            setupFieldType(context);
+            Murmur3FieldMapper fieldMapper = new Murmur3FieldMapper(fieldType, docValues, null,
+                    ignoreMalformed(context), coerce(context),
                     fieldDataSettings, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
             fieldMapper.includeInAll(includeInAll);
             return fieldMapper;
         }
+
+        @Override
+        protected NamedAnalyzer makeNumberAnalyzer(int precisionStep) {
+            return NumericLongAnalyzer.buildNamedAnalyzer(precisionStep);
+        }
+
+        @Override
+        protected int maxPrecisionStep() {
+            return 64;
+        }
     }
 
     public static class TypeParser implements Mapper.TypeParser {
@@ -92,13 +104,12 @@ public class Murmur3FieldMapper extends LongFieldMapper {
         }
     }
 
-    protected Murmur3FieldMapper(Names names, int precisionStep, float boost, FieldType fieldType, Boolean docValues,
+    protected Murmur3FieldMapper(MappedFieldType fieldType, Boolean docValues,
             Long nullValue, Explicit<Boolean> ignoreMalformed, Explicit<Boolean> coerce,
-            SimilarityProvider similarity, Loading normsLoading, @Nullable Settings fieldDataSettings,
+            @Nullable Settings fieldDataSettings,
             Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
-        super(names, precisionStep, boost, fieldType, docValues, nullValue, ignoreMalformed, coerce,
-                similarity, normsLoading, fieldDataSettings,
-                indexSettings, multiFields, copyTo);
+        super(fieldType, docValues, nullValue, ignoreMalformed, coerce,
+                fieldDataSettings, indexSettings, multiFields, copyTo);
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java
index ecb2e742e79..9d2dddb3db0 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/NumberFieldMapper.java
@@ -31,9 +31,7 @@ import org.apache.lucene.index.DocValuesType;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.index.IndexableFieldType;
-import org.apache.lucene.index.Term;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.store.ByteArrayDataOutput;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.Version;
@@ -45,14 +43,13 @@ import org.elasticsearch.common.util.ByteUtils;
 import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
 import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.mapper.internal.AllFieldMapper;
-import org.elasticsearch.index.query.QueryParseContext;
-import org.elasticsearch.index.similarity.SimilarityProvider;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -70,16 +67,6 @@ public abstract class NumberFieldMapper extends AbstractFieldMapper implements A
         public static final int PRECISION_STEP_32_BIT = 8;                 // 4tpv
         public static final int PRECISION_STEP_64_BIT = 16;                // 4tpv
 
-        public static final FieldType FIELD_TYPE = new FieldType(AbstractFieldMapper.Defaults.FIELD_TYPE);
-
-        static {
-            FIELD_TYPE.setTokenized(false);
-            FIELD_TYPE.setOmitNorms(true);
-            FIELD_TYPE.setIndexOptions(IndexOptions.DOCS);
-            FIELD_TYPE.setStoreTermVectors(false);
-            FIELD_TYPE.freeze();
-        }
-
         public static final Explicit<Boolean> IGNORE_MALFORMED = new Explicit<>(false, false);
         public static final Explicit<Boolean> COERCE = new Explicit<>(true, false);
     }
@@ -90,9 +77,9 @@ public abstract class NumberFieldMapper extends AbstractFieldMapper implements A
 
         private Boolean coerce;
         
-        public Builder(String name, FieldType fieldType, int defaultPrecisionStep) {
+        public Builder(String name, MappedFieldType fieldType, int defaultPrecisionStep) {
             super(name, fieldType);
-            fieldType.setNumericPrecisionStep(defaultPrecisionStep);
+            this.fieldType.setNumericPrecisionStep(defaultPrecisionStep);
         }
 
         public T precisionStep(int precisionStep) {
@@ -129,10 +116,60 @@ public abstract class NumberFieldMapper extends AbstractFieldMapper implements A
             }
             return Defaults.COERCE;
         }
-        
+
+        protected void setupFieldType(BuilderContext context) {
+            super.setupFieldType(context);
+            fieldType.setOmitNorms(fieldType.omitNorms() && fieldType.boost() == 1.0f);
+            int precisionStep = fieldType.numericPrecisionStep();
+            if (precisionStep <= 0 || precisionStep >= maxPrecisionStep()) {
+                fieldType.setNumericPrecisionStep(Integer.MAX_VALUE);
+            }
+            fieldType.setIndexAnalyzer(makeNumberAnalyzer(fieldType.numericPrecisionStep()));
+            fieldType.setSearchAnalyzer(makeNumberAnalyzer(Integer.MAX_VALUE));
+        }
+
+        protected abstract NamedAnalyzer makeNumberAnalyzer(int precisionStep);
+
+        protected abstract int maxPrecisionStep();
     }
 
-    protected int precisionStep;
+    public static abstract class NumberFieldType extends MappedFieldType {
+
+        public NumberFieldType() {
+            super(AbstractFieldMapper.Defaults.FIELD_TYPE);
+            setTokenized(false);
+            setOmitNorms(true);
+            setIndexOptions(IndexOptions.DOCS);
+            setStoreTermVectors(false);
+        }
+
+        protected NumberFieldType(NumberFieldType ref) {
+            super(ref);
+        }
+
+        public abstract NumberFieldType clone();
+
+        @Override
+        public abstract Object value(Object value);
+
+        @Override
+        public Object valueForSearch(Object value) {
+            return value(value);
+        }
+
+        @Override
+        public abstract Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions);
+
+        @Override
+        public boolean useTermQueryWithQueryString() {
+            return true;
+        }
+
+        @Override
+        public boolean isNumeric() {
+            return true;
+        }
+    }
 
     protected Boolean includeInAll;
 
@@ -151,7 +188,7 @@ public abstract class NumberFieldMapper extends AbstractFieldMapper implements A
     private ThreadLocal<NumericTokenStream> tokenStream = new ThreadLocal<NumericTokenStream>() {
         @Override
         protected NumericTokenStream initialValue() {
-            return new NumericTokenStream(precisionStep);
+            return new NumericTokenStream(fieldType.numericPrecisionStep());
         }
     };
 
@@ -183,23 +220,14 @@ public abstract class NumberFieldMapper extends AbstractFieldMapper implements A
         }
     };
 
-    protected NumberFieldMapper(Names names, int precisionStep, float boost, FieldType fieldType, Boolean docValues,
-                                Explicit<Boolean> ignoreMalformed, Explicit<Boolean> coerce, NamedAnalyzer indexAnalyzer,
-                                NamedAnalyzer searchAnalyzer, SimilarityProvider similarity,
-                                Loading normsLoading, @Nullable Settings fieldDataSettings, Settings indexSettings,
+    protected NumberFieldMapper(MappedFieldType fieldType, Boolean docValues,
+                                Explicit<Boolean> ignoreMalformed, Explicit<Boolean> coerce, @Nullable Settings fieldDataSettings, Settings indexSettings,
                                 MultiFields multiFields, CopyTo copyTo) {
         // LUCENE 4 UPGRADE: Since we can't do anything before the super call, we have to push the boost check down to subclasses
-        super(names, boost, fieldType, docValues, indexAnalyzer, searchAnalyzer,
-                similarity, normsLoading, fieldDataSettings, indexSettings, multiFields, copyTo);
-        if (precisionStep <= 0 || precisionStep >= maxPrecisionStep()) {
-            this.precisionStep = Integer.MAX_VALUE;
-        } else {
-            this.precisionStep = precisionStep;
-        }
+        super(fieldType, docValues, fieldDataSettings, indexSettings, multiFields, copyTo);
         this.ignoreMalformed = ignoreMalformed;
         this.coerce = coerce;
-        Version v = Version.indexCreated(indexSettings);
-        this.useSortedNumericDocValues = v.onOrAfter(Version.V_1_4_0_Beta1);
+        this.useSortedNumericDocValues = Version.indexCreated(indexSettings).onOrAfter(Version.V_1_4_0_Beta1);
     }
 
     @Override
@@ -221,12 +249,6 @@ public abstract class NumberFieldMapper extends AbstractFieldMapper implements A
         includeInAll = null;
     }
 
-    protected abstract int maxPrecisionStep();
-
-    public int precisionStep() {
-        return this.precisionStep;
-    }
-
     @Override
     protected void parseCreateField(ParseContext context, List<Field> fields) throws IOException {
         RuntimeException e = null;
@@ -247,41 +269,22 @@ public abstract class NumberFieldMapper extends AbstractFieldMapper implements A
 
     protected final void addDocValue(ParseContext context, List<Field> fields, long value) {
         if (useSortedNumericDocValues) {
-            fields.add(new SortedNumericDocValuesField(names().indexName(), value));
+            fields.add(new SortedNumericDocValuesField(fieldType().names().indexName(), value));
         } else {
-            CustomLongNumericDocValuesField field = (CustomLongNumericDocValuesField) context.doc().getByKey(names().indexName());
+            CustomLongNumericDocValuesField field = (CustomLongNumericDocValuesField) context.doc().getByKey(fieldType().names().indexName());
             if (field != null) {
                 field.add(value);
             } else {
-                field = new CustomLongNumericDocValuesField(names().indexName(), value);
-                context.doc().addWithKey(names().indexName(), field);
+                field = new CustomLongNumericDocValuesField(fieldType().names().indexName(), value);
+                context.doc().addWithKey(fieldType().names().indexName(), field);
             }
         }
     }
 
-    /**
-     * Use the field query created here when matching on numbers.
-     */
-    @Override
-    public boolean useTermQueryWithQueryString() {
-        return true;
-    }
-
-    @Override
-    public final Query termQuery(Object value, @Nullable QueryParseContext context) {
-        return new TermQuery(new Term(names.indexName(), indexedValueForSearch(value)));
-    }
-
-    @Override
-    public abstract Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context);
-
-    @Override
-    public abstract Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions);
-
     /**
      * Converts an object value into a double
      */
-    public double parseDoubleValue(Object value) {
+    public static double parseDoubleValue(Object value) {
         if (value instanceof Number) {
             return ((Number) value).doubleValue();
         }
@@ -296,7 +299,7 @@ public abstract class NumberFieldMapper extends AbstractFieldMapper implements A
     /**
      * Converts an object value into a long
      */
-    public long parseLongValue(Object value) {
+    public static long parseLongValue(Object value) {
         if (value instanceof Number) {
             return ((Number) value).longValue();
         }
@@ -308,16 +311,6 @@ public abstract class NumberFieldMapper extends AbstractFieldMapper implements A
         return Long.parseLong(value.toString());
     }
 
-    /**
-     * Override the default behavior (to return the string, and return the actual Number instance).
-     *
-     * @param value
-     */
-    @Override
-    public Object valueForSearch(Object value) {
-        return value(value);
-    }
-
     @Override
     public void merge(Mapper mergeWith, MergeResult mergeResult) throws MergeMappingException {
         super.merge(mergeWith, mergeResult);
@@ -326,7 +319,9 @@ public abstract class NumberFieldMapper extends AbstractFieldMapper implements A
         }
         if (!mergeResult.simulate()) {
             NumberFieldMapper nfmMergeWith = (NumberFieldMapper) mergeWith;
-            this.precisionStep = nfmMergeWith.precisionStep;
+            this.fieldType = this.fieldType.clone();
+            this.fieldType.setNumericPrecisionStep(nfmMergeWith.fieldType.numericPrecisionStep());
+            this.fieldType.freeze();
             this.includeInAll = nfmMergeWith.includeInAll;
             if (nfmMergeWith.ignoreMalformed.explicit()) {
                 this.ignoreMalformed = nfmMergeWith.ignoreMalformed;
@@ -342,13 +337,13 @@ public abstract class NumberFieldMapper extends AbstractFieldMapper implements A
     }
 
     protected NumericTokenStream popCachedStream() {
-        if (precisionStep == 4) {
+        if (fieldType.numericPrecisionStep() == 4) {
             return tokenStream4.get();
-        } else if (precisionStep == 8) {
+        } else if (fieldType.numericPrecisionStep() == 8) {
             return tokenStream8.get();
-        } else if (precisionStep == 16) {
+        } else if (fieldType.numericPrecisionStep() == 16) {
             return tokenStream16.get();
-        } else if (precisionStep == Integer.MAX_VALUE) {
+        } else if (fieldType.numericPrecisionStep() == Integer.MAX_VALUE) {
             return tokenStreamMax.get();
         }
         return tokenStream.get();
@@ -359,8 +354,8 @@ public abstract class NumberFieldMapper extends AbstractFieldMapper implements A
 
         protected final NumberFieldMapper mapper;
 
-        public CustomNumericField(NumberFieldMapper mapper, Number value, FieldType fieldType) {
-            super(mapper.names().indexName(), fieldType);
+        public CustomNumericField(NumberFieldMapper mapper, Number value, MappedFieldType fieldType) {
+            super(mapper.fieldType().names().indexName(), fieldType);
             this.mapper = mapper;
             if (value != null) {
                 this.fieldsData = value;
@@ -431,13 +426,8 @@ public abstract class NumberFieldMapper extends AbstractFieldMapper implements A
 
     }
 
-    public static class CustomLongNumericDocValuesField extends CustomNumericDocValuesField {
 
-        public static final FieldType TYPE = new FieldType();
-        static {
-          TYPE.setDocValuesType(DocValuesType.BINARY);
-          TYPE.freeze();
-        }
+    public static class CustomLongNumericDocValuesField extends CustomNumericDocValuesField {
 
         private final LongArrayList values;
 
@@ -481,9 +471,4 @@ public abstract class NumberFieldMapper extends AbstractFieldMapper implements A
             builder.field("coerce", coerce.value());
         }
     }
-
-    @Override
-    public boolean isNumeric() {
-        return true;
-    }
 }
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java
index f195862ac74..382f30eab40 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java
@@ -22,7 +22,6 @@ package org.elasticsearch.index.mapper.core;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.Terms;
 import org.apache.lucene.search.ConstantScoreQuery;
@@ -43,13 +42,13 @@ import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.analysis.NumericIntegerAnalyzer;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
 import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.query.QueryParseContext;
-import org.elasticsearch.index.similarity.SimilarityProvider;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -69,7 +68,7 @@ public class ShortFieldMapper extends NumberFieldMapper {
     public static final int DEFAULT_PRECISION_STEP = 8;
 
     public static class Defaults extends NumberFieldMapper.Defaults {
-        public static final FieldType FIELD_TYPE = new FieldType(NumberFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new ShortFieldType();
 
         static {
             FIELD_TYPE.freeze();
@@ -83,7 +82,7 @@ public class ShortFieldMapper extends NumberFieldMapper {
         protected Short nullValue = Defaults.NULL_VALUE;
 
         public Builder(String name) {
-            super(name, new FieldType(Defaults.FIELD_TYPE), DEFAULT_PRECISION_STEP);
+            super(name, Defaults.FIELD_TYPE, DEFAULT_PRECISION_STEP);
             builder = this;
         }
 
@@ -94,13 +93,24 @@ public class ShortFieldMapper extends NumberFieldMapper {
 
         @Override
         public ShortFieldMapper build(BuilderContext context) {
-            fieldType.setOmitNorms(fieldType.omitNorms() && boost == 1.0f);
-            ShortFieldMapper fieldMapper = new ShortFieldMapper(buildNames(context), fieldType.numericPrecisionStep(), boost, fieldType, docValues, nullValue,
-                    ignoreMalformed(context), coerce(context), similarity, normsLoading, fieldDataSettings, 
+            setupFieldType(context);
+            ShortFieldMapper fieldMapper = new ShortFieldMapper(fieldType, docValues, nullValue,
+                    ignoreMalformed(context), coerce(context), fieldDataSettings,
                     context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
             fieldMapper.includeInAll(includeInAll);
             return fieldMapper;
         }
+
+        @Override
+        protected NamedAnalyzer makeNumberAnalyzer(int precisionStep) {
+            String name = precisionStep == Integer.MAX_VALUE ? "_short/max" : ("_short/" + precisionStep);
+            return new NamedAnalyzer(name, new NumericIntegerAnalyzer(precisionStep));
+        }
+
+        @Override
+        protected int maxPrecisionStep() {
+            return 32;
+        }
     }
 
     public static class TypeParser implements Mapper.TypeParser {
@@ -124,23 +134,84 @@ public class ShortFieldMapper extends NumberFieldMapper {
         }
     }
 
+    public static class ShortFieldType extends NumberFieldType {
+
+        public ShortFieldType() {}
+
+        protected ShortFieldType(ShortFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public NumberFieldType clone() {
+            return new ShortFieldType(this);
+        }
+
+        @Override
+        public Short value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            if (value instanceof Number) {
+                return ((Number) value).shortValue();
+            }
+            if (value instanceof BytesRef) {
+                return Numbers.bytesToShort((BytesRef) value);
+            }
+            return Short.parseShort(value.toString());
+        }
+
+        @Override
+        public BytesRef indexedValueForSearch(Object value) {
+            BytesRefBuilder bytesRef = new BytesRefBuilder();
+            NumericUtils.intToPrefixCoded(parseValue(value), 0, bytesRef);  // 0 because of exact match
+            return bytesRef.get();
+        }
+
+        @Override
+        public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
+            return NumericRangeQuery.newIntRange(names().indexName(), numericPrecisionStep(),
+                lowerTerm == null ? null : (int)parseValue(lowerTerm),
+                upperTerm == null ? null : (int)parseValue(upperTerm),
+                includeLower, includeUpper);
+        }
+
+        @Override
+        public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
+            short iValue = Short.parseShort(value);
+            short iSim = fuzziness.asShort();
+            return NumericRangeQuery.newIntRange(names().indexName(), numericPrecisionStep(),
+                iValue - iSim,
+                iValue + iSim,
+                true, true);
+        }
+
+        @Override
+        public FieldStats stats(Terms terms, int maxDoc) throws IOException {
+            long minValue = NumericUtils.getMinInt(terms);
+            long maxValue = NumericUtils.getMaxInt(terms);
+            return new FieldStats.Long(
+                maxDoc, terms.getDocCount(), terms.getSumDocFreq(), terms.getSumTotalTermFreq(), minValue, maxValue
+            );
+        }
+    }
+
     private Short nullValue;
 
     private String nullValueAsString;
 
-    protected ShortFieldMapper(Names names, int precisionStep, float boost, FieldType fieldType, Boolean docValues,
+    protected ShortFieldMapper(MappedFieldType fieldType, Boolean docValues,
                                Short nullValue, Explicit<Boolean> ignoreMalformed, Explicit<Boolean> coerce,
-                               SimilarityProvider similarity, Loading normsLoading, @Nullable Settings fieldDataSettings,
+                               @Nullable Settings fieldDataSettings,
                                Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
-        super(names, precisionStep, boost, fieldType, docValues, ignoreMalformed, coerce, new NamedAnalyzer("_short/" + precisionStep,
-                new NumericIntegerAnalyzer(precisionStep)), new NamedAnalyzer("_short/max", new NumericIntegerAnalyzer(Integer.MAX_VALUE)),
-                similarity, normsLoading, fieldDataSettings, indexSettings, multiFields, copyTo);
+        super(fieldType, docValues, ignoreMalformed, coerce,
+             fieldDataSettings, indexSettings, multiFields, copyTo);
         this.nullValue = nullValue;
         this.nullValueAsString = nullValue == null ? null : nullValue.toString();
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -149,33 +220,7 @@ public class ShortFieldMapper extends NumberFieldMapper {
         return new FieldDataType("short");
     }
 
-    @Override
-    protected int maxPrecisionStep() {
-        return 32;
-    }
-
-    @Override
-    public Short value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).shortValue();
-        }
-        if (value instanceof BytesRef) {
-            return Numbers.bytesToShort((BytesRef) value);
-        }
-        return Short.parseShort(value.toString());
-    }
-
-    @Override
-    public BytesRef indexedValueForSearch(Object value) {
-        BytesRefBuilder bytesRef = new BytesRefBuilder();
-        NumericUtils.intToPrefixCoded(parseValue(value), 0, bytesRef);  // 0 because of exact match
-        return bytesRef.get();
-    }
-
-    private short parseValue(Object value) {
+    private static short parseValue(Object value) {
         if (value instanceof Number) {
             return ((Number) value).shortValue();
         }
@@ -185,28 +230,6 @@ public class ShortFieldMapper extends NumberFieldMapper {
         return Short.parseShort(value.toString());
     }
 
-    private int parseValueAsInt(Object value) {
-        return parseValue(value);
-    }
-
-    @Override
-    public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
-        short iValue = Short.parseShort(value);
-        short iSim = fuzziness.asShort();
-        return NumericRangeQuery.newIntRange(names.indexName(), precisionStep,
-                iValue - iSim,
-                iValue + iSim,
-                true, true);
-    }
-
-    @Override
-    public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
-        return NumericRangeQuery.newIntRange(names.indexName(), precisionStep,
-                lowerTerm == null ? null : parseValueAsInt(lowerTerm),
-                upperTerm == null ? null : parseValueAsInt(upperTerm),
-                includeLower, includeUpper);
-    }
-
     @Override
     public Query nullValueFilter() {
         if (nullValue == null) {
@@ -223,7 +246,7 @@ public class ShortFieldMapper extends NumberFieldMapper {
     @Override
     protected void innerParseCreateField(ParseContext context, List<Field> fields) throws IOException {
         short value;
-        float boost = this.boost;
+        float boost = this.fieldType.boost();
         if (context.externalValueSet()) {
             Object externalValue = context.externalValue();
             if (externalValue == null) {
@@ -245,7 +268,7 @@ public class ShortFieldMapper extends NumberFieldMapper {
                 value = ((Number) externalValue).shortValue();
             }
             if (context.includeInAll(includeInAll, this)) {
-                context.allEntries().addText(names.fullName(), Short.toString(value), boost);
+                context.allEntries().addText(fieldType.names().fullName(), Short.toString(value), boost);
             }
         } else {
             XContentParser parser = context.parser();
@@ -256,7 +279,7 @@ public class ShortFieldMapper extends NumberFieldMapper {
                 }
                 value = nullValue;
                 if (nullValueAsString != null && (context.includeInAll(includeInAll, this))) {
-                    context.allEntries().addText(names.fullName(), nullValueAsString, boost);
+                    context.allEntries().addText(fieldType.names().fullName(), nullValueAsString, boost);
                 }
             } else if (parser.currentToken() == XContentParser.Token.START_OBJECT) {
                 XContentParser.Token token;
@@ -285,16 +308,16 @@ public class ShortFieldMapper extends NumberFieldMapper {
             } else {
                 value = parser.shortValue(coerce.value());
                 if (context.includeInAll(includeInAll, this)) {
-                    context.allEntries().addText(names.fullName(), parser.text(), boost);
+                    context.allEntries().addText(fieldType.names().fullName(), parser.text(), boost);
                 }
             }
         }
         if (fieldType.indexOptions() != IndexOptions.NONE || fieldType.stored()) {
-            CustomShortNumericField field = new CustomShortNumericField(this, value, fieldType);
+            CustomShortNumericField field = new CustomShortNumericField(this, value, (NumberFieldType)fieldType);
             field.setBoost(boost);
             fields.add(field);
         }
-        if (hasDocValues()) {
+        if (fieldType().hasDocValues()) {
             addDocValue(context, fields, value);
         }
     }
@@ -320,8 +343,8 @@ public class ShortFieldMapper extends NumberFieldMapper {
     protected void doXContentBody(XContentBuilder builder, boolean includeDefaults, Params params) throws IOException {
         super.doXContentBody(builder, includeDefaults, params);
 
-        if (includeDefaults || precisionStep != DEFAULT_PRECISION_STEP) {
-            builder.field("precision_step", precisionStep);
+        if (includeDefaults || fieldType.numericPrecisionStep() != DEFAULT_PRECISION_STEP) {
+            builder.field("precision_step", fieldType.numericPrecisionStep());
         }
         if (includeDefaults || nullValue != null) {
             builder.field("null_value", nullValue);
@@ -334,22 +357,13 @@ public class ShortFieldMapper extends NumberFieldMapper {
 
     }
 
-    @Override
-    public FieldStats stats(Terms terms, int maxDoc) throws IOException {
-        long minValue = NumericUtils.getMinInt(terms);
-        long maxValue = NumericUtils.getMaxInt(terms);
-        return new FieldStats.Long(
-                maxDoc, terms.getDocCount(), terms.getSumDocFreq(), terms.getSumTotalTermFreq(), minValue, maxValue
-        );
-    }
-
     public static class CustomShortNumericField extends CustomNumericField {
 
         private final short number;
 
         private final NumberFieldMapper mapper;
 
-        public CustomShortNumericField(NumberFieldMapper mapper, short number, FieldType fieldType) {
+        public CustomShortNumericField(NumberFieldMapper mapper, short number, NumberFieldType fieldType) {
             super(mapper, number, fieldType);
             this.mapper = mapper;
             this.number = number;
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java
index 5dfffc83809..0fd77fe5875 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java
@@ -19,9 +19,7 @@
 
 package org.elasticsearch.index.mapper.core;
 
-import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.document.SortedSetDocValuesField;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.search.Query;
@@ -34,19 +32,20 @@ import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
 import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.mapper.internal.AllFieldMapper;
-import org.elasticsearch.index.similarity.SimilarityProvider;
 
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import static org.apache.lucene.index.IndexOptions.NONE;
 import static org.elasticsearch.index.mapper.MapperBuilders.stringField;
 import static org.elasticsearch.index.mapper.core.TypeParsers.parseField;
 import static org.elasticsearch.index.mapper.core.TypeParsers.parseMultiField;
@@ -59,7 +58,7 @@ public class StringFieldMapper extends AbstractFieldMapper implements AllFieldMa
     public static final String CONTENT_TYPE = "string";
 
     public static class Defaults extends AbstractFieldMapper.Defaults {
-        public static final FieldType FIELD_TYPE = new FieldType(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new StringFieldType();
 
         static {
             FIELD_TYPE.freeze();
@@ -77,12 +76,10 @@ public class StringFieldMapper extends AbstractFieldMapper implements AllFieldMa
 
         protected int positionOffsetGap = Defaults.POSITION_OFFSET_GAP;
 
-        protected NamedAnalyzer searchQuotedAnalyzer;
-
         protected int ignoreAbove = Defaults.IGNORE_ABOVE;
 
         public Builder(String name) {
-            super(name, new FieldType(Defaults.FIELD_TYPE));
+            super(name, Defaults.FIELD_TYPE);
             builder = this;
         }
 
@@ -94,9 +91,6 @@ public class StringFieldMapper extends AbstractFieldMapper implements AllFieldMa
         @Override
         public Builder searchAnalyzer(NamedAnalyzer searchAnalyzer) {
             super.searchAnalyzer(searchAnalyzer);
-            if (searchQuotedAnalyzer == null) {
-                searchQuotedAnalyzer = searchAnalyzer;
-            }
             return this;
         }
 
@@ -106,7 +100,7 @@ public class StringFieldMapper extends AbstractFieldMapper implements AllFieldMa
         }
 
         public Builder searchQuotedAnalyzer(NamedAnalyzer analyzer) {
-            this.searchQuotedAnalyzer = analyzer;
+            this.fieldType.setSearchQuoteAnalyzer(analyzer);
             return builder;
         }
 
@@ -118,20 +112,20 @@ public class StringFieldMapper extends AbstractFieldMapper implements AllFieldMa
         @Override
         public StringFieldMapper build(BuilderContext context) {
             if (positionOffsetGap > 0) {
-                indexAnalyzer = new NamedAnalyzer(indexAnalyzer, positionOffsetGap);
-                searchAnalyzer = new NamedAnalyzer(searchAnalyzer, positionOffsetGap);
-                searchQuotedAnalyzer = new NamedAnalyzer(searchQuotedAnalyzer, positionOffsetGap);
+                fieldType.setIndexAnalyzer(new NamedAnalyzer(fieldType.indexAnalyzer(), positionOffsetGap));
+                fieldType.setSearchAnalyzer(new NamedAnalyzer(fieldType.searchAnalyzer(), positionOffsetGap));
+                fieldType.setSearchQuoteAnalyzer(new NamedAnalyzer(fieldType.searchQuoteAnalyzer(), positionOffsetGap));
             }
             // if the field is not analyzed, then by default, we should omit norms and have docs only
             // index options, as probably what the user really wants
             // if they are set explicitly, we will use those values
             // we also change the values on the default field type so that toXContent emits what
             // differs from the defaults
-            FieldType defaultFieldType = new FieldType(Defaults.FIELD_TYPE);
+            MappedFieldType defaultFieldType = Defaults.FIELD_TYPE.clone();
             if (fieldType.indexOptions() != IndexOptions.NONE && !fieldType.tokenized()) {
                 defaultFieldType.setOmitNorms(true);
                 defaultFieldType.setIndexOptions(IndexOptions.DOCS);
-                if (!omitNormsSet && boost == Defaults.BOOST) {
+                if (!omitNormsSet && fieldType.boost() == Defaults.BOOST) {
                     fieldType.setOmitNorms(true);
                 }
                 if (!indexOptionsSet) {
@@ -139,9 +133,9 @@ public class StringFieldMapper extends AbstractFieldMapper implements AllFieldMa
                 }
             }
             defaultFieldType.freeze();
-            StringFieldMapper fieldMapper = new StringFieldMapper(buildNames(context),
-                    boost, fieldType, defaultFieldType, docValues, nullValue, indexAnalyzer, searchAnalyzer, searchQuotedAnalyzer,
-                    positionOffsetGap, ignoreAbove, similarity, normsLoading, 
+            setupFieldType(context);
+            StringFieldMapper fieldMapper = new StringFieldMapper(
+                    fieldType, defaultFieldType, docValues, nullValue, positionOffsetGap, ignoreAbove,
                     fieldDataSettings, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
             fieldMapper.includeInAll(includeInAll);
             return fieldMapper;
@@ -174,14 +168,14 @@ public class StringFieldMapper extends AbstractFieldMapper implements AllFieldMa
                     builder.positionOffsetGap(XContentMapValues.nodeIntegerValue(propNode, -1));
                     // we need to update to actual analyzers if they are not set in this case...
                     // so we can inject the position offset gap...
-                    if (builder.indexAnalyzer == null) {
-                        builder.indexAnalyzer = parserContext.analysisService().defaultIndexAnalyzer();
+                    if (builder.fieldType.indexAnalyzer() == null) {
+                        builder.fieldType.setIndexAnalyzer(parserContext.analysisService().defaultIndexAnalyzer());
                     }
-                    if (builder.searchAnalyzer == null) {
-                        builder.searchAnalyzer = parserContext.analysisService().defaultSearchAnalyzer();
+                    if (builder.fieldType.searchAnalyzer() == null) {
+                        builder.fieldType.setSearchAnalyzer(parserContext.analysisService().defaultSearchAnalyzer());
                     }
-                    if (builder.searchQuotedAnalyzer == null) {
-                        builder.searchQuotedAnalyzer = parserContext.analysisService().defaultSearchQuoteAnalyzer();
+                    if (builder.fieldType.searchQuoteAnalyzer() == null) {
+                        builder.fieldType.setSearchQuoteAnalyzer(parserContext.analysisService().defaultSearchQuoteAnalyzer());
                     }
                     iterator.remove();
                 } else if (propName.equals("ignore_above")) {
@@ -195,32 +189,50 @@ public class StringFieldMapper extends AbstractFieldMapper implements AllFieldMa
         }
     }
 
+    public static class StringFieldType extends MappedFieldType {
+
+        public StringFieldType() {
+            super(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        }
+
+        protected StringFieldType(StringFieldType ref) {
+            super(ref);
+        }
+
+        public StringFieldType clone() {
+            return new StringFieldType(this);
+        }
+
+        @Override
+        public String value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            return value.toString();
+        }
+    }
+
     private String nullValue;
     private Boolean includeInAll;
     private int positionOffsetGap;
-    private NamedAnalyzer searchQuotedAnalyzer;
     private int ignoreAbove;
-    private final FieldType defaultFieldType;
+    private final MappedFieldType defaultFieldType;
 
-    protected StringFieldMapper(Names names, float boost, FieldType fieldType, FieldType defaultFieldType, Boolean docValues,
-                                String nullValue, NamedAnalyzer indexAnalyzer, NamedAnalyzer searchAnalyzer,
-                                NamedAnalyzer searchQuotedAnalyzer, int positionOffsetGap, int ignoreAbove,
-                                SimilarityProvider similarity, Loading normsLoading, @Nullable Settings fieldDataSettings,
+    protected StringFieldMapper(MappedFieldType fieldType, MappedFieldType defaultFieldType, Boolean docValues,
+                                String nullValue, int positionOffsetGap, int ignoreAbove, @Nullable Settings fieldDataSettings,
                                 Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
-        super(names, boost, fieldType, docValues, indexAnalyzer, searchAnalyzer,
-                similarity, normsLoading, fieldDataSettings, indexSettings, multiFields, copyTo);
-        if (fieldType.tokenized() && fieldType.indexOptions() != IndexOptions.NONE && hasDocValues()) {
-            throw new MapperParsingException("Field [" + names.fullName() + "] cannot be analyzed and have doc values");
+        super(fieldType, docValues, fieldDataSettings, indexSettings, multiFields, copyTo);
+        if (fieldType.tokenized() && fieldType.indexOptions() != NONE && fieldType().hasDocValues()) {
+            throw new MapperParsingException("Field [" + fieldType.names().fullName() + "] cannot be analyzed and have doc values");
         }
         this.defaultFieldType = defaultFieldType;
         this.nullValue = nullValue;
         this.positionOffsetGap = positionOffsetGap;
-        this.searchQuotedAnalyzer = searchQuotedAnalyzer != null ? searchQuotedAnalyzer : this.searchAnalyzer;
         this.ignoreAbove = ignoreAbove;
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return defaultFieldType;
     }
 
@@ -248,14 +260,6 @@ public class StringFieldMapper extends AbstractFieldMapper implements AllFieldMa
         includeInAll = null;
     }
 
-    @Override
-    public String value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        return value.toString();
-    }
-
     @Override
     protected boolean customBoost() {
         return true;
@@ -269,11 +273,6 @@ public class StringFieldMapper extends AbstractFieldMapper implements AllFieldMa
         return ignoreAbove;
     }
 
-    @Override
-    public Analyzer searchQuoteAnalyzer() {
-        return this.searchQuotedAnalyzer;
-    }
-
     @Override
     public Query nullValueFilter() {
         if (nullValue == null) {
@@ -284,7 +283,7 @@ public class StringFieldMapper extends AbstractFieldMapper implements AllFieldMa
 
     @Override
     protected void parseCreateField(ParseContext context, List<Field> fields) throws IOException {
-        ValueAndBoost valueAndBoost = parseCreateFieldForString(context, nullValue, boost);
+        ValueAndBoost valueAndBoost = parseCreateFieldForString(context, nullValue, fieldType.boost());
         if (valueAndBoost.value() == null) {
             return;
         }
@@ -292,19 +291,19 @@ public class StringFieldMapper extends AbstractFieldMapper implements AllFieldMa
             return;
         }
         if (context.includeInAll(includeInAll, this)) {
-            context.allEntries().addText(names.fullName(), valueAndBoost.value(), valueAndBoost.boost());
+            context.allEntries().addText(fieldType.names().fullName(), valueAndBoost.value(), valueAndBoost.boost());
         }
 
         if (fieldType.indexOptions() != IndexOptions.NONE || fieldType.stored()) {
-            Field field = new Field(names.indexName(), valueAndBoost.value(), fieldType);
+            Field field = new Field(fieldType.names().indexName(), valueAndBoost.value(), fieldType);
             field.setBoost(valueAndBoost.boost());
             fields.add(field);
         }
-        if (hasDocValues()) {
-            fields.add(new SortedSetDocValuesField(names.indexName(), new BytesRef(valueAndBoost.value())));
+        if (fieldType().hasDocValues()) {
+            fields.add(new SortedSetDocValuesField(fieldType.names().indexName(), new BytesRef(valueAndBoost.value())));
         }
         if (fields.isEmpty()) {
-            context.ignoredValue(names.indexName(), valueAndBoost.value());
+            context.ignoredValue(fieldType.names().indexName(), valueAndBoost.value());
         }
     }
 
@@ -381,13 +380,14 @@ public class StringFieldMapper extends AbstractFieldMapper implements AllFieldMa
         if (includeDefaults || positionOffsetGap != Defaults.POSITION_OFFSET_GAP) {
             builder.field("position_offset_gap", positionOffsetGap);
         }
-        if (searchQuotedAnalyzer != null && !searchQuotedAnalyzer.name().equals(searchAnalyzer.name())) {
-            builder.field("search_quote_analyzer", searchQuotedAnalyzer.name());
+        NamedAnalyzer searchQuoteAnalyzer = fieldType.searchQuoteAnalyzer();
+        if (searchQuoteAnalyzer != null && !searchQuoteAnalyzer.name().equals(fieldType.searchAnalyzer().name())) {
+            builder.field("search_quote_analyzer", searchQuoteAnalyzer.name());
         } else if (includeDefaults) {
-            if (searchQuotedAnalyzer == null) {
+            if (searchQuoteAnalyzer == null) {
                 builder.field("search_quote_analyzer", "default");
             } else {
-                builder.field("search_quote_analyzer", searchQuotedAnalyzer.name());
+                builder.field("search_quote_analyzer", searchQuoteAnalyzer.name());
             }
         }
         if (includeDefaults || ignoreAbove != Defaults.IGNORE_ABOVE) {
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapper.java
index c13268b1988..eb53c172df4 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapper.java
@@ -22,18 +22,18 @@ package org.elasticsearch.index.mapper.core;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
-import org.apache.lucene.index.IndexOptions;
 import org.elasticsearch.common.Explicit;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
+import org.elasticsearch.index.analysis.NumericIntegerAnalyzer;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
-import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.MergeMappingException;
+import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.mapper.core.StringFieldMapper.ValueAndBoost;
 import org.elasticsearch.index.similarity.SimilarityProvider;
@@ -43,6 +43,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import static org.apache.lucene.index.IndexOptions.NONE;
 import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeIntegerValue;
 import static org.elasticsearch.index.mapper.MapperBuilders.tokenCountField;
 import static org.elasticsearch.index.mapper.core.TypeParsers.parseNumberField;
@@ -55,6 +56,7 @@ public class TokenCountFieldMapper extends IntegerFieldMapper {
     public static final String CONTENT_TYPE = "token_count";
 
     public static class Defaults extends IntegerFieldMapper.Defaults {
+
     }
 
     public static class Builder extends NumberFieldMapper.Builder<Builder, TokenCountFieldMapper> {
@@ -62,7 +64,7 @@ public class TokenCountFieldMapper extends IntegerFieldMapper {
         private NamedAnalyzer analyzer;
 
         public Builder(String name) {
-            super(name, new FieldType(Defaults.FIELD_TYPE), Defaults.PRECISION_STEP_32_BIT);
+            super(name, Defaults.FIELD_TYPE, Defaults.PRECISION_STEP_32_BIT);
             builder = this;
         }
 
@@ -82,13 +84,23 @@ public class TokenCountFieldMapper extends IntegerFieldMapper {
 
         @Override
         public TokenCountFieldMapper build(BuilderContext context) {
-            fieldType.setOmitNorms(fieldType.omitNorms() && boost == 1.0f);
-            TokenCountFieldMapper fieldMapper = new TokenCountFieldMapper(buildNames(context), fieldType.numericPrecisionStep(), boost, fieldType, docValues, nullValue,
-                    ignoreMalformed(context), coerce(context), similarity, normsLoading, fieldDataSettings, context.indexSettings(),
+            setupFieldType(context);
+            TokenCountFieldMapper fieldMapper = new TokenCountFieldMapper(fieldType, docValues, nullValue,
+                    ignoreMalformed(context), coerce(context), fieldDataSettings, context.indexSettings(),
                     analyzer, multiFieldsBuilder.build(this, context), copyTo);
             fieldMapper.includeInAll(includeInAll);
             return fieldMapper;
         }
+
+        @Override
+        protected NamedAnalyzer makeNumberAnalyzer(int precisionStep) {
+            return NumericIntegerAnalyzer.buildNamedAnalyzer(precisionStep);
+        }
+
+        @Override
+        protected int maxPrecisionStep() {
+            return 32;
+        }
     }
 
     public static class TypeParser implements Mapper.TypeParser {
@@ -122,34 +134,33 @@ public class TokenCountFieldMapper extends IntegerFieldMapper {
 
     private NamedAnalyzer analyzer;
 
-    protected TokenCountFieldMapper(Names names, int precisionStep, float boost, FieldType fieldType, Boolean docValues, Integer nullValue,
-            Explicit<Boolean> ignoreMalformed, Explicit<Boolean> coerce,
-            SimilarityProvider similarity, Loading normsLoading, Settings fieldDataSettings, Settings indexSettings, NamedAnalyzer analyzer,
+    protected TokenCountFieldMapper(MappedFieldType fieldType, Boolean docValues, Integer nullValue,
+            Explicit<Boolean> ignoreMalformed, Explicit<Boolean> coerce, Settings fieldDataSettings, Settings indexSettings, NamedAnalyzer analyzer,
             MultiFields multiFields, CopyTo copyTo) {
-        super(names, precisionStep, boost, fieldType, docValues, nullValue, ignoreMalformed, coerce,
-                similarity, normsLoading, fieldDataSettings, indexSettings, multiFields, copyTo);
+        super(fieldType, docValues, nullValue, ignoreMalformed, coerce,
+            fieldDataSettings, indexSettings, multiFields, copyTo);
 
         this.analyzer = analyzer;
     }
 
     @Override
     protected void parseCreateField(ParseContext context, List<Field> fields) throws IOException {
-        ValueAndBoost valueAndBoost = StringFieldMapper.parseCreateFieldForString(context, null /* Out null value is an int so we convert*/, boost);
+        ValueAndBoost valueAndBoost = StringFieldMapper.parseCreateFieldForString(context, null /* Out null value is an int so we convert*/, fieldType.boost());
         if (valueAndBoost.value() == null && nullValue() == null) {
             return;
         }
 
-        if (fieldType.indexOptions() != IndexOptions.NONE || fieldType.stored() || hasDocValues()) {
+        if (fieldType.indexOptions() != NONE || fieldType.stored() || fieldType().hasDocValues()) {
             int count;
             if (valueAndBoost.value() == null) {
                 count = nullValue();
             } else {
-                count = countPositions(analyzer.analyzer().tokenStream(names().shortName(), valueAndBoost.value()));
+                count = countPositions(analyzer.analyzer().tokenStream(fieldType().names().shortName(), valueAndBoost.value()));
             }
             addIntegerFields(context, fields, count, valueAndBoost.boost());
         }
         if (fields.isEmpty()) {
-            context.ignoredValue(names.indexName(), valueAndBoost.value());
+            context.ignoredValue(fieldType.names().indexName(), valueAndBoost.value());
         }
     }
 
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java b/src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java
index 983b83ce054..d7434a574dd 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/TypeParsers.java
@@ -30,7 +30,7 @@ import org.elasticsearch.common.settings.loader.SettingsLoader;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.mapper.ContentPath;
 import org.elasticsearch.index.mapper.DocumentMapperParser;
-import org.elasticsearch.index.mapper.FieldMapper.Loading;
+import org.elasticsearch.index.mapper.MappedFieldType.Loading;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.object.ObjectMapper;
diff --git a/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java
index db0c9899c15..4485aed953b 100644
--- a/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java
@@ -24,10 +24,9 @@ import com.carrotsearch.hppc.cursors.ObjectCursor;
 import com.google.common.base.Objects;
 import com.google.common.collect.Iterators;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
-import org.apache.lucene.index.DocValuesType;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.NumericUtils;
 import org.elasticsearch.Version;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Strings;
@@ -41,10 +40,9 @@ import org.elasticsearch.common.util.ByteUtils;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
-import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.fielddata.FieldDataType;
 import org.elasticsearch.index.mapper.ContentPath;
-import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
@@ -56,7 +54,6 @@ import org.elasticsearch.index.mapper.core.NumberFieldMapper;
 import org.elasticsearch.index.mapper.core.NumberFieldMapper.CustomNumericDocValuesField;
 import org.elasticsearch.index.mapper.core.StringFieldMapper;
 import org.elasticsearch.index.mapper.object.ArrayValueMapperParser;
-import org.elasticsearch.index.similarity.SimilarityProvider;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -97,7 +94,6 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implements ArrayVal
 
     public static class Defaults {
         public static final ContentPath.Type PATH_TYPE = ContentPath.Type.FULL;
-        public static final boolean STORE = false;
         public static final boolean ENABLE_LATLON = false;
         public static final boolean ENABLE_GEOHASH = false;
         public static final boolean ENABLE_GEOHASH_PREFIX = false;
@@ -107,7 +103,7 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implements ArrayVal
         public static final boolean VALIDATE_LAT = true;
         public static final boolean VALIDATE_LON = true;
 
-        public static final FieldType FIELD_TYPE = new FieldType(StringFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new GeoPointFieldType();
 
         static {
             FIELD_TYPE.setIndexOptions(IndexOptions.DOCS);
@@ -131,16 +127,15 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implements ArrayVal
 
         private int geoHashPrecision = Defaults.GEO_HASH_PRECISION;
 
-        boolean validateLat = Defaults.VALIDATE_LAT;
-        boolean validateLon = Defaults.VALIDATE_LON;
-        boolean normalizeLat = Defaults.NORMALIZE_LAT;
-        boolean normalizeLon = Defaults.NORMALIZE_LON;
-
         public Builder(String name) {
-            super(name, new FieldType(Defaults.FIELD_TYPE));
+            super(name, Defaults.FIELD_TYPE);
             this.builder = this;
         }
 
+        GeoPointFieldType fieldType() {
+            return (GeoPointFieldType)fieldType;
+        }
+
         @Override
         public Builder multiFieldPathType(ContentPath.Type pathType) {
             this.pathType = pathType;
@@ -185,6 +180,7 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implements ArrayVal
 
             DoubleFieldMapper latMapper = null;
             DoubleFieldMapper lonMapper = null;
+            GeoPointFieldType geoPointFieldType = (GeoPointFieldType)fieldType;
 
             context.path().add(name);
             if (enableLatLon) {
@@ -196,10 +192,13 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implements ArrayVal
                 }
                 latMapper = (DoubleFieldMapper) latMapperBuilder.includeInAll(false).store(fieldType.stored()).docValues(false).build(context);
                 lonMapper = (DoubleFieldMapper) lonMapperBuilder.includeInAll(false).store(fieldType.stored()).docValues(false).build(context);
+                geoPointFieldType.setLatLonEnabled(latMapper.fieldType(), lonMapper.fieldType());
             }
             StringFieldMapper geohashMapper = null;
-            if (enableGeoHash) {
+            if (enableGeoHash || enableGeohashPrefix) {
+                // TODO: possible also implicitly enable geohash if geohash precision is set
                 geohashMapper = stringField(Names.GEOHASH).index(true).tokenized(false).includeInAll(false).omitNorms(true).indexOptions(IndexOptions.DOCS).build(context);
+                geoPointFieldType.setGeohashEnabled(geohashMapper.fieldType(), geoHashPrecision, enableGeohashPrefix);
             }
             context.path().remove();
 
@@ -208,11 +207,11 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implements ArrayVal
             // this is important: even if geo points feel like they need to be tokenized to distinguish lat from lon, we actually want to
             // store them as a single token.
             fieldType.setTokenized(false);
+            fieldType.setHasDocValues(false);
+            setupFieldType(context);
 
-            return new GeoPointFieldMapper(buildNames(context), fieldType, docValues, indexAnalyzer, searchAnalyzer,
-                    similarity, fieldDataSettings, context.indexSettings(), origPathType, enableLatLon, enableGeoHash, enableGeohashPrefix, precisionStep,
-                    geoHashPrecision, latMapper, lonMapper, geohashMapper, validateLon, validateLat, normalizeLon, normalizeLat
-            , multiFieldsBuilder.build(this, context));
+            return new GeoPointFieldMapper(fieldType, docValues, fieldDataSettings, context.indexSettings(), origPathType,
+                     latMapper, lonMapper, geohashMapper, multiFieldsBuilder.build(this, context));
         }
     }
 
@@ -251,24 +250,24 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implements ArrayVal
                     }
                     iterator.remove();
                 } else if (fieldName.equals("validate")) {
-                    builder.validateLat = XContentMapValues.nodeBooleanValue(fieldNode);
-                    builder.validateLon = XContentMapValues.nodeBooleanValue(fieldNode);
+                    builder.fieldType().setValidateLat(XContentMapValues.nodeBooleanValue(fieldNode));
+                    builder.fieldType().setValidateLon(XContentMapValues.nodeBooleanValue(fieldNode));
                     iterator.remove();
                 } else if (fieldName.equals("validate_lon")) {
-                    builder.validateLon = XContentMapValues.nodeBooleanValue(fieldNode);
+                    builder.fieldType().setValidateLon(XContentMapValues.nodeBooleanValue(fieldNode));
                     iterator.remove();
                 } else if (fieldName.equals("validate_lat")) {
-                    builder.validateLat = XContentMapValues.nodeBooleanValue(fieldNode);
+                    builder.fieldType().setValidateLat(XContentMapValues.nodeBooleanValue(fieldNode));
                     iterator.remove();
                 } else if (fieldName.equals("normalize")) {
-                    builder.normalizeLat = XContentMapValues.nodeBooleanValue(fieldNode);
-                    builder.normalizeLon = XContentMapValues.nodeBooleanValue(fieldNode);
+                    builder.fieldType().setNormalizeLat(XContentMapValues.nodeBooleanValue(fieldNode));
+                    builder.fieldType().setNormalizeLon(XContentMapValues.nodeBooleanValue(fieldNode));
                     iterator.remove();
                 } else if (fieldName.equals("normalize_lat")) {
-                    builder.normalizeLat = XContentMapValues.nodeBooleanValue(fieldNode);
+                    builder.fieldType().setNormalizeLat(XContentMapValues.nodeBooleanValue(fieldNode));
                     iterator.remove();
                 } else if (fieldName.equals("normalize_lon")) {
-                    builder.normalizeLon = XContentMapValues.nodeBooleanValue(fieldNode);
+                    builder.fieldType().setNormalizeLon(XContentMapValues.nodeBooleanValue(fieldNode));
                     iterator.remove();
                 } else if (parseMultiField(builder, name, parserContext, fieldName, fieldNode)) {
                     iterator.remove();
@@ -278,6 +277,128 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implements ArrayVal
         }
     }
 
+    public static class GeoPointFieldType extends MappedFieldType {
+
+        private MappedFieldType geohashFieldType;
+        private int geohashPrecision;
+        private boolean geohashPrefixEnabled;
+
+        private MappedFieldType latFieldType;
+        private MappedFieldType lonFieldType;
+        private boolean validateLon = true;
+        private boolean validateLat = true;
+        private boolean normalizeLon = true;
+        private boolean normalizeLat = true;
+
+        public GeoPointFieldType() {
+            super(StringFieldMapper.Defaults.FIELD_TYPE);
+        }
+
+        protected GeoPointFieldType(GeoPointFieldType ref) {
+            super(ref);
+            this.geohashFieldType = ref.geohashFieldType; // copying ref is ok, this can never be modified
+            this.geohashPrecision = ref.geohashPrecision;
+            this.geohashPrefixEnabled = ref.geohashPrefixEnabled;
+            this.latFieldType = ref.latFieldType; // copying ref is ok, this can never be modified
+            this.lonFieldType = ref.lonFieldType; // copying ref is ok, this can never be modified
+            this.validateLon = ref.validateLon;
+            this.validateLat = ref.validateLat;
+            this.normalizeLon = ref.normalizeLon;
+            this.normalizeLat = ref.normalizeLat;
+        }
+
+        @Override
+        public MappedFieldType clone() {
+            return new GeoPointFieldType(this);
+        }
+
+        public boolean isGeohashEnabled() {
+            return geohashFieldType != null;
+        }
+
+        public MappedFieldType geohashFieldType() {
+            return geohashFieldType;
+        }
+
+        public int geohashPrecision() {
+            return geohashPrecision;
+        }
+
+        public boolean isGeohashPrefixEnabled() {
+            return geohashPrefixEnabled;
+        }
+
+        public void setGeohashEnabled(MappedFieldType geohashFieldType, int geohashPrecision, boolean geohashPrefixEnabled) {
+            checkIfFrozen();
+            this.geohashFieldType = geohashFieldType;
+            this.geohashPrecision = geohashPrecision;
+            this.geohashPrefixEnabled = geohashPrefixEnabled;
+        }
+
+        public boolean isLatLonEnabled() {
+            return latFieldType != null;
+        }
+
+        public MappedFieldType latFieldType() {
+            return latFieldType;
+        }
+
+        public MappedFieldType lonFieldType() {
+            return lonFieldType;
+        }
+
+        public void setLatLonEnabled(MappedFieldType latFieldType, MappedFieldType lonFieldType) {
+            checkIfFrozen();
+            this.latFieldType = latFieldType;
+            this.lonFieldType = lonFieldType;
+        }
+
+        public boolean validateLon() {
+            return validateLon;
+        }
+
+        public void setValidateLon(boolean validateLon) {
+            checkIfFrozen();
+            this.validateLon = validateLon;
+        }
+
+        public boolean validateLat() {
+            return validateLat;
+        }
+
+        public void setValidateLat(boolean validateLat) {
+            checkIfFrozen();
+            this.validateLat = validateLat;
+        }
+
+        public boolean normalizeLon() {
+            return normalizeLon;
+        }
+
+        public void setNormalizeLon(boolean normalizeLon) {
+            checkIfFrozen();
+            this.normalizeLon = normalizeLon;
+        }
+
+        public boolean normalizeLat() {
+            return normalizeLat;
+        }
+
+        public void setNormalizeLat(boolean normalizeLat) {
+            checkIfFrozen();
+            this.normalizeLat = normalizeLat;
+        }
+
+        @Override
+        public GeoPoint value(Object value) {
+            if (value instanceof GeoPoint) {
+                return (GeoPoint) value;
+            } else {
+                return GeoPoint.parseFromLatLon(value.toString());
+            }
+        }
+    }
+
     /**
      * A byte-aligned fixed-length encoding for latitudes and longitudes.
      */
@@ -405,52 +526,19 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implements ArrayVal
 
     private final ContentPath.Type pathType;
 
-    private final boolean enableLatLon;
-
-    private final boolean enableGeoHash;
-
-    private final boolean enableGeohashPrefix;
-
-    private final Integer precisionStep;
-
-    private final int geoHashPrecision;
-
     private final DoubleFieldMapper latMapper;
 
     private final DoubleFieldMapper lonMapper;
 
     private final StringFieldMapper geohashMapper;
 
-    private boolean validateLon;
-    private boolean validateLat;
-
-    private final boolean normalizeLon;
-    private final boolean normalizeLat;
-
-    public GeoPointFieldMapper(FieldMapper.Names names, FieldType fieldType, Boolean docValues,
-            NamedAnalyzer indexAnalyzer, NamedAnalyzer searchAnalyzer,
-            SimilarityProvider similarity, @Nullable Settings fieldDataSettings, Settings indexSettings,
-            ContentPath.Type pathType, boolean enableLatLon, boolean enableGeoHash, boolean enableGeohashPrefix, Integer precisionStep, int geoHashPrecision,
-            DoubleFieldMapper latMapper, DoubleFieldMapper lonMapper, StringFieldMapper geohashMapper,
-            boolean validateLon, boolean validateLat,
-            boolean normalizeLon, boolean normalizeLat, MultiFields multiFields) {
-        super(names, 1f, fieldType, docValues, null, indexAnalyzer, similarity, null, fieldDataSettings, indexSettings, multiFields, null);
+    public GeoPointFieldMapper(MappedFieldType fieldType, Boolean docValues, @Nullable Settings fieldDataSettings, Settings indexSettings,
+            ContentPath.Type pathType, DoubleFieldMapper latMapper, DoubleFieldMapper lonMapper, StringFieldMapper geohashMapper,MultiFields multiFields) {
+        super(fieldType, docValues, fieldDataSettings, indexSettings, multiFields, null);
         this.pathType = pathType;
-        this.enableLatLon = enableLatLon;
-        this.enableGeoHash = enableGeoHash || enableGeohashPrefix; // implicitly enable geohashes if geohash_prefix is set
-        this.enableGeohashPrefix = enableGeohashPrefix;
-        this.precisionStep = precisionStep;
-        this.geoHashPrecision = geoHashPrecision;
-
         this.latMapper = latMapper;
         this.lonMapper = lonMapper;
         this.geohashMapper = geohashMapper;
-
-        this.validateLat = validateLat;
-        this.validateLon = validateLon;
-
-        this.normalizeLat = normalizeLat;
-        this.normalizeLon = normalizeLon;
     }
 
     @Override
@@ -459,7 +547,12 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implements ArrayVal
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public GeoPointFieldType fieldType() {
+        return (GeoPointFieldType)fieldType;
+    }
+
+    @Override
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -473,39 +566,6 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implements ArrayVal
         return false;
     }
 
-    public DoubleFieldMapper latMapper() {
-        return latMapper;
-    }
-
-    public DoubleFieldMapper lonMapper() {
-        return lonMapper;
-    }
-
-    public StringFieldMapper geoHashStringMapper() {
-        return this.geohashMapper;
-    }
-
-    int geoHashPrecision() {
-        return geoHashPrecision;
-    }
-
-    public boolean isEnableLatLon() {
-        return enableLatLon;
-    }
-
-    public boolean isEnableGeohashPrefix() {
-        return enableGeohashPrefix;
-    }
-
-    @Override
-    public GeoPoint value(Object value) {
-        if (value instanceof GeoPoint) {
-            return (GeoPoint) value;
-        } else {
-            return GeoPoint.parseFromLatLon(value.toString());
-        }
-    }
-
     @Override
     protected void parseCreateField(ParseContext context, List<Field> fields) throws IOException {
         throw new UnsupportedOperationException("Parsing is implemented in parse(), this method should NEVER be called");
@@ -515,7 +575,7 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implements ArrayVal
     public Mapper parse(ParseContext context) throws IOException {
         ContentPath.Type origPathType = context.path().pathType();
         context.path().pathType(pathType);
-        context.path().add(names().shortName());
+        context.path().add(fieldType().names().shortName());
 
         GeoPoint sparse = context.parseExternalValue(GeoPoint.class);
         
@@ -565,9 +625,9 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implements ArrayVal
         return null;
     }
 
-    private void parseGeohashField(ParseContext context, String geohash) throws IOException {
-        int len = Math.min(geoHashPrecision, geohash.length());
-        int min = enableGeohashPrefix ? 1 : geohash.length();
+    private void addGeohashField(ParseContext context, String geohash) throws IOException {
+        int len = Math.min(fieldType().geohashPrecision(), geohash.length());
+        int min = fieldType().isGeohashPrefixEnabled() ? 1 : geohash.length();
 
         for (int i = len; i >= min; i--) {
             // side effect of this call is adding the field
@@ -584,40 +644,40 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implements ArrayVal
     }
 
     private void parse(ParseContext context, GeoPoint point, String geohash) throws IOException {
-        if (normalizeLat || normalizeLon) {
-            GeoUtils.normalizePoint(point, normalizeLat, normalizeLon);
+        if (fieldType().normalizeLat() || fieldType().normalizeLon()) {
+            GeoUtils.normalizePoint(point, fieldType().normalizeLat(), fieldType().normalizeLon());
         }
 
-        if (validateLat) {
+        if (fieldType().validateLat()) {
             if (point.lat() > 90.0 || point.lat() < -90.0) {
                 throw new IllegalArgumentException("illegal latitude value [" + point.lat() + "] for " + name());
             }
         }
-        if (validateLon) {
+        if (fieldType().validateLon()) {
             if (point.lon() > 180.0 || point.lon() < -180) {
                 throw new IllegalArgumentException("illegal longitude value [" + point.lon() + "] for " + name());
             }
         }
 
         if (fieldType.indexOptions() != IndexOptions.NONE || fieldType.stored()) {
-            Field field = new Field(names.indexName(), Double.toString(point.lat()) + ',' + Double.toString(point.lon()), fieldType);
+            Field field = new Field(fieldType.names().indexName(), Double.toString(point.lat()) + ',' + Double.toString(point.lon()), fieldType);
             context.doc().add(field);
         }
-        if (enableGeoHash) {
+        if (fieldType().isGeohashEnabled()) {
             if (geohash == null) {
                 geohash = GeoHashUtils.encode(point.lat(), point.lon());
             }
-            parseGeohashField(context, geohash);
+            addGeohashField(context, geohash);
         }
-        if (enableLatLon) {
+        if (fieldType().isLatLonEnabled()) {
             latMapper.parse(context.createExternalValueContext(point.lat()));
             lonMapper.parse(context.createExternalValueContext(point.lon()));
         }
-        if (hasDocValues()) {
-            CustomGeoPointDocValuesField field = (CustomGeoPointDocValuesField) context.doc().getByKey(names().indexName());
+        if (fieldType().hasDocValues()) {
+            CustomGeoPointDocValuesField field = (CustomGeoPointDocValuesField) context.doc().getByKey(fieldType().names().indexName());
             if (field == null) {
-                field = new CustomGeoPointDocValuesField(names().indexName(), point.lat(), point.lon());
-                context.doc().addWithKey(names().indexName(), field);
+                field = new CustomGeoPointDocValuesField(fieldType().names().indexName(), point.lat(), point.lon());
+                context.doc().addWithKey(fieldType().names().indexName(), field);
             } else {
                 field.add(point.lat(), point.lon());
             }
@@ -647,42 +707,43 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implements ArrayVal
         }
         GeoPointFieldMapper fieldMergeWith = (GeoPointFieldMapper) mergeWith;
 
-        if (this.enableLatLon != fieldMergeWith.enableLatLon) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different lat_lon");
+        if (this.fieldType().isLatLonEnabled() != fieldMergeWith.fieldType().isLatLonEnabled()) {
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different lat_lon");
         }
-        if (this.enableGeoHash != fieldMergeWith.enableGeoHash) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different geohash");
+        if (this.fieldType().isGeohashEnabled() != fieldMergeWith.fieldType().isGeohashEnabled()) {
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different geohash");
         }
-        if (this.geoHashPrecision != fieldMergeWith.geoHashPrecision) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different geohash_precision");
+        if (this.fieldType().geohashPrecision() != fieldMergeWith.fieldType().geohashPrecision()) {
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different geohash_precision");
         }
-        if (this.enableGeohashPrefix != fieldMergeWith.enableGeohashPrefix) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different geohash_prefix");
+        if (this.fieldType().isGeohashPrefixEnabled() != fieldMergeWith.fieldType().isGeohashPrefixEnabled()) {
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different geohash_prefix");
         }
-        if (this.normalizeLat != fieldMergeWith.normalizeLat) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different normalize_lat");
+        if (this.fieldType().normalizeLat() != fieldMergeWith.fieldType().normalizeLat()) {
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different normalize_lat");
         }
-        if (this.normalizeLon != fieldMergeWith.normalizeLon) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different normalize_lon");
+        if (this.fieldType().normalizeLon() != fieldMergeWith.fieldType().normalizeLon()) {
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different normalize_lon");
         }
-        if (!Objects.equal(this.precisionStep, fieldMergeWith.precisionStep)) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different precision_step");
+        if (fieldType().isLatLonEnabled() &&
+            this.fieldType().latFieldType().numericPrecisionStep() != fieldMergeWith.fieldType().latFieldType().numericPrecisionStep()) {
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different precision_step");
         }
-        if (this.validateLat != fieldMergeWith.validateLat) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different validate_lat");
+        if (this.fieldType().validateLat() != fieldMergeWith.fieldType().validateLat()) {
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different validate_lat");
         }
-        if (this.validateLon != fieldMergeWith.validateLon) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different validate_lon");
+        if (this.fieldType().validateLon() != fieldMergeWith.fieldType().validateLon()) {
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different validate_lon");
         }
     }
 
     @Override
     public Iterator<Mapper> iterator() {
         List<Mapper> extras = new ArrayList<>();
-        if (enableGeoHash) {
+        if (fieldType().isGeohashEnabled()) {
             extras.add(geohashMapper);
         }
-        if (enableLatLon) {
+        if (fieldType().isLatLonEnabled()) {
             extras.add(latMapper);
             extras.add(lonMapper);
         }
@@ -695,46 +756,46 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implements ArrayVal
         if (includeDefaults || pathType != Defaults.PATH_TYPE) {
             builder.field("path", pathType.name().toLowerCase(Locale.ROOT));
         }
-        if (includeDefaults || enableLatLon != Defaults.ENABLE_LATLON) {
-            builder.field("lat_lon", enableLatLon);
+        if (includeDefaults || fieldType().isLatLonEnabled() != Defaults.ENABLE_LATLON) {
+            builder.field("lat_lon", fieldType().isLatLonEnabled());
         }
-        if (includeDefaults || enableGeoHash != Defaults.ENABLE_GEOHASH) {
-            builder.field("geohash", enableGeoHash);
+        if (includeDefaults || fieldType().isGeohashEnabled() != Defaults.ENABLE_GEOHASH) {
+            builder.field("geohash", fieldType().isGeohashEnabled());
         }
-        if (includeDefaults || enableGeohashPrefix != Defaults.ENABLE_GEOHASH_PREFIX) {
-            builder.field("geohash_prefix", enableGeohashPrefix);
+        if (includeDefaults || fieldType().isGeohashPrefixEnabled() != Defaults.ENABLE_GEOHASH_PREFIX) {
+            builder.field("geohash_prefix", fieldType().isGeohashPrefixEnabled());
         }
-        if (includeDefaults || geoHashPrecision != Defaults.GEO_HASH_PRECISION) {
-            builder.field("geohash_precision", geoHashPrecision);
+        if (fieldType().isGeohashEnabled() && (includeDefaults || fieldType().geohashPrecision() != Defaults.GEO_HASH_PRECISION)) {
+            builder.field("geohash_precision", fieldType().geohashPrecision());
         }
-        if (includeDefaults || precisionStep != null) {
-            builder.field("precision_step", precisionStep);
+        if (fieldType().isLatLonEnabled() && (includeDefaults || fieldType().latFieldType().numericPrecisionStep() != NumericUtils.PRECISION_STEP_DEFAULT)) {
+            builder.field("precision_step", fieldType().latFieldType().numericPrecisionStep());
         }
-        if (includeDefaults || validateLat != Defaults.VALIDATE_LAT || validateLon != Defaults.VALIDATE_LON) {
-            if (validateLat && validateLon) {
+        if (includeDefaults || fieldType().validateLat() != Defaults.VALIDATE_LAT || fieldType().validateLon() != Defaults.VALIDATE_LON) {
+            if (fieldType().validateLat() && fieldType().validateLon()) {
                 builder.field("validate", true);
-            } else if (!validateLat && !validateLon) {
+            } else if (!fieldType().validateLat() && !fieldType().validateLon()) {
                 builder.field("validate", false);
             } else {
-                if (includeDefaults || validateLat != Defaults.VALIDATE_LAT) {
-                    builder.field("validate_lat", validateLat);
+                if (includeDefaults || fieldType().validateLat() != Defaults.VALIDATE_LAT) {
+                    builder.field("validate_lat", fieldType().validateLat());
                 }
-                if (includeDefaults || validateLon != Defaults.VALIDATE_LON) {
-                    builder.field("validate_lon", validateLon);
+                if (includeDefaults || fieldType().validateLon() != Defaults.VALIDATE_LON) {
+                    builder.field("validate_lon", fieldType().validateLon());
                 }
             }
         }
-        if (includeDefaults || normalizeLat != Defaults.NORMALIZE_LAT || normalizeLon != Defaults.NORMALIZE_LON) {
-            if (normalizeLat && normalizeLon) {
+        if (includeDefaults || fieldType().normalizeLat() != Defaults.NORMALIZE_LAT || fieldType().normalizeLon() != Defaults.NORMALIZE_LON) {
+            if (fieldType().normalizeLat() && fieldType().normalizeLon()) {
                 builder.field("normalize", true);
-            } else if (!normalizeLat && !normalizeLon) {
+            } else if (!fieldType().normalizeLat() && !fieldType().normalizeLon()) {
                 builder.field("normalize", false);
             } else {
-                if (includeDefaults || normalizeLat != Defaults.NORMALIZE_LAT) {
-                    builder.field("normalize_lat", normalizeLat);
+                if (includeDefaults || fieldType().normalizeLat() != Defaults.NORMALIZE_LAT) {
+                    builder.field("normalize_lat", fieldType().normalizeLat());
                 }
-                if (includeDefaults || normalizeLon != Defaults.NORMALIZE_LON) {
-                    builder.field("normalize_lon", normalizeLat);
+                if (includeDefaults || fieldType().normalizeLon() != Defaults.NORMALIZE_LON) {
+                    builder.field("normalize_lon", fieldType().normalizeLon());
                 }
             }
         }
@@ -742,15 +803,9 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implements ArrayVal
 
     public static class CustomGeoPointDocValuesField extends CustomNumericDocValuesField {
 
-        public static final FieldType TYPE = new FieldType();
-        static {
-          TYPE.setDocValuesType(DocValuesType.BINARY);
-          TYPE.freeze();
-        }
-
         private final ObjectHashSet<GeoPoint> points;
 
-        public CustomGeoPointDocValuesField(String  name, double lat, double lon) {
+        public CustomGeoPointDocValuesField(String name, double lat, double lon) {
             super(name);
             points = new ObjectHashSet<>(2);
             points.add(new GeoPoint(lat, lon));
diff --git a/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java
index 42a4fb287ea..9468088c982 100644
--- a/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java
@@ -20,7 +20,6 @@ package org.elasticsearch.index.mapper.geo;
 
 import com.spatial4j.core.shape.Shape;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.spatial.prefix.PrefixTreeStrategy;
 import org.apache.lucene.spatial.prefix.RecursivePrefixTreeStrategy;
@@ -40,10 +39,11 @@ import org.elasticsearch.common.unit.DistanceUnit;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.fielddata.FieldDataType;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
-import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.MergeMappingException;
+import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.mapper.core.AbstractFieldMapper;
 
@@ -94,7 +94,7 @@ public class GeoShapeFieldMapper extends AbstractFieldMapper {
         public static final double DISTANCE_ERROR_PCT = 0.025d;
         public static final Orientation ORIENTATION = Orientation.RIGHT;
 
-        public static final FieldType FIELD_TYPE = new FieldType();
+        public static final MappedFieldType FIELD_TYPE = new GeoShapeFieldType();
 
         static {
             FIELD_TYPE.setIndexOptions(IndexOptions.DOCS);
@@ -119,7 +119,7 @@ public class GeoShapeFieldMapper extends AbstractFieldMapper {
         private SpatialPrefixTree prefixTree;
 
         public Builder(String name) {
-            super(name, new FieldType(Defaults.FIELD_TYPE));
+            super(name, Defaults.FIELD_TYPE);
         }
 
         public Builder tree(String tree) {
@@ -155,7 +155,6 @@ public class GeoShapeFieldMapper extends AbstractFieldMapper {
         @Override
         public GeoShapeFieldMapper build(BuilderContext context) {
 
-            final FieldMapper.Names names = buildNames(context);
             if (Names.TREE_GEOHASH.equals(tree)) {
                 prefixTree = new GeohashPrefixTree(ShapeBuilder.SPATIAL_CONTEXT, getLevels(treeLevels, precisionInMeters, Defaults.GEOHASH_LEVELS, true));
             } else if (Names.TREE_QUADTREE.equals(tree)) {
@@ -169,9 +168,19 @@ public class GeoShapeFieldMapper extends AbstractFieldMapper {
             } else {
                 throw new IllegalArgumentException("Unknown prefix tree type [" + tree + "]");
             }
+            setupFieldType(context);
 
-            return new GeoShapeFieldMapper(names, prefixTree, strategyName, distanceErrorPct, orientation, fieldType,
-                    context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
+            RecursivePrefixTreeStrategy recursiveStrategy = new RecursivePrefixTreeStrategy(prefixTree, fieldType.names().indexName());
+            recursiveStrategy.setDistErrPct(distanceErrorPct);
+            recursiveStrategy.setPruneLeafyBranches(false);
+            TermQueryPrefixTreeStrategy termStrategy = new TermQueryPrefixTreeStrategy(prefixTree, fieldType.names().indexName());
+            termStrategy.setDistErrPct(distanceErrorPct);
+
+            GeoShapeFieldType geoShapeFieldType = (GeoShapeFieldType)fieldType;
+            geoShapeFieldType.setStrategies(strategyName, recursiveStrategy, termStrategy);
+            geoShapeFieldType.setOrientation(orientation);
+
+            return new GeoShapeFieldMapper(fieldType, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
         }
 
         private final int getLevels(int treeLevels, double precisionInMeters, int defaultLevels, boolean geoHash) {
@@ -223,25 +232,83 @@ public class GeoShapeFieldMapper extends AbstractFieldMapper {
         }
     }
 
-    private final PrefixTreeStrategy defaultStrategy;
-    private final RecursivePrefixTreeStrategy recursiveStrategy;
-    private final TermQueryPrefixTreeStrategy termStrategy;
-    private Orientation shapeOrientation;
+    public static class GeoShapeFieldType extends MappedFieldType {
 
-    public GeoShapeFieldMapper(FieldMapper.Names names, SpatialPrefixTree tree, String defaultStrategyName, double distanceErrorPct,
-                               Orientation shapeOrientation, FieldType fieldType, Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
-        super(names, 1, fieldType, false, null, null, null, null, null, indexSettings, multiFields, copyTo);
-        this.recursiveStrategy = new RecursivePrefixTreeStrategy(tree, names.indexName());
-        this.recursiveStrategy.setDistErrPct(distanceErrorPct);
-        this.recursiveStrategy.setPruneLeafyBranches(false);
-        this.termStrategy = new TermQueryPrefixTreeStrategy(tree, names.indexName());
-        this.termStrategy.setDistErrPct(distanceErrorPct);
-        this.defaultStrategy = resolveStrategy(defaultStrategyName);
-        this.shapeOrientation = shapeOrientation;
+        private PrefixTreeStrategy defaultStrategy;
+        private RecursivePrefixTreeStrategy recursiveStrategy;
+        private TermQueryPrefixTreeStrategy termStrategy;
+        private Orientation orientation;
+
+        public GeoShapeFieldType() {
+            super(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        }
+
+        protected GeoShapeFieldType(GeoShapeFieldType ref) {
+            super(ref);
+            // TODO: this shallow copy is probably not good...need to extract the parameters and recreate the tree and strategies?
+            this.defaultStrategy = ref.defaultStrategy;
+            this.recursiveStrategy = ref.recursiveStrategy;
+            this.termStrategy = ref.termStrategy;
+            this.orientation = ref.orientation;
+        }
+
+        @Override
+        public MappedFieldType clone() {
+            return new GeoShapeFieldType(this);
+        }
+
+        public PrefixTreeStrategy defaultStrategy() {
+            return this.defaultStrategy;
+        }
+
+        public PrefixTreeStrategy resolveStrategy(String strategyName) {
+            if (SpatialStrategy.RECURSIVE.getStrategyName().equals(strategyName)) {
+                return recursiveStrategy;
+            }
+            if (SpatialStrategy.TERM.getStrategyName().equals(strategyName)) {
+                return termStrategy;
+            }
+            throw new IllegalArgumentException("Unknown prefix tree strategy [" + strategyName + "]");
+        }
+
+        public void setStrategies(String defaultStrategy, RecursivePrefixTreeStrategy recursiveStrategy, TermQueryPrefixTreeStrategy termStrategy) {
+            checkIfFrozen();
+            this.recursiveStrategy = recursiveStrategy;
+            this.termStrategy = termStrategy;
+            this.defaultStrategy = resolveStrategy(defaultStrategy);
+        }
+
+        public void setDistErrPct(double distErrPct) {
+            checkIfFrozen();
+            this.recursiveStrategy.setDistErrPct(distErrPct);
+            this.termStrategy.setDistErrPct(distErrPct);
+        }
+
+        public Orientation orientation() { return this.orientation; }
+
+        public void setOrientation(Orientation orientation) {
+            checkIfFrozen();
+            this.orientation = orientation;
+        }
+
+        @Override
+        public String value(Object value) {
+            throw new UnsupportedOperationException("GeoShape fields cannot be converted to String values");
+        }
+
+    }
+
+    public GeoShapeFieldMapper(MappedFieldType fieldType, Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
+        super(fieldType, false, null, indexSettings, multiFields, copyTo);
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public GeoShapeFieldType fieldType() {
+        return (GeoShapeFieldType)fieldType;
+    }
+
+    @Override
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -261,18 +328,18 @@ public class GeoShapeFieldMapper extends AbstractFieldMapper {
                 }
                 shape = shapeBuilder.build();
             }
-            Field[] fields = defaultStrategy.createIndexableFields(shape);
+            Field[] fields = fieldType().defaultStrategy().createIndexableFields(shape);
             if (fields == null || fields.length == 0) {
                 return null;
             }
             for (Field field : fields) {
                 if (!customBoost()) {
-                    field.setBoost(boost);
+                    field.setBoost(fieldType.boost());
                 }
                 context.doc().add(field);
             }
         } catch (Exception e) {
-            throw new MapperParsingException("failed to parse [" + names.fullName() + "]", e);
+            throw new MapperParsingException("failed to parse [" + fieldType.names().fullName() + "]", e);
         }
         return null;
     }
@@ -281,29 +348,29 @@ public class GeoShapeFieldMapper extends AbstractFieldMapper {
     public void merge(Mapper mergeWith, MergeResult mergeResult) throws MergeMappingException {
         super.merge(mergeWith, mergeResult);
         if (!this.getClass().equals(mergeWith.getClass())) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different field type");
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different field type");
             return;
         }
         final GeoShapeFieldMapper fieldMergeWith = (GeoShapeFieldMapper) mergeWith;
-        final PrefixTreeStrategy mergeWithStrategy = fieldMergeWith.defaultStrategy;
+        final PrefixTreeStrategy mergeWithStrategy = fieldMergeWith.fieldType().defaultStrategy();
 
         // prevent user from changing strategies
-        if (!(this.defaultStrategy.getClass().equals(mergeWithStrategy.getClass()))) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different strategy");
+        if (!(this.fieldType().defaultStrategy().getClass().equals(mergeWithStrategy.getClass()))) {
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different strategy");
         }
 
-        final SpatialPrefixTree grid = this.defaultStrategy.getGrid();
+        final SpatialPrefixTree grid = this.fieldType().defaultStrategy().getGrid();
         final SpatialPrefixTree mergeGrid = mergeWithStrategy.getGrid();
 
         // prevent user from changing trees (changes encoding)
         if (!grid.getClass().equals(mergeGrid.getClass())) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different tree");
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different tree");
         }
 
         // TODO we should allow this, but at the moment levels is used to build bookkeeping variables
         // in lucene's SpatialPrefixTree implementations, need a patch to correct that first
         if (grid.getMaxLevels() != mergeGrid.getMaxLevels()) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] has different tree_levels or precision");
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] has different tree_levels or precision");
         }
 
         // bail if there were merge conflicts
@@ -312,11 +379,12 @@ public class GeoShapeFieldMapper extends AbstractFieldMapper {
         }
 
         // change distance error percent
-        this.defaultStrategy.setDistErrPct(mergeWithStrategy.getDistErrPct());
-
+        this.fieldType = this.fieldType.clone();
+        this.fieldType().setDistErrPct(mergeWithStrategy.getDistErrPct());
         // change orientation - this is allowed because existing dateline spanning shapes
         // have already been unwound and segmented
-        this.shapeOrientation = fieldMergeWith.shapeOrientation;
+        this.fieldType().setOrientation(fieldMergeWith.fieldType().orientation());
+        this.fieldType.freeze();
     }
 
     @Override
@@ -328,25 +396,25 @@ public class GeoShapeFieldMapper extends AbstractFieldMapper {
         builder.field("type", contentType());
 
         // TODO: Come up with a better way to get the name, maybe pass it from builder
-        if (defaultStrategy.getGrid() instanceof GeohashPrefixTree) {
+        if (fieldType().defaultStrategy().getGrid() instanceof GeohashPrefixTree) {
             // Don't emit the tree name since GeohashPrefixTree is the default
             // Only emit the tree levels if it isn't the default value
-            if (includeDefaults || defaultStrategy.getGrid().getMaxLevels() != Defaults.GEOHASH_LEVELS) {
-                builder.field(Names.TREE_LEVELS, defaultStrategy.getGrid().getMaxLevels());
+            if (includeDefaults || fieldType().defaultStrategy().getGrid().getMaxLevels() != Defaults.GEOHASH_LEVELS) {
+                builder.field(Names.TREE_LEVELS, fieldType().defaultStrategy().getGrid().getMaxLevels());
             }
         } else {
             builder.field(Names.TREE, Names.TREE_QUADTREE);
-            if (includeDefaults || defaultStrategy.getGrid().getMaxLevels() != Defaults.QUADTREE_LEVELS) {
-                builder.field(Names.TREE_LEVELS, defaultStrategy.getGrid().getMaxLevels());
+            if (includeDefaults || fieldType().defaultStrategy().getGrid().getMaxLevels() != Defaults.QUADTREE_LEVELS) {
+                builder.field(Names.TREE_LEVELS, fieldType().defaultStrategy().getGrid().getMaxLevels());
             }
         }
 
-        if (includeDefaults || defaultStrategy.getDistErrPct() != Defaults.DISTANCE_ERROR_PCT) {
-            builder.field(Names.DISTANCE_ERROR_PCT, defaultStrategy.getDistErrPct());
+        if (includeDefaults || fieldType().defaultStrategy().getDistErrPct() != Defaults.DISTANCE_ERROR_PCT) {
+            builder.field(Names.DISTANCE_ERROR_PCT, fieldType().defaultStrategy().getDistErrPct());
         }
 
-        if (includeDefaults || orientation() != Defaults.ORIENTATION) {
-            builder.field(Names.ORIENTATION, orientation());
+        if (includeDefaults || fieldType().orientation() != Defaults.ORIENTATION) {
+            builder.field(Names.ORIENTATION, fieldType().orientation());
         }
     }
 
@@ -354,34 +422,4 @@ public class GeoShapeFieldMapper extends AbstractFieldMapper {
     protected String contentType() {
         return CONTENT_TYPE;
     }
-
-    @Override
-    public String value(Object value) {
-        throw new UnsupportedOperationException("GeoShape fields cannot be converted to String values");
-    }
-
-    public PrefixTreeStrategy defaultStrategy() {
-        return this.defaultStrategy;
-    }
-
-    public PrefixTreeStrategy recursiveStrategy() {
-        return this.recursiveStrategy;
-    }
-
-    public PrefixTreeStrategy termStrategy() {
-        return this.termStrategy;
-    }
-
-    public Orientation orientation() { return this.shapeOrientation; }
-
-    public PrefixTreeStrategy resolveStrategy(String strategyName) {
-        if (SpatialStrategy.RECURSIVE.getStrategyName().equals(strategyName)) {
-            return recursiveStrategy;
-        }
-        if (SpatialStrategy.TERM.getStrategyName().equals(strategyName)) {
-            return termStrategy;
-        }
-        throw new IllegalArgumentException("Unknown prefix tree strategy [" + strategyName + "]");
-    }
-
 }
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java
index c310d96476c..364dee5852b 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java
@@ -21,7 +21,6 @@ package org.elasticsearch.index.mapper.internal;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.Query;
@@ -34,8 +33,8 @@ import org.elasticsearch.common.lucene.all.AllField;
 import org.elasticsearch.common.lucene.all.AllTermQuery;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
@@ -45,7 +44,6 @@ import org.elasticsearch.index.mapper.RootMapper;
 import org.elasticsearch.index.mapper.core.AbstractFieldMapper;
 import org.elasticsearch.index.query.QueryParseContext;
 import org.elasticsearch.index.similarity.SimilarityLookupService;
-import org.elasticsearch.index.similarity.SimilarityProvider;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -80,11 +78,12 @@ public class AllFieldMapper extends AbstractFieldMapper implements RootMapper {
         public static final String INDEX_NAME = AllFieldMapper.NAME;
         public static final EnabledAttributeMapper ENABLED = EnabledAttributeMapper.UNSET_ENABLED;
 
-        public static final FieldType FIELD_TYPE = new FieldType();
+        public static final MappedFieldType FIELD_TYPE = new AllFieldType();
 
         static {
             FIELD_TYPE.setIndexOptions(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS);
             FIELD_TYPE.setTokenized(true);
+            FIELD_TYPE.setNames(new MappedFieldType.Names(NAME));
             FIELD_TYPE.freeze();
         }
     }
@@ -94,7 +93,7 @@ public class AllFieldMapper extends AbstractFieldMapper implements RootMapper {
         private EnabledAttributeMapper enabled = Defaults.ENABLED;
 
         public Builder() {
-            super(Defaults.NAME, new FieldType(Defaults.FIELD_TYPE));
+            super(Defaults.NAME, Defaults.FIELD_TYPE);
             builder = this;
             indexName = Defaults.INDEX_NAME;
         }
@@ -113,7 +112,7 @@ public class AllFieldMapper extends AbstractFieldMapper implements RootMapper {
             }
             fieldType.setTokenized(true);
 
-            return new AllFieldMapper(name, fieldType, indexAnalyzer, searchAnalyzer, enabled, similarity, normsLoading, fieldDataSettings, context.indexSettings());
+            return new AllFieldMapper(fieldType, enabled, fieldDataSettings, context.indexSettings());
         }
     }
 
@@ -156,18 +155,49 @@ public class AllFieldMapper extends AbstractFieldMapper implements RootMapper {
         }
     }
 
+    public static class AllFieldType extends MappedFieldType {
+
+        public AllFieldType() {
+            super(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        }
+
+        protected AllFieldType(AllFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public MappedFieldType clone() {
+            return new AllFieldType(this);
+        }
+
+        @Override
+        public String value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            return value.toString();
+        }
+
+        @Override
+        public Query queryStringTermQuery(Term term) {
+            return new AllTermQuery(term);
+        }
+
+        @Override
+        public Query termQuery(Object value, QueryParseContext context) {
+            return queryStringTermQuery(createTerm(value));
+        }
+    }
 
     private EnabledAttributeMapper enabledState;
 
     public AllFieldMapper(Settings indexSettings) {
-        this(Defaults.NAME, new FieldType(Defaults.FIELD_TYPE), null, null, Defaults.ENABLED, null, null, null, indexSettings);
+        this(Defaults.FIELD_TYPE.clone(), Defaults.ENABLED, null, indexSettings);
     }
 
-    protected AllFieldMapper(String name, FieldType fieldType, NamedAnalyzer indexAnalyzer, NamedAnalyzer searchAnalyzer,
-                             EnabledAttributeMapper enabled, SimilarityProvider similarity, Loading normsLoading,
+    protected AllFieldMapper(MappedFieldType fieldType, EnabledAttributeMapper enabled,
                              @Nullable Settings fieldDataSettings, Settings indexSettings) {
-        super(new Names(name, name, name, name), 1.0f, fieldType, false, indexAnalyzer, searchAnalyzer,
-                similarity, normsLoading, fieldDataSettings, indexSettings);
+        super(fieldType, false, fieldDataSettings, indexSettings);
         this.enabledState = enabled;
 
     }
@@ -177,7 +207,7 @@ public class AllFieldMapper extends AbstractFieldMapper implements RootMapper {
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -186,16 +216,6 @@ public class AllFieldMapper extends AbstractFieldMapper implements RootMapper {
         return new FieldDataType("string");
     }
 
-    @Override
-    public Query queryStringTermQuery(Term term) {
-        return new AllTermQuery(term);
-    }
-
-    @Override
-    public Query termQuery(Object value, QueryParseContext context) {
-        return queryStringTermQuery(createTerm(value));
-    }
-
     @Override
     public void preParse(ParseContext context) throws IOException {
     }
@@ -219,11 +239,11 @@ public class AllFieldMapper extends AbstractFieldMapper implements RootMapper {
         // reset the entries
         context.allEntries().reset();
         Analyzer analyzer = findAnalyzer(context);
-        fields.add(new AllField(names.indexName(), context.allEntries(), analyzer, fieldType));
+        fields.add(new AllField(fieldType.names().indexName(), context.allEntries(), analyzer, fieldType));
     }
 
     private Analyzer findAnalyzer(ParseContext context) {
-        Analyzer analyzer = indexAnalyzer;
+        Analyzer analyzer = fieldType.indexAnalyzer();
         if (analyzer == null) {
             analyzer = context.docMapper().mappers().indexAnalyzer();
             if (analyzer == null) {
@@ -233,14 +253,6 @@ public class AllFieldMapper extends AbstractFieldMapper implements RootMapper {
         }
         return analyzer;
     }
-    
-    @Override
-    public String value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        return value.toString();
-    }
 
     @Override
     protected String contentType() {
@@ -294,8 +306,8 @@ public class AllFieldMapper extends AbstractFieldMapper implements RootMapper {
         
         doXContentAnalyzers(builder, includeDefaults);
 
-        if (similarity() != null) {
-            builder.field("similarity", similarity().name());
+        if (fieldType().similarity() != null) {
+            builder.field("similarity", fieldType().similarity().name());
         } else if (includeDefaults) {
             builder.field("similarity", SimilarityLookupService.DEFAULT_SIMILARITY);
         }
@@ -303,14 +315,14 @@ public class AllFieldMapper extends AbstractFieldMapper implements RootMapper {
         if (customFieldDataSettings != null) {
             builder.field("fielddata", (Map) customFieldDataSettings.getAsMap());
         } else if (includeDefaults) {
-            builder.field("fielddata", (Map) fieldDataType.getSettings().getAsMap());
+            builder.field("fielddata", (Map) fieldType.fieldDataType().getSettings().getAsMap());
         }
     }
 
     @Override
     public void merge(Mapper mergeWith, MergeResult mergeResult) throws MergeMappingException {
         if (((AllFieldMapper)mergeWith).enabled() != this.enabled() && ((AllFieldMapper)mergeWith).enabledState != Defaults.ENABLED) {
-            mergeResult.addConflict("mapper [" + names.fullName() + "] enabled is " + this.enabled() + " now encountering "+ ((AllFieldMapper)mergeWith).enabled());
+            mergeResult.addConflict("mapper [" + fieldType.names().fullName() + "] enabled is " + this.enabled() + " now encountering "+ ((AllFieldMapper)mergeWith).enabled());
         }
         super.merge(mergeWith, mergeResult);
     }
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java
index 2d4a6975d94..631fdb87771 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java
@@ -31,6 +31,7 @@ import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
@@ -38,6 +39,7 @@ import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.mapper.RootMapper;
 import org.elasticsearch.index.mapper.core.AbstractFieldMapper;
+import org.elasticsearch.search.highlight.HighlightBuilder;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -65,13 +67,16 @@ public class FieldNamesFieldMapper extends AbstractFieldMapper implements RootMa
         public static final String NAME = FieldNamesFieldMapper.NAME;
         
         public static final EnabledAttributeMapper ENABLED_STATE = EnabledAttributeMapper.UNSET_ENABLED;
-        public static final FieldType FIELD_TYPE = new FieldType(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new FieldNamesFieldType();
 
         static {
             FIELD_TYPE.setIndexOptions(IndexOptions.DOCS);
             FIELD_TYPE.setTokenized(false);
             FIELD_TYPE.setStored(false);
             FIELD_TYPE.setOmitNorms(true);
+            FIELD_TYPE.setIndexAnalyzer(Lucene.KEYWORD_ANALYZER);
+            FIELD_TYPE.setSearchAnalyzer(Lucene.KEYWORD_ANALYZER);
+            FIELD_TYPE.setNames(new MappedFieldType.Names(NAME));
             FIELD_TYPE.freeze();
         }
     }
@@ -80,7 +85,7 @@ public class FieldNamesFieldMapper extends AbstractFieldMapper implements RootMa
         private EnabledAttributeMapper enabledState = Defaults.ENABLED_STATE;
 
         public Builder() {
-            super(Defaults.NAME, new FieldType(Defaults.FIELD_TYPE));
+            super(Defaults.NAME, Defaults.FIELD_TYPE);
             indexName = Defaults.NAME;
         }
 
@@ -98,7 +103,8 @@ public class FieldNamesFieldMapper extends AbstractFieldMapper implements RootMa
 
         @Override
         public FieldNamesFieldMapper build(BuilderContext context) {
-            return new FieldNamesFieldMapper(name, indexName, boost, fieldType, enabledState, fieldDataSettings, context.indexSettings());
+            fieldType.setNames(new MappedFieldType.Names(name, indexName, indexName, name));
+            return new FieldNamesFieldMapper(fieldType, enabledState, fieldDataSettings, context.indexSettings());
         }
     }
 
@@ -127,17 +133,45 @@ public class FieldNamesFieldMapper extends AbstractFieldMapper implements RootMa
         }
     }
 
-    private final FieldType defaultFieldType;
+    public static class FieldNamesFieldType extends MappedFieldType {
+
+        public FieldNamesFieldType() {
+            super(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        }
+
+        protected FieldNamesFieldType(FieldNamesFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public MappedFieldType clone() {
+            return new FieldNamesFieldType(this);
+        }
+
+        @Override
+        public String value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            return value.toString();
+        }
+
+        @Override
+        public boolean useTermQueryWithQueryString() {
+            return true;
+        }
+    }
+
+    private final MappedFieldType defaultFieldType;
     private EnabledAttributeMapper enabledState;
     private final boolean pre13Index; // if the index was created before 1.3, _field_names is always disabled
 
     public FieldNamesFieldMapper(Settings indexSettings) {
-        this(Defaults.NAME, Defaults.NAME, Defaults.BOOST, new FieldType(Defaults.FIELD_TYPE), Defaults.ENABLED_STATE, null, indexSettings);
+        this(Defaults.FIELD_TYPE.clone(), Defaults.ENABLED_STATE, null, indexSettings);
     }
 
-    public FieldNamesFieldMapper(String name, String indexName, float boost, FieldType fieldType, EnabledAttributeMapper enabledState, @Nullable Settings fieldDataSettings, Settings indexSettings) {
-        super(new Names(name, indexName, indexName, name), boost, fieldType, false, Lucene.KEYWORD_ANALYZER,
-                Lucene.KEYWORD_ANALYZER, null, null, fieldDataSettings, indexSettings);
+    public FieldNamesFieldMapper(MappedFieldType fieldType, EnabledAttributeMapper enabledState, @Nullable Settings fieldDataSettings, Settings indexSettings) {
+        super(fieldType, false, fieldDataSettings, indexSettings);
         this.defaultFieldType = Defaults.FIELD_TYPE;
         this.pre13Index = Version.indexCreated(indexSettings).before(Version.V_1_3_0);
         this.enabledState = enabledState;
@@ -148,7 +182,7 @@ public class FieldNamesFieldMapper extends AbstractFieldMapper implements RootMa
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return defaultFieldType;
     }
 
@@ -157,19 +191,6 @@ public class FieldNamesFieldMapper extends AbstractFieldMapper implements RootMa
         return new FieldDataType("string");
     }
 
-    @Override
-    public String value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        return value.toString();
-    }
-
-    @Override
-    public boolean useTermQueryWithQueryString() {
-        return true;
-    }
-
     @Override
     public void preParse(ParseContext context) throws IOException {
     }
@@ -230,7 +251,7 @@ public class FieldNamesFieldMapper extends AbstractFieldMapper implements RootMa
             for (String path : paths) {
                 for (String fieldName : extractFieldNames(path)) {
                     if (fieldType.indexOptions() != IndexOptions.NONE || fieldType.stored()) {
-                        document.add(new Field(names().indexName(), fieldName, fieldType));
+                        document.add(new Field(fieldType().names().indexName(), fieldName, fieldType));
                     }
                 }
             }
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java
index b7438540c40..87cd4f7cb31 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java
@@ -22,7 +22,6 @@ package org.elasticsearch.index.mapper.internal;
 import com.google.common.collect.Iterables;
 import org.apache.lucene.document.BinaryDocValuesField;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.queries.TermsQuery;
@@ -43,6 +42,7 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
@@ -73,14 +73,16 @@ public class IdFieldMapper extends AbstractFieldMapper implements RootMapper {
 
     public static class Defaults extends AbstractFieldMapper.Defaults {
         public static final String NAME = IdFieldMapper.NAME;
-        public static final String INDEX_NAME = IdFieldMapper.NAME;
 
-        public static final FieldType FIELD_TYPE = new FieldType(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new IdFieldType();
 
         static {
             FIELD_TYPE.setIndexOptions(IndexOptions.NONE);
             FIELD_TYPE.setStored(false);
             FIELD_TYPE.setOmitNorms(true);
+            FIELD_TYPE.setIndexAnalyzer(Lucene.KEYWORD_ANALYZER);
+            FIELD_TYPE.setSearchAnalyzer(Lucene.KEYWORD_ANALYZER);
+            FIELD_TYPE.setNames(new MappedFieldType.Names(NAME));
             FIELD_TYPE.freeze();
         }
 
@@ -92,8 +94,8 @@ public class IdFieldMapper extends AbstractFieldMapper implements RootMapper {
         private String path = Defaults.PATH;
 
         public Builder() {
-            super(Defaults.NAME, new FieldType(Defaults.FIELD_TYPE));
-            indexName = Defaults.INDEX_NAME;
+            super(Defaults.NAME, Defaults.FIELD_TYPE);
+            indexName = Defaults.NAME;
         }
 
         public Builder path(String path) {
@@ -108,7 +110,8 @@ public class IdFieldMapper extends AbstractFieldMapper implements RootMapper {
 
         @Override
         public IdFieldMapper build(BuilderContext context) {
-            return new IdFieldMapper(name, indexName, boost, fieldType, docValues, path, fieldDataSettings, context.indexSettings());
+            fieldType.setNames(new MappedFieldType.Names(name, indexName, indexName, name));
+            return new IdFieldMapper(fieldType, docValues, path, fieldDataSettings, context.indexSettings());
         }
     }
 
@@ -133,21 +136,109 @@ public class IdFieldMapper extends AbstractFieldMapper implements RootMapper {
         }
     }
 
+    public static class IdFieldType extends MappedFieldType {
+
+        public IdFieldType() {
+            super(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        }
+
+        protected IdFieldType(IdFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public MappedFieldType clone() {
+            return new IdFieldType(this);
+        }
+
+
+        @Override
+        public String value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            return value.toString();
+        }
+
+        @Override
+        public boolean useTermQueryWithQueryString() {
+            return true;
+        }
+
+        @Override
+        public Query termQuery(Object value, @Nullable QueryParseContext context) {
+            if (indexOptions() != IndexOptions.NONE || context == null) {
+                return super.termQuery(value, context);
+            }
+            final BytesRef[] uids = Uid.createUidsForTypesAndId(context.queryTypes(), value);
+            return new TermsQuery(UidFieldMapper.NAME, uids);
+        }
+
+        @Override
+        public Query termsQuery(List values, @Nullable QueryParseContext context) {
+            if (indexOptions() != IndexOptions.NONE || context == null) {
+                return super.termsQuery(values, context);
+            }
+            return new TermsQuery(UidFieldMapper.NAME, Uid.createUidsForTypesAndIds(context.queryTypes(), values));
+        }
+
+        @Override
+        public Query prefixQuery(Object value, @Nullable MultiTermQuery.RewriteMethod method, @Nullable QueryParseContext context) {
+            if (indexOptions() != IndexOptions.NONE || context == null) {
+                return super.prefixQuery(value, method, context);
+            }
+            Collection<String> queryTypes = context.queryTypes();
+            BooleanQuery query = new BooleanQuery();
+            for (String queryType : queryTypes) {
+                PrefixQuery prefixQuery = new PrefixQuery(new Term(UidFieldMapper.NAME, Uid.createUidAsBytes(queryType, BytesRefs.toBytesRef(value))));
+                if (method != null) {
+                    prefixQuery.setRewriteMethod(method);
+                }
+                query.add(prefixQuery, BooleanClause.Occur.SHOULD);
+            }
+            return query;
+        }
+
+        @Override
+        public Query regexpQuery(Object value, int flags, int maxDeterminizedStates, @Nullable MultiTermQuery.RewriteMethod method, @Nullable QueryParseContext context) {
+            if (indexOptions() != IndexOptions.NONE || context == null) {
+                return super.regexpQuery(value, flags, maxDeterminizedStates, method, context);
+            }
+            Collection<String> queryTypes = context.queryTypes();
+            if (queryTypes.size() == 1) {
+                RegexpQuery regexpQuery = new RegexpQuery(new Term(UidFieldMapper.NAME, Uid.createUidAsBytes(Iterables.getFirst(queryTypes, null), BytesRefs.toBytesRef(value))),
+                    flags, maxDeterminizedStates);
+                if (method != null) {
+                    regexpQuery.setRewriteMethod(method);
+                }
+                return regexpQuery;
+            }
+            BooleanQuery query = new BooleanQuery();
+            for (String queryType : queryTypes) {
+                RegexpQuery regexpQuery = new RegexpQuery(new Term(UidFieldMapper.NAME, Uid.createUidAsBytes(queryType, BytesRefs.toBytesRef(value))), flags, maxDeterminizedStates);
+                if (method != null) {
+                    regexpQuery.setRewriteMethod(method);
+                }
+                query.add(regexpQuery, BooleanClause.Occur.SHOULD);
+            }
+            return query;
+        }
+    }
+
     private final String path;
 
     public IdFieldMapper(Settings indexSettings) {
-        this(Defaults.NAME, Defaults.INDEX_NAME, Defaults.BOOST, idFieldType(indexSettings), null, Defaults.PATH, null, indexSettings);
+        this(idFieldType(indexSettings), null, Defaults.PATH, null, indexSettings);
     }
 
-    protected IdFieldMapper(String name, String indexName, float boost, FieldType fieldType, Boolean docValues, String path,
+    protected IdFieldMapper(MappedFieldType fieldType, Boolean docValues, String path,
                             @Nullable Settings fieldDataSettings, Settings indexSettings) {
-        super(new Names(name, indexName, indexName, name), boost, fieldType, docValues, Lucene.KEYWORD_ANALYZER,
-                Lucene.KEYWORD_ANALYZER, null, null, fieldDataSettings, indexSettings);
+        super(fieldType, docValues, fieldDataSettings, indexSettings);
         this.path = path;
     }
     
-    private static FieldType idFieldType(Settings indexSettings) {
-        FieldType fieldType = new FieldType(Defaults.FIELD_TYPE);
+    private static MappedFieldType idFieldType(Settings indexSettings) {
+        MappedFieldType fieldType = Defaults.FIELD_TYPE.clone();
         boolean pre2x = Version.indexCreated(indexSettings).before(Version.V_2_0_0);
         if (pre2x && indexSettings.getAsBoolean("index.mapping._id.indexed", true) == false) {
             fieldType.setTokenized(false);
@@ -160,7 +251,7 @@ public class IdFieldMapper extends AbstractFieldMapper implements RootMapper {
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -169,78 +260,6 @@ public class IdFieldMapper extends AbstractFieldMapper implements RootMapper {
         return new FieldDataType("string");
     }
 
-    @Override
-    public String value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        return value.toString();
-    }
-
-    @Override
-    public boolean useTermQueryWithQueryString() {
-        return true;
-    }
-
-    @Override
-    public Query termQuery(Object value, @Nullable QueryParseContext context) {
-        if (fieldType.indexOptions() != IndexOptions.NONE || context == null) {
-            return super.termQuery(value, context);
-        }
-        final BytesRef[] uids = Uid.createUidsForTypesAndId(context.queryTypes(), value);
-        return new TermsQuery(UidFieldMapper.NAME, uids);
-    }
-
-    @Override
-    public Query termsQuery(List values, @Nullable QueryParseContext context) {
-        if (fieldType.indexOptions() != IndexOptions.NONE || context == null) {
-            return super.termsQuery(values, context);
-        }
-        return new TermsQuery(UidFieldMapper.NAME, Uid.createUidsForTypesAndIds(context.queryTypes(), values));
-    }
-
-    @Override
-    public Query prefixQuery(Object value, @Nullable MultiTermQuery.RewriteMethod method, @Nullable QueryParseContext context) {
-        if (fieldType.indexOptions() != IndexOptions.NONE || context == null) {
-            return super.prefixQuery(value, method, context);
-        }
-        Collection<String> queryTypes = context.queryTypes();
-        BooleanQuery query = new BooleanQuery();
-        for (String queryType : queryTypes) {
-            PrefixQuery prefixQuery = new PrefixQuery(new Term(UidFieldMapper.NAME, Uid.createUidAsBytes(queryType, BytesRefs.toBytesRef(value))));
-            if (method != null) {
-                prefixQuery.setRewriteMethod(method);
-            }
-            query.add(prefixQuery, BooleanClause.Occur.SHOULD);
-        }
-        return query;
-    }
-
-    @Override
-    public Query regexpQuery(Object value, int flags, int maxDeterminizedStates, @Nullable MultiTermQuery.RewriteMethod method, @Nullable QueryParseContext context) {
-        if (fieldType.indexOptions() != IndexOptions.NONE || context == null) {
-            return super.regexpQuery(value, flags, maxDeterminizedStates, method, context);
-        }
-        Collection<String> queryTypes = context.queryTypes();
-        if (queryTypes.size() == 1) {
-            RegexpQuery regexpQuery = new RegexpQuery(new Term(UidFieldMapper.NAME, Uid.createUidAsBytes(Iterables.getFirst(queryTypes, null), BytesRefs.toBytesRef(value))),
-                                                      flags, maxDeterminizedStates);
-            if (method != null) {
-                regexpQuery.setRewriteMethod(method);
-            }
-            return regexpQuery;
-        }
-        BooleanQuery query = new BooleanQuery();
-        for (String queryType : queryTypes) {
-            RegexpQuery regexpQuery = new RegexpQuery(new Term(UidFieldMapper.NAME, Uid.createUidAsBytes(queryType, BytesRefs.toBytesRef(value))), flags, maxDeterminizedStates);
-            if (method != null) {
-                regexpQuery.setRewriteMethod(method);
-            }
-            query.add(regexpQuery, BooleanClause.Occur.SHOULD);
-        }
-        return query;
-    }
-
     @Override
     public void preParse(ParseContext context) throws IOException {
         if (context.sourceToParse().id() != null) {
@@ -270,10 +289,10 @@ public class IdFieldMapper extends AbstractFieldMapper implements RootMapper {
         } // else we are in the pre/post parse phase
 
         if (fieldType.indexOptions() != IndexOptions.NONE || fieldType.stored()) {
-            fields.add(new Field(names.indexName(), context.id(), fieldType));
+            fields.add(new Field(fieldType.names().indexName(), context.id(), fieldType));
         }
-        if (hasDocValues()) {
-            fields.add(new BinaryDocValuesField(names.indexName(), new BytesRef(context.id())));
+        if (fieldType().hasDocValues()) {
+            fields.add(new BinaryDocValuesField(fieldType.names().indexName(), new BytesRef(context.id())));
         }
     }
 
@@ -310,7 +329,7 @@ public class IdFieldMapper extends AbstractFieldMapper implements RootMapper {
         if (customFieldDataSettings != null) {
             builder.field("fielddata", (Map) customFieldDataSettings.getAsMap());
         } else if (includeDefaults) {
-            builder.field("fielddata", (Map) fieldDataType.getSettings().getAsMap());
+            builder.field("fielddata", (Map) fieldType.fieldDataType().getSettings().getAsMap());
         }
         builder.endObject();
         return builder;
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/IndexFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/IndexFieldMapper.java
index 34ab0bcb4ae..00fe4013ed8 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/IndexFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/IndexFieldMapper.java
@@ -21,7 +21,6 @@ package org.elasticsearch.index.mapper.internal;
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
 import org.elasticsearch.Version;
 import org.elasticsearch.common.Nullable;
@@ -30,6 +29,7 @@ import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperBuilders;
 import org.elasticsearch.index.mapper.MapperParsingException;
@@ -38,6 +38,7 @@ import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.mapper.RootMapper;
 import org.elasticsearch.index.mapper.core.AbstractFieldMapper;
+import org.elasticsearch.search.highlight.HighlightBuilder;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -59,13 +60,16 @@ public class IndexFieldMapper extends AbstractFieldMapper implements RootMapper
     public static class Defaults extends AbstractFieldMapper.Defaults {
         public static final String NAME = IndexFieldMapper.NAME;
 
-        public static final FieldType FIELD_TYPE = new FieldType(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new IndexFieldType();
 
         static {
             FIELD_TYPE.setIndexOptions(IndexOptions.DOCS);
             FIELD_TYPE.setTokenized(false);
             FIELD_TYPE.setStored(false);
             FIELD_TYPE.setOmitNorms(true);
+            FIELD_TYPE.setIndexAnalyzer(Lucene.KEYWORD_ANALYZER);
+            FIELD_TYPE.setSearchAnalyzer(Lucene.KEYWORD_ANALYZER);
+            FIELD_TYPE.setNames(new MappedFieldType.Names(NAME));
             FIELD_TYPE.freeze();
         }
 
@@ -77,7 +81,7 @@ public class IndexFieldMapper extends AbstractFieldMapper implements RootMapper
         private EnabledAttributeMapper enabledState = EnabledAttributeMapper.UNSET_DISABLED;
 
         public Builder() {
-            super(Defaults.NAME, new FieldType(Defaults.FIELD_TYPE));
+            super(Defaults.NAME, Defaults.FIELD_TYPE);
             indexName = Defaults.NAME;
         }
 
@@ -88,7 +92,8 @@ public class IndexFieldMapper extends AbstractFieldMapper implements RootMapper
 
         @Override
         public IndexFieldMapper build(BuilderContext context) {
-            return new IndexFieldMapper(name, indexName, boost, fieldType, enabledState, fieldDataSettings, context.indexSettings());
+            fieldType.setNames(new MappedFieldType.Names(name, indexName, indexName, name));
+            return new IndexFieldMapper(fieldType, enabledState, fieldDataSettings, context.indexSettings());
         }
     }
 
@@ -114,16 +119,39 @@ public class IndexFieldMapper extends AbstractFieldMapper implements RootMapper
         }
     }
 
+    public static class IndexFieldType extends MappedFieldType {
+
+        public IndexFieldType() {
+            super(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        }
+
+        protected IndexFieldType(IndexFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public MappedFieldType clone() {
+            return new IndexFieldType(this);
+        }
+
+        @Override
+        public String value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            return value.toString();
+        }
+    }
+
     private EnabledAttributeMapper enabledState;
 
     public IndexFieldMapper(Settings indexSettings) {
-        this(Defaults.NAME, Defaults.NAME, Defaults.BOOST, new FieldType(Defaults.FIELD_TYPE), Defaults.ENABLED_STATE, null, indexSettings);
+        this(Defaults.FIELD_TYPE.clone(), Defaults.ENABLED_STATE, null, indexSettings);
     }
 
-    public IndexFieldMapper(String name, String indexName, float boost, FieldType fieldType, EnabledAttributeMapper enabledState,
+    public IndexFieldMapper(MappedFieldType fieldType, EnabledAttributeMapper enabledState,
                             @Nullable Settings fieldDataSettings, Settings indexSettings) {
-        super(new Names(name, indexName, indexName, name), boost, fieldType, false, Lucene.KEYWORD_ANALYZER,
-                Lucene.KEYWORD_ANALYZER, null, null, fieldDataSettings, indexSettings);
+        super(fieldType, false, fieldDataSettings, indexSettings);
         this.enabledState = enabledState;
     }
 
@@ -132,7 +160,7 @@ public class IndexFieldMapper extends AbstractFieldMapper implements RootMapper
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -142,16 +170,8 @@ public class IndexFieldMapper extends AbstractFieldMapper implements RootMapper
     }
 
     public String value(Document document) {
-        Field field = (Field) document.getField(names.indexName());
-        return field == null ? null : value(field);
-    }
-
-    @Override
-    public String value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        return value.toString();
+        Field field = (Field) document.getField(fieldType.names().indexName());
+        return field == null ? null : (String)fieldType().value(field);
     }
 
     @Override
@@ -174,7 +194,7 @@ public class IndexFieldMapper extends AbstractFieldMapper implements RootMapper
         if (!enabledState.enabled) {
             return;
         }
-        fields.add(new Field(names.indexName(), context.index(), fieldType));
+        fields.add(new Field(fieldType.names().indexName(), context.index(), fieldType));
     }
 
     @Override
@@ -202,7 +222,7 @@ public class IndexFieldMapper extends AbstractFieldMapper implements RootMapper
             if (customFieldDataSettings != null) {
                 builder.field("fielddata", (Map) customFieldDataSettings.getAsMap());
             } else if (includeDefaults) {
-                builder.field("fielddata", (Map) fieldDataType.getSettings().getAsMap());
+                builder.field("fielddata", (Map) fieldType.fieldDataType().getSettings().getAsMap());
             }
         }
         builder.endObject();
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java
index 7aca0b17ea6..ea79136beb1 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java
@@ -20,7 +20,6 @@ package org.elasticsearch.index.mapper.internal;
 
 import com.google.common.base.Objects;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.queries.TermsQuery;
 import org.apache.lucene.search.Query;
@@ -35,6 +34,7 @@ import org.elasticsearch.common.settings.loader.SettingsLoader;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.fielddata.FieldDataType;
 import org.elasticsearch.index.mapper.DocumentMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
@@ -70,18 +70,21 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
     public static class Defaults extends AbstractFieldMapper.Defaults {
         public static final String NAME = ParentFieldMapper.NAME;
 
-        public static final FieldType FIELD_TYPE = new FieldType(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new ParentFieldType();
 
         static {
             FIELD_TYPE.setIndexOptions(IndexOptions.DOCS);
             FIELD_TYPE.setTokenized(false);
             FIELD_TYPE.setStored(true);
             FIELD_TYPE.setOmitNorms(true);
+            FIELD_TYPE.setIndexAnalyzer(Lucene.KEYWORD_ANALYZER);
+            FIELD_TYPE.setSearchAnalyzer(Lucene.KEYWORD_ANALYZER);
+            FIELD_TYPE.setNames(new MappedFieldType.Names(NAME));
             FIELD_TYPE.freeze();
         }
     }
 
-    public static class Builder extends Mapper.Builder<Builder, ParentFieldMapper> {
+    public static class Builder extends AbstractFieldMapper.Builder<Builder, ParentFieldMapper> {
 
         protected String indexName;
 
@@ -89,7 +92,7 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
         protected Settings fieldDataSettings;
 
         public Builder() {
-            super(Defaults.NAME);
+            super(Defaults.NAME, Defaults.FIELD_TYPE);
             this.indexName = name;
             builder = this;
         }
@@ -109,7 +112,8 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
             if (type == null) {
                 throw new MapperParsingException("Parent mapping must contain the parent type");
             }
-            return new ParentFieldMapper(name, indexName, type, fieldDataSettings, context.indexSettings());
+            fieldType.setNames(new MappedFieldType.Names(name, indexName, indexName, name));
+            return new ParentFieldMapper(fieldType, type, fieldDataSettings, context.indexSettings());
         }
     }
 
@@ -130,8 +134,8 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
                 } else if (fieldName.equals("fielddata")) {
                     // Only take over `loading`, since that is the only option now that is configurable:
                     Map<String, String> fieldDataSettings = SettingsLoader.Helper.loadNestedFromMap(nodeMapValue(fieldNode, "fielddata"));
-                    if (fieldDataSettings.containsKey(Loading.KEY)) {
-                        Settings settings = settingsBuilder().put(Loading.KEY, fieldDataSettings.get(Loading.KEY)).build();
+                    if (fieldDataSettings.containsKey(MappedFieldType.Loading.KEY)) {
+                        Settings settings = settingsBuilder().put(MappedFieldType.Loading.KEY, fieldDataSettings.get(MappedFieldType.Loading.KEY)).build();
                         builder.fieldDataSettings(settings);
                     }
                     iterator.remove();
@@ -141,19 +145,101 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
         }
     }
 
+    public static class ParentFieldType extends MappedFieldType {
+
+        public ParentFieldType() {
+            super(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        }
+
+        protected ParentFieldType(ParentFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public MappedFieldType clone() {
+            return new ParentFieldType(this);
+        }
+
+        @Override
+        public Uid value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            return Uid.createUid(value.toString());
+        }
+
+        @Override
+        public Object valueForSearch(Object value) {
+            if (value == null) {
+                return null;
+            }
+            String sValue = value.toString();
+            if (sValue == null) {
+                return null;
+            }
+            int index = sValue.indexOf(Uid.DELIMITER);
+            if (index == -1) {
+                return sValue;
+            }
+            return sValue.substring(index + 1);
+        }
+
+        /**
+         * We don't need to analyzer the text, and we need to convert it to UID...
+         */
+        @Override
+        public boolean useTermQueryWithQueryString() {
+            return true;
+        }
+
+        @Override
+        public Query termQuery(Object value, @Nullable QueryParseContext context) {
+            return termsQuery(Collections.singletonList(value), context);
+        }
+
+        @Override
+        public Query termsQuery(List values, @Nullable QueryParseContext context) {
+            if (context == null) {
+                return super.termsQuery(values, context);
+            }
+
+            List<String> types = new ArrayList<>(context.mapperService().types().size());
+            for (DocumentMapper documentMapper : context.mapperService().docMappers(false)) {
+                if (!documentMapper.parentFieldMapper().active()) {
+                    types.add(documentMapper.type());
+                }
+            }
+
+            List<BytesRef> bValues = new ArrayList<>(values.size());
+            for (Object value : values) {
+                BytesRef bValue = BytesRefs.toBytesRef(value);
+                if (Uid.hasDelimiter(bValue)) {
+                    bValues.add(bValue);
+                } else {
+                    // we use all non child types, cause we don't know if its exact or not...
+                    for (String type : types) {
+                        bValues.add(Uid.createUidAsBytes(type, bValue));
+                    }
+                }
+            }
+            return new TermsQuery(names().indexName(), bValues);
+        }
+    }
+
     private final String type;
     private final BytesRef typeAsBytes;
 
-    protected ParentFieldMapper(String name, String indexName, String type, @Nullable Settings fieldDataSettings, Settings indexSettings) {
-        super(new Names(name, indexName, indexName, name), Defaults.BOOST, new FieldType(Defaults.FIELD_TYPE), false,
-                Lucene.KEYWORD_ANALYZER, Lucene.KEYWORD_ANALYZER, null, null, fieldDataSettings, indexSettings);
+    protected ParentFieldMapper(MappedFieldType fieldType, String type, @Nullable Settings fieldDataSettings, Settings indexSettings) {
+        super(fieldType, false, fieldDataSettings, indexSettings);
         this.type = type;
         this.typeAsBytes = type == null ? null : new BytesRef(type);
     }
 
     public ParentFieldMapper(Settings indexSettings) {
-        this(Defaults.NAME, Defaults.NAME, null, null, indexSettings);
-        this.fieldDataType = new FieldDataType("_parent", settingsBuilder().put(Loading.KEY, Loading.LAZY_VALUE));
+        this(Defaults.FIELD_TYPE.clone(), null, null, indexSettings);
+        this.fieldType = this.fieldType.clone();
+        this.fieldType.setFieldDataType(new FieldDataType("_parent", settingsBuilder().put(MappedFieldType.Loading.KEY, MappedFieldType.Loading.LAZY_VALUE)));
+        this.fieldType.freeze();
     }
 
     public String type() {
@@ -161,13 +247,13 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
     @Override
     public FieldDataType defaultFieldDataType() {
-        return new FieldDataType("_parent", settingsBuilder().put(Loading.KEY, Loading.EAGER_VALUE));
+        return new FieldDataType("_parent", settingsBuilder().put(MappedFieldType.Loading.KEY, MappedFieldType.Loading.EAGER_VALUE));
     }
 
     @Override
@@ -189,7 +275,7 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
             // we are in the parsing of _parent phase
             String parentId = context.parser().text();
             context.sourceToParse().parent(parentId);
-            fields.add(new Field(names.indexName(), Uid.createUid(context.stringBuilder(), type, parentId), fieldType));
+            fields.add(new Field(fieldType.names().indexName(), Uid.createUid(context.stringBuilder(), type, parentId), fieldType));
         } else {
             // otherwise, we are running it post processing of the xcontent
             String parsedParentId = context.doc().get(Defaults.NAME);
@@ -200,7 +286,7 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
                         throw new MapperParsingException("No parent id provided, not within the document, and not externally");
                     }
                     // we did not add it in the parsing phase, add it now
-                    fields.add(new Field(names.indexName(), Uid.createUid(context.stringBuilder(), type, parentId), fieldType));
+                    fields.add(new Field(fieldType.names().indexName(), Uid.createUid(context.stringBuilder(), type, parentId), fieldType));
                 } else if (parentId != null && !parsedParentId.equals(Uid.createUid(context.stringBuilder(), type, parentId))) {
                     throw new MapperParsingException("Parent id mismatch, document value is [" + Uid.createUid(parsedParentId).id() + "], while external value is [" + parentId + "]");
                 }
@@ -209,87 +295,6 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
         // we have parent mapping, yet no value was set, ignore it...
     }
 
-    @Override
-    public Uid value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        return Uid.createUid(value.toString());
-    }
-
-    @Override
-    public Object valueForSearch(Object value) {
-        if (value == null) {
-            return null;
-        }
-        String sValue = value.toString();
-        if (sValue == null) {
-            return null;
-        }
-        int index = sValue.indexOf(Uid.DELIMITER);
-        if (index == -1) {
-            return sValue;
-        }
-        return sValue.substring(index + 1);
-    }
-
-    @Override
-    public BytesRef indexedValueForSearch(Object value) {
-        if (value instanceof BytesRef) {
-            BytesRef bytesRef = (BytesRef) value;
-            if (Uid.hasDelimiter(bytesRef)) {
-                return bytesRef;
-            }
-            return Uid.createUidAsBytes(typeAsBytes, bytesRef);
-        }
-        String sValue = value.toString();
-        if (sValue.indexOf(Uid.DELIMITER) == -1) {
-            return Uid.createUidAsBytes(type, sValue);
-        }
-        return super.indexedValueForSearch(value);
-    }
-
-    @Override
-    public Query termQuery(Object value, @Nullable QueryParseContext context) {
-        return termsQuery(Collections.singletonList(value), context);
-    }
-
-    @Override
-    public Query termsQuery(List values, @Nullable QueryParseContext context) {
-        if (context == null) {
-            return super.termsQuery(values, context);
-        }
-
-        List<String> types = new ArrayList<>(context.mapperService().types().size());
-        for (DocumentMapper documentMapper : context.mapperService().docMappers(false)) {
-            if (!documentMapper.parentFieldMapper().active()) {
-                types.add(documentMapper.type());
-            }
-        }
-
-        List<BytesRef> bValues = new ArrayList<>(values.size());
-        for (Object value : values) {
-            BytesRef bValue = BytesRefs.toBytesRef(value);
-            if (Uid.hasDelimiter(bValue)) {
-                bValues.add(bValue);
-            } else {
-                // we use all non child types, cause we don't know if its exact or not...
-                for (String type : types) {
-                    bValues.add(Uid.createUidAsBytes(type, bValue));
-                }
-            }
-        }
-        return new TermsQuery(names.indexName(), bValues);
-    }
-
-    /**
-     * We don't need to analyzer the text, and we need to convert it to UID...
-     */
-    @Override
-    public boolean useTermQueryWithQueryString() {
-        return true;
-    }
-
     @Override
     protected String contentType() {
         return CONTENT_TYPE;
@@ -307,12 +312,28 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
         if (customFieldDataSettings != null) {
             builder.field("fielddata", (Map) customFieldDataSettings.getAsMap());
         } else if (includeDefaults) {
-            builder.field("fielddata", (Map) fieldDataType.getSettings().getAsMap());
+            builder.field("fielddata", (Map) fieldType.fieldDataType().getSettings().getAsMap());
         }
         builder.endObject();
         return builder;
     }
 
+    @Override
+    public BytesRef indexedValueForSearch(Object value) {
+        if (value instanceof BytesRef) {
+            BytesRef bytesRef = (BytesRef) value;
+            if (Uid.hasDelimiter(bytesRef)) {
+                return bytesRef;
+            }
+            return Uid.createUidAsBytes(typeAsBytes, bytesRef);
+        }
+        String sValue = value.toString();
+        if (sValue.indexOf(Uid.DELIMITER) == -1) {
+            return Uid.createUidAsBytes(type, sValue);
+        }
+        return super.indexedValueForSearch(value);
+    }
+
     @Override
     public void merge(Mapper mergeWith, MergeResult mergeResult) throws MergeMappingException {
         ParentFieldMapper other = (ParentFieldMapper) mergeWith;
@@ -322,14 +343,16 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
 
         if (!mergeResult.simulate()) {
             ParentFieldMapper fieldMergeWith = (ParentFieldMapper) mergeWith;
+            this.fieldType = this.fieldType.clone();
             if (fieldMergeWith.customFieldDataSettings != null) {
                 if (!Objects.equal(fieldMergeWith.customFieldDataSettings, this.customFieldDataSettings)) {
                     this.customFieldDataSettings = fieldMergeWith.customFieldDataSettings;
-                    this.fieldDataType = new FieldDataType(defaultFieldDataType().getType(),
+                    this.fieldType.setFieldDataType(new FieldDataType(defaultFieldDataType().getType(),
                             builder().put(defaultFieldDataType().getSettings()).put(this.customFieldDataSettings)
-                    );
+                    ));
                 }
             }
+            this.fieldType.freeze();
         }
     }
 
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/RoutingFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/RoutingFieldMapper.java
index 96b9375d9ad..d03238caf6e 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/RoutingFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/RoutingFieldMapper.java
@@ -21,7 +21,6 @@ package org.elasticsearch.index.mapper.internal;
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
 import org.elasticsearch.Version;
 import org.elasticsearch.common.Nullable;
@@ -30,6 +29,7 @@ import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
@@ -58,13 +58,16 @@ public class RoutingFieldMapper extends AbstractFieldMapper implements RootMappe
     public static class Defaults extends AbstractFieldMapper.Defaults {
         public static final String NAME = "_routing";
 
-        public static final FieldType FIELD_TYPE = new FieldType(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new RoutingFieldType();
 
         static {
             FIELD_TYPE.setIndexOptions(IndexOptions.DOCS);
             FIELD_TYPE.setTokenized(false);
             FIELD_TYPE.setStored(true);
             FIELD_TYPE.setOmitNorms(true);
+            FIELD_TYPE.setIndexAnalyzer(Lucene.KEYWORD_ANALYZER);
+            FIELD_TYPE.setSearchAnalyzer(Lucene.KEYWORD_ANALYZER);
+            FIELD_TYPE.setNames(new MappedFieldType.Names(NAME));
             FIELD_TYPE.freeze();
         }
 
@@ -79,7 +82,7 @@ public class RoutingFieldMapper extends AbstractFieldMapper implements RootMappe
         private String path = Defaults.PATH;
 
         public Builder() {
-            super(Defaults.NAME, new FieldType(Defaults.FIELD_TYPE));
+            super(Defaults.NAME, Defaults.FIELD_TYPE);
         }
 
         public Builder required(boolean required) {
@@ -121,6 +124,29 @@ public class RoutingFieldMapper extends AbstractFieldMapper implements RootMappe
         }
     }
 
+    public static class RoutingFieldType extends MappedFieldType {
+
+        public RoutingFieldType() {
+            super(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        }
+
+        protected RoutingFieldType(RoutingFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public MappedFieldType clone() {
+            return new RoutingFieldType(this);
+        }
+
+        @Override
+        public String value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            return value.toString();
+        }
+    }
 
     private boolean required;
     private final String path;
@@ -129,15 +155,14 @@ public class RoutingFieldMapper extends AbstractFieldMapper implements RootMappe
         this(Defaults.FIELD_TYPE, Defaults.REQUIRED, Defaults.PATH, null, indexSettings);
     }
 
-    protected RoutingFieldMapper(FieldType fieldType, boolean required, String path, @Nullable Settings fieldDataSettings, Settings indexSettings) {
-        super(new Names(Defaults.NAME, Defaults.NAME, Defaults.NAME, Defaults.NAME), 1.0f, fieldType, false, Lucene.KEYWORD_ANALYZER,
-                Lucene.KEYWORD_ANALYZER, null, null, fieldDataSettings, indexSettings);
+    protected RoutingFieldMapper(MappedFieldType fieldType, boolean required, String path, @Nullable Settings fieldDataSettings, Settings indexSettings) {
+        super(fieldType, false, fieldDataSettings, indexSettings);
         this.required = required;
         this.path = path;
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -159,16 +184,8 @@ public class RoutingFieldMapper extends AbstractFieldMapper implements RootMappe
     }
 
     public String value(Document document) {
-        Field field = (Field) document.getField(names.indexName());
-        return field == null ? null : value(field);
-    }
-
-    @Override
-    public String value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        return value.toString();
+        Field field = (Field) document.getField(fieldType.names().indexName());
+        return field == null ? null : (String)value(field);
     }
 
     @Override
@@ -194,10 +211,10 @@ public class RoutingFieldMapper extends AbstractFieldMapper implements RootMappe
             String routing = context.sourceToParse().routing();
             if (routing != null) {
                 if (fieldType.indexOptions() == IndexOptions.NONE && !fieldType.stored()) {
-                    context.ignoredValue(names.indexName(), routing);
+                    context.ignoredValue(fieldType.names().indexName(), routing);
                     return;
                 }
-                fields.add(new Field(names.indexName(), routing, fieldType));
+                fields.add(new Field(fieldType.names().indexName(), routing, fieldType));
             }
         }
     }
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/SizeFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/SizeFieldMapper.java
index 1d8ad2a422c..a9435c5a1da 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/SizeFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/SizeFieldMapper.java
@@ -20,16 +20,18 @@
 package org.elasticsearch.index.mapper.internal;
 
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.elasticsearch.Version;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.index.analysis.NamedAnalyzer;
+import org.elasticsearch.index.analysis.NumericIntegerAnalyzer;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
-import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.MergeMappingException;
+import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.mapper.RootMapper;
 import org.elasticsearch.index.mapper.core.IntegerFieldMapper;
@@ -53,10 +55,12 @@ public class SizeFieldMapper extends IntegerFieldMapper implements RootMapper {
         public static final String NAME = CONTENT_TYPE;
         public static final EnabledAttributeMapper ENABLED_STATE = EnabledAttributeMapper.UNSET_DISABLED;
 
-        public static final FieldType SIZE_FIELD_TYPE = new FieldType(IntegerFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType SIZE_FIELD_TYPE = IntegerFieldMapper.Defaults.FIELD_TYPE.clone();
 
         static {
             SIZE_FIELD_TYPE.setStored(true);
+            SIZE_FIELD_TYPE.setNumericPrecisionStep(Defaults.PRECISION_STEP_32_BIT);
+            SIZE_FIELD_TYPE.setNames(new MappedFieldType.Names(NAME));
             SIZE_FIELD_TYPE.freeze();
         }
     }
@@ -66,7 +70,7 @@ public class SizeFieldMapper extends IntegerFieldMapper implements RootMapper {
         protected EnabledAttributeMapper enabledState = EnabledAttributeMapper.UNSET_DISABLED;
 
         public Builder() {
-            super(Defaults.NAME, new FieldType(Defaults.SIZE_FIELD_TYPE), Defaults.PRECISION_STEP_32_BIT);
+            super(Defaults.NAME, Defaults.SIZE_FIELD_TYPE, Defaults.PRECISION_STEP_32_BIT);
             builder = this;
         }
 
@@ -77,8 +81,19 @@ public class SizeFieldMapper extends IntegerFieldMapper implements RootMapper {
 
         @Override
         public SizeFieldMapper build(BuilderContext context) {
+            setupFieldType(context);
             return new SizeFieldMapper(enabledState, fieldType, fieldDataSettings, context.indexSettings());
         }
+
+        @Override
+        protected NamedAnalyzer makeNumberAnalyzer(int precisionStep) {
+            return NumericIntegerAnalyzer.buildNamedAnalyzer(precisionStep);
+        }
+
+        @Override
+        protected int maxPrecisionStep() {
+            return 32;
+        }
     }
 
     public static class TypeParser implements Mapper.TypeParser {
@@ -104,12 +119,12 @@ public class SizeFieldMapper extends IntegerFieldMapper implements RootMapper {
     private EnabledAttributeMapper enabledState;
 
     public SizeFieldMapper(Settings indexSettings) {
-        this(Defaults.ENABLED_STATE, new FieldType(Defaults.SIZE_FIELD_TYPE), null, indexSettings);
+        this(Defaults.ENABLED_STATE, Defaults.SIZE_FIELD_TYPE.clone(), null, indexSettings);
     }
 
-    public SizeFieldMapper(EnabledAttributeMapper enabled, FieldType fieldType, @Nullable Settings fieldDataSettings, Settings indexSettings) {
-        super(new Names(Defaults.NAME), Defaults.PRECISION_STEP_32_BIT, Defaults.BOOST, fieldType, false, Defaults.NULL_VALUE,
-                Defaults.IGNORE_MALFORMED,  Defaults.COERCE, null, null, fieldDataSettings, 
+    public SizeFieldMapper(EnabledAttributeMapper enabled, MappedFieldType fieldType, @Nullable Settings fieldDataSettings, Settings indexSettings) {
+        super(fieldType, false, Defaults.NULL_VALUE,
+                Defaults.IGNORE_MALFORMED,  Defaults.COERCE, fieldDataSettings,
                 indexSettings, MultiFields.empty(), null);
         this.enabledState = enabled;
     }
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java
index 7c8ae58d5fd..0324ef0d0d3 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java
@@ -21,7 +21,6 @@ package org.elasticsearch.index.mapper.internal;
 
 import com.google.common.base.Objects;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.document.StoredField;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.util.BytesRef;
@@ -45,6 +44,7 @@ import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
@@ -78,12 +78,15 @@ public class SourceFieldMapper extends AbstractFieldMapper implements RootMapper
         public static final long COMPRESS_THRESHOLD = -1;
         public static final String FORMAT = null; // default format is to use the one provided
 
-        public static final FieldType FIELD_TYPE = new FieldType(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new SourceFieldType();
 
         static {
             FIELD_TYPE.setIndexOptions(IndexOptions.NONE); // not indexed
             FIELD_TYPE.setStored(true);
             FIELD_TYPE.setOmitNorms(true);
+            FIELD_TYPE.setIndexAnalyzer(Lucene.KEYWORD_ANALYZER);
+            FIELD_TYPE.setSearchAnalyzer(Lucene.KEYWORD_ANALYZER);
+            FIELD_TYPE.setNames(new MappedFieldType.Names(NAME));
             FIELD_TYPE.freeze();
         }
 
@@ -138,7 +141,7 @@ public class SourceFieldMapper extends AbstractFieldMapper implements RootMapper
 
         @Override
         public SourceFieldMapper build(BuilderContext context) {
-            return new SourceFieldMapper(name, enabled, format, compress, compressThreshold, includes, excludes, context.indexSettings());
+            return new SourceFieldMapper(enabled, format, compress, compressThreshold, includes, excludes, context.indexSettings());
         }
     }
 
@@ -195,6 +198,39 @@ public class SourceFieldMapper extends AbstractFieldMapper implements RootMapper
         }
     }
 
+    public static class SourceFieldType extends MappedFieldType {
+
+        public SourceFieldType() {
+            super(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        }
+
+        protected SourceFieldType(SourceFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public MappedFieldType clone() {
+            return new SourceFieldType(this);
+        }
+
+        @Override
+        public byte[] value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            BytesReference bValue;
+            if (value instanceof BytesRef) {
+                bValue = new BytesArray((BytesRef) value);
+            } else {
+                bValue = (BytesReference) value;
+            }
+            try {
+                return CompressorFactory.uncompressIfNeeded(bValue).toBytes();
+            } catch (IOException e) {
+                throw new ElasticsearchParseException("failed to decompress source", e);
+            }
+        }
+    }
 
     private final boolean enabled;
 
@@ -212,13 +248,12 @@ public class SourceFieldMapper extends AbstractFieldMapper implements RootMapper
     private XContentType formatContentType;
 
     public SourceFieldMapper(Settings indexSettings) {
-        this(Defaults.NAME, Defaults.ENABLED, Defaults.FORMAT, null, -1, null, null, indexSettings);
+        this(Defaults.ENABLED, Defaults.FORMAT, null, -1, null, null, indexSettings);
     }
 
-    protected SourceFieldMapper(String name, boolean enabled, String format, Boolean compress, long compressThreshold,
+    protected SourceFieldMapper(boolean enabled, String format, Boolean compress, long compressThreshold,
                                 String[] includes, String[] excludes, Settings indexSettings) {
-        super(new Names(name, name, name, name), Defaults.BOOST, new FieldType(Defaults.FIELD_TYPE), false,
-                Lucene.KEYWORD_ANALYZER, Lucene.KEYWORD_ANALYZER, null, null, null, indexSettings); // Only stored.
+        super(Defaults.FIELD_TYPE.clone(), false, null, indexSettings); // Only stored.
         this.enabled = enabled;
         this.compress = compress;
         this.compressThreshold = compressThreshold;
@@ -247,7 +282,7 @@ public class SourceFieldMapper extends AbstractFieldMapper implements RootMapper
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -358,25 +393,7 @@ public class SourceFieldMapper extends AbstractFieldMapper implements RootMapper
         if (!source.hasArray()) {
             source = source.toBytesArray();
         }
-        fields.add(new StoredField(names().indexName(), source.array(), source.arrayOffset(), source.length()));
-    }
-
-    @Override
-    public byte[] value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        BytesReference bValue;
-        if (value instanceof BytesRef) {
-            bValue = new BytesArray((BytesRef) value);
-        } else {
-            bValue = (BytesReference) value;
-        }
-        try {
-            return CompressorFactory.uncompressIfNeeded(bValue).toBytes();
-        } catch (IOException e) {
-            throw new ElasticsearchParseException("failed to decompress source", e);
-        }
+        fields.add(new StoredField(fieldType().names().indexName(), source.array(), source.arrayOffset(), source.length()));
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/TTLFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/TTLFieldMapper.java
index 8e817ddd903..0040b4a5140 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/TTLFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/TTLFieldMapper.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.index.mapper.internal;
 
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
 import org.elasticsearch.common.Explicit;
 import org.elasticsearch.common.Nullable;
@@ -30,6 +29,9 @@ import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.AlreadyExpiredException;
+import org.elasticsearch.index.analysis.NamedAnalyzer;
+import org.elasticsearch.index.analysis.NumericLongAnalyzer;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
@@ -59,12 +61,14 @@ public class TTLFieldMapper extends LongFieldMapper implements RootMapper {
     public static class Defaults extends LongFieldMapper.Defaults {
         public static final String NAME = TTLFieldMapper.CONTENT_TYPE;
 
-        public static final FieldType TTL_FIELD_TYPE = new FieldType(LongFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType TTL_FIELD_TYPE = new TTLFieldType();
 
         static {
             TTL_FIELD_TYPE.setIndexOptions(IndexOptions.DOCS);
             TTL_FIELD_TYPE.setStored(true);
             TTL_FIELD_TYPE.setTokenized(false);
+            TTL_FIELD_TYPE.setNumericPrecisionStep(Defaults.PRECISION_STEP_64_BIT);
+            TTL_FIELD_TYPE.setNames(new MappedFieldType.Names(NAME));
             TTL_FIELD_TYPE.freeze();
         }
 
@@ -78,7 +82,7 @@ public class TTLFieldMapper extends LongFieldMapper implements RootMapper {
         private long defaultTTL = Defaults.DEFAULT;
 
         public Builder() {
-            super(Defaults.NAME, new FieldType(Defaults.TTL_FIELD_TYPE), Defaults.PRECISION_STEP_64_BIT);
+            super(Defaults.NAME, Defaults.TTL_FIELD_TYPE, Defaults.PRECISION_STEP_64_BIT);
         }
 
         public Builder enabled(EnabledAttributeMapper enabled) {
@@ -93,8 +97,19 @@ public class TTLFieldMapper extends LongFieldMapper implements RootMapper {
 
         @Override
         public TTLFieldMapper build(BuilderContext context) {
+            setupFieldType(context);
             return new TTLFieldMapper(fieldType, enabledState, defaultTTL, ignoreMalformed(context),coerce(context), fieldDataSettings, context.indexSettings());
         }
+
+        @Override
+        protected NamedAnalyzer makeNumberAnalyzer(int precisionStep) {
+            return NumericLongAnalyzer.buildNamedAnalyzer(precisionStep);
+        }
+
+        @Override
+        protected int maxPrecisionStep() {
+            return 64;
+        }
     }
 
     public static class TypeParser implements Mapper.TypeParser {
@@ -121,18 +136,46 @@ public class TTLFieldMapper extends LongFieldMapper implements RootMapper {
         }
     }
 
+    public static class TTLFieldType extends LongFieldType {
+
+        public TTLFieldType() {
+        }
+
+        protected TTLFieldType(TTLFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public LongFieldType clone() {
+            return new TTLFieldType(this);
+        }
+
+        // Overrides valueForSearch to display live value of remaining ttl
+        @Override
+        public Object valueForSearch(Object value) {
+            long now;
+            SearchContext searchContext = SearchContext.current();
+            if (searchContext != null) {
+                now = searchContext.nowInMillis();
+            } else {
+                now = System.currentTimeMillis();
+            }
+            long val = value(value);
+            return val - now;
+        }
+    }
+
     private EnabledAttributeMapper enabledState;
     private long defaultTTL;
 
     public TTLFieldMapper(Settings indexSettings) {
-        this(new FieldType(Defaults.TTL_FIELD_TYPE), Defaults.ENABLED_STATE, Defaults.DEFAULT, Defaults.IGNORE_MALFORMED, Defaults.COERCE, null, indexSettings);
+        this(Defaults.TTL_FIELD_TYPE.clone(), Defaults.ENABLED_STATE, Defaults.DEFAULT, Defaults.IGNORE_MALFORMED, Defaults.COERCE, null, indexSettings);
     }
 
-    protected TTLFieldMapper(FieldType fieldType, EnabledAttributeMapper enabled, long defaultTTL, Explicit<Boolean> ignoreMalformed,
+    protected TTLFieldMapper(MappedFieldType fieldType, EnabledAttributeMapper enabled, long defaultTTL, Explicit<Boolean> ignoreMalformed,
                 Explicit<Boolean> coerce, @Nullable Settings fieldDataSettings, Settings indexSettings) {
-        super(new Names(Defaults.NAME, Defaults.NAME, Defaults.NAME, Defaults.NAME), Defaults.PRECISION_STEP_64_BIT,
-                Defaults.BOOST, fieldType, false, Defaults.NULL_VALUE, ignoreMalformed, coerce,
-                null, null, fieldDataSettings, indexSettings, MultiFields.empty(), null);
+        super(fieldType, false, Defaults.NULL_VALUE, ignoreMalformed, coerce,
+            fieldDataSettings, indexSettings, MultiFields.empty(), null);
         this.enabledState = enabled;
         this.defaultTTL = defaultTTL;
     }
@@ -145,20 +188,6 @@ public class TTLFieldMapper extends LongFieldMapper implements RootMapper {
         return this.defaultTTL;
     }
 
-    // Overrides valueForSearch to display live value of remaining ttl
-    @Override
-    public Object valueForSearch(Object value) {
-        long now;
-        SearchContext searchContext = SearchContext.current();
-        if (searchContext != null) {
-            now = searchContext.nowInMillis();
-        } else {
-            now = System.currentTimeMillis();
-        }
-        long val = value(value);
-        return val - now;
-    }
-
     // Other implementation for realtime get display
     public Object valueForSearch(long expirationTime) {
         return expirationTime - System.currentTimeMillis();
@@ -207,7 +236,7 @@ public class TTLFieldMapper extends LongFieldMapper implements RootMapper {
                     throw new AlreadyExpiredException(context.index(), context.type(), context.id(), timestamp, ttl, now);
                 }
                 // the expiration timestamp (timestamp + ttl) is set as field
-                fields.add(new CustomLongNumericField(this, expire, fieldType));
+                fields.add(new CustomLongNumericField(this, expire, (NumberFieldType)fieldType));
             }
         }
     }
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java
index 9437ee3d056..5f068395a03 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.index.mapper.internal;
 
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.document.NumericDocValuesField;
 import org.apache.lucene.index.IndexOptions;
 import org.elasticsearch.Version;
@@ -32,6 +31,9 @@ import org.elasticsearch.common.joda.FormatDateTimeFormatter;
 import org.elasticsearch.common.joda.Joda;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.index.analysis.NamedAnalyzer;
+import org.elasticsearch.index.analysis.NumericDateAnalyzer;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
@@ -46,7 +48,6 @@ import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeBooleanValue;
 import static org.elasticsearch.index.mapper.MapperBuilders.timestamp;
@@ -63,21 +64,26 @@ public class TimestampFieldMapper extends DateFieldMapper implements RootMapper
         public static final String NAME = "_timestamp";
 
         // TODO: this should be removed
-        public static final FieldType PRE_20_FIELD_TYPE;
-        public static final FieldType FIELD_TYPE = new FieldType(DateFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType PRE_20_FIELD_TYPE;
+        public static final FormatDateTimeFormatter DATE_TIME_FORMATTER = Joda.forPattern(DEFAULT_DATE_TIME_FORMAT);
+        public static final DateFieldType FIELD_TYPE = new TimestampFieldType();
 
         static {
             FIELD_TYPE.setStored(true);
             FIELD_TYPE.setTokenized(false);
+            FIELD_TYPE.setNumericPrecisionStep(Defaults.PRECISION_STEP_64_BIT);
+            FIELD_TYPE.setNames(new MappedFieldType.Names(NAME));
+            FIELD_TYPE.setDateTimeFormatter(DATE_TIME_FORMATTER);
+            FIELD_TYPE.setIndexAnalyzer(NumericDateAnalyzer.buildNamedAnalyzer(DATE_TIME_FORMATTER, Defaults.PRECISION_STEP_64_BIT));
+            FIELD_TYPE.setSearchAnalyzer(NumericDateAnalyzer.buildNamedAnalyzer(DATE_TIME_FORMATTER, Integer.MAX_VALUE));
             FIELD_TYPE.freeze();
-            PRE_20_FIELD_TYPE = new FieldType(FIELD_TYPE);
+            PRE_20_FIELD_TYPE = FIELD_TYPE.clone();
             PRE_20_FIELD_TYPE.setStored(false);
             PRE_20_FIELD_TYPE.freeze();
         }
 
         public static final EnabledAttributeMapper ENABLED = EnabledAttributeMapper.UNSET_DISABLED;
         public static final String PATH = null;
-        public static final FormatDateTimeFormatter DATE_TIME_FORMATTER = Joda.forPattern(DEFAULT_DATE_TIME_FORMAT);
         public static final String DEFAULT_TIMESTAMP = "now";
     }
 
@@ -85,13 +91,16 @@ public class TimestampFieldMapper extends DateFieldMapper implements RootMapper
 
         private EnabledAttributeMapper enabledState = EnabledAttributeMapper.UNSET_DISABLED;
         private String path = Defaults.PATH;
-        private FormatDateTimeFormatter dateTimeFormatter = Defaults.DATE_TIME_FORMATTER;
         private String defaultTimestamp = Defaults.DEFAULT_TIMESTAMP;
         private boolean explicitStore = false;
         private Boolean ignoreMissing = null;
 
         public Builder() {
-            super(Defaults.NAME, new FieldType(Defaults.FIELD_TYPE), Defaults.PRECISION_STEP_64_BIT);
+            super(Defaults.NAME, Defaults.FIELD_TYPE, Defaults.PRECISION_STEP_64_BIT);
+        }
+
+        DateFieldType fieldType() {
+            return (DateFieldType)fieldType;
         }
 
         public Builder enabled(EnabledAttributeMapper enabledState) {
@@ -105,8 +114,8 @@ public class TimestampFieldMapper extends DateFieldMapper implements RootMapper
         }
 
         public Builder dateTimeFormatter(FormatDateTimeFormatter dateTimeFormatter) {
-            this.dateTimeFormatter = dateTimeFormatter;
-            return builder;
+            fieldType().setDateTimeFormatter(dateTimeFormatter);
+            return this;
         }
 
         public Builder defaultTimestamp(String defaultTimestamp) {
@@ -131,9 +140,20 @@ public class TimestampFieldMapper extends DateFieldMapper implements RootMapper
                 assert fieldType.stored();
                 fieldType.setStored(false);
             }
-            return new TimestampFieldMapper(fieldType, docValues, enabledState, path, dateTimeFormatter, defaultTimestamp,
+            setupFieldType(context);
+            return new TimestampFieldMapper(fieldType, docValues, enabledState, path, defaultTimestamp,
                     ignoreMissing,
-                    ignoreMalformed(context), coerce(context), normsLoading, fieldDataSettings, context.indexSettings());
+                    ignoreMalformed(context), coerce(context), fieldDataSettings, context.indexSettings());
+        }
+
+        @Override
+        protected NamedAnalyzer makeNumberAnalyzer(int precisionStep) {
+            return NumericDateAnalyzer.buildNamedAnalyzer(fieldType().dateTimeFormatter(), precisionStep);
+        }
+
+        @Override
+        protected int maxPrecisionStep() {
+            return 64;
         }
     }
 
@@ -190,7 +210,29 @@ public class TimestampFieldMapper extends DateFieldMapper implements RootMapper
         }
     }
 
-    private static FieldType defaultFieldType(Settings settings) {
+    public static class TimestampFieldType extends DateFieldType {
+
+        public TimestampFieldType() {}
+
+        protected TimestampFieldType(TimestampFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public DateFieldType clone() {
+            return new TimestampFieldType(this);
+        }
+
+        /**
+         * Override the default behavior to return a timestamp
+         */
+        @Override
+        public Object valueForSearch(Object value) {
+            return value(value);
+        }
+    }
+
+    private static MappedFieldType defaultFieldType(Settings settings) {
         return Version.indexCreated(settings).onOrAfter(Version.V_2_0_0) ? Defaults.FIELD_TYPE : Defaults.PRE_20_FIELD_TYPE;
     }
 
@@ -198,23 +240,18 @@ public class TimestampFieldMapper extends DateFieldMapper implements RootMapper
 
     private final String path;
     private final String defaultTimestamp;
-    private final FieldType defaultFieldType;
+    private final MappedFieldType defaultFieldType;
     private final Boolean ignoreMissing;
 
     public TimestampFieldMapper(Settings indexSettings) {
-        this(new FieldType(defaultFieldType(indexSettings)), null, Defaults.ENABLED, Defaults.PATH, Defaults.DATE_TIME_FORMATTER, Defaults.DEFAULT_TIMESTAMP,
-             null, Defaults.IGNORE_MALFORMED, Defaults.COERCE, null, null, indexSettings);
+        this(defaultFieldType(indexSettings).clone(), null, Defaults.ENABLED, Defaults.PATH, Defaults.DEFAULT_TIMESTAMP,
+             null, Defaults.IGNORE_MALFORMED, Defaults.COERCE, null, indexSettings);
     }
 
-    protected TimestampFieldMapper(FieldType fieldType, Boolean docValues, EnabledAttributeMapper enabledState, String path,
-                                   FormatDateTimeFormatter dateTimeFormatter, String defaultTimestamp,
-                                   Boolean ignoreMissing,
-                                   Explicit<Boolean> ignoreMalformed, Explicit<Boolean> coerce, Loading normsLoading,
+    protected TimestampFieldMapper(MappedFieldType fieldType, Boolean docValues, EnabledAttributeMapper enabledState, String path,
+                                   String defaultTimestamp, Boolean ignoreMissing, Explicit<Boolean> ignoreMalformed, Explicit<Boolean> coerce,
                                    @Nullable Settings fieldDataSettings, Settings indexSettings) {
-        super(new Names(Defaults.NAME, Defaults.NAME, Defaults.NAME, Defaults.NAME), dateTimeFormatter,
-                Defaults.PRECISION_STEP_64_BIT, Defaults.BOOST, fieldType, docValues,
-                Defaults.NULL_VALUE, TimeUnit.MILLISECONDS /*always milliseconds*/,
-                ignoreMalformed, coerce, null, normsLoading, fieldDataSettings,
+        super(fieldType, docValues, Defaults.NULL_VALUE, ignoreMalformed, coerce, fieldDataSettings,
                 indexSettings, MultiFields.empty(), null);
         this.enabledState = enabledState;
         this.path = path;
@@ -224,7 +261,7 @@ public class TimestampFieldMapper extends DateFieldMapper implements RootMapper
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return defaultFieldType;
     }
 
@@ -249,19 +286,6 @@ public class TimestampFieldMapper extends DateFieldMapper implements RootMapper
         return this.ignoreMissing;
     }
 
-    @Override
-    public FormatDateTimeFormatter dateTimeFormatter() {
-        return this.dateTimeFormatter;
-    }
-
-    /**
-     * Override the default behavior to return a timestamp
-     */
-    @Override
-    public Object valueForSearch(Object value) {
-        return value(value);
-    }
-
     @Override
     public void preParse(ParseContext context) throws IOException {
         super.parse(context);
@@ -281,14 +305,14 @@ public class TimestampFieldMapper extends DateFieldMapper implements RootMapper
     protected void innerParseCreateField(ParseContext context, List<Field> fields) throws IOException {
         if (enabledState.enabled) {
             long timestamp = context.sourceToParse().timestamp();
-            if (fieldType.indexOptions() == IndexOptions.NONE && !fieldType.stored() && !hasDocValues()) {
-                context.ignoredValue(names.indexName(), String.valueOf(timestamp));
+            if (fieldType.indexOptions() == IndexOptions.NONE && !fieldType.stored() && !fieldType().hasDocValues()) {
+                context.ignoredValue(fieldType.names().indexName(), String.valueOf(timestamp));
             }
             if (fieldType.indexOptions() != IndexOptions.NONE || fieldType.stored()) {
-                fields.add(new LongFieldMapper.CustomLongNumericField(this, timestamp, fieldType));
+                fields.add(new LongFieldMapper.CustomLongNumericField(this, timestamp, (NumberFieldType)fieldType));
             }
-            if (hasDocValues()) {
-                fields.add(new NumericDocValuesField(names.indexName(), timestamp));
+            if (fieldType().hasDocValues()) {
+                fields.add(new NumericDocValuesField(fieldType.names().indexName(), timestamp));
             }
         }
     }
@@ -306,10 +330,10 @@ public class TimestampFieldMapper extends DateFieldMapper implements RootMapper
 
         // if all are defaults, no sense to write it at all
         if (!includeDefaults && indexed == indexedDefault && customFieldDataSettings == null &&
-                fieldType.stored() == Defaults.FIELD_TYPE.stored() && enabledState == Defaults.ENABLED && path == Defaults.PATH
-                && dateTimeFormatter.format().equals(Defaults.DATE_TIME_FORMATTER.format())
+            fieldType.stored() == Defaults.FIELD_TYPE.stored() && enabledState == Defaults.ENABLED && path == Defaults.PATH
+                && fieldType().dateTimeFormatter().format().equals(Defaults.DATE_TIME_FORMATTER.format())
                 && Defaults.DEFAULT_TIMESTAMP.equals(defaultTimestamp)
-                && defaultDocValues() == hasDocValues()) {
+                && defaultDocValues() == fieldType().hasDocValues()) {
             return builder;
         }
         builder.startObject(CONTENT_TYPE);
@@ -326,8 +350,8 @@ public class TimestampFieldMapper extends DateFieldMapper implements RootMapper
         if (includeDefaults || path != Defaults.PATH) {
             builder.field("path", path);
         }
-        if (includeDefaults || !dateTimeFormatter.format().equals(Defaults.DATE_TIME_FORMATTER.format())) {
-            builder.field("format", dateTimeFormatter.format());
+        if (includeDefaults || !fieldType().dateTimeFormatter().format().equals(Defaults.DATE_TIME_FORMATTER.format())) {
+            builder.field("format", fieldType().dateTimeFormatter().format());
         }
         if (includeDefaults || !Defaults.DEFAULT_TIMESTAMP.equals(defaultTimestamp)) {
             builder.field("default", defaultTimestamp);
@@ -338,7 +362,7 @@ public class TimestampFieldMapper extends DateFieldMapper implements RootMapper
         if (customFieldDataSettings != null) {
             builder.field("fielddata", (Map) customFieldDataSettings.getAsMap());
         } else if (includeDefaults) {
-            builder.field("fielddata", (Map) fieldDataType.getSettings().getAsMap());
+            builder.field("fielddata", (Map) fieldType.fieldDataType().getSettings().getAsMap());
         }
 
         builder.endObject();
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java
index a6b214f97f9..9128534c468 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.index.mapper.internal;
 
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.document.SortedSetDocValuesField;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.Term;
@@ -36,6 +35,7 @@ import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
@@ -65,13 +65,16 @@ public class TypeFieldMapper extends AbstractFieldMapper implements RootMapper {
     public static class Defaults extends AbstractFieldMapper.Defaults {
         public static final String NAME = TypeFieldMapper.NAME;
 
-        public static final FieldType FIELD_TYPE = new FieldType(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new TypeFieldType();
 
         static {
             FIELD_TYPE.setIndexOptions(IndexOptions.DOCS);
             FIELD_TYPE.setTokenized(false);
             FIELD_TYPE.setStored(false);
             FIELD_TYPE.setOmitNorms(true);
+            FIELD_TYPE.setIndexAnalyzer(Lucene.KEYWORD_ANALYZER);
+            FIELD_TYPE.setSearchAnalyzer(Lucene.KEYWORD_ANALYZER);
+            FIELD_TYPE.setNames(new MappedFieldType.Names(NAME));
             FIELD_TYPE.freeze();
         }
     }
@@ -79,13 +82,14 @@ public class TypeFieldMapper extends AbstractFieldMapper implements RootMapper {
     public static class Builder extends AbstractFieldMapper.Builder<Builder, TypeFieldMapper> {
 
         public Builder() {
-            super(Defaults.NAME, new FieldType(Defaults.FIELD_TYPE));
+            super(Defaults.NAME, Defaults.FIELD_TYPE);
             indexName = Defaults.NAME;
         }
 
         @Override
         public TypeFieldMapper build(BuilderContext context) {
-            return new TypeFieldMapper(name, indexName, boost, fieldType, fieldDataSettings, context.indexSettings());
+            fieldType.setNames(new MappedFieldType.Names(name, indexName, indexName, name));
+            return new TypeFieldMapper(fieldType, fieldDataSettings, context.indexSettings());
         }
     }
 
@@ -101,17 +105,53 @@ public class TypeFieldMapper extends AbstractFieldMapper implements RootMapper {
         }
     }
 
-    public TypeFieldMapper(Settings indexSettings) {
-        this(Defaults.NAME, Defaults.NAME, Defaults.BOOST, new FieldType(Defaults.FIELD_TYPE), null, indexSettings);
+    public static class TypeFieldType extends MappedFieldType {
+
+        public TypeFieldType() {
+            super(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        }
+
+        protected TypeFieldType(TypeFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public MappedFieldType clone() {
+            return new TypeFieldType(this);
+        }
+
+        @Override
+        public String value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            return value.toString();
+        }
+
+        @Override
+        public boolean useTermQueryWithQueryString() {
+            return true;
+        }
+
+        @Override
+        public Query termQuery(Object value, @Nullable QueryParseContext context) {
+            if (indexOptions() == IndexOptions.NONE) {
+                return new ConstantScoreQuery(new PrefixQuery(new Term(UidFieldMapper.NAME, Uid.typePrefixAsBytes(BytesRefs.toBytesRef(value)))));
+            }
+            return new ConstantScoreQuery(new TermQuery(createTerm(value)));
+        }
     }
 
-    public TypeFieldMapper(String name, String indexName, float boost, FieldType fieldType, @Nullable Settings fieldDataSettings, Settings indexSettings) {
-        super(new Names(name, indexName, indexName, name), boost, fieldType, false, Lucene.KEYWORD_ANALYZER,
-                Lucene.KEYWORD_ANALYZER, null, null, fieldDataSettings, indexSettings);
+    public TypeFieldMapper(Settings indexSettings) {
+        this(Defaults.FIELD_TYPE.clone(), null, indexSettings);
+    }
+
+    public TypeFieldMapper(MappedFieldType fieldType, @Nullable Settings fieldDataSettings, Settings indexSettings) {
+        super(fieldType, false, fieldDataSettings, indexSettings);
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -120,26 +160,6 @@ public class TypeFieldMapper extends AbstractFieldMapper implements RootMapper {
         return new FieldDataType("string");
     }
 
-    @Override
-    public String value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        return value.toString();
-    }
-
-    @Override
-    public Query termQuery(Object value, @Nullable QueryParseContext context) {
-        if (fieldType.indexOptions() == IndexOptions.NONE) {
-            return new ConstantScoreQuery(new PrefixQuery(new Term(UidFieldMapper.NAME, Uid.typePrefixAsBytes(BytesRefs.toBytesRef(value)))));
-        }
-        return new ConstantScoreQuery(new TermQuery(createTerm(value)));
-    }
-
-    @Override
-    public boolean useTermQueryWithQueryString() {
-        return true;
-    }
 
     @Override
     public void preParse(ParseContext context) throws IOException {
@@ -161,9 +181,9 @@ public class TypeFieldMapper extends AbstractFieldMapper implements RootMapper {
         if (fieldType.indexOptions() == IndexOptions.NONE && !fieldType.stored()) {
             return;
         }
-        fields.add(new Field(names.indexName(), context.type(), fieldType));
-        if (hasDocValues()) {
-            fields.add(new SortedSetDocValuesField(names.indexName(), new BytesRef(context.type())));
+        fields.add(new Field(fieldType.names().indexName(), context.type(), fieldType));
+        if (fieldType().hasDocValues()) {
+            fields.add(new SortedSetDocValuesField(fieldType.names().indexName(), new BytesRef(context.type())));
         }
     }
 
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java
index da9f424d9b2..3d49df6089c 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java
@@ -21,7 +21,6 @@ package org.elasticsearch.index.mapper.internal;
 
 import org.apache.lucene.document.BinaryDocValuesField;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.index.Term;
@@ -32,6 +31,7 @@ import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
@@ -61,17 +61,20 @@ public class UidFieldMapper extends AbstractFieldMapper implements RootMapper {
     public static class Defaults extends AbstractFieldMapper.Defaults {
         public static final String NAME = UidFieldMapper.NAME;
 
-        public static final FieldType FIELD_TYPE = new FieldType(AbstractFieldMapper.Defaults.FIELD_TYPE);
-        public static final FieldType NESTED_FIELD_TYPE;
+        public static final MappedFieldType FIELD_TYPE = new UidFieldType();
+        public static final MappedFieldType NESTED_FIELD_TYPE;
 
         static {
             FIELD_TYPE.setIndexOptions(IndexOptions.DOCS);
             FIELD_TYPE.setTokenized(false);
             FIELD_TYPE.setStored(true);
             FIELD_TYPE.setOmitNorms(true);
+            FIELD_TYPE.setIndexAnalyzer(Lucene.KEYWORD_ANALYZER);
+            FIELD_TYPE.setSearchAnalyzer(Lucene.KEYWORD_ANALYZER);
+            FIELD_TYPE.setNames(new MappedFieldType.Names(NAME));
             FIELD_TYPE.freeze();
 
-            NESTED_FIELD_TYPE = new FieldType(FIELD_TYPE);
+            NESTED_FIELD_TYPE = FIELD_TYPE.clone();
             NESTED_FIELD_TYPE.setStored(false);
             NESTED_FIELD_TYPE.freeze();
         }
@@ -86,7 +89,8 @@ public class UidFieldMapper extends AbstractFieldMapper implements RootMapper {
 
         @Override
         public UidFieldMapper build(BuilderContext context) {
-            return new UidFieldMapper(name, indexName, docValues, fieldDataSettings, context.indexSettings());
+            fieldType.setNames(new MappedFieldType.Names(name, indexName, indexName, name));
+            return new UidFieldMapper(fieldType, docValues, fieldDataSettings, context.indexSettings());
         }
     }
 
@@ -102,13 +106,36 @@ public class UidFieldMapper extends AbstractFieldMapper implements RootMapper {
         }
     }
 
-    public UidFieldMapper(Settings indexSettings) {
-        this(Defaults.NAME, Defaults.NAME, null, null, indexSettings);
+    public static class UidFieldType extends MappedFieldType {
+
+        public UidFieldType() {
+            super(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        }
+
+        protected UidFieldType(UidFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public MappedFieldType clone() {
+            return new UidFieldType(this);
+        }
+
+        @Override
+        public Uid value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            return Uid.createUid(value.toString());
+        }
     }
 
-    protected UidFieldMapper(String name, String indexName, Boolean docValues, @Nullable Settings fieldDataSettings, Settings indexSettings) {
-        super(new Names(name, indexName, indexName, name), Defaults.BOOST, new FieldType(Defaults.FIELD_TYPE), docValuesEnabled(docValues, indexSettings),
-                Lucene.KEYWORD_ANALYZER, Lucene.KEYWORD_ANALYZER, null, null, fieldDataSettings, indexSettings);
+    public UidFieldMapper(Settings indexSettings) {
+        this(Defaults.FIELD_TYPE.clone(), null, null, indexSettings);
+    }
+
+    protected UidFieldMapper(MappedFieldType fieldType, Boolean docValues, @Nullable Settings fieldDataSettings, Settings indexSettings) {
+        super(fieldType, docValuesEnabled(docValues, indexSettings), fieldDataSettings, indexSettings);
     }
     
     static Boolean docValuesEnabled(Boolean docValues, Settings indexSettings) {
@@ -119,7 +146,7 @@ public class UidFieldMapper extends AbstractFieldMapper implements RootMapper {
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -171,21 +198,13 @@ public class UidFieldMapper extends AbstractFieldMapper implements RootMapper {
         Field uid = new Field(NAME, Uid.createUid(context.stringBuilder(), context.type(), context.id()), Defaults.FIELD_TYPE);
         context.uid(uid);
         fields.add(uid);
-        if (hasDocValues()) {
+        if (fieldType().hasDocValues()) {
             fields.add(new BinaryDocValuesField(NAME, new BytesRef(uid.stringValue())));
         }
     }
 
-    @Override
-    public Uid value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        return Uid.createUid(value.toString());
-    }
-
     public Term term(String uid) {
-        return createTerm(uid);
+        return new Term(fieldType().names().indexName(), fieldType().indexedValueForSearch(uid));
     }
 
     @Override
@@ -210,7 +229,7 @@ public class UidFieldMapper extends AbstractFieldMapper implements RootMapper {
         if (customFieldDataSettings != null) {
             builder.field("fielddata", (Map) customFieldDataSettings.getAsMap());
         } else if (includeDefaults) {
-            builder.field("fielddata", (Map) fieldDataType.getSettings().getAsMap());
+            builder.field("fielddata", (Map) fieldType.fieldDataType().getSettings().getAsMap());
         }
 
         builder.endObject();
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/VersionFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/VersionFieldMapper.java
index 88b0074b634..f4a33b80b5c 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/VersionFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/VersionFieldMapper.java
@@ -20,13 +20,14 @@
 package org.elasticsearch.index.mapper.internal;
 
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.document.NumericDocValuesField;
+import org.apache.lucene.index.DocValuesType;
 import org.elasticsearch.Version;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
@@ -52,9 +53,13 @@ public class VersionFieldMapper extends AbstractFieldMapper implements RootMappe
     public static class Defaults {
 
         public static final String NAME = VersionFieldMapper.NAME;
-        public static final float BOOST = 1.0f;
-        public static final FieldType FIELD_TYPE = NumericDocValuesField.TYPE;
+        public static final MappedFieldType FIELD_TYPE = new VersionFieldType();
 
+        static {
+            FIELD_TYPE.setNames(new MappedFieldType.Names(NAME));
+            FIELD_TYPE.setDocValuesType(DocValuesType.NUMERIC);
+            FIELD_TYPE.freeze();
+        }
     }
 
     public static class Builder extends Mapper.Builder<Builder, VersionFieldMapper> {
@@ -86,6 +91,31 @@ public class VersionFieldMapper extends AbstractFieldMapper implements RootMappe
         }
     }
 
+    public static class VersionFieldType extends MappedFieldType {
+
+        public VersionFieldType() {
+            super(AbstractFieldMapper.Defaults.FIELD_TYPE);
+        }
+
+        protected VersionFieldType(VersionFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public MappedFieldType clone() {
+            return new VersionFieldType(this);
+        }
+
+        @Override
+        public Long value(Object value) {
+            if (value == null || (value instanceof Long)) {
+                return (Long) value;
+            } else {
+                return Long.parseLong(value.toString());
+            }
+        }
+    }
+
     private final ThreadLocal<Field> fieldCache = new ThreadLocal<Field>() {
         @Override
         protected Field initialValue() {
@@ -94,7 +124,7 @@ public class VersionFieldMapper extends AbstractFieldMapper implements RootMappe
     };
 
     public VersionFieldMapper(Settings indexSettings) {
-        super(new Names(NAME, NAME, NAME, NAME), Defaults.BOOST, Defaults.FIELD_TYPE, true, null, null, null, null, null, indexSettings);
+        super(Defaults.FIELD_TYPE, true, null, indexSettings);
     }
 
     @Override
@@ -116,15 +146,6 @@ public class VersionFieldMapper extends AbstractFieldMapper implements RootMappe
         return null;
     }
 
-    @Override
-    public Long value(Object value) {
-        if (value == null || (value instanceof Long)) {
-            return (Long) value;
-        } else {
-            return Long.parseLong(value.toString());
-        }
-    }
-
     @Override
     public void postParse(ParseContext context) throws IOException {
         // In the case of nested docs, let's fill nested docs with version=1 so that Lucene doesn't write a Bitset for documents
@@ -136,7 +157,7 @@ public class VersionFieldMapper extends AbstractFieldMapper implements RootMappe
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
diff --git a/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java
index 0fa74b0ab8a..8cf6b93f5ca 100644
--- a/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java
@@ -20,10 +20,8 @@
 package org.elasticsearch.index.mapper.ip;
 
 import com.google.common.net.InetAddresses;
-
 import org.apache.lucene.analysis.NumericTokenStream;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.search.ConstantScoreQuery;
 import org.apache.lucene.search.NumericRangeQuery;
@@ -43,6 +41,7 @@ import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.analysis.NumericAnalyzer;
 import org.elasticsearch.index.analysis.NumericTokenizer;
 import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
@@ -51,7 +50,6 @@ import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.mapper.core.LongFieldMapper.CustomLongNumericField;
 import org.elasticsearch.index.mapper.core.NumberFieldMapper;
 import org.elasticsearch.index.query.QueryParseContext;
-import org.elasticsearch.index.similarity.SimilarityProvider;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -101,7 +99,7 @@ public class IpFieldMapper extends NumberFieldMapper {
     public static class Defaults extends NumberFieldMapper.Defaults {
         public static final String NULL_VALUE = null;
 
-        public static final FieldType FIELD_TYPE = new FieldType(NumberFieldMapper.Defaults.FIELD_TYPE);
+        public static final MappedFieldType FIELD_TYPE = new IpFieldType();
 
         static {
             FIELD_TYPE.freeze();
@@ -113,7 +111,7 @@ public class IpFieldMapper extends NumberFieldMapper {
         protected String nullValue = Defaults.NULL_VALUE;
 
         public Builder(String name) {
-            super(name, new FieldType(Defaults.FIELD_TYPE), Defaults.PRECISION_STEP_64_BIT);
+            super(name, Defaults.FIELD_TYPE, Defaults.PRECISION_STEP_64_BIT);
             builder = this;
         }
 
@@ -124,13 +122,23 @@ public class IpFieldMapper extends NumberFieldMapper {
 
         @Override
         public IpFieldMapper build(BuilderContext context) {
-            fieldType.setOmitNorms(fieldType.omitNorms() && boost == 1.0f);
-            IpFieldMapper fieldMapper = new IpFieldMapper(buildNames(context),
-                    fieldType.numericPrecisionStep(), boost, fieldType, docValues, nullValue, ignoreMalformed(context), coerce(context),
-                    similarity, normsLoading, fieldDataSettings, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
+            setupFieldType(context);
+            IpFieldMapper fieldMapper = new IpFieldMapper(fieldType, docValues, nullValue, ignoreMalformed(context), coerce(context),
+                    fieldDataSettings, context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
             fieldMapper.includeInAll(includeInAll);
             return fieldMapper;
         }
+
+        @Override
+        protected NamedAnalyzer makeNumberAnalyzer(int precisionStep) {
+            String name = precisionStep == Integer.MAX_VALUE ? "_ip/max" : ("_ip/" + precisionStep);
+            return new NamedAnalyzer(name, new NumericIpAnalyzer(precisionStep));
+        }
+
+        @Override
+        protected int maxPrecisionStep() {
+            return 64;
+        }
     }
 
     public static class TypeParser implements Mapper.TypeParser {
@@ -154,21 +162,90 @@ public class IpFieldMapper extends NumberFieldMapper {
         }
     }
 
+    public static class IpFieldType extends NumberFieldType {
+
+        public IpFieldType() {}
+
+        protected IpFieldType(IpFieldType ref) {
+            super(ref);
+        }
+
+        @Override
+        public NumberFieldType clone() {
+            return new IpFieldType(this);
+        }
+
+
+        @Override
+        public Long value(Object value) {
+            if (value == null) {
+                return null;
+            }
+            if (value instanceof Number) {
+                return ((Number) value).longValue();
+            }
+            if (value instanceof BytesRef) {
+                return Numbers.bytesToLong((BytesRef) value);
+            }
+            return ipToLong(value.toString());
+        }
+
+        /**
+         * IPs should return as a string.
+         */
+        @Override
+        public Object valueForSearch(Object value) {
+            Long val = value(value);
+            if (val == null) {
+                return null;
+            }
+            return longToIp(val);
+        }
+
+        @Override
+        public BytesRef indexedValueForSearch(Object value) {
+            BytesRefBuilder bytesRef = new BytesRefBuilder();
+            NumericUtils.longToPrefixCoded(parseValue(value), 0, bytesRef); // 0 because of exact match
+            return bytesRef.get();
+        }
+
+        @Override
+        public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
+            return NumericRangeQuery.newLongRange(names().indexName(), numericPrecisionStep(),
+                lowerTerm == null ? null : parseValue(lowerTerm),
+                upperTerm == null ? null : parseValue(upperTerm),
+                includeLower, includeUpper);
+        }
+
+        @Override
+        public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
+            long iValue = ipToLong(value);
+            long iSim;
+            try {
+                iSim = ipToLong(fuzziness.asString());
+            } catch (IllegalArgumentException e) {
+                iSim = fuzziness.asLong();
+            }
+            return NumericRangeQuery.newLongRange(names().indexName(), numericPrecisionStep(),
+                iValue - iSim,
+                iValue + iSim,
+                true, true);
+        }
+    }
+
     private String nullValue;
 
-    protected IpFieldMapper(Names names, int precisionStep, float boost, FieldType fieldType, Boolean docValues,
+    protected IpFieldMapper(MappedFieldType fieldType, Boolean docValues,
                             String nullValue, Explicit<Boolean> ignoreMalformed, Explicit<Boolean> coerce,
-                            SimilarityProvider similarity, Loading normsLoading, @Nullable Settings fieldDataSettings,
+                            @Nullable Settings fieldDataSettings,
                             Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
-        super(names, precisionStep, boost, fieldType, docValues,
-                ignoreMalformed, coerce, new NamedAnalyzer("_ip/" + precisionStep, new NumericIpAnalyzer(precisionStep)),
-                new NamedAnalyzer("_ip/max", new NumericIpAnalyzer(Integer.MAX_VALUE)),
-                similarity, normsLoading, fieldDataSettings, indexSettings, multiFields, copyTo);
+        super(fieldType, docValues, ignoreMalformed, coerce,
+              fieldDataSettings, indexSettings, multiFields, copyTo);
         this.nullValue = nullValue;
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -177,45 +254,7 @@ public class IpFieldMapper extends NumberFieldMapper {
         return new FieldDataType("long");
     }
 
-    @Override
-    protected int maxPrecisionStep() {
-        return 64;
-    }
-
-    @Override
-    public Long value(Object value) {
-        if (value == null) {
-            return null;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).longValue();
-        }
-        if (value instanceof BytesRef) {
-            return Numbers.bytesToLong((BytesRef) value);
-        }
-        return ipToLong(value.toString());
-    }
-
-    /**
-     * IPs should return as a string.
-     */
-    @Override
-    public Object valueForSearch(Object value) {
-        Long val = value(value);
-        if (val == null) {
-            return null;
-        }
-        return longToIp(val);
-    }
-
-    @Override
-    public BytesRef indexedValueForSearch(Object value) {
-        BytesRefBuilder bytesRef = new BytesRefBuilder();
-        NumericUtils.longToPrefixCoded(parseValue(value), 0, bytesRef); // 0 because of exact match
-        return bytesRef.get();
-    }
-
-    private long parseValue(Object value) {
+    private static long parseValue(Object value) {
         if (value instanceof Number) {
             return ((Number) value).longValue();
         }
@@ -225,29 +264,6 @@ public class IpFieldMapper extends NumberFieldMapper {
         return ipToLong(value.toString());
     }
 
-    @Override
-    public Query fuzzyQuery(String value, Fuzziness fuzziness, int prefixLength, int maxExpansions, boolean transpositions) {
-        long iValue = ipToLong(value);
-        long iSim;
-        try {
-            iSim = ipToLong(fuzziness.asString());
-        } catch (IllegalArgumentException e) {
-            iSim = fuzziness.asLong();
-        }
-        return NumericRangeQuery.newLongRange(names.indexName(), precisionStep,
-                iValue - iSim,
-                iValue + iSim,
-                true, true);
-    }
-
-    @Override
-    public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, @Nullable QueryParseContext context) {
-        return NumericRangeQuery.newLongRange(names.indexName(), precisionStep,
-                lowerTerm == null ? null : parseValue(lowerTerm),
-                upperTerm == null ? null : parseValue(upperTerm),
-                includeLower, includeUpper);
-    }
-
     @Override
     public Query nullValueFilter() {
         if (nullValue == null) {
@@ -276,16 +292,16 @@ public class IpFieldMapper extends NumberFieldMapper {
             return;
         }
         if (context.includeInAll(includeInAll, this)) {
-            context.allEntries().addText(names.fullName(), ipAsString, boost);
+            context.allEntries().addText(fieldType.names().fullName(), ipAsString, fieldType.boost());
         }
 
         final long value = ipToLong(ipAsString);
         if (fieldType.indexOptions() != IndexOptions.NONE || fieldType.stored()) {
             CustomLongNumericField field = new CustomLongNumericField(this, value, fieldType);
-            field.setBoost(boost);
+            field.setBoost(fieldType.boost());
             fields.add(field);
         }
-        if (hasDocValues()) {
+        if (fieldType().hasDocValues()) {
             addDocValue(context, fields, value);
         }
     }
@@ -310,8 +326,8 @@ public class IpFieldMapper extends NumberFieldMapper {
     protected void doXContentBody(XContentBuilder builder, boolean includeDefaults, Params params) throws IOException {
         super.doXContentBody(builder, includeDefaults, params);
 
-        if (includeDefaults || precisionStep != Defaults.PRECISION_STEP_64_BIT) {
-            builder.field("precision_step", precisionStep);
+        if (includeDefaults || fieldType.numericPrecisionStep() != Defaults.PRECISION_STEP_64_BIT) {
+            builder.field("precision_step", fieldType.numericPrecisionStep());
         }
         if (includeDefaults || nullValue != null) {
             builder.field("null_value", nullValue);
diff --git a/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java b/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java
index ca0aed86f8e..d5e4c95b54c 100644
--- a/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java
@@ -165,7 +165,7 @@ public class CommonTermsQueryParser implements QueryParser {
         String field;
         FieldMapper mapper = parseContext.fieldMapper(fieldName);
         if (mapper != null) {
-            field = mapper.names().indexName();
+            field = mapper.fieldType().names().indexName();
         } else {
             field = fieldName;
         }
@@ -173,7 +173,7 @@ public class CommonTermsQueryParser implements QueryParser {
         Analyzer analyzer = null;
         if (queryAnalyzer == null) {
             if (mapper != null) {
-                analyzer = mapper.searchAnalyzer();
+                analyzer = mapper.fieldType().searchAnalyzer();
             }
             if (analyzer == null && mapper != null) {
                 analyzer = parseContext.getSearchAnalyzer(mapper);
diff --git a/src/main/java/org/elasticsearch/index/query/ExistsQueryParser.java b/src/main/java/org/elasticsearch/index/query/ExistsQueryParser.java
index fe981193805..0cf97b4cbe3 100644
--- a/src/main/java/org/elasticsearch/index/query/ExistsQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/ExistsQueryParser.java
@@ -98,7 +98,7 @@ public class ExistsQueryParser implements QueryParser {
             if (fieldNamesMapper!= null && fieldNamesMapper.enabled()) {
                 final String f;
                 if (mapper != null) {
-                    f = mapper.names().indexName();
+                    f = mapper.fieldType().names().indexName();
                 } else {
                     f = field;
                 }
diff --git a/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryParser.java b/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryParser.java
index 1e8fd7cfa03..1a2e6608dec 100644
--- a/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/FieldMaskingSpanQueryParser.java
@@ -92,7 +92,7 @@ public class FieldMaskingSpanQueryParser implements QueryParser {
 
         FieldMapper mapper = parseContext.fieldMapper(field);
         if (mapper != null) {
-            field = mapper.names().indexName();
+            field = mapper.fieldType().names().indexName();
         }
 
         FieldMaskingSpanQuery query = new FieldMaskingSpanQuery(inner, field);
diff --git a/src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java b/src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java
index 3a63ae68295..10a766ac068 100644
--- a/src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java
@@ -150,9 +150,9 @@ public class GeoShapeQueryParser implements QueryParser {
 
         GeoShapeFieldMapper shapeFieldMapper = (GeoShapeFieldMapper) fieldMapper;
 
-        PrefixTreeStrategy strategy = shapeFieldMapper.defaultStrategy();
+        PrefixTreeStrategy strategy = shapeFieldMapper.fieldType().defaultStrategy();
         if (strategyName != null) {
-            strategy = shapeFieldMapper.resolveStrategy(strategyName);
+            strategy = shapeFieldMapper.fieldType().resolveStrategy(strategyName);
         }
         Query query;
         if (strategy instanceof RecursivePrefixTreeStrategy && shapeRelation == ShapeRelation.DISJOINT) {
diff --git a/src/main/java/org/elasticsearch/index/query/GeohashCellQuery.java b/src/main/java/org/elasticsearch/index/query/GeohashCellQuery.java
index 08b38453dc6..363303181ac 100644
--- a/src/main/java/org/elasticsearch/index/query/GeohashCellQuery.java
+++ b/src/main/java/org/elasticsearch/index/query/GeohashCellQuery.java
@@ -32,6 +32,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.core.StringFieldMapper;
 import org.elasticsearch.index.mapper.geo.GeoPointFieldMapper;
 
@@ -71,11 +72,11 @@ public class GeohashCellQuery {
      * @return a new GeoBoundinboxfilter
      */
     public static Query create(QueryParseContext context, GeoPointFieldMapper fieldMapper, String geohash, @Nullable List<CharSequence> geohashes) {
-        if (fieldMapper.geoHashStringMapper() == null) {
+        MappedFieldType geoHashMapper = fieldMapper.fieldType().geohashFieldType();
+        if (geoHashMapper == null) {
             throw new IllegalArgumentException("geohash filter needs geohash_prefix to be enabled");
         }
 
-        StringFieldMapper geoHashMapper = fieldMapper.geoHashStringMapper();
         if (geohashes == null || geohashes.size() == 0) {
             return geoHashMapper.termQuery(geohash, context);
         } else {
@@ -246,7 +247,7 @@ public class GeohashCellQuery {
             }
 
             GeoPointFieldMapper geoMapper = ((GeoPointFieldMapper) mapper);
-            if (!geoMapper.isEnableGeohashPrefix()) {
+            if (!geoMapper.fieldType().isGeohashPrefixEnabled()) {
                 throw new QueryParsingException(parseContext, "can't execute geohash_cell on field [" + fieldName
                         + "], geohash_prefix is not enabled");
             }
diff --git a/src/main/java/org/elasticsearch/index/query/MissingQueryParser.java b/src/main/java/org/elasticsearch/index/query/MissingQueryParser.java
index 16596b6bdfb..7c7ae54aff5 100644
--- a/src/main/java/org/elasticsearch/index/query/MissingQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/MissingQueryParser.java
@@ -116,7 +116,7 @@ public class MissingQueryParser implements QueryParser {
                 if (fieldNamesMapper != null && fieldNamesMapper.enabled()) {
                     final String f;
                     if (mapper != null) {
-                        f = mapper.names().indexName();
+                        f = mapper.fieldType().names().indexName();
                     } else {
                         f = field;
                     }
diff --git a/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java b/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java
index fe1c99e421a..b33da0994c5 100644
--- a/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java
@@ -167,7 +167,7 @@ public class MoreLikeThisQueryParser implements QueryParser {
                     while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) {
                         String field = parser.text();
                         FieldMapper mapper = parseContext.fieldMapper(field);
-                        moreLikeFields.add(mapper == null ? field : mapper.names().indexName());
+                        moreLikeFields.add(mapper == null ? field : mapper.fieldType().names().indexName());
                     }
                 } else if (Fields.DOCUMENT_IDS.match(currentFieldName, parseContext.parseFlags())) {
                     while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) {
diff --git a/src/main/java/org/elasticsearch/index/query/QueryParseContext.java b/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
index e2be1229fa6..f279efa5052 100644
--- a/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
+++ b/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
@@ -287,8 +287,8 @@ public class QueryParseContext {
      * TODO: remove this by moving defaults into mappers themselves
      */
     public Analyzer getSearchAnalyzer(FieldMapper mapper) {
-        if (mapper.searchAnalyzer() != null) {
-            return mapper.searchAnalyzer();
+        if (mapper.fieldType().searchAnalyzer() != null) {
+            return mapper.fieldType().searchAnalyzer();
         }
         return mapperService().searchAnalyzer();
     }
@@ -297,8 +297,8 @@ public class QueryParseContext {
      * TODO: remove this by moving defaults into mappers themselves
      */
     public Analyzer getSearchQuoteAnalyzer(FieldMapper mapper) {
-        if (mapper.searchQuoteAnalyzer() != null) {
-            return mapper.searchQuoteAnalyzer();
+        if (mapper.fieldType().searchQuoteAnalyzer() != null) {
+            return mapper.fieldType().searchQuoteAnalyzer();
         }
         return mapperService().searchQuoteAnalyzer();
     }
diff --git a/src/main/java/org/elasticsearch/index/query/RangeQueryParser.java b/src/main/java/org/elasticsearch/index/query/RangeQueryParser.java
index e86ffebde31..fed95b9eb02 100644
--- a/src/main/java/org/elasticsearch/index/query/RangeQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/RangeQueryParser.java
@@ -128,7 +128,7 @@ public class RangeQueryParser implements QueryParser {
                             "[range] time_zone when using ms since epoch format as it's UTC based can not be applied to [" + fieldName
                                     + "]");
                 }
-                query = ((DateFieldMapper) mapper).rangeQuery(from, to, includeLower, includeUpper, timeZone, forcedDateParser, parseContext);
+                query = ((DateFieldMapper) mapper).fieldType().rangeQuery(from, to, includeLower, includeUpper, timeZone, forcedDateParser, parseContext);
             } else  {
                 if (timeZone != null) {
                     throw new QueryParsingException(parseContext, "[range] time_zone can not be applied to non date field ["
diff --git a/src/main/java/org/elasticsearch/index/query/SimpleQueryStringParser.java b/src/main/java/org/elasticsearch/index/query/SimpleQueryStringParser.java
index d48c5b7163f..ba70aa89bde 100644
--- a/src/main/java/org/elasticsearch/index/query/SimpleQueryStringParser.java
+++ b/src/main/java/org/elasticsearch/index/query/SimpleQueryStringParser.java
@@ -132,7 +132,7 @@ public class SimpleQueryStringParser implements QueryParser {
                         } else {
                             FieldMapper mapper = parseContext.fieldMapper(fField);
                             if (mapper != null) {
-                                fieldsAndWeights.put(mapper.names().indexName(), fBoost);
+                                fieldsAndWeights.put(mapper.fieldType().names().indexName(), fBoost);
                             } else {
                                 fieldsAndWeights.put(fField, fBoost);
                             }
diff --git a/src/main/java/org/elasticsearch/index/query/SpanTermQueryParser.java b/src/main/java/org/elasticsearch/index/query/SpanTermQueryParser.java
index b1b3cbf5fbf..1b4e8c3af0e 100644
--- a/src/main/java/org/elasticsearch/index/query/SpanTermQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/SpanTermQueryParser.java
@@ -95,7 +95,7 @@ public class SpanTermQueryParser implements QueryParser {
         BytesRef valueBytes = null;
         FieldMapper mapper = parseContext.fieldMapper(fieldName);
         if (mapper != null) {
-            fieldName = mapper.names().indexName();
+            fieldName = mapper.fieldType().names().indexName();
             valueBytes = mapper.indexedValueForSearch(value);
         }
         if (valueBytes == null) {
diff --git a/src/main/java/org/elasticsearch/index/query/TermsQueryParser.java b/src/main/java/org/elasticsearch/index/query/TermsQueryParser.java
index f4170292251..1da9b5f748e 100644
--- a/src/main/java/org/elasticsearch/index/query/TermsQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/TermsQueryParser.java
@@ -160,7 +160,7 @@ public class TermsQueryParser implements QueryParser {
 
         FieldMapper fieldMapper = parseContext.fieldMapper(fieldName);
         if (fieldMapper != null) {
-            fieldName = fieldMapper.names().indexName();
+            fieldName = fieldMapper.fieldType().names().indexName();
         }
 
         if (lookupId != null) {
diff --git a/src/main/java/org/elasticsearch/index/query/WildcardQueryParser.java b/src/main/java/org/elasticsearch/index/query/WildcardQueryParser.java
index 36ca202173e..be664f04f6b 100644
--- a/src/main/java/org/elasticsearch/index/query/WildcardQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/WildcardQueryParser.java
@@ -95,7 +95,7 @@ public class WildcardQueryParser implements QueryParser {
         BytesRef valueBytes;
         FieldMapper mapper = parseContext.fieldMapper(fieldName);
         if (mapper != null) {
-            fieldName = mapper.names().indexName();
+            fieldName = mapper.fieldType().names().indexName();
             valueBytes = mapper.indexedValueForSearch(value);
         } else {
             valueBytes = new BytesRef(value);
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java b/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java
index 375920a7fb0..b5a8363740d 100644
--- a/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java
+++ b/src/main/java/org/elasticsearch/index/query/functionscore/DecayFunctionParser.java
@@ -263,7 +263,7 @@ public abstract class DecayFunctionParser implements ScoreFunctionParser {
         }
         long origin = SearchContext.current().nowInMillis();
         if (originString != null) {
-            origin = dateFieldMapper.parseToMilliseconds(originString);
+            origin = dateFieldMapper.fieldType().parseToMilliseconds(originString, false, null, null);
         }
 
         if (scaleString == null) {
diff --git a/src/main/java/org/elasticsearch/index/search/MatchQuery.java b/src/main/java/org/elasticsearch/index/search/MatchQuery.java
index b2b747a9c92..344c9d3b29d 100644
--- a/src/main/java/org/elasticsearch/index/search/MatchQuery.java
+++ b/src/main/java/org/elasticsearch/index/search/MatchQuery.java
@@ -157,7 +157,7 @@ public class MatchQuery {
         final String field;
         FieldMapper mapper = parseContext.fieldMapper(fieldName);
         if (mapper != null) {
-            field = mapper.names().indexName();
+            field = mapper.fieldType().names().indexName();
         } else {
             field = fieldName;
         }
diff --git a/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java b/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java
index ea9666f0746..a31466a7dc6 100644
--- a/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java
+++ b/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java
@@ -165,7 +165,7 @@ public class MultiMatchQuery extends MatchQuery {
                 FieldMapper mapper = parseContext.fieldMapper(name);
                 if (mapper != null) {
                     Analyzer actualAnalyzer = getAnalyzer(mapper);
-                    name = mapper.names().indexName();
+                    name = mapper.fieldType().names().indexName();
                     if (!groups.containsKey(actualAnalyzer)) {
                        groups.put(actualAnalyzer, new ArrayList<FieldAndMapper>());
                     }
diff --git a/src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxQuery.java b/src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxQuery.java
index cb1befd76c7..bf1ba4578b2 100644
--- a/src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxQuery.java
+++ b/src/main/java/org/elasticsearch/index/search/geo/IndexedGeoBoundingBoxQuery.java
@@ -31,7 +31,7 @@ import org.elasticsearch.index.mapper.geo.GeoPointFieldMapper;
 public class IndexedGeoBoundingBoxQuery {
 
     public static Query create(GeoPoint topLeft, GeoPoint bottomRight, GeoPointFieldMapper fieldMapper) {
-        if (!fieldMapper.isEnableLatLon()) {
+        if (!fieldMapper.fieldType().isLatLonEnabled()) {
             throw new IllegalArgumentException("lat/lon is not enabled (indexed) for field [" + fieldMapper.name() + "], can't use indexed filter on it");
         }
         //checks to see if bounding box crosses 180 degrees
@@ -45,16 +45,16 @@ public class IndexedGeoBoundingBoxQuery {
     private static Query westGeoBoundingBoxFilter(GeoPoint topLeft, GeoPoint bottomRight, GeoPointFieldMapper fieldMapper) {
         BooleanQuery filter = new BooleanQuery();
         filter.setMinimumNumberShouldMatch(1);
-        filter.add(fieldMapper.lonMapper().rangeFilter(null, bottomRight.lon(), true, true), Occur.SHOULD);
-        filter.add(fieldMapper.lonMapper().rangeFilter(topLeft.lon(), null, true, true), Occur.SHOULD);
-        filter.add(fieldMapper.latMapper().rangeFilter(bottomRight.lat(), topLeft.lat(), true, true), Occur.MUST);
+        filter.add(fieldMapper.fieldType().lonFieldType().rangeQuery(null, bottomRight.lon(), true, true, null), Occur.SHOULD);
+        filter.add(fieldMapper.fieldType().lonFieldType().rangeQuery(topLeft.lon(), null, true, true, null), Occur.SHOULD);
+        filter.add(fieldMapper.fieldType().latFieldType().rangeQuery(bottomRight.lat(), topLeft.lat(), true, true, null), Occur.MUST);
         return new ConstantScoreQuery(filter);
     }
 
     private static Query eastGeoBoundingBoxFilter(GeoPoint topLeft, GeoPoint bottomRight, GeoPointFieldMapper fieldMapper) {
         BooleanQuery filter = new BooleanQuery();
-        filter.add(fieldMapper.lonMapper().rangeFilter(topLeft.lon(), bottomRight.lon(), true, true), Occur.MUST);
-        filter.add(fieldMapper.latMapper().rangeFilter(bottomRight.lat(), topLeft.lat(), true, true), Occur.MUST);
+        filter.add(fieldMapper.fieldType().lonFieldType().rangeQuery(topLeft.lon(), bottomRight.lon(), true, true, null), Occur.MUST);
+        filter.add(fieldMapper.fieldType().latFieldType().rangeQuery(bottomRight.lat(), topLeft.lat(), true, true, null), Occur.MUST);
         return new ConstantScoreQuery(filter);
     }
 }
diff --git a/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java b/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java
index 7c31ca2c8fd..c3232085130 100644
--- a/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java
+++ b/src/main/java/org/elasticsearch/index/similarity/SimilarityService.java
@@ -100,7 +100,7 @@ public class SimilarityService extends AbstractIndexComponent {
         @Override
         public Similarity get(String name) {
             FieldMapper mapper = mapperService.smartNameFieldMapper(name);
-            return (mapper != null && mapper.similarity() != null) ? mapper.similarity().get() : defaultSimilarity;
+            return (mapper != null && mapper.fieldType().similarity() != null) ? mapper.fieldType().similarity().get() : defaultSimilarity;
         }
     }
 }
diff --git a/src/main/java/org/elasticsearch/index/termvectors/ShardTermVectorsService.java b/src/main/java/org/elasticsearch/index/termvectors/ShardTermVectorsService.java
index 9ca66a65ec7..ec160dba1ec 100644
--- a/src/main/java/org/elasticsearch/index/termvectors/ShardTermVectorsService.java
+++ b/src/main/java/org/elasticsearch/index/termvectors/ShardTermVectorsService.java
@@ -236,7 +236,7 @@ public class ShardTermVectorsService extends AbstractIndexShardComponent {
         if (perFieldAnalyzer != null && perFieldAnalyzer.containsKey(field)) {
             analyzer = mapperService.analysisService().analyzer(perFieldAnalyzer.get(field).toString());
         } else {
-            analyzer = mapperService.smartNameFieldMapper(field).indexAnalyzer();
+            analyzer = mapperService.smartNameFieldMapper(field).fieldType().indexAnalyzer();
         }
         if (analyzer == null) {
             analyzer = mapperService.analysisService().defaultIndexAnalyzer();
diff --git a/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java b/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java
index 7547814d791..4c4233ff2c0 100644
--- a/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java
+++ b/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCache.java
@@ -37,6 +37,7 @@ import org.elasticsearch.index.fielddata.IndexFieldData;
 import org.elasticsearch.index.fielddata.IndexFieldDataCache;
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.IndexService;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.index.shard.ShardUtils;
 import org.elasticsearch.index.shard.IndexShard;
@@ -99,7 +100,7 @@ public class IndicesFieldDataCache extends AbstractComponent implements RemovalL
         this.closed = true;
     }
 
-    public IndexFieldDataCache buildIndexFieldDataCache(IndexService indexService, Index index, FieldMapper.Names fieldNames, FieldDataType fieldDataType) {
+    public IndexFieldDataCache buildIndexFieldDataCache(IndexService indexService, Index index, MappedFieldType.Names fieldNames, FieldDataType fieldDataType) {
         return new IndexFieldCache(logger, cache, indicesFieldDataCacheListener, indexService, index, fieldNames, fieldDataType);
     }
 
@@ -139,12 +140,12 @@ public class IndicesFieldDataCache extends AbstractComponent implements RemovalL
         private final ESLogger logger;
         private final IndexService indexService;
         final Index index;
-        final FieldMapper.Names fieldNames;
+        final MappedFieldType.Names fieldNames;
         final FieldDataType fieldDataType;
         private final Cache<Key, Accountable> cache;
         private final IndicesFieldDataCacheListener indicesFieldDataCacheListener;
 
-        IndexFieldCache(ESLogger logger,final Cache<Key, Accountable> cache, IndicesFieldDataCacheListener indicesFieldDataCacheListener, IndexService indexService, Index index, FieldMapper.Names fieldNames, FieldDataType fieldDataType) {
+        IndexFieldCache(ESLogger logger,final Cache<Key, Accountable> cache, IndicesFieldDataCacheListener indicesFieldDataCacheListener, IndexService indexService, Index index, MappedFieldType.Names fieldNames, FieldDataType fieldDataType) {
             this.logger = logger;
             this.indexService = indexService;
             this.index = index;
diff --git a/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCacheListener.java b/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCacheListener.java
index c9b5f653101..eff99a26e1a 100644
--- a/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCacheListener.java
+++ b/src/main/java/org/elasticsearch/indices/fielddata/cache/IndicesFieldDataCacheListener.java
@@ -25,6 +25,7 @@ import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.index.fielddata.FieldDataType;
 import org.elasticsearch.index.fielddata.IndexFieldDataCache;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
 
 /**
@@ -43,13 +44,14 @@ public class IndicesFieldDataCacheListener implements IndexFieldDataCache.Listen
     }
 
     @Override
-    public void onLoad(FieldMapper.Names fieldNames, FieldDataType fieldDataType, Accountable fieldData) {
+    public void onLoad(MappedFieldType.Names fieldNames, FieldDataType fieldDataType, Accountable fieldData) {
     }
 
     @Override
-    public void onUnload(FieldMapper.Names fieldNames, FieldDataType fieldDataType, boolean wasEvicted, long sizeInBytes) {
+    public void onUnload(MappedFieldType.Names fieldNames, FieldDataType fieldDataType, boolean wasEvicted, long sizeInBytes) {
         assert sizeInBytes >= 0 : "When reducing circuit breaker, it should be adjusted with a number higher or equal to 0 and not [" + sizeInBytes + "]";
         circuitBreakerService.getBreaker(CircuitBreaker.FIELDDATA).addWithoutBreaking(-sizeInBytes);
     }
 
 }
+
diff --git a/src/main/java/org/elasticsearch/percolator/SingleDocumentPercolatorIndex.java b/src/main/java/org/elasticsearch/percolator/SingleDocumentPercolatorIndex.java
index 165193d35f0..3233cdcd756 100644
--- a/src/main/java/org/elasticsearch/percolator/SingleDocumentPercolatorIndex.java
+++ b/src/main/java/org/elasticsearch/percolator/SingleDocumentPercolatorIndex.java
@@ -60,8 +60,8 @@ class SingleDocumentPercolatorIndex implements PercolatorIndex {
                 if (tokenStream != null) {
                     memoryIndex.addField(field.name(), tokenStream, field.boost());
                 }
-            } catch (IOException e) {
-                throw new ElasticsearchException("Failed to create token stream", e);
+            } catch (Exception e) {
+                throw new ElasticsearchException("Failed to create token stream for [" + field.name() + "]", e);
             }
         }
         context.initialize(new DocEngineSearcher(memoryIndex), parsedDocument);
diff --git a/src/main/java/org/elasticsearch/search/SearchService.java b/src/main/java/org/elasticsearch/search/SearchService.java
index 15a691f3360..025ac1f6ec9 100644
--- a/src/main/java/org/elasticsearch/search/SearchService.java
+++ b/src/main/java/org/elasticsearch/search/SearchService.java
@@ -59,7 +59,7 @@ import org.elasticsearch.index.fielddata.IndexFieldData;
 import org.elasticsearch.index.fielddata.IndexFieldDataService;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.FieldMapper;
-import org.elasticsearch.index.mapper.FieldMapper.Loading;
+import org.elasticsearch.index.mapper.MappedFieldType.Loading;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.query.TemplateQueryParser;
 import org.elasticsearch.index.search.stats.StatsGroupsParseElement;
@@ -840,8 +840,12 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
             final ObjectSet<String> warmUp = new ObjectHashSet<>();
             for (DocumentMapper docMapper : mapperService.docMappers(false)) {
                 for (FieldMapper fieldMapper : docMapper.mappers()) {
-                    final String indexName = fieldMapper.names().indexName();
-                    if (fieldMapper.fieldType().indexOptions() != IndexOptions.NONE && !fieldMapper.fieldType().omitNorms() && fieldMapper.normsLoading(defaultLoading) == Loading.EAGER) {
+                    final String indexName = fieldMapper.fieldType().names().indexName();
+                    Loading normsLoading = fieldMapper.fieldType().normsLoading();
+                    if (normsLoading == null) {
+                        normsLoading = defaultLoading;
+                    }
+                    if (fieldMapper.fieldType().indexOptions() != IndexOptions.NONE && !fieldMapper.fieldType().omitNorms() && normsLoading == Loading.EAGER) {
                         warmUp.add(indexName);
                     }
                 }
@@ -896,7 +900,7 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
             final Map<String, FieldMapper> warmUp = new HashMap<>();
             for (DocumentMapper docMapper : mapperService.docMappers(false)) {
                 for (FieldMapper fieldMapper : docMapper.mappers()) {
-                    final FieldDataType fieldDataType = fieldMapper.fieldDataType();
+                    final FieldDataType fieldDataType = fieldMapper.fieldType().fieldDataType();
                     if (fieldDataType == null) {
                         continue;
                     }
@@ -904,7 +908,7 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
                         continue;
                     }
 
-                    final String indexName = fieldMapper.names().indexName();
+                    final String indexName = fieldMapper.fieldType().names().indexName();
                     if (warmUp.containsKey(indexName)) {
                         continue;
                     }
@@ -924,10 +928,10 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
                                 final long start = System.nanoTime();
                                 indexFieldDataService.getForField(fieldMapper).load(ctx);
                                 if (indexShard.warmerService().logger().isTraceEnabled()) {
-                                    indexShard.warmerService().logger().trace("warmed fielddata for [{}], took [{}]", fieldMapper.names().fullName(), TimeValue.timeValueNanos(System.nanoTime() - start));
+                                    indexShard.warmerService().logger().trace("warmed fielddata for [{}], took [{}]", fieldMapper.fieldType().names().fullName(), TimeValue.timeValueNanos(System.nanoTime() - start));
                                 }
                             } catch (Throwable t) {
-                                indexShard.warmerService().logger().warn("failed to warm-up fielddata for [{}]", t, fieldMapper.names().fullName());
+                                indexShard.warmerService().logger().warn("failed to warm-up fielddata for [{}]", t, fieldMapper.fieldType().names().fullName());
                             } finally {
                                 latch.countDown();
                             }
@@ -950,14 +954,14 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
             final Map<String, FieldMapper> warmUpGlobalOrdinals = new HashMap<>();
             for (DocumentMapper docMapper : mapperService.docMappers(false)) {
                 for (FieldMapper fieldMapper : docMapper.mappers()) {
-                    final FieldDataType fieldDataType = fieldMapper.fieldDataType();
+                    final FieldDataType fieldDataType = fieldMapper.fieldType().fieldDataType();
                     if (fieldDataType == null) {
                         continue;
                     }
                     if (fieldDataType.getLoading() != Loading.EAGER_GLOBAL_ORDINALS) {
                         continue;
                     }
-                    final String indexName = fieldMapper.names().indexName();
+                    final String indexName = fieldMapper.fieldType().names().indexName();
                     if (warmUpGlobalOrdinals.containsKey(indexName)) {
                         continue;
                     }
@@ -976,10 +980,10 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
                             IndexFieldData.Global ifd = indexFieldDataService.getForField(fieldMapper);
                             ifd.loadGlobal(context.reader());
                             if (indexShard.warmerService().logger().isTraceEnabled()) {
-                                indexShard.warmerService().logger().trace("warmed global ordinals for [{}], took [{}]", fieldMapper.names().fullName(), TimeValue.timeValueNanos(System.nanoTime() - start));
+                                indexShard.warmerService().logger().trace("warmed global ordinals for [{}], took [{}]", fieldMapper.fieldType().names().fullName(), TimeValue.timeValueNanos(System.nanoTime() - start));
                             }
                         } catch (Throwable t) {
-                            indexShard.warmerService().logger().warn("failed to warm-up global ordinals for [{}]", t, fieldMapper.names().fullName());
+                            indexShard.warmerService().logger().warn("failed to warm-up global ordinals for [{}]", t, fieldMapper.fieldType().names().fullName());
                         } finally {
                             latch.countDown();
                         }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenParser.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenParser.java
index c3a427c1b48..f8c42c36845 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenParser.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenParser.java
@@ -89,7 +89,7 @@ public class ChildrenParser implements Aggregator.Parser {
                 parentFilter = new QueryWrapperFilter(parentDocMapper.typeFilter());
                 childFilter = new QueryWrapperFilter(childDocMapper.typeFilter());
                 ParentChildIndexFieldData parentChildIndexFieldData = context.fieldData().getForField(parentFieldMapper);
-                config.fieldContext(new FieldContext(parentFieldMapper.names().indexName(), parentChildIndexFieldData, parentFieldMapper));
+                config.fieldContext(new FieldContext(parentFieldMapper.fieldType().names().indexName(), parentChildIndexFieldData, parentFieldMapper));
             } else {
                 config.unmapped(true);
             }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/AggregationContext.java b/src/main/java/org/elasticsearch/search/aggregations/support/AggregationContext.java
index 4591e8392e2..f817c7d79fa 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/support/AggregationContext.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/support/AggregationContext.java
@@ -105,7 +105,7 @@ public class AggregationContext {
                 if (config.fieldContext != null && config.fieldContext.mapper() instanceof DateFieldMapper) {
                     final DateFieldMapper mapper = (DateFieldMapper) config.fieldContext.mapper();
                     try {
-                        missing = mapper.dateTimeFormatter().parser().parseDateTime(config.missing.toString()).getMillis();
+                        missing = mapper.fieldType().dateTimeFormatter().parser().parseDateTime(config.missing.toString()).getMillis();
                     } catch (IllegalArgumentException e) {
                         throw new SearchParseException(context, "Expected a date value in [missing] but got [" + config.missing + "]", null, e);
                     }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormat.java b/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormat.java
index d9b01bb8f69..7efef92364c 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormat.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormat.java
@@ -72,7 +72,7 @@ public class ValueFormat {
         }
 
         public static DateTime mapper(DateFieldMapper mapper) {
-            return new DateTime(mapper.dateTimeFormatter().format(), ValueFormatter.DateTime.mapper(mapper), ValueParser.DateMath.mapper(mapper));
+            return new DateTime(mapper.fieldType().dateTimeFormatter().format(), ValueFormatter.DateTime.mapper(mapper), ValueParser.DateMath.mapper(mapper));
         }
 
         public DateTime(String pattern, ValueFormatter formatter, ValueParser parser) {
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatter.java b/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatter.java
index f3a47e271a1..0a06b27afd6 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatter.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormatter.java
@@ -105,7 +105,7 @@ public interface ValueFormatter extends Streamable {
         private DateTimeZone timeZone = DateTimeZone.UTC;
 
         public static DateTime mapper(DateFieldMapper mapper) {
-            return new DateTime(mapper.dateTimeFormatter());
+            return new DateTime(mapper.fieldType().dateTimeFormatter());
         }
 
         static final byte ID = 2;
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueParser.java b/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueParser.java
index 4314e95b710..ccc57c34288 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueParser.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueParser.java
@@ -110,7 +110,7 @@ public interface ValueParser {
         }
 
         public static DateMath mapper(DateFieldMapper mapper) {
-            return new DateMath(new DateMathParser(mapper.dateTimeFormatter(), DateFieldMapper.Defaults.TIME_UNIT));
+            return new DateMath(new DateMathParser(mapper.fieldType().dateTimeFormatter(), DateFieldMapper.Defaults.TIME_UNIT));
         }
     }
 
diff --git a/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java b/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java
index 66f4bf991af..9afa3f5fe35 100644
--- a/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java
+++ b/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java
@@ -152,7 +152,7 @@ public class FetchPhase implements SearchPhase {
                     if (fieldNames == null) {
                         fieldNames = new HashSet<>();
                     }
-                    fieldNames.add(mapper.names().indexName());
+                    fieldNames.add(mapper.fieldType().names().indexName());
                 } else {
                     if (extractFieldNames == null) {
                         extractFieldNames = newArrayList();
diff --git a/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java b/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java
index c997624ff60..55ee8f9c21e 100644
--- a/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java
+++ b/src/main/java/org/elasticsearch/search/highlight/FastVectorHighlighter.java
@@ -147,10 +147,10 @@ public class FastVectorHighlighter implements Highlighter {
             // we highlight against the low level reader and docId, because if we load source, we want to reuse it if possible
             // Only send matched fields if they were requested to save time.
             if (field.fieldOptions().matchedFields() != null && !field.fieldOptions().matchedFields().isEmpty()) {
-                fragments = cache.fvh.getBestFragments(fieldQuery, hitContext.reader(), hitContext.docId(), mapper.names().indexName(), field.fieldOptions().matchedFields(), fragmentCharSize,
+                fragments = cache.fvh.getBestFragments(fieldQuery, hitContext.reader(), hitContext.docId(), mapper.fieldType().names().indexName(), field.fieldOptions().matchedFields(), fragmentCharSize,
                         numberOfFragments, entry.fragListBuilder, entry.fragmentsBuilder, field.fieldOptions().preTags(), field.fieldOptions().postTags(), encoder);
             } else {
-                fragments = cache.fvh.getBestFragments(fieldQuery, hitContext.reader(), hitContext.docId(), mapper.names().indexName(), fragmentCharSize,
+                fragments = cache.fvh.getBestFragments(fieldQuery, hitContext.reader(), hitContext.docId(), mapper.fieldType().names().indexName(), fragmentCharSize,
                         numberOfFragments, entry.fragListBuilder, entry.fragmentsBuilder, field.fieldOptions().preTags(), field.fieldOptions().postTags(), encoder);
             }
 
@@ -163,7 +163,7 @@ public class FastVectorHighlighter implements Highlighter {
                 // Essentially we just request that a fragment is built from 0 to noMatchSize using the normal fragmentsBuilder
                 FieldFragList fieldFragList = new SimpleFieldFragList(-1 /*ignored*/);
                 fieldFragList.add(0, noMatchSize, Collections.<WeightedPhraseInfo>emptyList());
-                fragments = entry.fragmentsBuilder.createFragments(hitContext.reader(), hitContext.docId(), mapper.names().indexName(),
+                fragments = entry.fragmentsBuilder.createFragments(hitContext.reader(), hitContext.docId(), mapper.fieldType().names().indexName(),
                         fieldFragList, 1, field.fieldOptions().preTags(), field.fieldOptions().postTags(), encoder);
                 if (fragments != null && fragments.length > 0) {
                     return new HighlightField(highlighterContext.fieldName, StringText.convertFromStringArray(fragments));
diff --git a/src/main/java/org/elasticsearch/search/highlight/HighlightUtils.java b/src/main/java/org/elasticsearch/search/highlight/HighlightUtils.java
index acbba6749cf..3358aec0ed7 100644
--- a/src/main/java/org/elasticsearch/search/highlight/HighlightUtils.java
+++ b/src/main/java/org/elasticsearch/search/highlight/HighlightUtils.java
@@ -47,9 +47,9 @@ public final class HighlightUtils {
         boolean forceSource = searchContext.highlight().forceSource(field);
         List<Object> textsToHighlight;
         if (!forceSource && mapper.fieldType().stored()) {
-            CustomFieldsVisitor fieldVisitor = new CustomFieldsVisitor(ImmutableSet.of(mapper.names().indexName()), false);
+            CustomFieldsVisitor fieldVisitor = new CustomFieldsVisitor(ImmutableSet.of(mapper.fieldType().names().indexName()), false);
             hitContext.reader().document(hitContext.docId(), fieldVisitor);
-            textsToHighlight = fieldVisitor.fields().get(mapper.names().indexName());
+            textsToHighlight = fieldVisitor.fields().get(mapper.fieldType().names().indexName());
             if (textsToHighlight == null) {
                 // Can happen if the document doesn't have the field to highlight
                 textsToHighlight = ImmutableList.of();
@@ -57,7 +57,7 @@ public final class HighlightUtils {
         } else {
             SourceLookup sourceLookup = searchContext.lookup().source();
             sourceLookup.setSegmentAndDocument(hitContext.readerContext(), hitContext.docId());
-            textsToHighlight = sourceLookup.extractRawValues(hitContext.getSourcePath(mapper.names().fullName()));
+            textsToHighlight = sourceLookup.extractRawValues(hitContext.getSourcePath(mapper.fieldType().names().fullName()));
         }
         assert textsToHighlight != null;
         return textsToHighlight;
diff --git a/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java b/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java
index 460b2df05cd..86a50547cbc 100644
--- a/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java
+++ b/src/main/java/org/elasticsearch/search/highlight/PlainHighlighter.java
@@ -69,7 +69,7 @@ public class PlainHighlighter implements Highlighter {
 
         org.apache.lucene.search.highlight.Highlighter entry = cache.get(mapper);
         if (entry == null) {
-            QueryScorer queryScorer = new CustomQueryScorer(highlighterContext.query, field.fieldOptions().requireFieldMatch() ? mapper.names().indexName() : null);
+            QueryScorer queryScorer = new CustomQueryScorer(highlighterContext.query, field.fieldOptions().requireFieldMatch() ? mapper.fieldType().names().indexName() : null);
             queryScorer.setExpandMultiTermQuery(true);
             Fragmenter fragmenter;
             if (field.fieldOptions().numberOfFragments() == 0) {
@@ -105,7 +105,7 @@ public class PlainHighlighter implements Highlighter {
             for (Object textToHighlight : textsToHighlight) {
                 String text = textToHighlight.toString();
 
-                TokenStream tokenStream = analyzer.tokenStream(mapper.names().indexName(), text);
+                TokenStream tokenStream = analyzer.tokenStream(mapper.fieldType().names().indexName(), text);
                 if (!tokenStream.hasAttribute(CharTermAttribute.class) || !tokenStream.hasAttribute(OffsetAttribute.class)) {
                     // can't perform highlighting if the stream has no terms (binary token stream) or no offsets
                     continue;
@@ -161,7 +161,7 @@ public class PlainHighlighter implements Highlighter {
             String fieldContents = textsToHighlight.get(0).toString();
             int end;
             try {
-                end = findGoodEndForNoHighlightExcerpt(noMatchSize, analyzer.tokenStream(mapper.names().indexName(), fieldContents));
+                end = findGoodEndForNoHighlightExcerpt(noMatchSize, analyzer.tokenStream(mapper.fieldType().names().indexName(), fieldContents));
             } catch (Exception e) {
                 throw new FetchPhaseExecutionException(context, "Failed to highlight field [" + highlighterContext.fieldName + "]", e);
             }
diff --git a/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java b/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java
index dcbb810d4dd..35f6560899e 100644
--- a/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java
+++ b/src/main/java/org/elasticsearch/search/highlight/PostingsHighlighter.java
@@ -91,7 +91,7 @@ public class PostingsHighlighter implements Highlighter {
             }
 
             IndexSearcher searcher = new IndexSearcher(hitContext.reader());
-            Snippet[] fieldSnippets = highlighter.highlightField(fieldMapper.names().indexName(), highlighterContext.query, searcher, hitContext.docId(), numberOfFragments);
+            Snippet[] fieldSnippets = highlighter.highlightField(fieldMapper.fieldType().names().indexName(), highlighterContext.query, searcher, hitContext.docId(), numberOfFragments);
             for (Snippet fieldSnippet : fieldSnippets) {
                 if (Strings.hasText(fieldSnippet.getText())) {
                     snippets.add(fieldSnippet);
diff --git a/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/FragmentBuilderHelper.java b/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/FragmentBuilderHelper.java
index 3d338277033..ee824ee13c3 100644
--- a/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/FragmentBuilderHelper.java
+++ b/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/FragmentBuilderHelper.java
@@ -48,8 +48,8 @@ public final class FragmentBuilderHelper {
      */
     public static WeightedFragInfo fixWeightedFragInfo(FieldMapper mapper, Field[] values, WeightedFragInfo fragInfo) {
         assert fragInfo != null : "FragInfo must not be null";
-        assert mapper.names().indexName().equals(values[0].name()) : "Expected FieldMapper for field " + values[0].name();
-        if (!fragInfo.getSubInfos().isEmpty() && (containsBrokenAnalysis(mapper.indexAnalyzer()))) {
+        assert mapper.fieldType().names().indexName().equals(values[0].name()) : "Expected FieldMapper for field " + values[0].name();
+        if (!fragInfo.getSubInfos().isEmpty() && (containsBrokenAnalysis(mapper.fieldType().indexAnalyzer()))) {
             /* This is a special case where broken analysis like WDF is used for term-vector creation at index-time
              * which can potentially mess up the offsets. To prevent a SAIIOBException we need to resort
              * the fragments based on their offsets rather than using soley the positions as it is done in
diff --git a/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceScoreOrderFragmentsBuilder.java b/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceScoreOrderFragmentsBuilder.java
index b7670cb08ec..71393fdf190 100644
--- a/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceScoreOrderFragmentsBuilder.java
+++ b/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceScoreOrderFragmentsBuilder.java
@@ -60,10 +60,10 @@ public class SourceScoreOrderFragmentsBuilder extends ScoreOrderFragmentsBuilder
         SourceLookup sourceLookup = searchContext.lookup().source();
         sourceLookup.setSegmentAndDocument((LeafReaderContext) reader.getContext(), docId);
 
-        List<Object> values = sourceLookup.extractRawValues(hitContext.getSourcePath(mapper.names().fullName()));
+        List<Object> values = sourceLookup.extractRawValues(hitContext.getSourcePath(mapper.fieldType().names().fullName()));
         Field[] fields = new Field[values.size()];
         for (int i = 0; i < values.size(); i++) {
-            fields[i] = new Field(mapper.names().indexName(), values.get(i).toString(), TextField.TYPE_NOT_STORED);
+            fields[i] = new Field(mapper.fieldType().names().indexName(), values.get(i).toString(), TextField.TYPE_NOT_STORED);
         }
         return fields;
     }
diff --git a/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceSimpleFragmentsBuilder.java b/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceSimpleFragmentsBuilder.java
index c52312f5ac0..7a12b449c97 100644
--- a/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceSimpleFragmentsBuilder.java
+++ b/src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SourceSimpleFragmentsBuilder.java
@@ -56,13 +56,13 @@ public class SourceSimpleFragmentsBuilder extends SimpleFragmentsBuilder {
         SourceLookup sourceLookup = searchContext.lookup().source();
         sourceLookup.setSegmentAndDocument((LeafReaderContext) reader.getContext(), docId);
 
-        List<Object> values = sourceLookup.extractRawValues(hitContext.getSourcePath(mapper.names().fullName()));
+        List<Object> values = sourceLookup.extractRawValues(hitContext.getSourcePath(mapper.fieldType().names().fullName()));
         if (values.isEmpty()) {
             return EMPTY_FIELDS;
         }
         Field[] fields = new Field[values.size()];
         for (int i = 0; i < values.size(); i++) {
-            fields[i] = new Field(mapper.names().indexName(), values.get(i).toString(), TextField.TYPE_NOT_STORED);
+            fields[i] = new Field(mapper.fieldType().names().indexName(), values.get(i).toString(), TextField.TYPE_NOT_STORED);
         }
         return fields;
     }
diff --git a/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java b/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java
index 3cc9b9e1fd7..e634dff6a2f 100644
--- a/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java
+++ b/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java
@@ -85,7 +85,7 @@ public class FieldLookup {
         }
         valueLoaded = true;
         value = null;
-        List<Object> values = fields.get(mapper.names().indexName());
+        List<Object> values = fields.get(mapper.fieldType().names().indexName());
         return values != null ? value = values.get(0) : null;
     }
 
@@ -95,6 +95,6 @@ public class FieldLookup {
         }
         valuesLoaded = true;
         values.clear();
-        return values = fields().get(mapper.names().indexName());
+        return values = fields().get(mapper.fieldType().names().indexName());
     }
 }
diff --git a/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java b/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java
index 52e0872742a..9936372c9b8 100644
--- a/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java
+++ b/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java
@@ -144,12 +144,12 @@ public class LeafFieldsLookup implements Map {
             cachedFieldData.put(name, data);
         }
         if (data.fields() == null) {
-            String fieldName = data.mapper().names().indexName();
+            String fieldName = data.mapper().fieldType().names().indexName();
             fieldVisitor.reset(fieldName);
             try {
                 reader.document(docId, fieldVisitor);
                 fieldVisitor.postProcess(data.mapper());
-                data.fields(ImmutableMap.of(name, fieldVisitor.fields().get(data.mapper().names().indexName())));
+                data.fields(ImmutableMap.of(name, fieldVisitor.fields().get(data.mapper().fieldType().names().indexName())));
             } catch (IOException e) {
                 throw new ElasticsearchParseException("failed to load field [" + name + "]", e);
             }
diff --git a/src/main/java/org/elasticsearch/search/sort/SortParseElement.java b/src/main/java/org/elasticsearch/search/sort/SortParseElement.java
index 3d97b788825..6d1cc200f8a 100644
--- a/src/main/java/org/elasticsearch/search/sort/SortParseElement.java
+++ b/src/main/java/org/elasticsearch/search/sort/SortParseElement.java
@@ -268,7 +268,7 @@ public class SortParseElement implements SearchParseElement {
 
             IndexFieldData.XFieldComparatorSource fieldComparatorSource = context.fieldData().getForField(fieldMapper)
                     .comparatorSource(missing, sortMode, nested);
-            sortFields.add(new SortField(fieldMapper.names().indexName(), fieldComparatorSource, reverse));
+            sortFields.add(new SortField(fieldMapper.fieldType().names().indexName(), fieldComparatorSource, reverse));
         }
     }
 
diff --git a/src/main/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProvider.java b/src/main/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProvider.java
index b95d7200d08..879b51a6fe2 100644
--- a/src/main/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProvider.java
+++ b/src/main/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProvider.java
@@ -253,7 +253,7 @@ public class AnalyzingCompletionLookupProvider extends CompletionLookupProvider
         return new LookupFactory() {
             @Override
             public Lookup getLookup(CompletionFieldMapper mapper, CompletionSuggestionContext suggestionContext) {
-                AnalyzingSuggestHolder analyzingSuggestHolder = lookupMap.get(mapper.names().indexName());
+                AnalyzingSuggestHolder analyzingSuggestHolder = lookupMap.get(mapper.fieldType().names().indexName());
                 if (analyzingSuggestHolder == null) {
                     return null;
                 }
@@ -263,19 +263,19 @@ public class AnalyzingCompletionLookupProvider extends CompletionLookupProvider
                 final Automaton queryPrefix = mapper.requiresContext() ? ContextQuery.toAutomaton(analyzingSuggestHolder.getPreserveSeparator(), suggestionContext.getContextQueries()) : null;
 
                 if (suggestionContext.isFuzzy()) {
-                    suggester = new XFuzzySuggester(mapper.indexAnalyzer(), queryPrefix, mapper.searchAnalyzer(), flags,
-                            analyzingSuggestHolder.maxSurfaceFormsPerAnalyzedForm, analyzingSuggestHolder.maxGraphExpansions,
-                            suggestionContext.getFuzzyEditDistance(), suggestionContext.isFuzzyTranspositions(),
-                            suggestionContext.getFuzzyPrefixLength(), suggestionContext.getFuzzyMinLength(), suggestionContext.isFuzzyUnicodeAware(),
-                            analyzingSuggestHolder.fst, analyzingSuggestHolder.hasPayloads,
-                            analyzingSuggestHolder.maxAnalyzedPathsForOneInput, analyzingSuggestHolder.sepLabel, analyzingSuggestHolder.payloadSep, analyzingSuggestHolder.endByte,
-                            analyzingSuggestHolder.holeCharacter);
+                    suggester = new XFuzzySuggester(mapper.fieldType().indexAnalyzer(), queryPrefix, mapper.fieldType().searchAnalyzer(), flags,
+                        analyzingSuggestHolder.maxSurfaceFormsPerAnalyzedForm, analyzingSuggestHolder.maxGraphExpansions,
+                        suggestionContext.getFuzzyEditDistance(), suggestionContext.isFuzzyTranspositions(),
+                        suggestionContext.getFuzzyPrefixLength(), suggestionContext.getFuzzyMinLength(), suggestionContext.isFuzzyUnicodeAware(),
+                        analyzingSuggestHolder.fst, analyzingSuggestHolder.hasPayloads,
+                        analyzingSuggestHolder.maxAnalyzedPathsForOneInput, analyzingSuggestHolder.sepLabel, analyzingSuggestHolder.payloadSep, analyzingSuggestHolder.endByte,
+                        analyzingSuggestHolder.holeCharacter);
                 } else {
-                    suggester = new XAnalyzingSuggester(mapper.indexAnalyzer(), queryPrefix, mapper.searchAnalyzer(), flags,
-                            analyzingSuggestHolder.maxSurfaceFormsPerAnalyzedForm, analyzingSuggestHolder.maxGraphExpansions,
-                            analyzingSuggestHolder.preservePositionIncrements, analyzingSuggestHolder.fst, analyzingSuggestHolder.hasPayloads,
-                            analyzingSuggestHolder.maxAnalyzedPathsForOneInput, analyzingSuggestHolder.sepLabel, analyzingSuggestHolder.payloadSep, analyzingSuggestHolder.endByte,
-                            analyzingSuggestHolder.holeCharacter);
+                    suggester = new XAnalyzingSuggester(mapper.fieldType().indexAnalyzer(), queryPrefix, mapper.fieldType().searchAnalyzer(), flags,
+                        analyzingSuggestHolder.maxSurfaceFormsPerAnalyzedForm, analyzingSuggestHolder.maxGraphExpansions,
+                        analyzingSuggestHolder.preservePositionIncrements, analyzingSuggestHolder.fst, analyzingSuggestHolder.hasPayloads,
+                        analyzingSuggestHolder.maxAnalyzedPathsForOneInput, analyzingSuggestHolder.sepLabel, analyzingSuggestHolder.payloadSep, analyzingSuggestHolder.endByte,
+                        analyzingSuggestHolder.holeCharacter);
                 }
                 return suggester;
             }
@@ -304,7 +304,7 @@ public class AnalyzingCompletionLookupProvider extends CompletionLookupProvider
 
             @Override
             AnalyzingSuggestHolder getAnalyzingSuggestHolder(CompletionFieldMapper mapper) {
-                return lookupMap.get(mapper.names().indexName());
+                return lookupMap.get(mapper.fieldType().names().indexName());
             }
 
             @Override
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java
index 453dbdc3eb5..91824b75af5 100644
--- a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java
+++ b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java
@@ -191,10 +191,10 @@ public final class PhraseSuggestParser implements SuggestContextParser {
             throw new IllegalArgumentException("No mapping found for field [" + suggestion.getField() + "]");
         } else if (suggestion.getAnalyzer() == null) {
             // no analyzer name passed in, so try the field's analyzer, or the default analyzer
-            if (fieldMapper.searchAnalyzer() == null) {
+            if (fieldMapper.fieldType().searchAnalyzer() == null) {
                 suggestion.setAnalyzer(mapperService.searchAnalyzer());
             } else {
-                suggestion.setAnalyzer(fieldMapper.searchAnalyzer());
+                suggestion.setAnalyzer(fieldMapper.fieldType().searchAnalyzer());
             }
         }
         
diff --git a/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java b/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java
index 2592c3cba2e..cf9f09204d9 100644
--- a/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java
+++ b/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java
@@ -163,8 +163,8 @@ public class PreBuiltAnalyzerTests extends ElasticsearchSingleNodeTest {
         DocumentMapper docMapper = createIndex("test", indexSettings).mapperService().documentMapperParser().parse(mapping);
 
         FieldMapper fieldMapper = docMapper.mappers().getMapper("field");
-        assertThat(fieldMapper.searchAnalyzer(), instanceOf(NamedAnalyzer.class));
-        NamedAnalyzer fieldMapperNamedAnalyzer = (NamedAnalyzer) fieldMapper.searchAnalyzer();
+        assertThat(fieldMapper.fieldType().searchAnalyzer(), instanceOf(NamedAnalyzer.class));
+        NamedAnalyzer fieldMapperNamedAnalyzer = (NamedAnalyzer) fieldMapper.fieldType().searchAnalyzer();
 
         assertThat(fieldMapperNamedAnalyzer.analyzer(), is(namedAnalyzer.analyzer()));
     }
diff --git a/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java b/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java
index 99bc38b5c84..ceeb448586b 100644
--- a/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java
+++ b/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java
@@ -24,7 +24,7 @@ import org.apache.lucene.index.IndexReader;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
 import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource;
-import org.elasticsearch.index.mapper.FieldMapper.Names;
+import org.elasticsearch.index.mapper.MappedFieldType.Names;
 import org.elasticsearch.search.MultiValueMode;
 import org.junit.Test;
 
diff --git a/src/test/java/org/elasticsearch/index/mapper/FieldMappersLookupTests.java b/src/test/java/org/elasticsearch/index/mapper/FieldMappersLookupTests.java
index 75c8e18fc91..ab336cf7dab 100644
--- a/src/test/java/org/elasticsearch/index/mapper/FieldMappersLookupTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/FieldMappersLookupTests.java
@@ -176,17 +176,20 @@ public class FieldMappersLookupTests extends ElasticsearchTestCase {
     static class FakeFieldMapper extends AbstractFieldMapper {
         static Settings dummySettings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT.id).build();
         public FakeFieldMapper(String fullName, String indexName) {
-            super(new Names(fullName, indexName, indexName, fullName), 1.0f, AbstractFieldMapper.Defaults.FIELD_TYPE, null, null, null, null, null, null, dummySettings, null, null);
+            super(makeFieldType(fullName, indexName), null, null, dummySettings, null, null);
+        }
+        static MappedFieldType makeFieldType(String fullName, String indexName) {
+            MappedFieldType fieldType = Defaults.FIELD_TYPE.clone();
+            fieldType.setNames(new MappedFieldType.Names(fullName, indexName, indexName, fullName));
+            return fieldType;
         }
         @Override
-        public FieldType defaultFieldType() { return null; }
+        public MappedFieldType defaultFieldType() { return null; }
         @Override
         public FieldDataType defaultFieldDataType() { return null; }
         @Override
         protected String contentType() { return null; }
         @Override
         protected void parseCreateField(ParseContext context, List list) throws IOException {}
-        @Override
-        public String value(Object value) { return null; }
     }
 }
diff --git a/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java
index 36c218f3d7c..b0ff89f414d 100644
--- a/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java
@@ -306,9 +306,9 @@ public class SimpleAllMapperTests extends ElasticsearchSingleNodeTest {
             assertThat(field, nullValue());
         }
         if (similarity == null || similarity.equals("TF/IDF")) {
-            assertThat(builtDocMapper.allFieldMapper().similarity(), nullValue());
+            assertThat(builtDocMapper.allFieldMapper().fieldType().similarity(), nullValue());
         }   else {
-            assertThat(similarity, equalTo(builtDocMapper.allFieldMapper().similarity().name()));
+            assertThat(similarity, equalTo(builtDocMapper.allFieldMapper().fieldType().similarity().name()));
         }
         assertThat(builtMapping.contains("fielddata"), is(fieldData));
         if (allDefault) {
diff --git a/src/test/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapperTests.java
index c09741ba17e..d28609e5bee 100644
--- a/src/test/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapperTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapperTests.java
@@ -108,7 +108,7 @@ public class Murmur3FieldMapperTests extends ElasticsearchSingleNodeTest {
 
         DocumentMapper docMapper = parser.parse(mapping);
         Murmur3FieldMapper mapper = (Murmur3FieldMapper)docMapper.mappers().getMapper("field");
-        assertFalse(mapper.hasDocValues());
+        assertFalse(mapper.fieldType().hasDocValues());
     }
 
     public void testIndexSettingBackcompat() throws Exception {
diff --git a/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalMapper.java b/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalMapper.java
index a8bf1476465..45c6322f359 100755
--- a/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalMapper.java
+++ b/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalMapper.java
@@ -23,7 +23,6 @@ import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 import com.spatial4j.core.shape.Point;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.geo.GeoPoint;
 import org.elasticsearch.common.geo.builders.ShapeBuilder;
@@ -32,6 +31,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.fielddata.FieldDataType;
 import org.elasticsearch.index.mapper.ContentPath;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
@@ -61,15 +61,6 @@ import static org.elasticsearch.index.mapper.core.TypeParsers.parseMultiField;
  * .shape GeoShape type
  */
 public class ExternalMapper extends AbstractFieldMapper {
-    /**
-     * Returns the actual value of the field.
-     *
-     * @param value
-     */
-    @Override
-    public Object value(Object value) {
-        return null;
-    }
 
     public static class Names {
         public static final String FIELD_BIN = "bin";
@@ -89,7 +80,7 @@ public class ExternalMapper extends AbstractFieldMapper {
         private String mapperName;
 
         public Builder(String name, String generatedValue, String mapperName) {
-            super(name, new FieldType(Defaults.FIELD_TYPE));
+            super(name, Defaults.FIELD_TYPE);
             this.builder = this;
             this.stringBuilder = stringField(name).store(false);
             this.generatedValue = generatedValue;
@@ -115,8 +106,9 @@ public class ExternalMapper extends AbstractFieldMapper {
             context.path().remove();
 
             context.path().pathType(origPathType);
+            setupFieldType(context);
 
-            return new ExternalMapper(buildNames(context), generatedValue, mapperName, binMapper, boolMapper, pointMapper, shapeMapper, stringMapper,
+            return new ExternalMapper(fieldType, generatedValue, mapperName, binMapper, boolMapper, pointMapper, shapeMapper, stringMapper,
                     context.indexSettings(), multiFieldsBuilder.build(this, context), copyTo);
         }
     }
@@ -159,11 +151,11 @@ public class ExternalMapper extends AbstractFieldMapper {
     private final GeoShapeFieldMapper shapeMapper;
     private final FieldMapper stringMapper;
 
-    public ExternalMapper(FieldMapper.Names names,
+    public ExternalMapper(MappedFieldType fieldType,
                           String generatedValue, String mapperName,
                           BinaryFieldMapper binMapper, BooleanFieldMapper boolMapper, GeoPointFieldMapper pointMapper,
                           GeoShapeFieldMapper shapeMapper, FieldMapper stringMapper, Settings indexSettings, MultiFields multiFields, CopyTo copyTo) {
-        super(names, 1.0f, Defaults.FIELD_TYPE, false, null, null, null, null, null, indexSettings,
+        super(fieldType, false, null, indexSettings,
                 multiFields, copyTo);
         this.generatedValue = generatedValue;
         this.mapperName = mapperName;
@@ -175,7 +167,7 @@ public class ExternalMapper extends AbstractFieldMapper {
     }
 
     @Override
-    public FieldType defaultFieldType() {
+    public MappedFieldType defaultFieldType() {
         return Defaults.FIELD_TYPE;
     }
 
@@ -236,7 +228,7 @@ public class ExternalMapper extends AbstractFieldMapper {
 
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.startObject(names().shortName());
+        builder.startObject(fieldType().names().shortName());
         builder.field("type", mapperName);
         multiFields.toXContent(builder, params);
         builder.endObject();
diff --git a/src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java
index b959bb41ab6..d31e2a1b01b 100644
--- a/src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java
@@ -55,12 +55,12 @@ public class GeoShapeFieldMapperTests extends ElasticsearchSingleNodeTest {
         assertThat(fieldMapper, instanceOf(GeoShapeFieldMapper.class));
 
         GeoShapeFieldMapper geoShapeFieldMapper = (GeoShapeFieldMapper) fieldMapper;
-        PrefixTreeStrategy strategy = geoShapeFieldMapper.defaultStrategy();
+        PrefixTreeStrategy strategy = geoShapeFieldMapper.fieldType().defaultStrategy();
 
         assertThat(strategy.getDistErrPct(), equalTo(GeoShapeFieldMapper.Defaults.DISTANCE_ERROR_PCT));
         assertThat(strategy.getGrid(), instanceOf(GeohashPrefixTree.class));
         assertThat(strategy.getGrid().getMaxLevels(), equalTo(GeoShapeFieldMapper.Defaults.GEOHASH_LEVELS));
-        assertThat(geoShapeFieldMapper.orientation(), equalTo(GeoShapeFieldMapper.Defaults.ORIENTATION));
+        assertThat(geoShapeFieldMapper.fieldType().orientation(), equalTo(GeoShapeFieldMapper.Defaults.ORIENTATION));
     }
 
     /**
@@ -79,7 +79,7 @@ public class GeoShapeFieldMapperTests extends ElasticsearchSingleNodeTest {
         FieldMapper fieldMapper = defaultMapper.mappers().getMapper("location");
         assertThat(fieldMapper, instanceOf(GeoShapeFieldMapper.class));
 
-        ShapeBuilder.Orientation orientation = ((GeoShapeFieldMapper)fieldMapper).orientation();
+        ShapeBuilder.Orientation orientation = ((GeoShapeFieldMapper)fieldMapper).fieldType().orientation();
         assertThat(orientation, equalTo(ShapeBuilder.Orientation.CLOCKWISE));
         assertThat(orientation, equalTo(ShapeBuilder.Orientation.LEFT));
         assertThat(orientation, equalTo(ShapeBuilder.Orientation.CW));
@@ -96,7 +96,7 @@ public class GeoShapeFieldMapperTests extends ElasticsearchSingleNodeTest {
         fieldMapper = defaultMapper.mappers().getMapper("location");
         assertThat(fieldMapper, instanceOf(GeoShapeFieldMapper.class));
 
-        orientation = ((GeoShapeFieldMapper)fieldMapper).orientation();
+        orientation = ((GeoShapeFieldMapper)fieldMapper).fieldType().orientation();
         assertThat(orientation, equalTo(ShapeBuilder.Orientation.COUNTER_CLOCKWISE));
         assertThat(orientation, equalTo(ShapeBuilder.Orientation.RIGHT));
         assertThat(orientation, equalTo(ShapeBuilder.Orientation.CCW));
@@ -118,7 +118,7 @@ public class GeoShapeFieldMapperTests extends ElasticsearchSingleNodeTest {
         assertThat(fieldMapper, instanceOf(GeoShapeFieldMapper.class));
 
         GeoShapeFieldMapper geoShapeFieldMapper = (GeoShapeFieldMapper) fieldMapper;
-        PrefixTreeStrategy strategy = geoShapeFieldMapper.defaultStrategy();
+        PrefixTreeStrategy strategy = geoShapeFieldMapper.fieldType().defaultStrategy();
 
         assertThat(strategy.getDistErrPct(), equalTo(0.1));
         assertThat(strategy.getGrid(), instanceOf(GeohashPrefixTree.class));
@@ -141,7 +141,7 @@ public class GeoShapeFieldMapperTests extends ElasticsearchSingleNodeTest {
         assertThat(fieldMapper, instanceOf(GeoShapeFieldMapper.class));
 
         GeoShapeFieldMapper geoShapeFieldMapper = (GeoShapeFieldMapper) fieldMapper;
-        PrefixTreeStrategy strategy = geoShapeFieldMapper.defaultStrategy();
+        PrefixTreeStrategy strategy = geoShapeFieldMapper.fieldType().defaultStrategy();
 
         assertThat(strategy.getDistErrPct(), equalTo(0.5));
         assertThat(strategy.getGrid(), instanceOf(QuadPrefixTree.class));
@@ -169,7 +169,7 @@ public class GeoShapeFieldMapperTests extends ElasticsearchSingleNodeTest {
             assertThat(fieldMapper, instanceOf(GeoShapeFieldMapper.class));
 
             GeoShapeFieldMapper geoShapeFieldMapper = (GeoShapeFieldMapper) fieldMapper;
-            PrefixTreeStrategy strategy = geoShapeFieldMapper.defaultStrategy();
+            PrefixTreeStrategy strategy = geoShapeFieldMapper.fieldType().defaultStrategy();
 
             assertThat(strategy.getDistErrPct(), equalTo(0.5));
             assertThat(strategy.getGrid(), instanceOf(QuadPrefixTree.class));
@@ -193,7 +193,7 @@ public class GeoShapeFieldMapperTests extends ElasticsearchSingleNodeTest {
             assertThat(fieldMapper, instanceOf(GeoShapeFieldMapper.class));
 
             GeoShapeFieldMapper geoShapeFieldMapper = (GeoShapeFieldMapper) fieldMapper;
-            PrefixTreeStrategy strategy = geoShapeFieldMapper.defaultStrategy();
+            PrefixTreeStrategy strategy = geoShapeFieldMapper.fieldType().defaultStrategy();
 
             // distance_error_pct was not specified so we expect the mapper to take the highest precision between "precision" and
             // "tree_levels" setting distErrPct to 0 to guarantee desired precision
@@ -219,7 +219,7 @@ public class GeoShapeFieldMapperTests extends ElasticsearchSingleNodeTest {
             assertThat(fieldMapper, instanceOf(GeoShapeFieldMapper.class));
 
             GeoShapeFieldMapper geoShapeFieldMapper = (GeoShapeFieldMapper) fieldMapper;
-            PrefixTreeStrategy strategy = geoShapeFieldMapper.defaultStrategy();
+            PrefixTreeStrategy strategy = geoShapeFieldMapper.fieldType().defaultStrategy();
 
             assertThat(strategy.getDistErrPct(), equalTo(0.5));
             assertThat(strategy.getGrid(), instanceOf(GeohashPrefixTree.class));
@@ -243,7 +243,7 @@ public class GeoShapeFieldMapperTests extends ElasticsearchSingleNodeTest {
             assertThat(fieldMapper, instanceOf(GeoShapeFieldMapper.class));
 
             GeoShapeFieldMapper geoShapeFieldMapper = (GeoShapeFieldMapper) fieldMapper;
-            PrefixTreeStrategy strategy = geoShapeFieldMapper.defaultStrategy();
+            PrefixTreeStrategy strategy = geoShapeFieldMapper.fieldType().defaultStrategy();
 
             assertThat(strategy.getDistErrPct(), equalTo(0.5));
             assertThat(strategy.getGrid(), instanceOf(GeohashPrefixTree.class));
@@ -266,7 +266,7 @@ public class GeoShapeFieldMapperTests extends ElasticsearchSingleNodeTest {
             assertThat(fieldMapper, instanceOf(GeoShapeFieldMapper.class));
 
             GeoShapeFieldMapper geoShapeFieldMapper = (GeoShapeFieldMapper) fieldMapper;
-            PrefixTreeStrategy strategy = geoShapeFieldMapper.defaultStrategy();
+            PrefixTreeStrategy strategy = geoShapeFieldMapper.fieldType().defaultStrategy();
 
             assertThat(strategy.getDistErrPct(), equalTo(0.5));
             assertThat(strategy.getGrid(), instanceOf(QuadPrefixTree.class));
@@ -292,7 +292,7 @@ public class GeoShapeFieldMapperTests extends ElasticsearchSingleNodeTest {
             assertThat(fieldMapper, instanceOf(GeoShapeFieldMapper.class));
 
             GeoShapeFieldMapper geoShapeFieldMapper = (GeoShapeFieldMapper) fieldMapper;
-            PrefixTreeStrategy strategy = geoShapeFieldMapper.defaultStrategy();
+            PrefixTreeStrategy strategy = geoShapeFieldMapper.fieldType().defaultStrategy();
 
             assertThat(strategy.getDistErrPct(), equalTo(0.5));
             assertThat(strategy.getGrid(), instanceOf(QuadPrefixTree.class));
@@ -314,7 +314,7 @@ public class GeoShapeFieldMapperTests extends ElasticsearchSingleNodeTest {
             assertThat(fieldMapper, instanceOf(GeoShapeFieldMapper.class));
 
             GeoShapeFieldMapper geoShapeFieldMapper = (GeoShapeFieldMapper) fieldMapper;
-            PrefixTreeStrategy strategy = geoShapeFieldMapper.defaultStrategy();
+            PrefixTreeStrategy strategy = geoShapeFieldMapper.fieldType().defaultStrategy();
 
             assertThat(strategy.getDistErrPct(), equalTo(0.5));
             assertThat(strategy.getGrid(), instanceOf(GeohashPrefixTree.class));
@@ -351,13 +351,13 @@ public class GeoShapeFieldMapperTests extends ElasticsearchSingleNodeTest {
         assertThat(fieldMapper, instanceOf(GeoShapeFieldMapper.class));
 
         GeoShapeFieldMapper geoShapeFieldMapper = (GeoShapeFieldMapper) fieldMapper;
-        PrefixTreeStrategy strategy = geoShapeFieldMapper.defaultStrategy();
+        PrefixTreeStrategy strategy = geoShapeFieldMapper.fieldType().defaultStrategy();
 
         assertThat(strategy, instanceOf(RecursivePrefixTreeStrategy.class));
         assertThat(strategy.getGrid(), instanceOf(GeohashPrefixTree.class));
         assertThat(strategy.getDistErrPct(), equalTo(0.01));
         assertThat(strategy.getGrid().getMaxLevels(), equalTo(GeoUtils.geoHashLevelsForPrecision(1d)));
-        assertThat(geoShapeFieldMapper.orientation(), equalTo(ShapeBuilder.Orientation.CCW));
+        assertThat(geoShapeFieldMapper.fieldType().orientation(), equalTo(ShapeBuilder.Orientation.CCW));
 
         // correct mapping
         stage2Mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
@@ -373,12 +373,12 @@ public class GeoShapeFieldMapperTests extends ElasticsearchSingleNodeTest {
         assertThat(fieldMapper, instanceOf(GeoShapeFieldMapper.class));
 
         geoShapeFieldMapper = (GeoShapeFieldMapper) fieldMapper;
-        strategy = geoShapeFieldMapper.defaultStrategy();
+        strategy = geoShapeFieldMapper.fieldType().defaultStrategy();
 
         assertThat(strategy, instanceOf(RecursivePrefixTreeStrategy.class));
         assertThat(strategy.getGrid(), instanceOf(GeohashPrefixTree.class));
         assertThat(strategy.getDistErrPct(), equalTo(0.001));
         assertThat(strategy.getGrid().getMaxLevels(), equalTo(GeoUtils.geoHashLevelsForPrecision(1d)));
-        assertThat(geoShapeFieldMapper.orientation(), equalTo(ShapeBuilder.Orientation.CW));
+        assertThat(geoShapeFieldMapper.fieldType().orientation(), equalTo(ShapeBuilder.Orientation.CW));
     }
 }
diff --git a/src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java b/src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java
index 50cc9968466..12d5211f087 100644
--- a/src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java
@@ -96,25 +96,25 @@ public class GeohashMappingGeoPointTests extends ElasticsearchSingleNodeTest {
     @Test
     public void testGeoHashPrecisionAsInteger() throws Exception {
         String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
-                .startObject("properties").startObject("point").field("type", "geo_point").field("geohash_precision", 10).endObject().endObject()
+                .startObject("properties").startObject("point").field("type", "geo_point").field("geohash", true).field("geohash_precision", 10).endObject().endObject()
                 .endObject().endObject().string();
         DocumentMapper defaultMapper = createIndex("test").mapperService().documentMapperParser().parse(mapping);
         FieldMapper mapper = defaultMapper.mappers().smartNameFieldMapper("point");
         assertThat(mapper, instanceOf(GeoPointFieldMapper.class));
         GeoPointFieldMapper geoPointFieldMapper = (GeoPointFieldMapper) mapper;
-        assertThat(geoPointFieldMapper.geoHashPrecision(), is(10));
+        assertThat(geoPointFieldMapper.fieldType().geohashPrecision(), is(10));
     }
 
     @Test
     public void testGeoHashPrecisionAsLength() throws Exception {
         String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
-                .startObject("properties").startObject("point").field("type", "geo_point").field("geohash_precision", "5m").endObject().endObject()
+                .startObject("properties").startObject("point").field("type", "geo_point").field("geohash", true).field("geohash_precision", "5m").endObject().endObject()
                 .endObject().endObject().string();
         DocumentMapper defaultMapper = createIndex("test").mapperService().documentMapperParser().parse(mapping);
         FieldMapper mapper = defaultMapper.mappers().smartNameFieldMapper("point");
         assertThat(mapper, instanceOf(GeoPointFieldMapper.class));
         GeoPointFieldMapper geoPointFieldMapper = (GeoPointFieldMapper) mapper;
-        assertThat(geoPointFieldMapper.geoHashPrecision(), is(10));
+        assertThat(geoPointFieldMapper.fieldType().geohashPrecision(), is(10));
     }
 
     @Test
diff --git a/src/test/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapperTests.java
index 8da6e71c135..a8ce3c145a7 100644
--- a/src/test/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapperTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapperTests.java
@@ -69,7 +69,7 @@ public class FieldNamesFieldMapperTests extends ElasticsearchSingleNodeTest {
 
         DocumentMapper docMapper = createIndex("test").mapperService().documentMapperParser().parse(mapping);
         FieldNamesFieldMapper fieldNamesMapper = docMapper.rootMapper(FieldNamesFieldMapper.class);
-        assertFalse(fieldNamesMapper.hasDocValues());
+        assertFalse(fieldNamesMapper.fieldType().hasDocValues());
         assertEquals(IndexOptions.DOCS, fieldNamesMapper.fieldType().indexOptions());
         assertFalse(fieldNamesMapper.fieldType().tokenized());
         assertFalse(fieldNamesMapper.fieldType().stored());
diff --git a/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java
index 620847559ee..26ffbefdd1c 100644
--- a/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java
@@ -130,11 +130,11 @@ public class TestMergeMapperTests extends ElasticsearchSingleNodeTest {
         DocumentMapper existing = parser.parse(mapping1);
         DocumentMapper changed = parser.parse(mapping2);
 
-        assertThat(((NamedAnalyzer) existing.mappers().getMapper("field").searchAnalyzer()).name(), equalTo("whitespace"));
+        assertThat(((NamedAnalyzer) existing.mappers().getMapper("field").fieldType().searchAnalyzer()).name(), equalTo("whitespace"));
         MergeResult mergeResult = existing.merge(changed.mapping(), false);
 
         assertThat(mergeResult.hasConflicts(), equalTo(false));
-        assertThat(((NamedAnalyzer) existing.mappers().getMapper("field").searchAnalyzer()).name(), equalTo("keyword"));
+        assertThat(((NamedAnalyzer) existing.mappers().getMapper("field").fieldType().searchAnalyzer()).name(), equalTo("keyword"));
     }
 
     @Test
@@ -150,11 +150,11 @@ public class TestMergeMapperTests extends ElasticsearchSingleNodeTest {
         DocumentMapper existing = parser.parse(mapping1);
         DocumentMapper changed = parser.parse(mapping2);
 
-        assertThat(((NamedAnalyzer) existing.mappers().getMapper("field").searchAnalyzer()).name(), equalTo("whitespace"));
+        assertThat(((NamedAnalyzer) existing.mappers().getMapper("field").fieldType().searchAnalyzer()).name(), equalTo("whitespace"));
         MergeResult mergeResult = existing.merge(changed.mapping(), false);
 
         assertThat(mergeResult.hasConflicts(), equalTo(false));
-        assertThat(((NamedAnalyzer) existing.mappers().getMapper("field").searchAnalyzer()).name(), equalTo("standard"));
+        assertThat(((NamedAnalyzer) existing.mappers().getMapper("field").fieldType().searchAnalyzer()).name(), equalTo("standard"));
         assertThat(((StringFieldMapper) (existing.mappers().getMapper("field"))).getIgnoreAbove(), equalTo(14));
     }
 
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java b/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java
index e7df72c3dcd..4c845b4a91f 100644
--- a/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java
@@ -27,14 +27,18 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
+import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.DocumentMapperParser;
-import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.ParseContext.Document;
-import org.elasticsearch.index.mapper.core.*;
+import org.elasticsearch.index.mapper.core.CompletionFieldMapper;
+import org.elasticsearch.index.mapper.core.DateFieldMapper;
+import org.elasticsearch.index.mapper.core.LongFieldMapper;
+import org.elasticsearch.index.mapper.core.StringFieldMapper;
+import org.elasticsearch.index.mapper.core.TokenCountFieldMapper;
 import org.elasticsearch.index.mapper.geo.GeoPointFieldMapper;
-import org.elasticsearch.index.IndexService;
 import org.elasticsearch.test.ElasticsearchSingleNodeTest;
 import org.junit.Test;
 
@@ -46,8 +50,12 @@ import java.util.TreeMap;
 import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath;
 import static org.elasticsearch.common.io.Streams.copyToStringFromClasspath;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.index.mapper.MapperBuilders.*;
-import static org.hamcrest.Matchers.*;
+import static org.elasticsearch.index.mapper.MapperBuilders.doc;
+import static org.elasticsearch.index.mapper.MapperBuilders.rootObject;
+import static org.elasticsearch.index.mapper.MapperBuilders.stringField;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.notNullValue;
 
 /**
  *
@@ -119,7 +127,7 @@ public class MultiFieldTests extends ElasticsearchSingleNodeTest {
         assertNotSame(IndexOptions.NONE, docMapper.mappers().getMapper("name.test1").fieldType().indexOptions());
         assertThat(docMapper.mappers().getMapper("name.test1").fieldType().stored(), equalTo(true));
         assertThat(docMapper.mappers().getMapper("name.test1").fieldType().tokenized(), equalTo(true));
-        assertThat(docMapper.mappers().getMapper("name.test1").fieldDataType().getLoading(), equalTo(FieldMapper.Loading.EAGER));
+        assertThat(docMapper.mappers().getMapper("name.test1").fieldType().fieldDataType().getLoading(), equalTo(MappedFieldType.Loading.EAGER));
 
         assertThat(docMapper.mappers().getMapper("name.test2"), notNullValue());
         assertThat(docMapper.mappers().getMapper("name.test2"), instanceOf(TokenCountFieldMapper.class));
diff --git a/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldsIntegrationTests.java b/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldsIntegrationTests.java
index 3e5c29daade..60609d82b1a 100644
--- a/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldsIntegrationTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldsIntegrationTests.java
@@ -113,6 +113,7 @@ public class MultiFieldsIntegrationTests extends ElasticsearchIntegrationTest {
         assertThat(mappingMetaData, not(nullValue()));
         Map<String, Object> mappingSource = mappingMetaData.sourceAsMap();
         Map aField = ((Map) XContentMapValues.extractValue("properties.a", mappingSource));
+        logger.info("Keys: " + aField.keySet());
         assertThat(aField.size(), equalTo(2));
         assertThat(aField.get("type").toString(), equalTo("geo_point"));
         assertThat(aField.get("fields"), notNullValue());
diff --git a/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java
index 5ab240857b3..c429a012f86 100644
--- a/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java
@@ -52,7 +52,7 @@ public class SimpleMapperTests extends ElasticsearchSingleNodeTest {
         BytesReference json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/index/mapper/simple/test1.json"));
         Document doc = docMapper.parse("person", "1", json).rootDoc();
 
-        assertThat(doc.get(docMapper.mappers().getMapper("name.first").names().indexName()), equalTo("shay"));
+        assertThat(doc.get(docMapper.mappers().getMapper("name.first").fieldType().names().indexName()), equalTo("shay"));
 //        System.out.println("Document: " + doc);
 //        System.out.println("Json: " + docMapper.sourceMapper().value(doc));
         doc = docMapper.parse("person", "1", json).rootDoc();
@@ -71,8 +71,8 @@ public class SimpleMapperTests extends ElasticsearchSingleNodeTest {
         DocumentMapper builtDocMapper = parser.parse(builtMapping);
         BytesReference json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/index/mapper/simple/test1.json"));
         Document doc = builtDocMapper.parse("person", "1", json).rootDoc();
-        assertThat(doc.get(docMapper.uidMapper().names().indexName()), equalTo(Uid.createUid("person", "1")));
-        assertThat(doc.get(docMapper.mappers().getMapper("name.first").names().indexName()), equalTo("shay"));
+        assertThat(doc.get(docMapper.uidMapper().fieldType().names().indexName()), equalTo(Uid.createUid("person", "1")));
+        assertThat(doc.get(docMapper.mappers().getMapper("name.first").fieldType().names().indexName()), equalTo("shay"));
 //        System.out.println("Document: " + doc);
 //        System.out.println("Json: " + docMapper.sourceMapper().value(doc));
     }
@@ -86,8 +86,8 @@ public class SimpleMapperTests extends ElasticsearchSingleNodeTest {
 
         BytesReference json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/index/mapper/simple/test1.json"));
         Document doc = docMapper.parse("person", "1", json).rootDoc();
-        assertThat(doc.get(docMapper.uidMapper().names().indexName()), equalTo(Uid.createUid("person", "1")));
-        assertThat(doc.get(docMapper.mappers().getMapper("name.first").names().indexName()), equalTo("shay"));
+        assertThat(doc.get(docMapper.uidMapper().fieldType().names().indexName()), equalTo(Uid.createUid("person", "1")));
+        assertThat(doc.get(docMapper.mappers().getMapper("name.first").fieldType().names().indexName()), equalTo("shay"));
 //        System.out.println("Document: " + doc);
 //        System.out.println("Json: " + docMapper.sourceMapper().value(doc));
     }
@@ -98,8 +98,8 @@ public class SimpleMapperTests extends ElasticsearchSingleNodeTest {
         DocumentMapper docMapper = createIndex("test").mapperService().documentMapperParser().parse(mapping);
         BytesReference json = new BytesArray(copyToBytesFromClasspath("/org/elasticsearch/index/mapper/simple/test1-notype-noid.json"));
         Document doc = docMapper.parse("person", "1", json).rootDoc();
-        assertThat(doc.get(docMapper.uidMapper().names().indexName()), equalTo(Uid.createUid("person", "1")));
-        assertThat(doc.get(docMapper.mappers().getMapper("name.first").names().indexName()), equalTo("shay"));
+        assertThat(doc.get(docMapper.uidMapper().fieldType().names().indexName()), equalTo(Uid.createUid("person", "1")));
+        assertThat(doc.get(docMapper.mappers().getMapper("name.first").fieldType().names().indexName()), equalTo("shay"));
 //        System.out.println("Document: " + doc);
 //        System.out.println("Json: " + docMapper.sourceMapper().value(doc));
     }
diff --git a/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java
index 5b429d093c2..0583e289994 100644
--- a/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java
@@ -54,6 +54,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
 
+import static org.elasticsearch.index.mapper.core.StringFieldMapper.Builder;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
@@ -371,9 +372,9 @@ public class SimpleStringMappingTests extends ElasticsearchSingleNodeTest {
         DocumentMapperParser parser = indexService.mapperService().documentMapperParser();
         final BuilderContext ctx = new BuilderContext(indexService.settingsService().getSettings(), new ContentPath(1));
 
-        assertFalse(new StringFieldMapper.Builder("anything").index(false).build(ctx).hasDocValues());
-        assertTrue(new StringFieldMapper.Builder("anything").index(false).fieldDataSettings(DOC_VALUES_SETTINGS).build(ctx).hasDocValues());
-        assertTrue(new StringFieldMapper.Builder("anything").index(false).docValues(true).build(ctx).hasDocValues());
+        assertFalse(new Builder("anything").index(false).build(ctx).fieldType().hasDocValues());
+        assertTrue(new Builder("anything").index(false).fieldDataSettings(DOC_VALUES_SETTINGS).build(ctx).fieldType().hasDocValues());
+        assertTrue(new Builder("anything").index(false).docValues(true).build(ctx).fieldType().hasDocValues());
 
         String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
             .startObject("properties")
@@ -414,11 +415,11 @@ public class SimpleStringMappingTests extends ElasticsearchSingleNodeTest {
             fail();
         } catch (Exception e) { /* OK */ }
 
-        assertFalse(new StringFieldMapper.Builder("anything").index(false).build(ctx).hasDocValues());
-        assertTrue(new StringFieldMapper.Builder("anything").index(true).tokenized(false).build(ctx).hasDocValues());
-        assertFalse(new StringFieldMapper.Builder("anything").index(true).tokenized(true).build(ctx).hasDocValues());
-        assertFalse(new StringFieldMapper.Builder("anything").index(false).tokenized(false).docValues(false).build(ctx).hasDocValues());
-        assertTrue(new StringFieldMapper.Builder("anything").index(false).docValues(true).build(ctx).hasDocValues());
+        assertFalse(new Builder("anything").index(false).build(ctx).fieldType().hasDocValues());
+        assertTrue(new Builder("anything").index(true).tokenized(false).build(ctx).fieldType().hasDocValues());
+        assertFalse(new Builder("anything").index(true).tokenized(true).build(ctx).fieldType().hasDocValues());
+        assertFalse(new Builder("anything").index(false).tokenized(false).docValues(false).build(ctx).fieldType().hasDocValues());
+        assertTrue(new Builder("anything").index(false).docValues(true).build(ctx).fieldType().hasDocValues());
 
         String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
                 .startObject("properties")
diff --git a/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java
index e415ea76c07..3e40a84c931 100644
--- a/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java
@@ -38,7 +38,7 @@ import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.json.JsonXContent;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.DocumentMapperParser;
-import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.index.mapper.ParsedDocument;
 import org.elasticsearch.index.mapper.SourceToParse;
@@ -113,8 +113,8 @@ public class TimestampMappingTests extends ElasticsearchSingleNodeTest {
                 assertThat(docMapper.timestampFieldMapper().fieldType().stored(), equalTo(version.onOrAfter(Version.V_2_0_0) ? true : false));
                 assertThat(docMapper.timestampFieldMapper().fieldType().indexOptions(), equalTo(TimestampFieldMapper.Defaults.FIELD_TYPE.indexOptions()));
                 assertThat(docMapper.timestampFieldMapper().path(), equalTo(TimestampFieldMapper.Defaults.PATH));
-                assertThat(docMapper.timestampFieldMapper().dateTimeFormatter().format(), equalTo(TimestampFieldMapper.DEFAULT_DATE_TIME_FORMAT));
-                assertThat(docMapper.timestampFieldMapper().hasDocValues(), equalTo(false));
+                assertThat(docMapper.timestampFieldMapper().fieldType().dateTimeFormatter().format(), equalTo(TimestampFieldMapper.DEFAULT_DATE_TIME_FORMAT));
+                assertThat(docMapper.timestampFieldMapper().fieldType().hasDocValues(), equalTo(false));
                 assertAcked(client().admin().indices().prepareDelete("test").execute().get());
             }
         }
@@ -135,8 +135,8 @@ public class TimestampMappingTests extends ElasticsearchSingleNodeTest {
         assertThat(docMapper.timestampFieldMapper().fieldType().stored(), equalTo(false));
         assertEquals(IndexOptions.NONE, docMapper.timestampFieldMapper().fieldType().indexOptions());
         assertThat(docMapper.timestampFieldMapper().path(), equalTo("timestamp"));
-        assertThat(docMapper.timestampFieldMapper().dateTimeFormatter().format(), equalTo("year"));
-        assertThat(docMapper.timestampFieldMapper().hasDocValues(), equalTo(true));
+        assertThat(docMapper.timestampFieldMapper().fieldType().dateTimeFormatter().format(), equalTo("year"));
+        assertThat(docMapper.timestampFieldMapper().fieldType().hasDocValues(), equalTo(true));
     }
 
     @Test
@@ -507,16 +507,16 @@ public class TimestampMappingTests extends ElasticsearchSingleNodeTest {
         DocumentMapperParser parser = createIndex("test", indexSettings).mapperService().documentMapperParser();
 
         DocumentMapper docMapper = parser.parse(mapping);
-        assertThat(docMapper.timestampFieldMapper().fieldDataType().getLoading(), equalTo(FieldMapper.Loading.LAZY));
-        assertThat(docMapper.timestampFieldMapper().fieldDataType().getFormat(indexSettings), equalTo("doc_values"));
+        assertThat(docMapper.timestampFieldMapper().fieldType().fieldDataType().getLoading(), equalTo(MappedFieldType.Loading.LAZY));
+        assertThat(docMapper.timestampFieldMapper().fieldType().fieldDataType().getFormat(indexSettings), equalTo("doc_values"));
         mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
                 .startObject("_timestamp").field("enabled", randomBoolean()).startObject("fielddata").field("loading", "eager").field("format", "array").endObject().field("store", "yes").endObject()
                 .endObject().endObject().string();
 
         MergeResult mergeResult = docMapper.merge(parser.parse(mapping).mapping(), false);
         assertThat(mergeResult.buildConflicts().length, equalTo(0));
-        assertThat(docMapper.timestampFieldMapper().fieldDataType().getLoading(), equalTo(FieldMapper.Loading.EAGER));
-        assertThat(docMapper.timestampFieldMapper().fieldDataType().getFormat(indexSettings), equalTo("array"));
+        assertThat(docMapper.timestampFieldMapper().fieldType().fieldDataType().getLoading(), equalTo(MappedFieldType.Loading.EAGER));
+        assertThat(docMapper.timestampFieldMapper().fieldType().fieldDataType().getFormat(indexSettings), equalTo("array"));
     }
 
     @Test
@@ -574,7 +574,7 @@ public class TimestampMappingTests extends ElasticsearchSingleNodeTest {
         DocumentMapperParser parser = createIndex("test", indexSettings).mapperService().documentMapperParser();
 
         DocumentMapper docMapper = parser.parse(mapping);
-        assertThat(docMapper.timestampFieldMapper().fieldDataType().getLoading(), equalTo(FieldMapper.Loading.LAZY));
+        assertThat(docMapper.timestampFieldMapper().fieldType().fieldDataType().getLoading(), equalTo(MappedFieldType.Loading.LAZY));
         mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
                 .startObject("_timestamp").field("enabled", false)
                 .startObject("fielddata").field("format", "array").endObject()
@@ -597,9 +597,9 @@ public class TimestampMappingTests extends ElasticsearchSingleNodeTest {
             assertTrue("found unexpected conflict [" + conflict + "]", expectedConflicts.remove(conflict));
         }
         assertTrue("missing conflicts: " + Arrays.toString(expectedConflicts.toArray()), expectedConflicts.isEmpty());
-        assertThat(docMapper.timestampFieldMapper().fieldDataType().getLoading(), equalTo(FieldMapper.Loading.LAZY));
+        assertThat(docMapper.timestampFieldMapper().fieldType().fieldDataType().getLoading(), equalTo(MappedFieldType.Loading.LAZY));
         assertTrue(docMapper.timestampFieldMapper().enabled());
-        assertThat(docMapper.timestampFieldMapper().fieldDataType().getFormat(indexSettings), equalTo("doc_values"));
+        assertThat(docMapper.timestampFieldMapper().fieldType().fieldDataType().getFormat(indexSettings), equalTo("doc_values"));
     }
 
     @Test
@@ -739,9 +739,9 @@ public class TimestampMappingTests extends ElasticsearchSingleNodeTest {
     void assertDocValuesSerialization(String mapping) throws Exception {
         DocumentMapperParser parser = createIndex("test_doc_values").mapperService().documentMapperParser();
         DocumentMapper docMapper = parser.parse(mapping);
-        boolean docValues= docMapper.timestampFieldMapper().hasDocValues();
+        boolean docValues = docMapper.timestampFieldMapper().fieldType().hasDocValues();
         docMapper = parser.parse(docMapper.mappingSource().string());
-        assertThat(docMapper.timestampFieldMapper().hasDocValues(), equalTo(docValues));
+        assertThat(docMapper.timestampFieldMapper().fieldType().hasDocValues(), equalTo(docValues));
         assertAcked(client().admin().indices().prepareDelete("test_doc_values"));
     }
 
diff --git a/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingTests.java
index 1090f6df85a..588891d1cf4 100644
--- a/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingTests.java
@@ -149,10 +149,10 @@ public class UpdateMappingTests extends ElasticsearchSingleNodeTest {
         DocumentMapper documentMapper = indexService.mapperService().parse("type", new CompressedString(indexMapping.string()), true);
         assertThat(documentMapper.timestampFieldMapper().enabled(), equalTo(enabled));
         assertTrue(documentMapper.timestampFieldMapper().fieldType().stored());
-        assertTrue(documentMapper.timestampFieldMapper().hasDocValues());
+        assertTrue(documentMapper.timestampFieldMapper().fieldType().hasDocValues());
         documentMapper = indexService.mapperService().parse("type", new CompressedString(documentMapper.mappingSource().string()), true);
         assertThat(documentMapper.timestampFieldMapper().enabled(), equalTo(enabled));
-        assertTrue(documentMapper.timestampFieldMapper().hasDocValues());
+        assertTrue(documentMapper.timestampFieldMapper().fieldType().hasDocValues());
         assertTrue(documentMapper.timestampFieldMapper().fieldType().stored());
     }
 
diff --git a/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java b/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java
index c2c98553bbf..3f4119b4739 100644
--- a/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java
+++ b/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java
@@ -56,9 +56,9 @@ public class SimilarityTests extends ElasticsearchSingleNodeTest {
                 .build();
         SimilarityService similarityService = createIndex("foo", indexSettings).similarityService();
         DocumentMapper documentMapper = similarityService.mapperService().documentMapperParser().parse(mapping);
-        assertThat(documentMapper.mappers().getMapper("field1").similarity(), instanceOf(DefaultSimilarityProvider.class));
+        assertThat(documentMapper.mappers().getMapper("field1").fieldType().similarity(), instanceOf(DefaultSimilarityProvider.class));
 
-        DefaultSimilarity similarity = (DefaultSimilarity) documentMapper.mappers().getMapper("field1").similarity().get();
+        DefaultSimilarity similarity = (DefaultSimilarity) documentMapper.mappers().getMapper("field1").fieldType().similarity().get();
         assertThat(similarity.getDiscountOverlaps(), equalTo(false));
     }
 
@@ -78,9 +78,9 @@ public class SimilarityTests extends ElasticsearchSingleNodeTest {
                 .build();
         SimilarityService similarityService = createIndex("foo", indexSettings).similarityService();
         DocumentMapper documentMapper = similarityService.mapperService().documentMapperParser().parse(mapping);
-        assertThat(documentMapper.mappers().getMapper("field1").similarity(), instanceOf(BM25SimilarityProvider.class));
+        assertThat(documentMapper.mappers().getMapper("field1").fieldType().similarity(), instanceOf(BM25SimilarityProvider.class));
 
-        BM25Similarity similarity = (BM25Similarity) documentMapper.mappers().getMapper("field1").similarity().get();
+        BM25Similarity similarity = (BM25Similarity) documentMapper.mappers().getMapper("field1").fieldType().similarity().get();
         assertThat(similarity.getK1(), equalTo(2.0f));
         assertThat(similarity.getB(), equalTo(1.5f));
         assertThat(similarity.getDiscountOverlaps(), equalTo(false));
@@ -103,9 +103,9 @@ public class SimilarityTests extends ElasticsearchSingleNodeTest {
                 .build();
         SimilarityService similarityService = createIndex("foo", indexSettings).similarityService();
         DocumentMapper documentMapper = similarityService.mapperService().documentMapperParser().parse(mapping);
-        assertThat(documentMapper.mappers().getMapper("field1").similarity(), instanceOf(DFRSimilarityProvider.class));
+        assertThat(documentMapper.mappers().getMapper("field1").fieldType().similarity(), instanceOf(DFRSimilarityProvider.class));
 
-        DFRSimilarity similarity = (DFRSimilarity) documentMapper.mappers().getMapper("field1").similarity().get();
+        DFRSimilarity similarity = (DFRSimilarity) documentMapper.mappers().getMapper("field1").fieldType().similarity().get();
         assertThat(similarity.getBasicModel(), instanceOf(BasicModelG.class));
         assertThat(similarity.getAfterEffect(), instanceOf(AfterEffectL.class));
         assertThat(similarity.getNormalization(), instanceOf(NormalizationH2.class));
@@ -129,9 +129,9 @@ public class SimilarityTests extends ElasticsearchSingleNodeTest {
                 .build();
         SimilarityService similarityService = createIndex("foo", indexSettings).similarityService();
         DocumentMapper documentMapper = similarityService.mapperService().documentMapperParser().parse(mapping);
-        assertThat(documentMapper.mappers().getMapper("field1").similarity(), instanceOf(IBSimilarityProvider.class));
+        assertThat(documentMapper.mappers().getMapper("field1").fieldType().similarity(), instanceOf(IBSimilarityProvider.class));
 
-        IBSimilarity similarity = (IBSimilarity) documentMapper.mappers().getMapper("field1").similarity().get();
+        IBSimilarity similarity = (IBSimilarity) documentMapper.mappers().getMapper("field1").fieldType().similarity().get();
         assertThat(similarity.getDistribution(), instanceOf(DistributionSPL.class));
         assertThat(similarity.getLambda(), instanceOf(LambdaTTF.class));
         assertThat(similarity.getNormalization(), instanceOf(NormalizationH2.class));
@@ -152,9 +152,9 @@ public class SimilarityTests extends ElasticsearchSingleNodeTest {
                 .build();
         SimilarityService similarityService = createIndex("foo", indexSettings).similarityService();
         DocumentMapper documentMapper = similarityService.mapperService().documentMapperParser().parse(mapping);
-        assertThat(documentMapper.mappers().getMapper("field1").similarity(), instanceOf(LMDirichletSimilarityProvider.class));
+        assertThat(documentMapper.mappers().getMapper("field1").fieldType().similarity(), instanceOf(LMDirichletSimilarityProvider.class));
 
-        LMDirichletSimilarity similarity = (LMDirichletSimilarity) documentMapper.mappers().getMapper("field1").similarity().get();
+        LMDirichletSimilarity similarity = (LMDirichletSimilarity) documentMapper.mappers().getMapper("field1").fieldType().similarity().get();
         assertThat(similarity.getMu(), equalTo(3000f));
     }
 
@@ -172,9 +172,9 @@ public class SimilarityTests extends ElasticsearchSingleNodeTest {
                 .build();
         SimilarityService similarityService = createIndex("foo", indexSettings).similarityService();
         DocumentMapper documentMapper = similarityService.mapperService().documentMapperParser().parse(mapping);
-        assertThat(documentMapper.mappers().getMapper("field1").similarity(), instanceOf(LMJelinekMercerSimilarityProvider.class));
+        assertThat(documentMapper.mappers().getMapper("field1").fieldType().similarity(), instanceOf(LMJelinekMercerSimilarityProvider.class));
 
-        LMJelinekMercerSimilarity similarity = (LMJelinekMercerSimilarity) documentMapper.mappers().getMapper("field1").similarity().get();
+        LMJelinekMercerSimilarity similarity = (LMJelinekMercerSimilarity) documentMapper.mappers().getMapper("field1").fieldType().similarity().get();
         assertThat(similarity.getLambda(), equalTo(0.7f));
     }
 }
diff --git a/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java b/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java
index 637c877caf3..adf1fbf2a04 100644
--- a/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java
+++ b/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java
@@ -36,7 +36,7 @@ import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.json.JsonXContent;
 import org.elasticsearch.index.engine.Segment;
-import org.elasticsearch.index.mapper.FieldMapper.Loading;
+import org.elasticsearch.index.mapper.MappedFieldType.Loading;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.indices.cache.query.IndicesQueryCache;
 import org.elasticsearch.search.SearchService;
diff --git a/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingTest.java b/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingTest.java
index 733f0a26cd2..b61ad6e61df 100644
--- a/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingTest.java
+++ b/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingTest.java
@@ -26,11 +26,11 @@ import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.mapper.DocumentMapper;
-import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.merge.policy.MergePolicyModule;
-import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.shard.IndexShard;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
@@ -62,7 +62,7 @@ public class ParentFieldLoadingTest extends ElasticsearchIntegrationTest {
         assertAcked(prepareCreate("test")
                 .setSettings(indexSettings)
                 .addMapping("parent")
-                .addMapping("child", childMapping(FieldMapper.Loading.LAZY)));
+                .addMapping("child", childMapping(MappedFieldType.Loading.LAZY)));
         ensureGreen();
 
         client().prepareIndex("test", "parent", "1").setSource("{}").get();
@@ -93,7 +93,7 @@ public class ParentFieldLoadingTest extends ElasticsearchIntegrationTest {
         assertAcked(prepareCreate("test")
                 .setSettings(indexSettings)
                 .addMapping("parent")
-                .addMapping("child", childMapping(FieldMapper.Loading.EAGER)));
+                .addMapping("child", childMapping(MappedFieldType.Loading.EAGER)));
         ensureGreen();
 
         client().prepareIndex("test", "parent", "1").setSource("{}").get();
@@ -108,7 +108,7 @@ public class ParentFieldLoadingTest extends ElasticsearchIntegrationTest {
         assertAcked(prepareCreate("test")
                 .setSettings(indexSettings)
                 .addMapping("parent")
-                .addMapping("child", childMapping(FieldMapper.Loading.EAGER_GLOBAL_ORDINALS)));
+                .addMapping("child", childMapping(MappedFieldType.Loading.EAGER_GLOBAL_ORDINALS)));
         ensureGreen();
 
         // Need to do 2 separate refreshes, otherwise we have 1 segment and then we can't measure if global ordinals
@@ -139,7 +139,7 @@ public class ParentFieldLoadingTest extends ElasticsearchIntegrationTest {
         assertThat(fielddataSizeDefault, greaterThan(0l));
 
         PutMappingResponse putMappingResponse = client().admin().indices().preparePutMapping("test").setType("child")
-                .setSource(childMapping(FieldMapper.Loading.EAGER_GLOBAL_ORDINALS))
+                .setSource(childMapping(MappedFieldType.Loading.EAGER_GLOBAL_ORDINALS))
                 .get();
         assertAcked(putMappingResponse);
         assertBusy(new Runnable() {
@@ -156,7 +156,7 @@ public class ParentFieldLoadingTest extends ElasticsearchIntegrationTest {
                     MapperService mapperService = indexService.mapperService();
                     DocumentMapper documentMapper = mapperService.documentMapper("child");
                     if (documentMapper != null) {
-                        verified = documentMapper.parentFieldMapper().fieldDataType().getLoading() == FieldMapper.Loading.EAGER_GLOBAL_ORDINALS;
+                        verified = documentMapper.parentFieldMapper().fieldType().fieldDataType().getLoading() == MappedFieldType.Loading.EAGER_GLOBAL_ORDINALS;
                     }
                 }
                 assertTrue(verified);
@@ -171,10 +171,10 @@ public class ParentFieldLoadingTest extends ElasticsearchIntegrationTest {
         assertThat(response.getIndicesStats().getFieldData().getMemorySizeInBytes(), greaterThan(fielddataSizeDefault));
     }
 
-    private XContentBuilder childMapping(FieldMapper.Loading loading) throws IOException {
+    private XContentBuilder childMapping(MappedFieldType.Loading loading) throws IOException {
         return jsonBuilder().startObject().startObject("child").startObject("_parent")
                 .field("type", "parent")
-                .startObject("fielddata").field(FieldMapper.Loading.KEY, loading).endObject()
+                .startObject("fielddata").field(MappedFieldType.Loading.KEY, loading).endObject()
                 .endObject().endObject().endObject();
     }
 
diff --git a/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java b/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java
index 0d4329d5bb7..83bcdb44397 100644
--- a/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java
+++ b/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java
@@ -37,7 +37,7 @@ import org.elasticsearch.index.cache.filter.FilterCacheModule;
 import org.elasticsearch.index.cache.filter.FilterCacheModule.FilterCacheSettings;
 import org.elasticsearch.index.cache.filter.index.IndexFilterCache;
 import org.elasticsearch.index.fielddata.FieldDataType;
-import org.elasticsearch.index.mapper.FieldMapper.Loading;
+import org.elasticsearch.index.mapper.MappedFieldType.Loading;
 import org.elasticsearch.index.mapper.MergeMappingException;
 import org.elasticsearch.index.query.HasChildQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
diff --git a/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java b/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java
index 13e4d0d6554..eb6a6629aac 100644
--- a/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java
+++ b/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java
@@ -461,7 +461,7 @@ public class GeoShapeIntegrationTests extends ElasticsearchIntegrationTest {
         assertThat(fieldMapper, instanceOf(GeoShapeFieldMapper.class));
 
         GeoShapeFieldMapper gsfm = (GeoShapeFieldMapper)fieldMapper;
-        ShapeBuilder.Orientation orientation = gsfm.orientation();
+        ShapeBuilder.Orientation orientation = gsfm.fieldType().orientation();
         assertThat(orientation, equalTo(ShapeBuilder.Orientation.CLOCKWISE));
         assertThat(orientation, equalTo(ShapeBuilder.Orientation.LEFT));
         assertThat(orientation, equalTo(ShapeBuilder.Orientation.CW));
@@ -473,7 +473,7 @@ public class GeoShapeIntegrationTests extends ElasticsearchIntegrationTest {
         assertThat(fieldMapper, instanceOf(GeoShapeFieldMapper.class));
 
         gsfm = (GeoShapeFieldMapper)fieldMapper;
-        orientation = gsfm.orientation();
+        orientation = gsfm.fieldType().orientation();
         assertThat(orientation, equalTo(ShapeBuilder.Orientation.COUNTER_CLOCKWISE));
         assertThat(orientation, equalTo(ShapeBuilder.Orientation.RIGHT));
         assertThat(orientation, equalTo(ShapeBuilder.Orientation.CCW));
diff --git a/src/test/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProviderV1.java b/src/test/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProviderV1.java
index d8cd3dd3fc7..a2867abcd81 100644
--- a/src/test/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProviderV1.java
+++ b/src/test/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProviderV1.java
@@ -59,6 +59,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
+import static org.apache.lucene.search.suggest.analyzing.XAnalyzingSuggester.HOLE_CHARACTER;
+
 /**
  * This is an older implementation of the AnalyzingCompletionLookupProvider class
  * We use this to test for backwards compatibility in our tests, namely
@@ -232,7 +234,7 @@ public class AnalyzingCompletionLookupProviderV1 extends CompletionLookupProvide
         return new LookupFactory() {
             @Override
             public Lookup getLookup(CompletionFieldMapper mapper, CompletionSuggestionContext suggestionContext) {
-                AnalyzingSuggestHolder analyzingSuggestHolder = lookupMap.get(mapper.names().indexName());
+                AnalyzingSuggestHolder analyzingSuggestHolder = lookupMap.get(mapper.fieldType().names().indexName());
                 if (analyzingSuggestHolder == null) {
                     return null;
                 }
@@ -242,18 +244,18 @@ public class AnalyzingCompletionLookupProviderV1 extends CompletionLookupProvide
 
                 XAnalyzingSuggester suggester;
                 if (suggestionContext.isFuzzy()) {
-                    suggester = new XFuzzySuggester(mapper.indexAnalyzer(), queryPrefix, mapper.searchAnalyzer(), flags,
-                            analyzingSuggestHolder.maxSurfaceFormsPerAnalyzedForm, analyzingSuggestHolder.maxGraphExpansions,
-                            suggestionContext.getFuzzyEditDistance(), suggestionContext.isFuzzyTranspositions(),
-                            suggestionContext.getFuzzyPrefixLength(), suggestionContext.getFuzzyMinLength(), false,
-                            analyzingSuggestHolder.fst, analyzingSuggestHolder.hasPayloads,
-                            analyzingSuggestHolder.maxAnalyzedPathsForOneInput, SEP_LABEL, PAYLOAD_SEP, END_BYTE, XAnalyzingSuggester.HOLE_CHARACTER);
+                    suggester = new XFuzzySuggester(mapper.fieldType().indexAnalyzer(), queryPrefix, mapper.fieldType().searchAnalyzer(), flags,
+                        analyzingSuggestHolder.maxSurfaceFormsPerAnalyzedForm, analyzingSuggestHolder.maxGraphExpansions,
+                        suggestionContext.getFuzzyEditDistance(), suggestionContext.isFuzzyTranspositions(),
+                        suggestionContext.getFuzzyPrefixLength(), suggestionContext.getFuzzyMinLength(), false,
+                        analyzingSuggestHolder.fst, analyzingSuggestHolder.hasPayloads,
+                        analyzingSuggestHolder.maxAnalyzedPathsForOneInput, SEP_LABEL, PAYLOAD_SEP, END_BYTE, HOLE_CHARACTER);
                 } else {
-                    suggester = new XAnalyzingSuggester(mapper.indexAnalyzer(), queryPrefix, mapper.searchAnalyzer(), flags,
-                            analyzingSuggestHolder.maxSurfaceFormsPerAnalyzedForm, analyzingSuggestHolder.maxGraphExpansions,
-                            analyzingSuggestHolder.preservePositionIncrements,
-                            analyzingSuggestHolder.fst, analyzingSuggestHolder.hasPayloads,
-                            analyzingSuggestHolder.maxAnalyzedPathsForOneInput, SEP_LABEL, PAYLOAD_SEP, END_BYTE, XAnalyzingSuggester.HOLE_CHARACTER);
+                    suggester = new XAnalyzingSuggester(mapper.fieldType().indexAnalyzer(), queryPrefix, mapper.fieldType().searchAnalyzer(), flags,
+                        analyzingSuggestHolder.maxSurfaceFormsPerAnalyzedForm, analyzingSuggestHolder.maxGraphExpansions,
+                        analyzingSuggestHolder.preservePositionIncrements,
+                        analyzingSuggestHolder.fst, analyzingSuggestHolder.hasPayloads,
+                        analyzingSuggestHolder.maxAnalyzedPathsForOneInput, SEP_LABEL, PAYLOAD_SEP, END_BYTE, HOLE_CHARACTER);
                 }
                 return suggester;
             }
@@ -285,7 +287,7 @@ public class AnalyzingCompletionLookupProviderV1 extends CompletionLookupProvide
 
             @Override
             AnalyzingSuggestHolder getAnalyzingSuggestHolder(CompletionFieldMapper mapper) {
-                return lookupMap.get(mapper.names().indexName());
+                return lookupMap.get(mapper.fieldType().names().indexName());
             }
 
             @Override
diff --git a/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTest.java b/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTest.java
index 757723ef4d0..d77d6308b62 100644
--- a/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTest.java
+++ b/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTest.java
@@ -20,7 +20,6 @@
 package org.elasticsearch.search.suggest.completion;
 
 import com.google.common.collect.Lists;
-
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.codecs.FieldsConsumer;
@@ -55,7 +54,8 @@ import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.codec.postingsformat.Elasticsearch090PostingsFormat;
-import org.elasticsearch.index.mapper.FieldMapper.Names;
+import org.elasticsearch.index.mapper.MappedFieldType;
+import org.elasticsearch.index.mapper.MappedFieldType.Names;
 import org.elasticsearch.index.mapper.core.AbstractFieldMapper;
 import org.elasticsearch.index.mapper.core.CompletionFieldMapper;
 import org.elasticsearch.search.suggest.SuggestUtils;
@@ -76,8 +76,16 @@ import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 
 public class CompletionPostingsFormatTest extends ElasticsearchTestCase {
-    
+
     Settings indexSettings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT.id).build();
+    static final MappedFieldType FIELD_TYPE = CompletionFieldMapper.Defaults.FIELD_TYPE.clone();
+    static final NamedAnalyzer analyzer = new NamedAnalyzer("foo", new StandardAnalyzer());
+    static {
+        FIELD_TYPE.setNames(new Names("foo"));
+        FIELD_TYPE.setIndexAnalyzer(analyzer);
+        FIELD_TYPE.setSearchAnalyzer(analyzer);
+        FIELD_TYPE.freeze();
+    }
 
     @Test
     public void testCompletionPostingsFormat() throws IOException {
@@ -92,8 +100,7 @@ public class CompletionPostingsFormatTest extends ElasticsearchTestCase {
         IndexInput input = dir.openInput("foo.txt", IOContext.DEFAULT);
         LookupFactory load = currentProvider.load(input);
         PostingsFormat format = PostingsFormat.forName(Lucene.LATEST_POSTINGS_FORMAT);
-        NamedAnalyzer analyzer = new NamedAnalyzer("foo", new StandardAnalyzer());
-        Lookup lookup = load.getLookup(new CompletionFieldMapper(new Names("foo"), analyzer, analyzer, format, null, true, true, true, Integer.MAX_VALUE, indexSettings, AbstractFieldMapper.MultiFields.empty(), null, ContextMapping.EMPTY_MAPPING), new CompletionSuggestionContext(null));
+        Lookup lookup = load.getLookup(new CompletionFieldMapper(FIELD_TYPE, format, true, true, true, Integer.MAX_VALUE, indexSettings, AbstractFieldMapper.MultiFields.empty(), null, ContextMapping.EMPTY_MAPPING), new CompletionSuggestionContext(null));
         List<LookupResult> result = lookup.lookup("ge", false, 10);
         assertThat(result.get(0).key.toString(), equalTo("Generator - Foo Fighters"));
         assertThat(result.get(0).payload.utf8ToString(), equalTo("id:10"));
@@ -111,8 +118,7 @@ public class CompletionPostingsFormatTest extends ElasticsearchTestCase {
         IndexInput input = dir.openInput("foo.txt", IOContext.DEFAULT);
         LookupFactory load = currentProvider.load(input);
         PostingsFormat format = new Elasticsearch090PostingsFormat();
-        NamedAnalyzer analyzer = new NamedAnalyzer("foo", new StandardAnalyzer());
-        AnalyzingCompletionLookupProvider.AnalyzingSuggestHolder analyzingSuggestHolder = load.getAnalyzingSuggestHolder(new CompletionFieldMapper(new Names("foo"), analyzer, analyzer, format, null, true, true, true, Integer.MAX_VALUE, indexSettings, AbstractFieldMapper.MultiFields.empty(), null, ContextMapping.EMPTY_MAPPING));
+        AnalyzingCompletionLookupProvider.AnalyzingSuggestHolder analyzingSuggestHolder = load.getAnalyzingSuggestHolder(new CompletionFieldMapper(FIELD_TYPE, format, true, true, true, Integer.MAX_VALUE, indexSettings, AbstractFieldMapper.MultiFields.empty(), null, ContextMapping.EMPTY_MAPPING));
         assertThat(analyzingSuggestHolder.sepLabel, is(AnalyzingCompletionLookupProviderV1.SEP_LABEL));
         assertThat(analyzingSuggestHolder.payloadSep, is(AnalyzingCompletionLookupProviderV1.PAYLOAD_SEP));
         assertThat(analyzingSuggestHolder.endByte, is(AnalyzingCompletionLookupProviderV1.END_BYTE));
@@ -129,8 +135,7 @@ public class CompletionPostingsFormatTest extends ElasticsearchTestCase {
         IndexInput input = dir.openInput("foo.txt", IOContext.DEFAULT);
         LookupFactory load = currentProvider.load(input);
         PostingsFormat format = new Elasticsearch090PostingsFormat();
-        NamedAnalyzer analyzer = new NamedAnalyzer("foo", new StandardAnalyzer());
-        AnalyzingCompletionLookupProvider.AnalyzingSuggestHolder analyzingSuggestHolder = load.getAnalyzingSuggestHolder(new CompletionFieldMapper(new Names("foo"), analyzer, analyzer, format, null, true, true, true, Integer.MAX_VALUE, indexSettings, AbstractFieldMapper.MultiFields.empty(), null, ContextMapping.EMPTY_MAPPING));
+        AnalyzingCompletionLookupProvider.AnalyzingSuggestHolder analyzingSuggestHolder = load.getAnalyzingSuggestHolder(new CompletionFieldMapper(FIELD_TYPE, format, true, true, true, Integer.MAX_VALUE, indexSettings, AbstractFieldMapper.MultiFields.empty(), null, ContextMapping.EMPTY_MAPPING));
         assertThat(analyzingSuggestHolder.sepLabel, is(XAnalyzingSuggester.SEP_LABEL));
         assertThat(analyzingSuggestHolder.payloadSep, is(XAnalyzingSuggester.PAYLOAD_SEP));
         assertThat(analyzingSuggestHolder.endByte, is(XAnalyzingSuggester.END_BYTE));
@@ -237,8 +242,7 @@ public class CompletionPostingsFormatTest extends ElasticsearchTestCase {
         reference.build(iter);
         PostingsFormat provider = PostingsFormat.forName(Lucene.LATEST_POSTINGS_FORMAT);
 
-        NamedAnalyzer namedAnalzyer = new NamedAnalyzer("foo", new StandardAnalyzer());
-        final CompletionFieldMapper mapper = new CompletionFieldMapper(new Names("foo"), namedAnalzyer, namedAnalzyer, provider, null, usePayloads,
+        final CompletionFieldMapper mapper = new CompletionFieldMapper(FIELD_TYPE, provider, usePayloads,
                 preserveSeparators, preservePositionIncrements, Integer.MAX_VALUE, indexSettings, AbstractFieldMapper.MultiFields.empty(), null, ContextMapping.EMPTY_MAPPING);
         Lookup buildAnalyzingLookup = buildAnalyzingLookup(mapper, titles, titles, weights);
         Field field = buildAnalyzingLookup.getClass().getDeclaredField("maxAnalyzedPathsForOneInput");
@@ -250,7 +254,7 @@ public class CompletionPostingsFormatTest extends ElasticsearchTestCase {
         for (int i = 0; i < titles.length; i++) {
             int res = between(1, 10);
             final StringBuilder builder = new StringBuilder();
-            SuggestUtils.analyze(namedAnalzyer.tokenStream("foo", titles[i]), new SuggestUtils.TokenConsumer() {
+            SuggestUtils.analyze(analyzer.tokenStream("foo", titles[i]), new SuggestUtils.TokenConsumer() {
                 @Override
                 public void nextToken() throws IOException {
                     if (builder.length() == 0) {
@@ -285,7 +289,7 @@ public class CompletionPostingsFormatTest extends ElasticsearchTestCase {
                 return mapper.postingsFormat(in);
             }
         };
-        IndexWriterConfig indexWriterConfig = new IndexWriterConfig(mapper.indexAnalyzer());
+        IndexWriterConfig indexWriterConfig = new IndexWriterConfig(mapper.fieldType().indexAnalyzer());
 
         indexWriterConfig.setCodec(filterCodec);
         IndexWriter writer = new IndexWriter(dir, indexWriterConfig);
@@ -305,7 +309,7 @@ public class CompletionPostingsFormatTest extends ElasticsearchTestCase {
         assertThat(reader.leaves().size(), equalTo(1));
         assertThat(reader.leaves().get(0).reader().numDocs(), equalTo(weights.length));
         LeafReaderContext atomicReaderContext = reader.leaves().get(0);
-        Terms luceneTerms = atomicReaderContext.reader().terms(mapper.names().fullName());
+        Terms luceneTerms = atomicReaderContext.reader().terms(mapper.fieldType().names().fullName());
         Lookup lookup = ((Completion090PostingsFormat.CompletionTerms) luceneTerms).getLookup(mapper, new CompletionSuggestionContext(null));
         reader.close();
         writer.close();
@@ -340,8 +344,7 @@ public class CompletionPostingsFormatTest extends ElasticsearchTestCase {
         IndexInput input = dir.openInput("foo.txt", IOContext.DEFAULT);
         LookupFactory load = provider.load(input);
         PostingsFormat format = new Elasticsearch090PostingsFormat();
-        NamedAnalyzer analyzer = new NamedAnalyzer("foo", new StandardAnalyzer());
-        assertNull(load.getLookup(new CompletionFieldMapper(new Names("foo"), analyzer, analyzer, format, null, true, true, true, Integer.MAX_VALUE, indexSettings, AbstractFieldMapper.MultiFields.empty(), null, ContextMapping.EMPTY_MAPPING), new CompletionSuggestionContext(null)));
+        assertNull(load.getLookup(new CompletionFieldMapper(FIELD_TYPE, format, true, true, true, Integer.MAX_VALUE, indexSettings, AbstractFieldMapper.MultiFields.empty(), null, ContextMapping.EMPTY_MAPPING), new CompletionSuggestionContext(null)));
         dir.close();
     }
 
diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
index 81f0e9f39bf..621d4fc4d01 100644
--- a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
+++ b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
@@ -98,7 +98,8 @@ import org.elasticsearch.index.codec.CodecService;
 import org.elasticsearch.index.fielddata.FieldDataType;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.FieldMapper;
-import org.elasticsearch.index.mapper.FieldMapper.Loading;
+import org.elasticsearch.index.mapper.MappedFieldType;
+import org.elasticsearch.index.mapper.MappedFieldType.Loading;
 import org.elasticsearch.index.mapper.internal.SizeFieldMapper;
 import org.elasticsearch.index.mapper.internal.TimestampFieldMapper;
 import org.elasticsearch.index.merge.policy.*;
@@ -558,7 +559,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
 
     private static Settings.Builder setRandomNormsLoading(Random random, Settings.Builder builder) {
         if (random.nextBoolean()) {
-            builder.put(SearchService.NORMS_LOADING_KEY, RandomPicks.randomFrom(random, Arrays.asList(FieldMapper.Loading.EAGER, FieldMapper.Loading.LAZY)));
+            builder.put(SearchService.NORMS_LOADING_KEY, RandomPicks.randomFrom(random, Arrays.asList(MappedFieldType.Loading.EAGER, MappedFieldType.Loading.LAZY)));
         }
         return builder;
     }

From 35a58d874ef56be50a0ad1d7bfb13edb4204d0a3 Mon Sep 17 00:00:00 2001
From: Colin Goodheart-Smithe <colin.goodheart-smithe@elasticsearch.com>
Date: Tue, 12 May 2015 10:37:22 +0100
Subject: [PATCH 072/123] Scripting: Unify script and template requests across
 codebase

This change unifies the way scripts and templates are specified for all instances in the codebase. It builds on the Script class added previously and adds request building and parsing support as well as the ability to transfer script objects between nodes. It also adds a Template class which aims to provide the same functionality for template APIs

Closes #11091
---
 .../scripted-metric-aggregation.asciidoc      |   22 +-
 docs/java-api/update.asciidoc                 |    4 +-
 docs/reference/aggregations.asciidoc          |    2 -
 .../bucket/range-aggregation.asciidoc         |   29 +-
 .../significantterms-aggregation.asciidoc     |    7 -
 .../bucket/terms-aggregation.asciidoc         |   22 +-
 .../metrics/avg-aggregation.asciidoc          |   32 +-
 .../metrics/cardinality-aggregation.asciidoc  |   23 +-
 .../extendedstats-aggregation.asciidoc        |   32 +-
 .../metrics/max-aggregation.asciidoc          |   30 +-
 .../metrics/min-aggregation.asciidoc          |   30 +-
 .../metrics/percentile-aggregation.asciidoc   |   30 +-
 .../percentile-rank-aggregation.asciidoc      |   32 +-
 .../scripted-metric-aggregation.asciidoc      |   45 +-
 .../metrics/stats-aggregation.asciidoc        |   32 +-
 .../metrics/sum-aggregation.asciidoc          |   27 +-
 .../metrics/valuecount-aggregation.asciidoc   |   24 +-
 docs/reference/docs/bulk.asciidoc             |    2 +-
 docs/reference/docs/update.asciidoc           |   46 +-
 docs/reference/mapping/transform.asciidoc     |   12 +-
 docs/reference/modules/scripting.asciidoc     |   20 +-
 .../query-dsl/function-score-query.asciidoc   |   14 +-
 .../reference/query-dsl/script-query.asciidoc |    8 +-
 .../query-dsl/template-query.asciidoc         |    4 +-
 .../search/request/script-fields.asciidoc     |    8 +-
 docs/reference/search/request/sort.asciidoc   |    8 +-
 .../reference/search/search-template.asciidoc |   18 +-
 .../action/bulk/BulkRequest.java              |    9 +-
 .../action/search/SearchRequest.java          |   90 +-
 .../action/search/SearchRequestBuilder.java   |   68 +-
 .../action/update/UpdateHelper.java           |   10 +-
 .../action/update/UpdateRequest.java          |  201 ++-
 .../action/update/UpdateRequestBuilder.java   |   35 +-
 .../search/function/ScriptScoreFunction.java  |   15 +-
 .../common/xcontent/XContentType.java         |   18 +
 .../index/mapper/DocumentMapper.java          |   80 +-
 .../index/mapper/DocumentMapperParser.java    |   23 +-
 .../index/query/QueryBuilders.java            |   21 +
 .../index/query/ScriptQueryBuilder.java       |   57 +-
 .../index/query/ScriptQueryParser.java        |   66 +-
 .../index/query/TemplateQueryBuilder.java     |   60 +-
 .../index/query/TemplateQueryParser.java      |   94 +-
 .../functionscore/ScoreFunctionBuilders.java  |   21 +
 .../script/ScriptScoreFunctionBuilder.java    |   54 +-
 .../script/ScriptScoreFunctionParser.java     |   30 +-
 .../query/support/BaseInnerHitBuilder.java    |   50 +-
 .../rest/action/update/RestUpdateAction.java  |   25 +-
 .../script/AbstractScriptParser.java          |  196 +++
 .../java/org/elasticsearch/script/Script.java |  268 +++-
 .../script/ScriptParameterParser.java         |   19 +-
 .../elasticsearch/script/ScriptService.java   |   83 +-
 .../org/elasticsearch/script/Template.java    |  198 +++
 .../elasticsearch/search/SearchService.java   |   35 +-
 .../ValuesSourceAggregationBuilder.java       |   80 +-
 .../significant/SignificantTermsBuilder.java  |    2 +-
 .../significant/heuristics/ChiSquare.java     |    3 +-
 .../bucket/significant/heuristics/GND.java    |    3 +-
 .../significant/heuristics/JLHScore.java      |    3 +-
 .../heuristics/MutualInformation.java         |    3 +-
 .../heuristics/PercentageScore.java           |    3 +-
 .../heuristics/ScriptHeuristic.java           |  160 ++-
 .../SignificanceHeuristicBuilder.java         |    8 +-
 .../scripted/InternalScriptedMetric.java      |   47 +-
 .../scripted/ScriptedMetricAggregator.java    |  101 +-
 .../scripted/ScriptedMetricBuilder.java       |  144 ++-
 .../scripted/ScriptedMetricParser.java        |   89 +-
 .../metrics/tophits/TopHitsBuilder.java       |   50 +-
 .../support/ValuesSourceParser.java           |   37 +-
 .../search/builder/SearchSourceBuilder.java   |   56 +-
 .../script/ScriptFieldsParseElement.java      |   40 +-
 .../internal/ShardSearchLocalRequest.java     |   39 +-
 .../search/internal/ShardSearchRequest.java   |    9 +-
 .../internal/ShardSearchTransportRequest.java |   17 +-
 .../search/sort/ScriptSortBuilder.java        |   88 +-
 .../search/sort/ScriptSortParser.java         |   42 +-
 .../search/sort/SortBuilders.java             |   16 +
 .../suggest/phrase/PhraseSuggestParser.java   |   19 +-
 .../action/IndicesRequestTests.java           |   28 +-
 .../action/bulk/BulkRequestTests.java         |   16 +-
 .../action/update/UpdateRequestTests.java     |  108 +-
 .../expression/ScriptComparisonBenchmark.java |    4 +-
 .../scripts/score/BasicScriptBenchmark.java   |   16 +-
 ...TimeDataHistogramAggregationBenchmark.java |   11 +-
 .../cluster/NoMasterNodeTests.java            |   25 +-
 .../function/ScriptScoreFunctionTests.java    |    3 +-
 .../org/elasticsearch/document/BulkTests.java |  273 ++++
 .../index/query/TemplateQueryBuilderTest.java |   21 +-
 .../index/query/TemplateQueryParserTest.java  |    8 +-
 .../index/query/TemplateQueryTest.java        |  406 +++++-
 .../nested/SimpleNestedTests.java             |  144 +++
 .../percolator/PercolatorTests.java           |   18 +-
 .../routing/AliasRoutingTests.java            |    4 +-
 .../script/CustomScriptContextTests.java      |   23 +-
 .../script/GroovyScriptTests.java             |   31 +-
 .../script/IndexLookupTests.java              |  579 ++++++++-
 .../script/IndexedScriptTests.java            |   62 +-
 .../script/NativeScriptTests.java             |    7 +-
 .../script/OnDiskScriptTests.java             |   33 +
 .../script/ScriptFieldTests.java              |   32 +
 .../script/ScriptParameterParserTest.java     |   46 +-
 .../script/ScriptServiceTests.java            |   35 +-
 .../expression/ExpressionScriptTests.java     |   11 +-
 .../search/aggregations/EquivalenceTests.java |    9 +-
 .../bucket/DateHistogramTests.java            |  411 +++++-
 .../aggregations/bucket/DateRangeTests.java   |  453 ++++++-
 .../aggregations/bucket/DoubleTermsTests.java |  538 ++++++--
 .../aggregations/bucket/HistogramTests.java   |  296 ++++-
 .../aggregations/bucket/IPv4RangeTests.java   |  452 ++++++-
 .../aggregations/bucket/LongTermsTests.java   |  276 +++-
 .../aggregations/bucket/MinDocCountTests.java |    3 +-
 .../aggregations/bucket/RangeTests.java       |  491 ++++++-
 ...ignificantTermsSignificanceScoreTests.java |  151 ++-
 .../aggregations/bucket/StringTermsTests.java | 1141 ++++++++++-------
 .../aggregations/bucket/TopHitsTests.java     |  132 +-
 .../metrics/ScriptedMetricTests.java          |  741 ++++++++++-
 .../child/SimpleChildQuerySearchTests.java    |   13 +-
 .../search/fields/SearchFieldsTests.java      |  256 +++-
 .../functionscore/ExplainableScriptTests.java |   11 +-
 .../functionscore/FunctionScoreTests.java     |  297 ++++-
 .../RandomScoreFunctionTests.java             |   95 +-
 .../search/geo/GeoDistanceTests.java          |  137 +-
 .../search/innerhits/InnerHitsTests.java      |  246 +++-
 .../search/query/SearchQueryTests.java        |   64 +-
 .../search/rescore/QueryRescorerTests.java    |   54 +-
 .../scriptfilter/ScriptQuerySearchTests.java  |   80 +-
 .../search/sort/SimpleSortTests.java          |  487 ++++++-
 .../search/stats/SearchStatsTests.java        |   15 +-
 .../search/timeout/SearchTimeoutTests.java    |    5 +-
 .../update/UpdateByNativeScriptTests.java     |   30 +-
 .../org/elasticsearch/update/UpdateTests.java |  826 +++++++++++-
 130 files changed, 10901 insertions(+), 2201 deletions(-)
 create mode 100644 src/main/java/org/elasticsearch/script/AbstractScriptParser.java
 create mode 100644 src/main/java/org/elasticsearch/script/Template.java

diff --git a/docs/java-api/aggregations/metrics/scripted-metric-aggregation.asciidoc b/docs/java-api/aggregations/metrics/scripted-metric-aggregation.asciidoc
index c2776b84797..e9c79ed59d8 100644
--- a/docs/java-api/aggregations/metrics/scripted-metric-aggregation.asciidoc
+++ b/docs/java-api/aggregations/metrics/scripted-metric-aggregation.asciidoc
@@ -30,10 +30,10 @@ MetricsAggregationBuilder aggregation =
         AggregationBuilders
                 .scriptedMetric("agg")
                 .initScript("_agg['heights'] = []")
-                .mapScript("if (doc['gender'].value == \"male\") " +
+                .mapScript(new Script("if (doc['gender'].value == \"male\") " +
                         "{ _agg.heights.add(doc['height'].value) } " +
                         "else " +
-                        "{ _agg.heights.add(-1 * doc['height'].value) }");
+                        "{ _agg.heights.add(-1 * doc['height'].value) }"));
 --------------------------------------------------
 
 You can also specify a `combine` script which will be executed on each shard:
@@ -43,12 +43,12 @@ You can also specify a `combine` script which will be executed on each shard:
 MetricsAggregationBuilder aggregation =
         AggregationBuilders
                 .scriptedMetric("agg")
-                .initScript("_agg['heights'] = []")
-                .mapScript("if (doc['gender'].value == \"male\") " +
+                .initScript(new Script("_agg['heights'] = []"))
+                .mapScript(new Script("if (doc['gender'].value == \"male\") " +
                         "{ _agg.heights.add(doc['height'].value) } " +
                         "else " +
-                        "{ _agg.heights.add(-1 * doc['height'].value) }")
-                .combineScript("heights_sum = 0; for (t in _agg.heights) { heights_sum += t }; return heights_sum");
+                        "{ _agg.heights.add(-1 * doc['height'].value) }"))
+                .combineScript(new Script("heights_sum = 0; for (t in _agg.heights) { heights_sum += t }; return heights_sum"));
 --------------------------------------------------
 
 You can also specify a `reduce` script which will be executed on the node which gets the request:
@@ -58,13 +58,13 @@ You can also specify a `reduce` script which will be executed on the node which
 MetricsAggregationBuilder aggregation =
         AggregationBuilders
                 .scriptedMetric("agg")
-                .initScript("_agg['heights'] = []")
-                .mapScript("if (doc['gender'].value == \"male\") " +
+                .initScript(new Script("_agg['heights'] = []"))
+                .mapScript(new Script("if (doc['gender'].value == \"male\") " +
                         "{ _agg.heights.add(doc['height'].value) } " +
                         "else " +
-                        "{ _agg.heights.add(-1 * doc['height'].value) }")
-                .combineScript("heights_sum = 0; for (t in _agg.heights) { heights_sum += t }; return heights_sum")
-                .reduceScript("heights_sum = 0; for (a in _aggs) { heights_sum += a }; return heights_sum");
+                        "{ _agg.heights.add(-1 * doc['height'].value) }"))
+                .combineScript(new Script("heights_sum = 0; for (t in _agg.heights) { heights_sum += t }; return heights_sum"))
+                .reduceScript(new Script("heights_sum = 0; for (a in _aggs) { heights_sum += a }; return heights_sum"));
 --------------------------------------------------
 
 
diff --git a/docs/java-api/update.asciidoc b/docs/java-api/update.asciidoc
index 2de835755c6..ea25ec0c2d2 100644
--- a/docs/java-api/update.asciidoc
+++ b/docs/java-api/update.asciidoc
@@ -22,7 +22,7 @@ Or you can use `prepareUpdate()` method:
 [source,java]
 --------------------------------------------------
 client.prepareUpdate("ttl", "doc", "1")
-        .setScript("ctx._source.gender = \"male\"" <1> , ScriptService.ScriptType.INLINE)
+        .setScript(new Script("ctx._source.gender = \"male\"" <1> , ScriptService.ScriptType.INLINE, null, null))
         .get();
 
 client.prepareUpdate("ttl", "doc", "1")
@@ -46,7 +46,7 @@ The update API allows to update a document based on a script provided:
 [source,java]
 --------------------------------------------------
 UpdateRequest updateRequest = new UpdateRequest("ttl", "doc", "1")
-        .script("ctx._source.gender = \"male\"");
+        .script(new Script("ctx._source.gender = \"male\""));
 client.update(updateRequest).get();
 --------------------------------------------------
 
diff --git a/docs/reference/aggregations.asciidoc b/docs/reference/aggregations.asciidoc
index 2464873b452..b1b34ee66df 100644
--- a/docs/reference/aggregations.asciidoc
+++ b/docs/reference/aggregations.asciidoc
@@ -73,8 +73,6 @@ Some aggregations work on values extracted from the aggregated documents. Typica
 a specific document field which is set using the `field` key for the aggregations. It is also possible to define a
 <<modules-scripting,`script`>> which will generate the values (per document).
 
-TIP: The `script` parameter expects an inline script. Use `script_id` for indexed scripts and `script_file` for scripts in the `config/scripts/` directory.
-
 When both `field` and `script` settings are configured for the aggregation, the script will be treated as a
 `value script`.  While normal scripts are evaluated on a document level (i.e. the script has access to all the data
 associated with the document), value scripts are evaluated on the *value* level. In this mode, the values are extracted
diff --git a/docs/reference/aggregations/bucket/range-aggregation.asciidoc b/docs/reference/aggregations/bucket/range-aggregation.asciidoc
index f7bfcab0644..d428d44523f 100644
--- a/docs/reference/aggregations/bucket/range-aggregation.asciidoc
+++ b/docs/reference/aggregations/bucket/range-aggregation.asciidoc
@@ -128,8 +128,6 @@ It is also possible to customize the key for each range:
 
 ==== Script
 
-TIP: The `script` parameter expects an inline script. Use `script_id` for indexed scripts and `script_file` for scripts in the `config/scripts/` directory.
-
 [source,js]
 --------------------------------------------------
 {
@@ -148,6 +146,33 @@ TIP: The `script` parameter expects an inline script. Use `script_id` for indexe
 }
 --------------------------------------------------
 
+This will interpret the `script` parameter as an `inline` script with the default script language and no script parameters. To use a file script use the following syntax:
+
+[source,js]
+--------------------------------------------------
+{
+    "aggs" : {
+        "price_ranges" : {
+            "range" : {
+                "script" : {
+                    "file": "my_script",
+                    "params": {
+                        "field": "price"
+                    }
+                },
+                "ranges" : [
+                    { "to" : 50 },
+                    { "from" : 50, "to" : 100 },
+                    { "from" : 100 }
+                ]
+            }
+        }
+    }
+}
+--------------------------------------------------
+
+TIP: for indexed scripts replace the `file` parameter with an `id` parameter.
+
 ==== Value Script
 
 Lets say the product prices are in USD but we would like to get the price ranges in EURO. We can use value script to convert the prices prior the aggregation (assuming conversion rate of 0.8)
diff --git a/docs/reference/aggregations/bucket/significantterms-aggregation.asciidoc b/docs/reference/aggregations/bucket/significantterms-aggregation.asciidoc
index 1e329db1df4..80c747e61a5 100644
--- a/docs/reference/aggregations/bucket/significantterms-aggregation.asciidoc
+++ b/docs/reference/aggregations/bucket/significantterms-aggregation.asciidoc
@@ -358,13 +358,6 @@ Customized scores can be implemented via a script:
 --------------------------------------------------
 
 Scripts can be inline (as in above example), indexed or stored on disk. For details on the options, see <<modules-scripting, script documentation>>. 
-Parameters need to be set as follows:
-
-[horizontal]
-`script`:: Inline script, name of script file or name of indexed script. Mandatory.
-`script_type`:: One of "inline" (default), "indexed" or "file".
-`lang`:: Script language (default "groovy")
-`params`:: Script parameters (default empty).
 
 Available parameters in the script are
 
diff --git a/docs/reference/aggregations/bucket/terms-aggregation.asciidoc b/docs/reference/aggregations/bucket/terms-aggregation.asciidoc
index cf401126c8a..70bdb00d184 100644
--- a/docs/reference/aggregations/bucket/terms-aggregation.asciidoc
+++ b/docs/reference/aggregations/bucket/terms-aggregation.asciidoc
@@ -441,7 +441,27 @@ Generating the terms using a script:
 }
 --------------------------------------------------
 
-TIP: The `script` parameter expects an inline script. Use `script_id` for indexed scripts and `script_file` for scripts in the `config/scripts/` directory.
+This will interpret the `script` parameter as an `inline` script with the default script language and no script parameters. To use a file script use the following syntax:
+
+[source,js]
+--------------------------------------------------
+{
+    "aggs" : {
+        "genders" : {
+            "terms" : {
+                "script" : {
+                    "file": "my_script",
+                    "params": {
+                        "field": "gender"
+                    }
+                }
+            }
+        }
+    }
+}
+--------------------------------------------------
+
+TIP: for indexed scripts replace the `file` parameter with an `id` parameter.
 
 
 ==== Value Script
diff --git a/docs/reference/aggregations/metrics/avg-aggregation.asciidoc b/docs/reference/aggregations/metrics/avg-aggregation.asciidoc
index 8e0d2b4b5e7..f81cd3eee33 100644
--- a/docs/reference/aggregations/metrics/avg-aggregation.asciidoc
+++ b/docs/reference/aggregations/metrics/avg-aggregation.asciidoc
@@ -47,7 +47,29 @@ Computing the average grade based on a script:
 }
 --------------------------------------------------
 
-TIP: The `script` parameter expects an inline script. Use `script_id` for indexed scripts and `script_file` for scripts in the `config/scripts/` directory.
+This will interpret the `script` parameter as an `inline` script with the default script language and no script parameters. To use a file script use the following syntax:
+
+[source,js]
+--------------------------------------------------
+{
+    ...,
+
+    "aggs" : {
+        "avg_grade" : { 
+            "avg" : { 
+                "script" : {
+                    "file": "my_script",
+                    "params": {
+                        "field": "grade"
+                    }
+                }
+            }
+        }
+    }
+}
+--------------------------------------------------
+
+TIP: for indexed scripts replace the `file` parameter with an `id` parameter.
 
 ===== Value Script
 
@@ -63,9 +85,11 @@ It turned out that the exam was way above the level of the students and a grade
             "avg_corrected_grade" : {
                 "avg" : {
                     "field" : "grade",
-                    "script" : "_value * correction",
-                    "params" : {
-                        "correction" : 1.2
+                    "script" : {
+                        "inline": "_value * correction",
+                        "params" : {
+                            "correction" : 1.2
+                        }
                     }
                 }
             }
diff --git a/docs/reference/aggregations/metrics/cardinality-aggregation.asciidoc b/docs/reference/aggregations/metrics/cardinality-aggregation.asciidoc
index 8e34e16f7a8..0b484288b1c 100644
--- a/docs/reference/aggregations/metrics/cardinality-aggregation.asciidoc
+++ b/docs/reference/aggregations/metrics/cardinality-aggregation.asciidoc
@@ -153,7 +153,28 @@ however since hashes need to be computed on the fly.
 }
 --------------------------------------------------
 
-TIP: The `script` parameter expects an inline script. Use `script_id` for indexed scripts and `script_file` for scripts in the `config/scripts/` directory.
+This will interpret the `script` parameter as an `inline` script with the default script language and no script parameters. To use a file script use the following syntax:
+
+[source,js]
+--------------------------------------------------
+{
+    "aggs" : {
+        "author_count" : {
+            "cardinality" : {
+                "script" : {
+                    "file": "my_script",
+                    "params": {
+                        "first_name_field": "author.first_name",
+                        "last_name_field": "author.last_name"
+                    }
+                }
+            }
+        }
+    }
+}
+--------------------------------------------------
+
+TIP: for indexed scripts replace the `file` parameter with an `id` parameter.
 
 ==== Missing value
 
diff --git a/docs/reference/aggregations/metrics/extendedstats-aggregation.asciidoc b/docs/reference/aggregations/metrics/extendedstats-aggregation.asciidoc
index 0f65b7670cf..30a5acf6809 100644
--- a/docs/reference/aggregations/metrics/extendedstats-aggregation.asciidoc
+++ b/docs/reference/aggregations/metrics/extendedstats-aggregation.asciidoc
@@ -91,7 +91,29 @@ Computing the grades stats based on a script:
 }
 --------------------------------------------------
 
-TIP: The `script` parameter expects an inline script. Use `script_id` for indexed scripts and `script_file` for scripts in the `config/scripts/` directory.
+This will interpret the `script` parameter as an `inline` script with the default script language and no script parameters. To use a file script use the following syntax:
+
+[source,js]
+--------------------------------------------------
+{
+    ...,
+
+    "aggs" : {
+        "grades_stats" : { 
+            "extended_stats" : { 
+                "script" : {
+                    "file": "my_script",
+                    "params": {
+                        "field": "grade"
+                    }
+                }
+            }
+        }
+    }
+}
+--------------------------------------------------
+
+TIP: for indexed scripts replace the `file` parameter with an `id` parameter.
 
 ===== Value Script
 
@@ -107,9 +129,11 @@ It turned out that the exam was way above the level of the students and a grade
             "grades_stats" : {
                 "extended_stats" : {
                     "field" : "grade",
-                    "script" : "_value * correction",
-                    "params" : {
-                        "correction" : 1.2
+                    "script" : {
+                        "inline": "_value * correction",
+                        "params" : {
+                            "correction" : 1.2
+                        }
                     }
                 }
             }
diff --git a/docs/reference/aggregations/metrics/max-aggregation.asciidoc b/docs/reference/aggregations/metrics/max-aggregation.asciidoc
index 856adc4b03d..2a641fda5dc 100644
--- a/docs/reference/aggregations/metrics/max-aggregation.asciidoc
+++ b/docs/reference/aggregations/metrics/max-aggregation.asciidoc
@@ -44,7 +44,27 @@ Computing the max price value across all document, this time using a script:
 }
 --------------------------------------------------
 
-TIP: The `script` parameter expects an inline script. Use `script_id` for indexed scripts and `script_file` for scripts in the `config/scripts/` directory.
+This will interpret the `script` parameter as an `inline` script with the default script language and no script parameters. To use a file script use the following syntax:
+
+[source,js]
+--------------------------------------------------
+{
+    "aggs" : {
+        "max_price" : { 
+            "max" : { 
+                "script" : {
+                    "file": "my_script",
+                    "params": {
+                        "field": "price"
+                    }
+                }
+            }
+        }
+    }
+}
+--------------------------------------------------
+
+TIP: for indexed scripts replace the `file` parameter with an `id` parameter.
 
 ==== Value Script
 
@@ -57,9 +77,11 @@ Let's say that the prices of the documents in our index are in USD, but we would
         "max_price_in_euros" : {
             "max" : {
                 "field" : "price",
-                "script" : "_value * conversion_rate",
-                "params" : {
-                    "conversion_rate" : 1.2
+                "script" : {
+                    "inline": "_value * conversion_rate",
+                    "params" : {
+                        "conversion_rate" : 1.2
+                    }
                 }
             }
         }
diff --git a/docs/reference/aggregations/metrics/min-aggregation.asciidoc b/docs/reference/aggregations/metrics/min-aggregation.asciidoc
index c7424d5570b..7698a41202c 100644
--- a/docs/reference/aggregations/metrics/min-aggregation.asciidoc
+++ b/docs/reference/aggregations/metrics/min-aggregation.asciidoc
@@ -44,7 +44,27 @@ Computing the min price value across all document, this time using a script:
 }
 --------------------------------------------------
 
-TIP: The `script` parameter expects an inline script. Use `script_id` for indexed scripts and `script_file` for scripts in the `config/scripts/` directory.
+This will interpret the `script` parameter as an `inline` script with the default script language and no script parameters. To use a file script use the following syntax:
+
+[source,js]
+--------------------------------------------------
+{
+    "aggs" : {
+        "min_price" : { 
+            "min" : { 
+                "script" : {
+                    "file": "my_script",
+                    "params": {
+                        "field": "price"
+                    }
+                }
+            }
+        }
+    }
+}
+--------------------------------------------------
+
+TIP: for indexed scripts replace the `file` parameter with an `id` parameter.
 
 ==== Value Script
 
@@ -57,9 +77,11 @@ Let's say that the prices of the documents in our index are in USD, but we would
         "min_price_in_euros" : {
             "min" : {
                 "field" : "price",
-                "script" : "_value * conversion_rate",
-                "params" : {
-                    "conversion_rate" : 1.2
+                "script" : 
+                    "inline": "_value * conversion_rate",
+                    "params" : {
+                        "conversion_rate" : 1.2
+                    }
                 }
             }
         }
diff --git a/docs/reference/aggregations/metrics/percentile-aggregation.asciidoc b/docs/reference/aggregations/metrics/percentile-aggregation.asciidoc
index d5262beb6ef..ecad363886d 100644
--- a/docs/reference/aggregations/metrics/percentile-aggregation.asciidoc
+++ b/docs/reference/aggregations/metrics/percentile-aggregation.asciidoc
@@ -100,9 +100,11 @@ a script to convert them on-the-fly:
     "aggs" : {
         "load_time_outlier" : {
             "percentiles" : {
-                "script" : "doc['load_time'].value / timeUnit", <1>
-                "params" : {
-                    "timeUnit" : 1000   <2>
+                "script" : {
+                    "inline": "doc['load_time'].value / timeUnit", <1>
+                    "params" : {
+                        "timeUnit" : 1000   <2>
+                    }
                 }
             }
         }
@@ -113,7 +115,27 @@ a script to convert them on-the-fly:
 script to generate values which percentiles are calculated on
 <2> Scripting supports parameterized input just like any other script
 
-TIP: The `script` parameter expects an inline script. Use `script_id` for indexed scripts and `script_file` for scripts in the `config/scripts/` directory.
+This will interpret the `script` parameter as an `inline` script with the default script language and no script parameters. To use a file script use the following syntax:
+
+[source,js]
+--------------------------------------------------
+{
+    "aggs" : {
+        "load_time_outlier" : {
+            "percentiles" : {
+                "script" : {
+                    "file": "my_script",
+                    "params" : {
+                        "timeUnit" : 1000
+                    }
+                }
+            }
+        }
+    }
+}
+--------------------------------------------------
+
+TIP: for indexed scripts replace the `file` parameter with an `id` parameter.
 
 [[search-aggregations-metrics-percentile-aggregation-approximation]]
 ==== Percentiles are (usually) approximate
diff --git a/docs/reference/aggregations/metrics/percentile-rank-aggregation.asciidoc b/docs/reference/aggregations/metrics/percentile-rank-aggregation.asciidoc
index a494a0a5d00..5da59061e0b 100644
--- a/docs/reference/aggregations/metrics/percentile-rank-aggregation.asciidoc
+++ b/docs/reference/aggregations/metrics/percentile-rank-aggregation.asciidoc
@@ -72,9 +72,11 @@ a script to convert them on-the-fly:
         "load_time_outlier" : {
             "percentile_ranks" : {
                 "values" : [3, 5],
-                "script" : "doc['load_time'].value / timeUnit", <1>
-                "params" : {
-                    "timeUnit" : 1000   <2>
+                "script" : {
+                    "inline": "doc['load_time'].value / timeUnit", <1>
+                    "params" : {
+                        "timeUnit" : 1000   <2>
+                    }
                 }
             }
         }
@@ -85,7 +87,28 @@ a script to convert them on-the-fly:
 script to generate values which percentile ranks are calculated on
 <2> Scripting supports parameterized input just like any other script
 
-TIP: The `script` parameter expects an inline script. Use `script_id` for indexed scripts and `script_file` for scripts in the `config/scripts/` directory.
+This will interpret the `script` parameter as an `inline` script with the default script language and no script parameters. To use a file script use the following syntax:
+
+[source,js]
+--------------------------------------------------
+{
+    "aggs" : {
+        "load_time_outlier" : {
+            "percentile_ranks" : {
+                "values" : [3, 5],
+                "script" : {
+                    "file": "my_script",
+                    "params" : {
+                        "timeUnit" : 1000
+                    }
+                }
+            }
+        }
+    }
+}
+--------------------------------------------------
+
+TIP: for indexed scripts replace the `file` parameter with an `id` parameter.
 
 ==== Missing value
 
@@ -108,3 +131,4 @@ had a value.
 --------------------------------------------------
 
 <1> Documents without a value in the `grade` field will fall into the same bucket as documents that have the value `10`.
+
diff --git a/docs/reference/aggregations/metrics/scripted-metric-aggregation.asciidoc b/docs/reference/aggregations/metrics/scripted-metric-aggregation.asciidoc
index a775d545409..6db8c82a9e8 100644
--- a/docs/reference/aggregations/metrics/scripted-metric-aggregation.asciidoc
+++ b/docs/reference/aggregations/metrics/scripted-metric-aggregation.asciidoc
@@ -45,6 +45,42 @@ The response for the above aggregation:
 }
 --------------------------------------------------
 
+The above example can also be specified using file scripts as follows:
+
+[source,js]
+--------------------------------------------------
+{
+    "query" : {
+        "match_all" : {}
+    },
+    "aggs": {
+        "profit": {
+            "scripted_metric": {
+                "init_script" : {
+                    "file": "my_init_script"
+                },
+                "map_script" : {
+                    "file": "my_map_script"
+                },
+                "combine_script" : {
+                    "file": "my_combine_script"
+                },
+                "params": {
+                    "field": "amount" <1>
+                },
+                "reduce_script" : {
+                    "file": "my_reduce_script"
+                },
+            }
+        }
+    }
+}
+--------------------------------------------------
+
+<1> script parameters for init, map and combine scripts must be specified in a global `params` object so that it can be share between the scripts
+
+For more details on specifying scripts see <<modules-scripting, script documentation>>. 
+
 ==== Scope of scripts
 
 The scripted metric aggregation uses scripts at 4 stages of its execution:
@@ -225,13 +261,4 @@ params::           Optional. An object whose contents will be passed as variable
 --------------------------------------------------
 reduce_params::    Optional. An object whose contents will be passed as variables to the `reduce_script`. This can be useful to allow the user to control 
                    the behavior of the reduce phase. If this is not specified the variable will be undefined in the reduce_script execution.
-lang::             Optional. The script language used for the scripts. If this is not specified the default scripting language is used.
-init_script_file:: Optional. Can be used in place of the `init_script` parameter to provide the script using in a file.
-init_script_id:: Optional. Can be used in place of the `init_script` parameter to provide the script using an indexed script.
-map_script_file:: Optional. Can be used in place of the `map_script` parameter to provide the script using in a file.
-map_script_id:: Optional. Can be used in place of the `map_script` parameter to provide the script using an indexed script.
-combine_script_file:: Optional. Can be used in place of the `combine_script` parameter to provide the script using in a file.
-combine_script_id:: Optional. Can be used in place of the `combine_script` parameter to provide the script using an indexed script.
-reduce_script_file:: Optional. Can be used in place of the `reduce_script` parameter to provide the script using in a file.
-reduce_script_id:: Optional. Can be used in place of the `reduce_script` parameter to provide the script using an indexed script.
 
diff --git a/docs/reference/aggregations/metrics/stats-aggregation.asciidoc b/docs/reference/aggregations/metrics/stats-aggregation.asciidoc
index 429be4b8c4d..852c1c3f7a9 100644
--- a/docs/reference/aggregations/metrics/stats-aggregation.asciidoc
+++ b/docs/reference/aggregations/metrics/stats-aggregation.asciidoc
@@ -53,7 +53,29 @@ Computing the grades stats based on a script:
 }
 --------------------------------------------------
 
-TIP: The `script` parameter expects an inline script. Use `script_id` for indexed scripts and `script_file` for scripts in the `config/scripts/` directory.
+This will interpret the `script` parameter as an `inline` script with the default script language and no script parameters. To use a file script use the following syntax:
+
+[source,js]
+--------------------------------------------------
+{
+    ...,
+
+    "aggs" : {
+        "grades_stats" : {
+            "stats" : { 
+                "script" : {
+                    "file": "my_script",
+                    "params" : {
+                        "field" : "grade"
+                    }
+                }
+            }
+        }
+    }
+}
+--------------------------------------------------
+
+TIP: for indexed scripts replace the `file` parameter with an `id` parameter.
 
 ===== Value Script
 
@@ -69,9 +91,11 @@ It turned out that the exam was way above the level of the students and a grade
             "grades_stats" : {
                 "stats" : {
                     "field" : "grade",
-                    "script" : "_value * correction",
-                    "params" : {
-                        "correction" : 1.2
+                    "script" : 
+                        "inline": "_value * correction",
+                        "params" : {
+                            "correction" : 1.2
+                        }
                     }
                 }
             }
diff --git a/docs/reference/aggregations/metrics/sum-aggregation.asciidoc b/docs/reference/aggregations/metrics/sum-aggregation.asciidoc
index 2d16129d15f..98286e9396f 100644
--- a/docs/reference/aggregations/metrics/sum-aggregation.asciidoc
+++ b/docs/reference/aggregations/metrics/sum-aggregation.asciidoc
@@ -55,7 +55,29 @@ Computing the intraday return based on a script:
 }
 --------------------------------------------------
 
-TIP: The `script` parameter expects an inline script. Use `script_id` for indexed scripts and `script_file` for scripts in the `config/scripts/` directory.
+This will interpret the `script` parameter as an `inline` script with the default script language and no script parameters. To use a file script use the following syntax:
+
+[source,js]
+--------------------------------------------------
+{
+    ...,
+
+    "aggs" : {
+        "intraday_return" : { 
+            "sum" : { 
+                "script" : {
+                    "file": "my_script",
+                    "params" : {
+                        "field" : "change"
+                    }
+                }
+            }
+        }
+    }
+}
+--------------------------------------------------
+
+TIP: for indexed scripts replace the `file` parameter with an `id` parameter.
 
 ===== Value Script
 
@@ -71,7 +93,8 @@ Computing the sum of squares over all stock tick changes:
             "daytime_return" : {
                 "sum" : {
                     "field" : "change",
-                    "script" : "_value * _value" }
+                    "script" : "_value * _value"
+                }
             }
         }
     }
diff --git a/docs/reference/aggregations/metrics/valuecount-aggregation.asciidoc b/docs/reference/aggregations/metrics/valuecount-aggregation.asciidoc
index ed5e23ee339..fa2bfdbbb9d 100644
--- a/docs/reference/aggregations/metrics/valuecount-aggregation.asciidoc
+++ b/docs/reference/aggregations/metrics/valuecount-aggregation.asciidoc
@@ -48,4 +48,26 @@ Counting the values generated by a script:
 }
 --------------------------------------------------
 
-TIP: The `script` parameter expects an inline script. Use `script_id` for indexed scripts and `script_file` for scripts in the `config/scripts/` directory.
+This will interpret the `script` parameter as an `inline` script with the default script language and no script parameters. To use a file script use the following syntax:
+
+[source,js]
+--------------------------------------------------
+{
+    ...,
+
+    "aggs" : {
+        "grades_count" : { 
+            "value_count" : { 
+                "script" : {
+                    "file": "my_script",
+                    "params" : {
+                        "field" : "grade"
+                    }
+                }
+            }
+        }
+    }
+}
+--------------------------------------------------
+
+TIP: for indexed scripts replace the `file` parameter with an `id` parameter.
diff --git a/docs/reference/docs/bulk.asciidoc b/docs/reference/docs/bulk.asciidoc
index 2760a125ff8..aaf12079747 100644
--- a/docs/reference/docs/bulk.asciidoc
+++ b/docs/reference/docs/bulk.asciidoc
@@ -187,7 +187,7 @@ the options. Curl example with update actions:
 { "update" : {"_id" : "1", "_type" : "type1", "_index" : "index1", "_retry_on_conflict" : 3} }
 { "doc" : {"field" : "value"} }
 { "update" : { "_id" : "0", "_type" : "type1", "_index" : "index1", "_retry_on_conflict" : 3} }
-{ "script" : "ctx._source.counter += param1", "lang" : "js", "params" : {"param1" : 1}, "upsert" : {"counter" : 1}}
+{ "script" : { "inline": "ctx._source.counter += param1", "lang" : "js", "params" : {"param1" : 1}}, "upsert" : {"counter" : 1}}
 { "update" : {"_id" : "2", "_type" : "type1", "_index" : "index1", "_retry_on_conflict" : 3} }
 { "doc" : {"field" : "value"}, "doc_as_upsert" : true }
 --------------------------------------------------
diff --git a/docs/reference/docs/update.asciidoc b/docs/reference/docs/update.asciidoc
index 4236e06754a..485b31cb037 100644
--- a/docs/reference/docs/update.asciidoc
+++ b/docs/reference/docs/update.asciidoc
@@ -28,9 +28,11 @@ Now, we can execute a script that would increment the counter:
 [source,js]
 --------------------------------------------------
 curl -XPOST 'localhost:9200/test/type1/1/_update' -d '{
-    "script" : "ctx._source.counter += count",
-    "params" : {
-        "count" : 4
+    "script" : {
+        "inline": "ctx._source.counter += count",
+        "params" : {
+            "count" : 4
+        }
     }
 }'
 --------------------------------------------------
@@ -41,9 +43,11 @@ will still add it, since its a list):
 [source,js]
 --------------------------------------------------
 curl -XPOST 'localhost:9200/test/type1/1/_update' -d '{
-    "script" : "ctx._source.tags += tag",
-    "params" : {
-        "tag" : "blue"
+    "script" : {
+        "inline": "ctx._source.tags += tag",
+        "params" : {
+            "tag" : "blue"
+        }
     }
 }'
 --------------------------------------------------
@@ -71,9 +75,11 @@ And, we can delete the doc if the tags contain blue, or ignore (noop):
 [source,js]
 --------------------------------------------------
 curl -XPOST 'localhost:9200/test/type1/1/_update' -d '{
-    "script" : "ctx._source.tags.contains(tag) ? ctx.op = \"delete\" : ctx.op = \"none\"",
-    "params" : {
-        "tag" : "blue"
+    "script" : {
+        "inline": "ctx._source.tags.contains(tag) ? ctx.op = \"delete\" : ctx.op = \"none\"",
+        "params" : {
+            "tag" : "blue"
+        }
     }
 }'
 --------------------------------------------------
@@ -136,9 +142,11 @@ index the fresh doc:
 [source,js]
 --------------------------------------------------
 curl -XPOST 'localhost:9200/test/type1/1/_update' -d '{
-    "script" : "ctx._source.counter += count",
-    "params" : {
-        "count" : 4
+    "script" : {
+        "inline": "ctx._source.counter += count",
+        "params" : {
+            "count" : 4
+        }
     },
     "upsert" : {
         "counter" : 1
@@ -153,13 +161,15 @@ new `scripted_upsert` parameter with the value `true`.
 [source,js]
 --------------------------------------------------
 curl -XPOST 'localhost:9200/sessions/session/dh3sgudg8gsrgl/_update' -d '{
-    "script_id" : "my_web_session_summariser",
     "scripted_upsert":true,
-    "params" : {
-        "pageViewEvent" : {
-        	"url":"foo.com/bar",
-        	"response":404,
-        	"time":"2014-01-01 12:32"
+    "script" : {
+        "id": "my_web_session_summariser",
+        "params" : {
+            "pageViewEvent" : {
+                "url":"foo.com/bar",
+                "response":404,
+                "time":"2014-01-01 12:32"
+            }
         }
     },
     "upsert" : {
diff --git a/docs/reference/mapping/transform.asciidoc b/docs/reference/mapping/transform.asciidoc
index 5235afcfd96..9377336518a 100644
--- a/docs/reference/mapping/transform.asciidoc
+++ b/docs/reference/mapping/transform.asciidoc
@@ -10,11 +10,13 @@ field.  Example:
 {
     "example" : {
         "transform" : {
-            "script" : "if (ctx._source['title']?.startsWith('t')) ctx._source['suggest'] = ctx._source['content']",
-            "params" : {
-                "variable" : "not used but an example anyway"
-            },
-            "lang": "groovy"
+            "script" : {
+                "inline": "if (ctx._source['title']?.startsWith('t')) ctx._source['suggest'] = ctx._source['content']",
+                "params" : {
+                    "variable" : "not used but an example anyway"
+                },
+                "lang": "groovy"
+            }
         },
         "properties": {
            "title": { "type": "string" },
diff --git a/docs/reference/modules/scripting.asciidoc b/docs/reference/modules/scripting.asciidoc
index 750802c4ec2..0550542b4a2 100644
--- a/docs/reference/modules/scripting.asciidoc
+++ b/docs/reference/modules/scripting.asciidoc
@@ -29,7 +29,7 @@ GET /_search
 {
     "script_fields": {
         "my_field": {
-            "script": "1 + my_var",
+            "inline": "1 + my_var",
             "params": {
               "my_var": 2
             }
@@ -38,7 +38,7 @@ GET /_search
 }
 -----------------------------------
 
-Save the contents of the script as a file called `config/scripts/my_script.groovy`
+Save the contents of the `inline` field as a file called `config/scripts/my_script.groovy`
 on every data node in the cluster:
 
 [source,js]
@@ -54,7 +54,7 @@ GET /_search
 {
     "script_fields": {
         "my_field": {
-            "script_file": "my_script",
+            "file": "my_script",
             "params": {
               "my_var": 2
             }
@@ -67,9 +67,9 @@ GET /_search
 
 
 Additional `lang` plugins are provided to allow to execute scripts in
-different languages. All places where a `script` parameter can be used, a `lang` parameter
-(on the same level) can be provided to define the language of the
-script. The following are the supported scripting languages:
+different languages. All places where a script can be used, a `lang` parameter
+can be provided to define the language of the script. The following are the 
+supported scripting languages:
 
 [cols="<,<,<",options="header",]
 |=======================================================================
@@ -120,7 +120,7 @@ curl -XPOST localhost:9200/_search -d '{
         {
           "script_score": {
             "lang": "groovy",
-            "script_file": "calculate-score",
+            "file": "calculate-score",
             "params": {
               "my_modifier": 8
             }
@@ -162,8 +162,8 @@ curl -XPOST localhost:9200/_scripts/groovy/indexedCalculateScore -d '{
 This will create a document with id: `indexedCalculateScore` and type: `groovy` in the
 `.scripts` index. The type of the document is the language used by the script.
 
-This script can be accessed at query time by appending `_id` to
-the script parameter and passing the script id. So `script` becomes `script_id`.:
+This script can be accessed at query time by using the `id` script parameter and passing 
+the script id:
 
 [source,js]
 --------------------------------------------------
@@ -178,7 +178,7 @@ curl -XPOST localhost:9200/_search -d '{
       "functions": [
         {
           "script_score": {
-            "script_id": "indexedCalculateScore",
+            "id": "indexedCalculateScore",
             "lang" : "groovy",
             "params": {
               "my_modifier": 8
diff --git a/docs/reference/query-dsl/function-score-query.asciidoc b/docs/reference/query-dsl/function-score-query.asciidoc
index 4588b4c7858..a5618a23c48 100644
--- a/docs/reference/query-dsl/function-score-query.asciidoc
+++ b/docs/reference/query-dsl/function-score-query.asciidoc
@@ -120,12 +120,14 @@ script, and provide parameters to it:
 [source,js]
 --------------------------------------------------
 "script_score": {
-    "lang": "lang",
-    "params": {
-        "param1": value1,
-        "param2": value2
-     },
-    "script": "_score * doc['my_numeric_field'].value / pow(param1, param2)"
+    "script": {
+        "lang": "lang",
+        "params": {
+            "param1": value1,
+            "param2": value2
+        },
+        "inline": "_score * doc['my_numeric_field'].value / pow(param1, param2)"
+    }
 }
 --------------------------------------------------
 
diff --git a/docs/reference/query-dsl/script-query.asciidoc b/docs/reference/query-dsl/script-query.asciidoc
index 899f176578e..4c307f2556f 100644
--- a/docs/reference/query-dsl/script-query.asciidoc
+++ b/docs/reference/query-dsl/script-query.asciidoc
@@ -34,9 +34,11 @@ to use the ability to pass parameters to the script itself, for example:
     }, 
     "filter" : {
         "script" : {
-            "script" : "doc['num1'].value > param1"
-            "params" : {
-                "param1" : 5
+            "script" : {
+                "inline" : "doc['num1'].value > param1"
+                "params" : {
+                    "param1" : 5
+                }
             }
         }
     }
diff --git a/docs/reference/query-dsl/template-query.asciidoc b/docs/reference/query-dsl/template-query.asciidoc
index 5d68992ff54..31728fe9993 100644
--- a/docs/reference/query-dsl/template-query.asciidoc
+++ b/docs/reference/query-dsl/template-query.asciidoc
@@ -12,7 +12,7 @@ GET /_search
 {
     "query": {
         "template": {
-            "query": { "match": { "text": "{{query_string}}" }},
+            "inline": { "match": { "text": "{{query_string}}" }},
             "params" : {
                 "query_string" : "all about search"
             }
@@ -45,7 +45,7 @@ GET /_search
 {
     "query": {
         "template": {
-            "query": "{ \"match\": { \"text\": \"{{query_string}}\" }}", <1>
+            "inline": "{ \"match\": { \"text\": \"{{query_string}}\" }}", <1>
             "params" : {
                 "query_string" : "all about search"
             }
diff --git a/docs/reference/search/request/script-fields.asciidoc b/docs/reference/search/request/script-fields.asciidoc
index 46b169838a0..596aba31d82 100644
--- a/docs/reference/search/request/script-fields.asciidoc
+++ b/docs/reference/search/request/script-fields.asciidoc
@@ -15,9 +15,11 @@ evaluation>> (based on different fields) for each hit, for example:
             "script" : "doc['my_field_name'].value * 2"
         },
         "test2" : {
-            "script" : "doc['my_field_name'].value * factor",
-            "params" : {
-                "factor"  : 2.0
+            "script" : {
+                "inline": "doc['my_field_name'].value * factor",
+                "params" : {
+                    "factor"  : 2.0
+                }
             }
         }
     }
diff --git a/docs/reference/search/request/sort.asciidoc b/docs/reference/search/request/sort.asciidoc
index 1e4218bb61d..58f42d8fdd8 100644
--- a/docs/reference/search/request/sort.asciidoc
+++ b/docs/reference/search/request/sort.asciidoc
@@ -318,10 +318,12 @@ Allow to sort based on custom scripts, here is an example:
     },
     "sort" : {
         "_script" : {
-            "script" : "doc['field_name'].value * factor",
             "type" : "number",
-            "params" : {
-                "factor" : 1.1
+            "script" : {
+                "inline": "doc['field_name'].value * factor",
+                "params" : {
+                    "factor" : 1.1
+                }
             },
             "order" : "asc"
         }
diff --git a/docs/reference/search/search-template.asciidoc b/docs/reference/search/search-template.asciidoc
index bb33628ba3b..b92dbfaa795 100644
--- a/docs/reference/search/search-template.asciidoc
+++ b/docs/reference/search/search-template.asciidoc
@@ -8,7 +8,7 @@ before they are executed and fill existing templates with template parameters.
 ------------------------------------------
 GET /_search/template
 {
-    "template" : {
+    "inline" : {
       "query": { "match" : { "{{my_field}}" : "{{my_value}}" } },
       "size" : "{{my_size}}"
     },
@@ -40,7 +40,7 @@ disable scripts per language, source and operation as described in
 ------------------------------------------
 GET /_search/template
 {
-    "template": {
+    "inline": {
         "query": {
             "match": {
                 "title": "{{query_string}}"
@@ -60,7 +60,7 @@ GET /_search/template
 ------------------------------------------
 GET /_search/template
 {
-  "template": {
+  "inline": {
     "query": {
       "terms": {
         "status": [
@@ -97,7 +97,7 @@ A default value is written as `{{var}}{{^var}}default{{/var}}` for instance:
 [source,js]
 ------------------------------------------
 {
-  "template": {
+  "inline": {
     "query": {
       "range": {
         "line_no": {
@@ -212,7 +212,7 @@ via the REST API, should be written as a string:
 
 [source,json]
 --------------------
-"template": "{\"query\":{\"filtered\":{\"query\":{\"match\":{\"line\":\"{{text}}\"}},\"filter\":{{{#line_no}}\"range\":{\"line_no\":{{{#start}}\"gte\":\"{{start}}\"{{#end}},{{/end}}{{/start}}{{#end}}\"lte\":\"{{end}}\"{{/end}}}}{{/line_no}}}}}}"
+"inline": "{\"query\":{\"filtered\":{\"query\":{\"match\":{\"line\":\"{{text}}\"}},\"filter\":{{{#line_no}}\"range\":{\"line_no\":{{{#start}}\"gte\":\"{{start}}\"{{#end}},{{/end}}{{/start}}{{#end}}\"lte\":\"{{end}}\"{{/end}}}}{{/line_no}}}}}}"
 --------------------
 
 ==================================
@@ -229,9 +229,7 @@ In order to execute the stored template, reference it by it's name under the `te
 ------------------------------------------
 GET /_search/template
 {
-    "template": {
-        "file": "storedTemplate" <1>
-    },
+    "file": "storedTemplate", <1>
     "params": {
         "query_string": "search for these words"
     }
@@ -293,9 +291,7 @@ To use an indexed template at search time use:
 ------------------------------------------
 GET /_search/template
 {
-    "template": {
-        "id": "templateName" <1>
-    },
+    "id": "templateName", <1>
     "params": {
         "query_string": "search for these words"
     }
diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java b/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java
index 715c1d716d9..a562dc046b2 100644
--- a/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java
+++ b/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java
@@ -20,7 +20,12 @@
 package org.elasticsearch.action.bulk;
 
 import com.google.common.collect.Lists;
-import org.elasticsearch.action.*;
+
+import org.elasticsearch.action.ActionRequest;
+import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.action.CompositeIndicesRequest;
+import org.elasticsearch.action.IndicesRequest;
+import org.elasticsearch.action.WriteConsistencyLevel;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.update.UpdateRequest;
@@ -140,7 +145,7 @@ public class BulkRequest extends ActionRequest<BulkRequest> implements Composite
             sizeInBytes += request.upsertRequest().source().length();
         }
         if (request.script() != null) {
-            sizeInBytes += request.script().length() * 2;
+            sizeInBytes += request.script().getScript().length() * 2;
         }
         return this;
     }
diff --git a/src/main/java/org/elasticsearch/action/search/SearchRequest.java b/src/main/java/org/elasticsearch/action/search/SearchRequest.java
index 8e1da31affa..90ceee99f90 100644
--- a/src/main/java/org/elasticsearch/action/search/SearchRequest.java
+++ b/src/main/java/org/elasticsearch/action/search/SearchRequest.java
@@ -35,11 +35,13 @@ import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.ScriptService.ScriptType;
+import org.elasticsearch.script.Template;
+import org.elasticsearch.script.mustache.MustacheScriptEngineService;
 import org.elasticsearch.search.Scroll;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 
 import java.io.IOException;
-import java.util.Collections;
 import java.util.Map;
 
 import static org.elasticsearch.search.Scroll.readScroll;
@@ -69,9 +71,7 @@ public class SearchRequest extends ActionRequest<SearchRequest> implements Indic
     private String preference;
 
     private BytesReference templateSource;
-    private String templateName;
-    private ScriptService.ScriptType templateType;
-    private Map<String, Object> templateParams = Collections.emptyMap();
+    private Template template;
 
     private BytesReference source;
 
@@ -100,9 +100,7 @@ public class SearchRequest extends ActionRequest<SearchRequest> implements Indic
         this.routing = searchRequest.routing;
         this.preference = searchRequest.preference;
         this.templateSource = searchRequest.templateSource;
-        this.templateName = searchRequest.templateName;
-        this.templateType = searchRequest.templateType;
-        this.templateParams = searchRequest.templateParams;
+        this.template = searchRequest.template;
         this.source = searchRequest.source;
         this.extraSource = searchRequest.extraSource;
         this.queryCache = searchRequest.queryCache;
@@ -390,42 +388,92 @@ public class SearchRequest extends ActionRequest<SearchRequest> implements Indic
     }
 
     /**
-     * The name of the stored template
+     * The stored template
      */
+    public void template(Template template) {
+        this.template = template;
+    }
+
+    /**
+     * The stored template
+     */
+    public Template template() {
+        return template;
+    }
+
+    /**
+     * The name of the stored template
+     * 
+     * @deprecated use {@link #template(Template))} instead.
+     */
+    @Deprecated
     public void templateName(String templateName) {
-        this.templateName = templateName;
+        updateOrCreateScript(templateName, null, null, null);
     }
 
+    /**
+     * The type of the stored template
+     * 
+     * @deprecated use {@link #template(Template))} instead.
+     */
+    @Deprecated
     public void templateType(ScriptService.ScriptType templateType) {
-        this.templateType = templateType;
+        updateOrCreateScript(null, templateType, null, null);
     }
 
     /**
      * Template parameters used for rendering
+     * 
+     * @deprecated use {@link #template(Template))} instead.
      */
+    @Deprecated
     public void templateParams(Map<String, Object> params) {
-        this.templateParams = params;
+        updateOrCreateScript(null, null, null, params);
     }
 
     /**
      * The name of the stored template
+     * 
+     * @deprecated use {@link #template()} instead.
      */
+    @Deprecated
     public String templateName() {
-        return templateName;
+        return template == null ? null : template.getScript();
     }
 
     /**
      * The name of the stored template
+     * 
+     * @deprecated use {@link #template()} instead.
      */
+    @Deprecated
     public ScriptService.ScriptType templateType() {
-        return templateType;
+        return template == null ? null : template.getType();
     }
 
     /**
      * Template parameters used for rendering
+     * 
+     * @deprecated use {@link #template()} instead.
      */
+    @Deprecated
     public Map<String, Object> templateParams() {
-        return templateParams;
+        return template == null ? null : template.getParams();
+    }
+
+    private void updateOrCreateScript(String templateContent, ScriptType type, String lang, Map<String, Object> params) {
+        Template template = template();
+        if (template == null) {
+            template = new Template(templateContent == null ? "" : templateContent, type == null ? ScriptType.INLINE : type, lang, null,
+                    params);
+        } else {
+            String newTemplateContent = templateContent == null ? template.getScript() : templateContent;
+            ScriptType newTemplateType = type == null ? template.getType() : type;
+            String newTemplateLang = lang == null ? template.getLang() : lang;
+            Map<String, Object> newTemplateParams = params == null ? template.getParams() : params;
+            template = new Template(newTemplateContent, newTemplateType, MustacheScriptEngineService.NAME, null, newTemplateParams);
+        }
+        template(template);
     }
 
     /**
@@ -517,10 +565,8 @@ public class SearchRequest extends ActionRequest<SearchRequest> implements Indic
         indicesOptions = IndicesOptions.readIndicesOptions(in);
 
         templateSource = in.readBytesReference();
-        templateName = in.readOptionalString();
-        templateType = ScriptService.ScriptType.readFrom(in);
         if (in.readBoolean()) {
-            templateParams = (Map<String, Object>) in.readGenericValue();
+            template = Template.readTemplate(in);
         }
         queryCache = in.readOptionalBoolean();
     }
@@ -550,12 +596,10 @@ public class SearchRequest extends ActionRequest<SearchRequest> implements Indic
         indicesOptions.writeIndicesOptions(out);
 
         out.writeBytesReference(templateSource);
-        out.writeOptionalString(templateName);
-        ScriptService.ScriptType.writeTo(templateType, out);
-        boolean existTemplateParams = templateParams != null;
-        out.writeBoolean(existTemplateParams);
-        if (existTemplateParams) {
-            out.writeGenericValue(templateParams);
+        boolean hasTemplate = template != null;
+        out.writeBoolean(hasTemplate);
+        if (hasTemplate) {
+            template.writeTo(out);
         }
 
         out.writeOptionalBoolean(queryCache);
diff --git a/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java b/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java
index f7e84b0733a..690ad43b466 100644
--- a/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java
+++ b/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java
@@ -29,7 +29,9 @@ import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.Template;
 import org.elasticsearch.search.Scroll;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
@@ -423,33 +425,60 @@ public class SearchRequestBuilder extends ActionRequestBuilder<SearchRequest, Se
      * @param name   The name that will represent this value in the return hit
      * @param script The script to use
      */
+    public SearchRequestBuilder addScriptField(String name, Script script) {
+        sourceBuilder().scriptField(name, script);
+        return this;
+    }
+
+    /**
+     * Adds a script based field to load and return. The field does not have to
+     * be stored, but its recommended to use non analyzed or numeric fields.
+     *
+     * @param name
+     *            The name that will represent this value in the return hit
+     * @param script
+     *            The script to use
+     * @deprecated Use {@link #addScriptField(String, Script)} instead.
+     */
+    @Deprecated
     public SearchRequestBuilder addScriptField(String name, String script) {
         sourceBuilder().scriptField(name, script);
         return this;
     }
 
     /**
-     * Adds a script based field to load and return. The field does not have to be stored,
-     * but its recommended to use non analyzed or numeric fields.
+     * Adds a script based field to load and return. The field does not have to
+     * be stored, but its recommended to use non analyzed or numeric fields.
      *
-     * @param name   The name that will represent this value in the return hit
-     * @param script The script to use
-     * @param params Parameters that the script can use.
+     * @param name
+     *            The name that will represent this value in the return hit
+     * @param script
+     *            The script to use
+     * @param params
+     *            Parameters that the script can use.
+     * @deprecated Use {@link #addScriptField(String, Script)} instead.
      */
+    @Deprecated
     public SearchRequestBuilder addScriptField(String name, String script, Map<String, Object> params) {
         sourceBuilder().scriptField(name, script, params);
         return this;
     }
 
     /**
-     * Adds a script based field to load and return. The field does not have to be stored,
-     * but its recommended to use non analyzed or numeric fields.
+     * Adds a script based field to load and return. The field does not have to
+     * be stored, but its recommended to use non analyzed or numeric fields.
      *
-     * @param name   The name that will represent this value in the return hit
-     * @param lang   The language of the script
-     * @param script The script to use
-     * @param params Parameters that the script can use (can be <tt>null</tt>).
+     * @param name
+     *            The name that will represent this value in the return hit
+     * @param lang
+     *            The language of the script
+     * @param script
+     *            The script to use
+     * @param params
+     *            Parameters that the script can use (can be <tt>null</tt>).
+     * @deprecated Use {@link #addScriptField(String, Script)} instead.
      */
+    @Deprecated
     public SearchRequestBuilder addScriptField(String name, String lang, String script, Map<String, Object> params) {
         sourceBuilder().scriptField(name, lang, script, params);
         return this;
@@ -939,16 +968,33 @@ public class SearchRequestBuilder extends ActionRequestBuilder<SearchRequest, Se
      * template stuff
      */
 
+    public SearchRequestBuilder setTemplate(Template template) {
+        request.template(template);
+        return this;
+    }
+
+    /**
+     * @deprecated Use {@link #setTemplate(Template)} instead.
+     */
+    @Deprecated
     public SearchRequestBuilder setTemplateName(String templateName) {
         request.templateName(templateName);
         return this;
     }
 
+    /**
+     * @deprecated Use {@link #setTemplate(Template)} instead.
+     */
+    @Deprecated
     public SearchRequestBuilder setTemplateType(ScriptService.ScriptType templateType) {
         request.templateType(templateType);
         return this;
     }
 
+    /**
+     * @deprecated Use {@link #setTemplate(Template)} instead.
+     */
+    @Deprecated
     public SearchRequestBuilder setTemplateParams(Map<String, Object> templateParams) {
         request.templateParams(templateParams);
         return this;
diff --git a/src/main/java/org/elasticsearch/action/update/UpdateHelper.java b/src/main/java/org/elasticsearch/action/update/UpdateHelper.java
index ef8144fc095..173587bbbb7 100644
--- a/src/main/java/org/elasticsearch/action/update/UpdateHelper.java
+++ b/src/main/java/org/elasticsearch/action/update/UpdateHelper.java
@@ -45,7 +45,6 @@ import org.elasticsearch.index.shard.IndexShard;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.script.ExecutableScript;
 import org.elasticsearch.script.ScriptContext;
-import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.search.fetch.source.FetchSourceContext;
 import org.elasticsearch.search.lookup.SourceLookup;
@@ -94,7 +93,7 @@ public class UpdateHelper extends AbstractComponent {
                 ctx.put("op", "create");
                 ctx.put("_source", upsertDoc);
                 try {
-                    ExecutableScript script = scriptService.executable(new Script(request.scriptLang, request.script, request.scriptType, request.scriptParams), ScriptContext.Standard.UPDATE);
+                    ExecutableScript script = scriptService.executable(request.script, ScriptContext.Standard.UPDATE);
                     script.setNextVar("ctx", ctx);
                     script.run();
                     // we need to unwrap the ctx...
@@ -111,7 +110,8 @@ public class UpdateHelper extends AbstractComponent {
                 // (the default) or "none", meaning abort upsert
                 if (!"create".equals(scriptOpChoice)) {
                     if (!"none".equals(scriptOpChoice)) {
-                        logger.warn("Used upsert operation [{}] for script [{}], doing nothing...", scriptOpChoice, request.script);
+                        logger.warn("Used upsert operation [{}] for script [{}], doing nothing...", scriptOpChoice,
+                                request.script.getScript());
                     }
                     UpdateResponse update = new UpdateResponse(getResult.getIndex(), getResult.getType(), getResult.getId(),
                             getResult.getVersion(), false);
@@ -193,7 +193,7 @@ public class UpdateHelper extends AbstractComponent {
             ctx.put("_source", sourceAndContent.v2());
 
             try {
-                ExecutableScript script = scriptService.executable(new Script(request.scriptLang, request.script, request.scriptType, request.scriptParams), ScriptContext.Standard.UPDATE);
+                ExecutableScript script = scriptService.executable(request.script, ScriptContext.Standard.UPDATE);
                 script.setNextVar("ctx", ctx);
                 script.run();
                 // we need to unwrap the ctx...
@@ -246,7 +246,7 @@ public class UpdateHelper extends AbstractComponent {
             update.setGetResult(extractGetResult(request, indexShard.indexService().index().name(), getResult.getVersion(), updatedSourceAsMap, updateSourceContentType, getResult.internalSourceRef()));
             return new Result(update, Operation.NONE, updatedSourceAsMap, updateSourceContentType);
         } else {
-            logger.warn("Used update operation [{}] for script [{}], doing nothing...", operation, request.script);
+            logger.warn("Used update operation [{}] for script [{}], doing nothing...", operation, request.script.getScript());
             UpdateResponse update = new UpdateResponse(getResult.getIndex(), getResult.getType(), getResult.getId(), getResult.getVersion(), false);
             return new Result(update, Operation.NONE, updatedSourceAsMap, updateSourceContentType);
         }
diff --git a/src/main/java/org/elasticsearch/action/update/UpdateRequest.java b/src/main/java/org/elasticsearch/action/update/UpdateRequest.java
index c3f03db7944..ac1b52a5493 100644
--- a/src/main/java/org/elasticsearch/action/update/UpdateRequest.java
+++ b/src/main/java/org/elasticsearch/action/update/UpdateRequest.java
@@ -19,14 +19,12 @@
 
 package org.elasticsearch.action.update;
 
-import com.google.common.collect.Maps;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.DocumentRequest;
 import org.elasticsearch.action.WriteConsistencyLevel;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.support.single.instance.InstanceShardOperationRequest;
 import org.elasticsearch.common.Nullable;
-import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -37,11 +35,14 @@ import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.VersionType;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptParameterParser;
 import org.elasticsearch.script.ScriptParameterParser.ScriptParameterValue;
 import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.ScriptService.ScriptType;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 
 import static org.elasticsearch.action.ValidateActions.addValidationError;
@@ -59,13 +60,7 @@ public class UpdateRequest extends InstanceShardOperationRequest<UpdateRequest>
     private String parent;
 
     @Nullable
-    String script;
-    @Nullable
-    ScriptService.ScriptType scriptType;
-    @Nullable
-    String scriptLang;
-    @Nullable
-    Map<String, Object> scriptParams;
+    Script script;
 
     private String[] fields;
 
@@ -205,105 +200,171 @@ public class UpdateRequest extends InstanceShardOperationRequest<UpdateRequest>
         return this.shardId;
     }
 
-    public String script() {
+    public Script script() {
         return this.script;
     }
 
-    public ScriptService.ScriptType scriptType() { return this.scriptType; }
+    /**
+     * The script to execute. Note, make sure not to send different script each times and instead
+     * use script params if possible with the same (automatically compiled) script.
+     */
+    public UpdateRequest script(Script script) {
+        this.script = script;
+        return this;
+    }
 
+    /**
+     * @deprecated Use {@link #script()} instead
+     */
+    @Deprecated
+    public String scriptString() {
+        return this.script == null ? null : this.script.getScript();
+    }
+
+    /**
+     * @deprecated Use {@link #script()} instead
+     */
+    @Deprecated
+    public ScriptService.ScriptType scriptType() {
+        return this.script == null ? null : this.script.getType();
+    }
+
+    /**
+     * @deprecated Use {@link #script()} instead
+     */
+    @Deprecated
     public Map<String, Object> scriptParams() {
-        return this.scriptParams;
+        return this.script == null ? null : this.script.getParams();
     }
 
     /**
-     * The script to execute. Note, make sure not to send different script each times and instead
-     * use script params if possible with the same (automatically compiled) script.
+     * The script to execute. Note, make sure not to send different script each
+     * times and instead use script params if possible with the same
+     * (automatically compiled) script.
+     * 
+     * @deprecated Use {@link #script(Script)} instead
      */
+    @Deprecated
     public UpdateRequest script(String script, ScriptService.ScriptType scriptType) {
-        this.script = script;
-        this.scriptType = scriptType;
+        updateOrCreateScript(script, scriptType, null, null);
         return this;
     }
 
     /**
-     * The script to execute. Note, make sure not to send different script each times and instead
-     * use script params if possible with the same (automatically compiled) script.
+     * The script to execute. Note, make sure not to send different script each
+     * times and instead use script params if possible with the same
+     * (automatically compiled) script.
+     * 
+     * @deprecated Use {@link #script(Script)} instead
      */
+    @Deprecated
     public UpdateRequest script(String script) {
-        this.script = script;
-        this.scriptType = ScriptService.ScriptType.INLINE;
+        updateOrCreateScript(script, ScriptType.INLINE, null, null);
         return this;
     }
 
-
     /**
      * The language of the script to execute.
+     * 
+     * @deprecated Use {@link #script(Script)} instead
      */
+    @Deprecated
     public UpdateRequest scriptLang(String scriptLang) {
-        this.scriptLang = scriptLang;
+        updateOrCreateScript(null, null, scriptLang, null);
         return this;
     }
 
+    /**
+     * @deprecated Use {@link #script()} instead
+     */
+    @Deprecated
     public String scriptLang() {
-        return scriptLang;
+        return script == null ? null : script.getLang();
     }
 
     /**
      * Add a script parameter.
+     * 
+     * @deprecated Use {@link #script(Script)} instead
      */
+    @Deprecated
     public UpdateRequest addScriptParam(String name, Object value) {
-        if (scriptParams == null) {
-            scriptParams = Maps.newHashMap();
+        Script script = script();
+        if (script == null) {
+            HashMap<String, Object> scriptParams = new HashMap<String, Object>();
+            scriptParams.put(name, value);
+            updateOrCreateScript(null, null, null, scriptParams);
+        } else {
+            Map<String, Object> scriptParams = script.getParams();
+            if (scriptParams == null) {
+                scriptParams = new HashMap<String, Object>();
+                scriptParams.put(name, value);
+                updateOrCreateScript(null, null, null, scriptParams);
+            } else {
+                scriptParams.put(name, value);
+            }
         }
-        scriptParams.put(name, value);
         return this;
     }
 
     /**
      * Sets the script parameters to use with the script.
+     * 
+     * @deprecated Use {@link #script(Script)} instead
      */
+    @Deprecated
     public UpdateRequest scriptParams(Map<String, Object> scriptParams) {
-        if (this.scriptParams == null) {
-            this.scriptParams = scriptParams;
-        } else {
-            this.scriptParams.putAll(scriptParams);
-        }
+        updateOrCreateScript(null, null, null, scriptParams);
         return this;
     }
 
+    private void updateOrCreateScript(String scriptContent, ScriptType type, String lang, Map<String, Object> params) {
+        Script script = script();
+        if (script == null) {
+            script = new Script(scriptContent == null ? "" : scriptContent, type == null ? ScriptType.INLINE : type, lang, params);
+        } else {
+            String newScriptContent = scriptContent == null ? script.getScript() : scriptContent;
+            ScriptType newScriptType = type == null ? script.getType() : type;
+            String newScriptLang = lang == null ? script.getLang() : lang;
+            Map<String, Object> newScriptParams = params == null ? script.getParams() : params;
+            script = new Script(newScriptContent, newScriptType, newScriptLang, newScriptParams);
+        }
+        script(script);
+    }
+
     /**
-     * The script to execute. Note, make sure not to send different script each times and instead
-     * use script params if possible with the same (automatically compiled) script.
+     * The script to execute. Note, make sure not to send different script each
+     * times and instead use script params if possible with the same
+     * (automatically compiled) script.
+     * 
+     * @deprecated Use {@link #script(Script)} instead
      */
+    @Deprecated
     public UpdateRequest script(String script, ScriptService.ScriptType scriptType, @Nullable Map<String, Object> scriptParams) {
-        this.script = script;
-        this.scriptType = scriptType;
-        if (this.scriptParams != null) {
-            this.scriptParams.putAll(scriptParams);
-        } else {
-            this.scriptParams = scriptParams;
-        }
+        this.script = new Script(script, scriptType, null, scriptParams);
         return this;
     }
 
     /**
-     * The script to execute. Note, make sure not to send different script each times and instead
-     * use script params if possible with the same (automatically compiled) script.
+     * The script to execute. Note, make sure not to send different script each
+     * times and instead use script params if possible with the same
+     * (automatically compiled) script.
      *
-     * @param script       The script to execute
-     * @param scriptLang   The script language
-     * @param scriptType   The script type
-     * @param scriptParams The script parameters
+     * @param script
+     *            The script to execute
+     * @param scriptLang
+     *            The script language
+     * @param scriptType
+     *            The script type
+     * @param scriptParams
+     *            The script parameters
+     * 
+     * @deprecated Use {@link #script(Script)} instead
      */
-    public UpdateRequest script(String script, @Nullable String scriptLang, ScriptService.ScriptType scriptType, @Nullable Map<String, Object> scriptParams) {
-        this.script = script;
-        this.scriptLang = scriptLang;
-        this.scriptType = scriptType;
-        if (this.scriptParams != null) {
-            this.scriptParams.putAll(scriptParams);
-        } else {
-            this.scriptParams = scriptParams;
-        }
+    @Deprecated
+    public UpdateRequest script(String script, @Nullable String scriptLang, ScriptService.ScriptType scriptType,
+            @Nullable Map<String, Object> scriptParams) {
+        this.script = new Script(script, scriptType, scriptLang, scriptParams);
         return this;
     }
 
@@ -574,6 +635,7 @@ public class UpdateRequest extends InstanceShardOperationRequest<UpdateRequest>
 
     public UpdateRequest source(BytesReference source) throws Exception {
         ScriptParameterParser scriptParameterParser = new ScriptParameterParser();
+        Map<String, Object> scriptParams = null;
         XContentType xContentType = XContentFactory.xContentType(source);
         try (XContentParser parser = XContentFactory.xContent(xContentType).createParser(source)) {
             XContentParser.Token token = parser.nextToken();
@@ -584,6 +646,8 @@ public class UpdateRequest extends InstanceShardOperationRequest<UpdateRequest>
             while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
                 if (token == XContentParser.Token.FIELD_NAME) {
                     currentFieldName = parser.currentName();
+                } else if ("script".equals(currentFieldName) && token == XContentParser.Token.START_OBJECT) {
+                    script = Script.parse(parser);
                 } else if ("params".equals(currentFieldName)) {
                     scriptParams = parser.map();
                 } else if ("scripted_upsert".equals(currentFieldName)) {
@@ -604,12 +668,13 @@ public class UpdateRequest extends InstanceShardOperationRequest<UpdateRequest>
                     scriptParameterParser.token(currentFieldName, token, parser);
                 }
             }
-            ScriptParameterValue scriptValue = scriptParameterParser.getDefaultScriptParameterValue();
-            if (scriptValue != null) {
-                script = scriptValue.script();
-                scriptType = scriptValue.scriptType();
+            // Don't have a script using the new API so see if it is specified with the old API
+            if (script == null) {
+                ScriptParameterValue scriptValue = scriptParameterParser.getDefaultScriptParameterValue();
+                if (scriptValue != null) {
+                    script = new Script(scriptValue.script(), scriptValue.scriptType(), scriptParameterParser.lang(), scriptParams);
+                }
             }
-            scriptLang = scriptParameterParser.lang();
         }
         return this;
     }
@@ -639,12 +704,9 @@ public class UpdateRequest extends InstanceShardOperationRequest<UpdateRequest>
         id = in.readString();
         routing = in.readOptionalString();
         parent = in.readOptionalString();
-        script = in.readOptionalString();
-        if(Strings.hasLength(script)) {
-            scriptType = ScriptService.ScriptType.readFrom(in);
+        if (in.readBoolean()) {
+            script = Script.readScript(in);
         }
-        scriptLang = in.readOptionalString();
-        scriptParams = in.readMap();
         retryOnConflict = in.readVInt();
         refresh = in.readBoolean();
         if (in.readBoolean()) {
@@ -677,12 +739,11 @@ public class UpdateRequest extends InstanceShardOperationRequest<UpdateRequest>
         out.writeString(id);
         out.writeOptionalString(routing);
         out.writeOptionalString(parent);
-        out.writeOptionalString(script);
-        if (Strings.hasLength(script)) {
-            ScriptService.ScriptType.writeTo(scriptType, out);
+        boolean hasScript = script != null;
+        out.writeBoolean(hasScript);
+        if (hasScript) {
+            script.writeTo(out);
         }
-        out.writeOptionalString(scriptLang);
-        out.writeMap(scriptParams);
         out.writeVInt(retryOnConflict);
         out.writeBoolean(refresh);
         if (doc == null) {
diff --git a/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java b/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java
index 3bcb9c640df..7c30c47dd7c 100644
--- a/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java
+++ b/src/main/java/org/elasticsearch/action/update/UpdateRequestBuilder.java
@@ -27,6 +27,7 @@ import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.VersionType;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptService;
 
 import java.util.Map;
@@ -80,21 +81,43 @@ public class UpdateRequestBuilder extends InstanceShardOperationRequestBuilder<U
      * The script works with the variable <code>ctx</code>, which is bound to the entry,
      * e.g. <code>ctx._source.mycounter += 1</code>.
      *
+     */
+    public UpdateRequestBuilder setScript(Script script) {
+        request.script(script);
+        return this;
+    }
+
+    /**
+     * The script to execute. Note, make sure not to send different script each
+     * times and instead use script params if possible with the same
+     * (automatically compiled) script.
+     * <p/>
+     * The script works with the variable <code>ctx</code>, which is bound to
+     * the entry, e.g. <code>ctx._source.mycounter += 1</code>.
+     *
      * @see #setScriptLang(String)
      * @see #setScriptParams(Map)
+     * 
+     * @deprecated use {@link #setScript(Script)} instead
      */
+    @Deprecated
     public UpdateRequestBuilder setScript(String script, ScriptService.ScriptType scriptType) {
         request.script(script, scriptType);
         return this;
     }
 
     /**
-     * The language of the script to execute.
-     * Valid options are: mvel, js, groovy, python, and native (Java)<br>
+     * The language of the script to execute. Valid options are: mvel, js,
+     * groovy, python, and native (Java)<br>
      * Default: groovy
      * <p/>
-     * Ref: http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-scripting.html
+     * Ref:
+     * http://www.elasticsearch.org/guide/en/elasticsearch/reference/current
+     * /modules-scripting.html
+     * 
+     * @deprecated use {@link #setScript(Script)} instead
      */
+    @Deprecated
     public UpdateRequestBuilder setScriptLang(String scriptLang) {
         request.scriptLang(scriptLang);
         return this;
@@ -102,7 +125,10 @@ public class UpdateRequestBuilder extends InstanceShardOperationRequestBuilder<U
 
     /**
      * Sets the script parameters to use with the script.
+     * 
+     * @deprecated use {@link #setScript(Script)} instead
      */
+    @Deprecated
     public UpdateRequestBuilder setScriptParams(Map<String, Object> scriptParams) {
         request.scriptParams(scriptParams);
         return this;
@@ -110,7 +136,10 @@ public class UpdateRequestBuilder extends InstanceShardOperationRequestBuilder<U
 
     /**
      * Add a script parameter.
+     * 
+     * @deprecated use {@link #setScript(Script)} instead
      */
+    @Deprecated
     public UpdateRequestBuilder addScriptParam(String name, Object value) {
         request.addScriptParam(name, value);
         return this;
diff --git a/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java b/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java
index 860588207f0..d1ee646fc34 100644
--- a/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java
+++ b/src/main/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunction.java
@@ -24,11 +24,11 @@ import org.apache.lucene.search.Explanation;
 import org.apache.lucene.search.Scorer;
 import org.elasticsearch.script.ExplainableSearchScript;
 import org.elasticsearch.script.LeafSearchScript;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptException;
 import org.elasticsearch.script.SearchScript;
 
 import java.io.IOException;
-import java.util.Map;
 
 public class ScriptScoreFunction extends ScoreFunction {
 
@@ -71,17 +71,14 @@ public class ScriptScoreFunction extends ScoreFunction {
         }
     }
 
-    private final String sScript;
-
-    private final Map<String, Object> params;
+    private final Script sScript;
 
     private final SearchScript script;
 
 
-    public ScriptScoreFunction(String sScript, Map<String, Object> params, SearchScript script) {
+    public ScriptScoreFunction(Script sScript, SearchScript script) {
         super(CombineFunction.REPLACE);
         this.sScript = sScript;
-        this.params = params;
         this.script = script;
     }
 
@@ -114,8 +111,8 @@ public class ScriptScoreFunction extends ScoreFunction {
                 } else {
                     double score = score(docId, subQueryScore.getValue());
                     String explanation = "script score function, computed with script:\"" + sScript;
-                    if (params != null) {
-                        explanation += "\" and parameters: \n" + params.toString();
+                    if (sScript.getParams() != null) {
+                        explanation += "\" and parameters: \n" + sScript.getParams().toString();
                     }
                     Explanation scoreExp = Explanation.match(
                             subQueryScore.getValue(), "_score: ",
@@ -131,7 +128,7 @@ public class ScriptScoreFunction extends ScoreFunction {
 
     @Override
     public String toString() {
-        return "script[" + sScript + "], params [" + params + "]";
+        return "script" + sScript.toString();
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentType.java b/src/main/java/org/elasticsearch/common/xcontent/XContentType.java
index 4acee241603..329bad87265 100644
--- a/src/main/java/org/elasticsearch/common/xcontent/XContentType.java
+++ b/src/main/java/org/elasticsearch/common/xcontent/XContentType.java
@@ -19,11 +19,15 @@
 
 package org.elasticsearch.common.xcontent;
 
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.cbor.CborXContent;
 import org.elasticsearch.common.xcontent.json.JsonXContent;
 import org.elasticsearch.common.xcontent.smile.SmileXContent;
 import org.elasticsearch.common.xcontent.yaml.YamlXContent;
 
+import java.io.IOException;
+
 /**
  * The content type of {@link org.elasticsearch.common.xcontent.XContent}.
  */
@@ -144,4 +148,18 @@ public enum XContentType {
     public abstract String shortName();
 
     public abstract XContent xContent();
+
+    public static XContentType readFrom(StreamInput in) throws IOException {
+        int index = in.readVInt();
+        for (XContentType contentType : values()) {
+            if (index == contentType.index) {
+                return contentType;
+            }
+        }
+        throw new IllegalStateException("Unknown XContentType with index [" + index + "]");
+    }
+
+    public static void writeTo(XContentType contentType, StreamOutput out) throws IOException {
+        out.writeVInt(contentType.index);
+    }
 }
diff --git a/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java b/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
index 7f8bb8ffa0a..b306396700a 100644
--- a/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
@@ -134,8 +134,18 @@ public class DocumentMapper implements ToXContent {
             return this;
         }
 
-        public Builder transform(ScriptService scriptService, String script, ScriptType scriptType, String language, Map<String, Object> parameters) {
-            sourceTransforms.add(new ScriptTransform(scriptService, script, scriptType, language, parameters));
+        public Builder transform(ScriptService scriptService, Script script) {
+            sourceTransforms.add(new ScriptTransform(scriptService, script));
+            return this;
+        }
+
+        /**
+         * @deprecated Use {@link #transform(ScriptService, Script)} instead.
+         */
+        @Deprecated
+        public Builder transform(ScriptService scriptService, String script, ScriptType scriptType, String language,
+                Map<String, Object> parameters) {
+            sourceTransforms.add(new ScriptTransform(scriptService, new Script(script, scriptType, language, parameters)));
             return this;
         }
 
@@ -388,20 +398,20 @@ public class DocumentMapper implements ToXContent {
 
     private void addFieldMappers(Collection<FieldMapper> fieldMappers) {
         assert mappingLock.isWriteLockedByCurrentThread();
-        this.fieldMappers = this.fieldMappers.copyAndAllAll(fieldMappers);
+            this.fieldMappers = this.fieldMappers.copyAndAllAll(fieldMappers);
         mapperService.addFieldMappers(fieldMappers);
     }
 
     private void addObjectMappers(Collection<ObjectMapper> objectMappers) {
         assert mappingLock.isWriteLockedByCurrentThread();
-        MapBuilder<String, ObjectMapper> builder = MapBuilder.newMapBuilder(this.objectMappers);
-        for (ObjectMapper objectMapper : objectMappers) {
-            builder.put(objectMapper.fullPath(), objectMapper);
-            if (objectMapper.nested().isNested()) {
-                hasNestedObjects = true;
+            MapBuilder<String, ObjectMapper> builder = MapBuilder.newMapBuilder(this.objectMappers);
+            for (ObjectMapper objectMapper : objectMappers) {
+                builder.put(objectMapper.fullPath(), objectMapper);
+                if (objectMapper.nested().isNested()) {
+                    hasNestedObjects = true;
+                }
             }
-        }
-        this.objectMappers = builder.immutableMap();
+            this.objectMappers = builder.immutableMap();
         mapperService.addObjectMappers(objectMappers);
     }
 
@@ -454,15 +464,15 @@ public class DocumentMapper implements ToXContent {
 
     public MergeResult merge(Mapping mapping, boolean simulate) {
         try (ReleasableLock lock = mappingWriteLock.acquire()) {
-            final MergeResult mergeResult = newMergeContext(simulate);
-            this.mapping.merge(mapping, mergeResult);
-            if (simulate == false) {
-                addFieldMappers(mergeResult.getNewFieldMappers());
-                addObjectMappers(mergeResult.getNewObjectMappers());
-                refreshSource();
-            }
-            return mergeResult;
+        final MergeResult mergeResult = newMergeContext(simulate);
+        this.mapping.merge(mapping, mergeResult);
+        if (simulate == false) {
+            addFieldMappers(mergeResult.getNewFieldMappers());
+            addObjectMappers(mergeResult.getNewObjectMappers());
+            refreshSource();
         }
+        return mergeResult;
+    }
     }
 
     private void refreshSource() throws ElasticsearchGenerationException {
@@ -498,28 +508,13 @@ public class DocumentMapper implements ToXContent {
     private static class ScriptTransform implements SourceTransform {
         private final ScriptService scriptService;
         /**
-         * Contents of the script to transform the source document before indexing.
+         * The script to transform the source document before indexing.
          */
-        private final String script;
-        /**
-         * The type of the script to run.
-         */
-        private final ScriptType scriptType;
-        /**
-         * Language of the script to transform the source document before indexing.
-         */
-        private final String language;
-        /**
-         * Parameters passed to the transform script.
-         */
-        private final Map<String, Object> parameters;
+        private final Script script;
 
-        public ScriptTransform(ScriptService scriptService, String script, ScriptType scriptType, String language, Map<String, Object> parameters) {
+        public ScriptTransform(ScriptService scriptService, Script script) {
             this.scriptService = scriptService;
             this.script = script;
-            this.scriptType = scriptType;
-            this.language = language;
-            this.parameters = parameters;
         }
 
         @Override
@@ -527,7 +522,7 @@ public class DocumentMapper implements ToXContent {
         public Map<String, Object> transformSourceAsMap(Map<String, Object> sourceAsMap) {
             try {
                 // We use the ctx variable and the _source name to be consistent with the update api.
-                ExecutableScript executable = scriptService.executable(new Script(language, script, scriptType, parameters), ScriptContext.Standard.MAPPING);
+                ExecutableScript executable = scriptService.executable(script, ScriptContext.Standard.MAPPING);
                 Map<String, Object> ctx = new HashMap<>(1);
                 ctx.put("_source", sourceAsMap);
                 executable.setNextVar("ctx", ctx);
@@ -541,16 +536,7 @@ public class DocumentMapper implements ToXContent {
 
         @Override
         public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-            builder.startObject();
-            builder.field("script", script);
-            if (language != null) {
-                builder.field("lang", language);
-            }
-            if (parameters != null) {
-                builder.field("params", parameters);
-            }
-            builder.endObject();
-            return builder;
+            return script.toXContent(builder, params);
         }
     }
 }
diff --git a/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java b/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java
index 4bb9e8d830e..d5a3ff1f9ad 100644
--- a/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java
+++ b/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java
@@ -71,10 +71,8 @@ import org.elasticsearch.index.mapper.object.ObjectMapper;
 import org.elasticsearch.index.mapper.object.RootObjectMapper;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.index.similarity.SimilarityLookupService;
-import org.elasticsearch.script.ScriptParameterParser;
-import org.elasticsearch.script.ScriptParameterParser.ScriptParameterValue;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptService;
-import org.elasticsearch.script.ScriptService.ScriptType;
 
 import java.util.Iterator;
 import java.util.List;
@@ -238,7 +236,6 @@ public class DocumentMapperParser extends AbstractIndexComponent {
             Object fieldNode = entry.getValue();
 
             if ("transform".equals(fieldName)) {
-                iterator.remove();
                 if (fieldNode instanceof Map) {
                     parseTransform(docBuilder, (Map<String, Object>) fieldNode, parserContext.indexVersionCreated());
                 } else if (fieldNode instanceof List) {
@@ -251,6 +248,7 @@ public class DocumentMapperParser extends AbstractIndexComponent {
                 } else {
                     throw new MapperParsingException("Transform must be an object or an array but was:  " + fieldNode);
                 }
+                iterator.remove();
             } else {
                 Mapper.TypeParser typeParser = rootTypeParsers.get(fieldName);
                 if (typeParser != null) {
@@ -296,23 +294,10 @@ public class DocumentMapperParser extends AbstractIndexComponent {
         return remainingFields.toString();
     }
 
-    @SuppressWarnings("unchecked")
     private void parseTransform(DocumentMapper.Builder docBuilder, Map<String, Object> transformConfig, Version indexVersionCreated) {
-        ScriptParameterParser scriptParameterParser = new ScriptParameterParser();
-        scriptParameterParser.parseConfig(transformConfig, true);
-        
-        String script = null;
-        ScriptType scriptType = null;
-        ScriptParameterValue scriptValue = scriptParameterParser.getDefaultScriptParameterValue();
-        if (scriptValue != null) {
-            script = scriptValue.script();
-            scriptType = scriptValue.scriptType();
-        }
-        
+        Script script = Script.parse(transformConfig, true);
         if (script != null) {
-            String scriptLang = scriptParameterParser.lang();
-            Map<String, Object> params = (Map<String, Object>)transformConfig.remove("params");
-            docBuilder.transform(scriptService, script, scriptType, scriptLang, params);
+            docBuilder.transform(scriptService, script);
         }
         checkNoRemainingFields(transformConfig, indexVersionCreated, "Transform config has unsupported parameters: ");
     }
diff --git a/src/main/java/org/elasticsearch/index/query/QueryBuilders.java b/src/main/java/org/elasticsearch/index/query/QueryBuilders.java
index fe2e572522b..c9070a24c37 100644
--- a/src/main/java/org/elasticsearch/index/query/QueryBuilders.java
+++ b/src/main/java/org/elasticsearch/index/query/QueryBuilders.java
@@ -27,7 +27,9 @@ import org.elasticsearch.common.geo.ShapeRelation;
 import org.elasticsearch.common.geo.builders.ShapeBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.Template;
 
 import java.util.Collection;
 import java.util.Map;
@@ -562,6 +564,13 @@ public abstract class QueryBuilders {
         return new GeoShapeQueryBuilder(name, shape);
     }
 
+    /**
+     * Facilitates creating template query requests using an inline script
+     */
+    public static TemplateQueryBuilder templateQuery(Template template) {
+        return new TemplateQueryBuilder(template);
+    }
+
     /**
      * Facilitates creating template query requests using an inline script
      */
@@ -596,6 +605,18 @@ public abstract class QueryBuilders {
      *
      * @param script The script to filter by.
      */
+    public static ScriptQueryBuilder scriptQuery(Script script) {
+        return new ScriptQueryBuilder(script);
+    }
+
+    /**
+     * A builder for filter based on a script.
+     *
+     * @param script
+     *            The script to filter by.
+     * @deprecated Use {@link #scriptQuery(Script)} instead.
+     */
+    @Deprecated
     public static ScriptQueryBuilder scriptQuery(String script) {
         return new ScriptQueryBuilder(script);
     }
diff --git a/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java
index 9ae05159953..8a6f72190c2 100644
--- a/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java
+++ b/src/main/java/org/elasticsearch/index/query/ScriptQueryBuilder.java
@@ -20,34 +20,56 @@
 package org.elasticsearch.index.query;
 
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.Script.ScriptField;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 
-import static com.google.common.collect.Maps.newHashMap;
-
 public class ScriptQueryBuilder extends QueryBuilder {
 
-    private final String script;
+    private Script script;
 
+    @Deprecated
+    private String scriptString;
+
+    @Deprecated
     private Map<String, Object> params;
 
+    @Deprecated
     private String lang;
 
     private String queryName;
 
-    public ScriptQueryBuilder(String script) {
+    public ScriptQueryBuilder(Script script) {
         this.script = script;
     }
 
+    /**
+     * @deprecated Use {@link #ScriptQueryBuilder(Script)} instead.
+     */
+    @Deprecated
+    public ScriptQueryBuilder(String script) {
+        this.scriptString = script;
+    }
+
+    /**
+     * @deprecated Use {@link #ScriptQueryBuilder(Script)} instead.
+     */
+    @Deprecated
     public ScriptQueryBuilder addParam(String name, Object value) {
         if (params == null) {
-            params = newHashMap();
+            params = new HashMap<>();
         }
         params.put(name, value);
         return this;
     }
 
+    /**
+     * @deprecated Use {@link #ScriptQueryBuilder(Script)} instead.
+     */
+    @Deprecated
     public ScriptQueryBuilder params(Map<String, Object> params) {
         if (this.params == null) {
             this.params = params;
@@ -59,7 +81,10 @@ public class ScriptQueryBuilder extends QueryBuilder {
 
     /**
      * Sets the script language.
+     * 
+     * @deprecated Use {@link #ScriptQueryBuilder(Script)} instead.
      */
+    @Deprecated
     public ScriptQueryBuilder lang(String lang) {
         this.lang = lang;
         return this;
@@ -74,15 +99,23 @@ public class ScriptQueryBuilder extends QueryBuilder {
     }
 
     @Override
-    protected void doXContent(XContentBuilder builder, Params params) throws IOException {
+    protected void doXContent(XContentBuilder builder, Params builderParams) throws IOException {
+
         builder.startObject(ScriptQueryParser.NAME);
-        builder.field("script", script);
-        if (this.params != null) {
-            builder.field("params", this.params);
-        }
-        if (this.lang != null) {
-            builder.field("lang", lang);
+        if (script != null) {
+            builder.field(ScriptField.SCRIPT.getPreferredName(), script);
+        } else {
+            if (this.scriptString != null) {
+                builder.field("script", scriptString);
+            }
+            if (this.params != null) {
+                builder.field("params", this.params);
+            }
+            if (this.lang != null) {
+                builder.field("lang", lang);
+            }
         }
+
         if (queryName != null) {
             builder.field("_name", queryName);
         }
diff --git a/src/main/java/org/elasticsearch/index/query/ScriptQueryParser.java b/src/main/java/org/elasticsearch/index/query/ScriptQueryParser.java
index 84dad2b5d92..9912cb94bac 100644
--- a/src/main/java/org/elasticsearch/index/query/ScriptQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/ScriptQueryParser.java
@@ -19,6 +19,8 @@
 
 package org.elasticsearch.index.query;
 
+import com.google.common.base.Objects;
+
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
@@ -29,6 +31,7 @@ import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.script.LeafSearchScript;
 import org.elasticsearch.script.Script;
+import org.elasticsearch.script.Script.ScriptField;
 import org.elasticsearch.script.ScriptContext;
 import org.elasticsearch.script.ScriptParameterParser;
 import org.elasticsearch.script.ScriptParameterParser.ScriptParameterValue;
@@ -38,7 +41,6 @@ import org.elasticsearch.search.lookup.SearchLookup;
 
 import java.io.IOException;
 import java.util.Map;
-import java.util.Objects;
 
 import static com.google.common.collect.Maps.newHashMap;
 
@@ -55,7 +57,7 @@ public class ScriptQueryParser implements QueryParser {
 
     @Override
     public String[] names() {
-        return new String[]{NAME};
+        return new String[] { NAME };
     }
 
     @Override
@@ -66,13 +68,11 @@ public class ScriptQueryParser implements QueryParser {
         XContentParser.Token token;
 
         // also, when caching, since its isCacheable is false, will result in loading all bit set...
-        String script = null;
-        String scriptLang;
+        Script script = null;
         Map<String, Object> params = null;
 
         String queryName = null;
         String currentFieldName = null;
-        ScriptService.ScriptType scriptType = null;
 
         while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
             if (token == XContentParser.Token.FIELD_NAME) {
@@ -80,7 +80,9 @@ public class ScriptQueryParser implements QueryParser {
             } else if (parseContext.isDeprecatedSetting(currentFieldName)) {
                 // skip
             } else if (token == XContentParser.Token.START_OBJECT) {
-                if ("params".equals(currentFieldName)) {
+                if (ScriptField.SCRIPT.match(currentFieldName)) {
+                    script = Script.parse(parser);
+                } else if ("params".equals(currentFieldName)) { // TODO remove in 2.0 (here to support old script APIs)
                     params = parser.map();
                 } else {
                     throw new QueryParsingException(parseContext, "[script] query does not support [" + currentFieldName + "]");
@@ -88,27 +90,29 @@ public class ScriptQueryParser implements QueryParser {
             } else if (token.isValue()) {
                 if ("_name".equals(currentFieldName)) {
                     queryName = parser.text();
-                } else if (!scriptParameterParser.token(currentFieldName, token, parser)){
+                } else if (!scriptParameterParser.token(currentFieldName, token, parser)) {
                     throw new QueryParsingException(parseContext, "[script] query does not support [" + currentFieldName + "]");
                 }
             }
         }
 
-        ScriptParameterValue scriptValue = scriptParameterParser.getDefaultScriptParameterValue();
-        if (scriptValue != null) {
-            script = scriptValue.script();
-            scriptType = scriptValue.scriptType();
+        if (script == null) { // Didn't find anything using the new API so try using the old one instead
+            ScriptParameterValue scriptValue = scriptParameterParser.getDefaultScriptParameterValue();
+            if (scriptValue != null) {
+                if (params == null) {
+                    params = newHashMap();
+                }
+                script = new Script(scriptValue.script(), scriptValue.scriptType(), scriptParameterParser.lang(), params);
+            }
+        } else if (params != null) {
+            throw new QueryParsingException(parseContext, "script params must be specified inside script object in a [script] filter");
         }
-        scriptLang = scriptParameterParser.lang();
 
         if (script == null) {
             throw new QueryParsingException(parseContext, "script must be provided with a [script] filter");
         }
-        if (params == null) {
-            params = newHashMap();
-        }
 
-        Query query = new ScriptQuery(scriptLang, script, scriptType, params, parseContext.scriptService(), parseContext.lookup());
+        Query query = new ScriptQuery(script, parseContext.scriptService(), parseContext.lookup());
         if (queryName != null) {
             parseContext.addNamedQuery(queryName, query);
         }
@@ -117,14 +121,13 @@ public class ScriptQueryParser implements QueryParser {
 
     static class ScriptQuery extends Query {
 
-        private final String script;
-        private final Map<String, Object> params;
+        private final Script script;
+
         private final SearchScript searchScript;
 
-        private ScriptQuery(String scriptLang, String script, ScriptService.ScriptType scriptType, Map<String, Object> params, ScriptService scriptService, SearchLookup searchLookup) {
+        public ScriptQuery(Script script, ScriptService scriptService, SearchLookup searchLookup) {
             this.script = script;
-            this.params = params;
-            this.searchScript = scriptService.search(searchLookup, new Script(scriptLang, script, scriptType, newHashMap(params)), ScriptContext.Standard.SEARCH);
+            this.searchScript = scriptService.search(searchLookup, script, ScriptContext.Standard.SEARCH);
         }
 
         @Override
@@ -137,23 +140,20 @@ public class ScriptQueryParser implements QueryParser {
         }
 
         @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (super.equals(o) == false) return false;
-
-            ScriptQuery that = (ScriptQuery) o;
-
-            if (params != null ? !params.equals(that.params) : that.params != null) return false;
-            if (script != null ? !script.equals(that.script) : that.script != null) return false;
-
-            return true;
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (!super.equals(obj))
+                return false;
+            ScriptQuery other = (ScriptQuery) obj;
+            return Objects.equal(script, other.script);
         }
 
         @Override
         public int hashCode() {
+            final int prime = 31;
             int result = super.hashCode();
-            result = 31 * result + Objects.hashCode(script);
-            result = 31 * result + Objects.hashCode(params);
+            result = prime * result + Objects.hashCode(script);
             return result;
         }
 
diff --git a/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java b/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java
index 7154fe93fc0..852977fa0db 100644
--- a/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java
+++ b/src/main/java/org/elasticsearch/index/query/TemplateQueryBuilder.java
@@ -20,6 +20,7 @@ package org.elasticsearch.index.query;
 
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.Template;
 
 import java.io.IOException;
 import java.util.Map;
@@ -29,51 +30,58 @@ import java.util.Map;
  * */
 public class TemplateQueryBuilder extends QueryBuilder {
 
+    /** Template to fill. */
+    private Template template;
     /** Parameters to fill the template with. */
     private Map<String, Object> vars;
     /** Template to fill.*/
-    private String template;
+    private String templateString;
 
     private ScriptService.ScriptType templateType;
 
     /**
-     * @param template the template to use for that query.
-     * @param vars the parameters to fill the template with.
+     * @param template
+     *            the template to use for that query.
      * */
+    public TemplateQueryBuilder(Template template) {
+        this.template = template;
+    }
+
+    /**
+     * @param template
+     *            the template to use for that query.
+     * @param vars
+     *            the parameters to fill the template with.
+     * @deprecated Use {@link #TemplateQueryBuilder(Template)} instead.
+     * */
+    @Deprecated
     public TemplateQueryBuilder(String template, Map<String, Object> vars) {
         this(template, ScriptService.ScriptType.INLINE, vars);
     }
 
     /**
-     * @param template the template to use for that query.
-     * @param vars the parameters to fill the template with.
-     * @param templateType what kind of template (INLINE,FILE,ID)
+     * @param template
+     *            the template to use for that query.
+     * @param vars
+     *            the parameters to fill the template with.
+     * @param templateType
+     *            what kind of template (INLINE,FILE,ID)
+     * @deprecated Use {@link #TemplateQueryBuilder(Template)} instead.
      * */
+    @Deprecated
     public TemplateQueryBuilder(String template, ScriptService.ScriptType templateType, Map<String, Object> vars) {
-        this.template = template;
-        this.vars =vars;
+        this.templateString = template;
+        this.vars = vars;
         this.templateType = templateType;
     }
 
     @Override
-    protected void doXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.startObject(TemplateQueryParser.NAME);
-        String fieldname;
-        switch(templateType){
-            case FILE:
-                fieldname = "file";
-                break;
-            case INDEXED:
-                fieldname = "id";
-                break;
-            case INLINE:
-                fieldname = TemplateQueryParser.QUERY;
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown template type " + templateType);
+    protected void doXContent(XContentBuilder builder, Params builderParams) throws IOException {
+        builder.field(TemplateQueryParser.NAME);
+        if (template == null) {
+            new Template(templateString, templateType, null, null, this.vars).toXContent(builder, builderParams);
+        } else {
+            template.toXContent(builder, builderParams);
         }
-        builder.field(fieldname, template);
-        builder.field(TemplateQueryParser.PARAMS, vars);
-        builder.endObject();
     }
 }
diff --git a/src/main/java/org/elasticsearch/index/query/TemplateQueryParser.java b/src/main/java/org/elasticsearch/index/query/TemplateQueryParser.java
index 32872f8f7a0..040df24ec9f 100644
--- a/src/main/java/org/elasticsearch/index/query/TemplateQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/TemplateQueryParser.java
@@ -22,22 +22,20 @@ import org.apache.lucene.search.Query;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.inject.Inject;
-import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.script.ExecutableScript;
 import org.elasticsearch.script.ScriptContext;
-import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptService;
-import org.elasticsearch.script.mustache.MustacheScriptEngineService;
+import org.elasticsearch.script.Template;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * In the simplest case, parse template string and variables from the request, compile the template and
- * execute the template against the given variables.
+ * In the simplest case, parse template string and variables from the request,
+ * compile the template and execute the template against the given variables.
  * */
 public class TemplateQueryParser implements QueryParser {
 
@@ -45,12 +43,10 @@ public class TemplateQueryParser implements QueryParser {
     public static final String NAME = "template";
     /** Name of query parameter containing the template string. */
     public static final String QUERY = "query";
-    /** Name of query parameter containing the template parameters. */
-    public static final String PARAMS = "params";
 
     private final ScriptService scriptService;
 
-    private final static Map<String,ScriptService.ScriptType> parametersToTypes = new HashMap<>();
+    private final static Map<String, ScriptService.ScriptType> parametersToTypes = new HashMap<>();
     static {
         parametersToTypes.put("query", ScriptService.ScriptType.INLINE);
         parametersToTypes.put("file", ScriptService.ScriptType.FILE);
@@ -64,21 +60,23 @@ public class TemplateQueryParser implements QueryParser {
 
     @Override
     public String[] names() {
-        return new String[] {NAME};
+        return new String[] { NAME };
     }
 
     /**
-     * Parses the template query replacing template parameters with provided values.
-     * Handles both submitting the template as part of the request as well as
-     * referencing only the template name.
-     * @param parseContext parse context containing the templated query.
+     * Parses the template query replacing template parameters with provided
+     * values. Handles both submitting the template as part of the request as
+     * well as referencing only the template name.
+     * 
+     * @param parseContext
+     *            parse context containing the templated query.
      */
     @Override
     @Nullable
     public Query parse(QueryParseContext parseContext) throws IOException {
         XContentParser parser = parseContext.parser();
-        TemplateContext templateContext = parse(parser, PARAMS, parametersToTypes);
-        ExecutableScript executable = this.scriptService.executable(new Script(MustacheScriptEngineService.NAME, templateContext.template(), templateContext.scriptType(), templateContext.params()), ScriptContext.Standard.SEARCH);
+        Template template = parse(parser);
+        ExecutableScript executable = this.scriptService.executable(template, ScriptContext.Standard.SEARCH);
 
         BytesReference querySource = (BytesReference) executable.run();
 
@@ -89,72 +87,20 @@ public class TemplateQueryParser implements QueryParser {
         }
     }
 
-    public static TemplateContext parse(XContentParser parser, String paramsFieldname, String ... parameters) throws IOException {
+    public static Template parse(XContentParser parser, String... parameters) throws IOException {
 
-        Map<String,ScriptService.ScriptType> parameterMap = new HashMap<>(parametersToTypes);
+        Map<String, ScriptService.ScriptType> parameterMap = new HashMap<>(parametersToTypes);
         for (String parameter : parameters) {
             parameterMap.put(parameter, ScriptService.ScriptType.INLINE);
         }
-        return parse(parser,paramsFieldname,parameterMap);
+        return parse(parser, parameterMap);
     }
 
-    public static TemplateContext parse(XContentParser parser, String paramsFieldname) throws IOException {
-        return parse(parser,paramsFieldname,parametersToTypes);
+    public static Template parse(XContentParser parser) throws IOException {
+        return parse(parser, parametersToTypes);
     }
 
-    public static TemplateContext parse(XContentParser parser, String paramsFieldname, Map<String,ScriptService.ScriptType> parameterMap) throws IOException {
-        Map<String, Object> params = null;
-        String templateNameOrTemplateContent = null;
-
-        String currentFieldName = null;
-        XContentParser.Token token;
-        ScriptService.ScriptType type = null;
-        while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
-            if (token == XContentParser.Token.FIELD_NAME) {
-                currentFieldName = parser.currentName();
-            } else if (parameterMap.containsKey(currentFieldName)) {
-                type = parameterMap.get(currentFieldName);
-                if (token == XContentParser.Token.START_OBJECT) {
-                    XContentBuilder builder = XContentBuilder.builder(parser.contentType().xContent());
-                    builder.copyCurrentStructure(parser);
-                    templateNameOrTemplateContent = builder.string();
-                } else {
-                    templateNameOrTemplateContent = parser.text();
-                }
-            } else if (paramsFieldname.equals(currentFieldName)) {
-                params = parser.map();
-            }
-        }
-
-        return new TemplateContext(type, templateNameOrTemplateContent, params);
-    }
-
-    public static class TemplateContext {
-        private Map<String, Object> params;
-        private String template;
-        private ScriptService.ScriptType type;
-
-        public TemplateContext(ScriptService.ScriptType type, String template, Map<String, Object> params) {
-            this.params = params;
-            this.template = template;
-            this.type = type;
-        }
-
-        public Map<String, Object> params() {
-            return params;
-        }
-
-        public String template() {
-            return template;
-        }
-
-        public ScriptService.ScriptType scriptType(){
-            return type;
-        }
-
-        @Override
-        public String toString(){
-            return type + " " + template;
-        }
+    public static Template parse(XContentParser parser, Map<String, ScriptService.ScriptType> parameterMap) throws IOException {
+        return Template.parse(parser, parameterMap);
     }
 }
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java b/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java
index 8ae38b5008f..ef9865395b3 100644
--- a/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java
+++ b/src/main/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilders.java
@@ -27,6 +27,7 @@ import org.elasticsearch.index.query.functionscore.lin.LinearDecayFunctionBuilde
 import org.elasticsearch.index.query.functionscore.random.RandomScoreFunctionBuilder;
 import org.elasticsearch.index.query.functionscore.script.ScriptScoreFunctionBuilder;
 import org.elasticsearch.index.query.functionscore.weight.WeightBuilder;
+import org.elasticsearch.script.Script;
 
 import java.util.Map;
 
@@ -56,18 +57,38 @@ public class ScoreFunctionBuilders {
         return new LinearDecayFunctionBuilder(fieldName, null, scale);
     }
 
+    public static ScriptScoreFunctionBuilder scriptFunction(Script script) {
+        return (new ScriptScoreFunctionBuilder()).script(script);
+    }
+
+    /**
+     * @deprecated Use {@link #scriptFunction(Script)} instead.
+     */
+    @Deprecated
     public static ScriptScoreFunctionBuilder scriptFunction(String script) {
         return (new ScriptScoreFunctionBuilder()).script(script);
     }
 
+    /**
+     * @deprecated Use {@link #scriptFunction(Script)} instead.
+     */
+    @Deprecated
     public static ScriptScoreFunctionBuilder scriptFunction(String script, String lang) {
         return (new ScriptScoreFunctionBuilder()).script(script).lang(lang);
     }
 
+    /**
+     * @deprecated Use {@link #scriptFunction(Script)} instead.
+     */
+    @Deprecated
     public static ScriptScoreFunctionBuilder scriptFunction(String script, String lang, Map<String, Object> params) {
         return (new ScriptScoreFunctionBuilder()).script(script).lang(lang).params(params);
     }
 
+    /**
+     * @deprecated Use {@link #scriptFunction(Script)} instead.
+     */
+    @Deprecated
     public static ScriptScoreFunctionBuilder scriptFunction(String script, Map<String, Object> params) {
         return (new ScriptScoreFunctionBuilder()).script(script).params(params);
     }
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/script/ScriptScoreFunctionBuilder.java b/src/main/java/org/elasticsearch/index/query/functionscore/script/ScriptScoreFunctionBuilder.java
index 3f715512bab..20dca88788a 100644
--- a/src/main/java/org/elasticsearch/index/query/functionscore/script/ScriptScoreFunctionBuilder.java
+++ b/src/main/java/org/elasticsearch/index/query/functionscore/script/ScriptScoreFunctionBuilder.java
@@ -19,12 +19,13 @@
 
 package org.elasticsearch.index.query.functionscore.script;
 
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
-
-import com.google.common.collect.Maps;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.Script.ScriptField;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -33,7 +34,9 @@ import java.util.Map;
  */
 public class ScriptScoreFunctionBuilder extends ScoreFunctionBuilder {
 
-    private String script;
+    private Script script;
+
+    private String scriptString;
 
     private String lang;
 
@@ -43,22 +46,35 @@ public class ScriptScoreFunctionBuilder extends ScoreFunctionBuilder {
 
     }
 
-    public ScriptScoreFunctionBuilder script(String script) {
+    public ScriptScoreFunctionBuilder script(Script script) {
         this.script = script;
         return this;
     }
 
     /**
-     * Sets the language of the script.
+     * @deprecated Use {@link #script(Script)} instead
      */
+    @Deprecated
+    public ScriptScoreFunctionBuilder script(String script) {
+        this.scriptString = script;
+        return this;
+    }
+
+    /**
+     * Sets the language of the script.@deprecated Use {@link #script(Script)}
+     * instead
+     */
+    @Deprecated
     public ScriptScoreFunctionBuilder lang(String lang) {
         this.lang = lang;
         return this;
     }
 
     /**
-     * Additional parameters that can be provided to the script.
+     * Additional parameters that can be provided to the script.@deprecated Use
+     * {@link #script(Script)} instead
      */
+    @Deprecated
     public ScriptScoreFunctionBuilder params(Map<String, Object> params) {
         if (this.params == null) {
             this.params = params;
@@ -69,11 +85,13 @@ public class ScriptScoreFunctionBuilder extends ScoreFunctionBuilder {
     }
 
     /**
-     * Additional parameters that can be provided to the script.
+     * Additional parameters that can be provided to the script.@deprecated Use
+     * {@link #script(Script)} instead
      */
+    @Deprecated
     public ScriptScoreFunctionBuilder param(String key, Object value) {
         if (params == null) {
-            params = Maps.newHashMap();
+            params = new HashMap<>();
         }
         params.put(key, value);
         return this;
@@ -82,12 +100,18 @@ public class ScriptScoreFunctionBuilder extends ScoreFunctionBuilder {
     @Override
     public void doXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject(getName());
-        builder.field("script", script);
-        if (lang != null) {
-            builder.field("lang", lang);
-        }
-        if (this.params != null) {
-            builder.field("params", this.params);
+        if (script != null) {
+            builder.field(ScriptField.SCRIPT.getPreferredName(), script);
+        } else {
+            if (scriptString != null) {
+                builder.field("script", scriptString);
+            }
+            if (lang != null) {
+                builder.field("lang", lang);
+            }
+            if (this.params != null) {
+                builder.field("params", this.params);
+            }
         }
         builder.endObject();
     }
diff --git a/src/main/java/org/elasticsearch/index/query/functionscore/script/ScriptScoreFunctionParser.java b/src/main/java/org/elasticsearch/index/query/functionscore/script/ScriptScoreFunctionParser.java
index b01eaee3615..72a592da5b3 100644
--- a/src/main/java/org/elasticsearch/index/query/functionscore/script/ScriptScoreFunctionParser.java
+++ b/src/main/java/org/elasticsearch/index/query/functionscore/script/ScriptScoreFunctionParser.java
@@ -29,15 +29,17 @@ import org.elasticsearch.index.query.QueryParseContext;
 import org.elasticsearch.index.query.QueryParsingException;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionParser;
 import org.elasticsearch.script.Script;
+import org.elasticsearch.script.Script.ScriptField;
 import org.elasticsearch.script.ScriptContext;
 import org.elasticsearch.script.ScriptParameterParser;
 import org.elasticsearch.script.ScriptParameterParser.ScriptParameterValue;
-import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.script.SearchScript;
 
 import java.io.IOException;
 import java.util.Map;
 
+import static com.google.common.collect.Maps.newHashMap;
+
 /**
  *
  */
@@ -57,16 +59,17 @@ public class ScriptScoreFunctionParser implements ScoreFunctionParser {
     @Override
     public ScoreFunction parse(QueryParseContext parseContext, XContentParser parser) throws IOException, QueryParsingException {
         ScriptParameterParser scriptParameterParser = new ScriptParameterParser();
-        String script = null;
+        Script script = null;
         Map<String, Object> vars = null;
-        ScriptService.ScriptType scriptType = null;
         String currentFieldName = null;
         XContentParser.Token token;
         while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
             if (token == XContentParser.Token.FIELD_NAME) {
                 currentFieldName = parser.currentName();
             } else if (token == XContentParser.Token.START_OBJECT) {
-                if ("params".equals(currentFieldName)) {
+                if (ScriptField.SCRIPT.match(currentFieldName)) {
+                    script = Script.parse(parser);
+                } else if ("params".equals(currentFieldName)) { // TODO remove in 2.0 (here to support old script APIs)
                     vars = parser.map();
                 } else {
                     throw new QueryParsingException(parseContext, NAMES[0] + " query does not support [" + currentFieldName + "]");
@@ -78,19 +81,26 @@ public class ScriptScoreFunctionParser implements ScoreFunctionParser {
             }
         }
 
-        ScriptParameterValue scriptValue = scriptParameterParser.getDefaultScriptParameterValue();
-        if (scriptValue != null) {
-            script = scriptValue.script();
-            scriptType = scriptValue.scriptType();
+        if (script == null) { // Didn't find anything using the new API so try using the old one instead
+            ScriptParameterValue scriptValue = scriptParameterParser.getDefaultScriptParameterValue();
+            if (scriptValue != null) {
+                if (vars == null) {
+                    vars = newHashMap();
+                }
+                script = new Script(scriptValue.script(), scriptValue.scriptType(), scriptParameterParser.lang(), vars);
+            }
+        } else if (vars != null) {
+            throw new QueryParsingException(parseContext, "script params must be specified inside script object");
         }
+
         if (script == null) {
             throw new QueryParsingException(parseContext, NAMES[0] + " requires 'script' field");
         }
 
         SearchScript searchScript;
         try {
-            searchScript = parseContext.scriptService().search(parseContext.lookup(), new Script(scriptParameterParser.lang(), script, scriptType, vars), ScriptContext.Standard.SEARCH);
-            return new ScriptScoreFunction(script, vars, searchScript);
+            searchScript = parseContext.scriptService().search(parseContext.lookup(), script, ScriptContext.Standard.SEARCH);
+            return new ScriptScoreFunction(script, searchScript);
         } catch (Exception e) {
             throw new QueryParsingException(parseContext, NAMES[0] + " the script could not be loaded", e);
         }
diff --git a/src/main/java/org/elasticsearch/index/query/support/BaseInnerHitBuilder.java b/src/main/java/org/elasticsearch/index/query/support/BaseInnerHitBuilder.java
index 0987e5dd4f6..8e991c8f130 100644
--- a/src/main/java/org/elasticsearch/index/query/support/BaseInnerHitBuilder.java
+++ b/src/main/java/org/elasticsearch/index/query/support/BaseInnerHitBuilder.java
@@ -23,6 +23,7 @@ import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.highlight.HighlightBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
@@ -148,33 +149,60 @@ public abstract class BaseInnerHitBuilder<T extends BaseInnerHitBuilder> impleme
      * @param name   The name that will represent this value in the return hit
      * @param script The script to use
      */
+    public T addScriptField(String name, Script script) {
+        sourceBuilder().scriptField(name, script);
+        return (T) this;
+    }
+
+    /**
+     * Adds a script based field to load and return. The field does not have to
+     * be stored, but its recommended to use non analyzed or numeric fields.
+     *
+     * @param name
+     *            The name that will represent this value in the return hit
+     * @param script
+     *            The script to use
+     * @deprecated Use {@link #addScriptField(String, Script)} instead.
+     */
+    @Deprecated
     public T addScriptField(String name, String script) {
         sourceBuilder().scriptField(name, script);
         return (T) this;
     }
 
     /**
-     * Adds a script based field to load and return. The field does not have to be stored,
-     * but its recommended to use non analyzed or numeric fields.
+     * Adds a script based field to load and return. The field does not have to
+     * be stored, but its recommended to use non analyzed or numeric fields.
      *
-     * @param name   The name that will represent this value in the return hit
-     * @param script The script to use
-     * @param params Parameters that the script can use.
+     * @param name
+     *            The name that will represent this value in the return hit
+     * @param script
+     *            The script to use
+     * @param params
+     *            Parameters that the script can use.
+     * @deprecated Use {@link #addScriptField(String, Script)} instead.
      */
+    @Deprecated
     public T addScriptField(String name, String script, Map<String, Object> params) {
         sourceBuilder().scriptField(name, script, params);
         return (T) this;
     }
 
     /**
-     * Adds a script based field to load and return. The field does not have to be stored,
-     * but its recommended to use non analyzed or numeric fields.
+     * Adds a script based field to load and return. The field does not have to
+     * be stored, but its recommended to use non analyzed or numeric fields.
      *
-     * @param name   The name that will represent this value in the return hit
-     * @param lang   The language of the script
-     * @param script The script to use
-     * @param params Parameters that the script can use (can be <tt>null</tt>).
+     * @param name
+     *            The name that will represent this value in the return hit
+     * @param lang
+     *            The language of the script
+     * @param script
+     *            The script to use
+     * @param params
+     *            Parameters that the script can use (can be <tt>null</tt>).
+     * @deprecated Use {@link #addScriptField(String, Script)} instead.
      */
+    @Deprecated
     public T addScriptField(String name, String lang, String script, Map<String, Object> params) {
         sourceBuilder().scriptField(name, lang, script, params);
         return (T) this;
diff --git a/src/main/java/org/elasticsearch/rest/action/update/RestUpdateAction.java b/src/main/java/org/elasticsearch/rest/action/update/RestUpdateAction.java
index d019e598cac..a23780db62e 100644
--- a/src/main/java/org/elasticsearch/rest/action/update/RestUpdateAction.java
+++ b/src/main/java/org/elasticsearch/rest/action/update/RestUpdateAction.java
@@ -31,12 +31,20 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentBuilderString;
 import org.elasticsearch.index.VersionType;
-import org.elasticsearch.rest.*;
+import org.elasticsearch.rest.BaseRestHandler;
+import org.elasticsearch.rest.BytesRestResponse;
+import org.elasticsearch.rest.RestChannel;
+import org.elasticsearch.rest.RestController;
+import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.RestResponse;
+import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.rest.action.support.RestActions;
 import org.elasticsearch.rest.action.support.RestBuilderListener;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptParameterParser;
 import org.elasticsearch.script.ScriptParameterParser.ScriptParameterValue;
 
+import java.util.HashMap;
 import java.util.Map;
 
 import static org.elasticsearch.rest.RestRequest.Method.POST;
@@ -68,16 +76,13 @@ public class RestUpdateAction extends BaseRestHandler {
         scriptParameterParser.parseParams(request);
         ScriptParameterValue scriptValue = scriptParameterParser.getDefaultScriptParameterValue();
         if (scriptValue != null) {
-            updateRequest.script(scriptValue.script(), scriptValue.scriptType());
-        }
-        String scriptLang = scriptParameterParser.lang();
-        if (scriptLang != null) {
-            updateRequest.scriptLang(scriptLang);
-        }
-        for (Map.Entry<String, String> entry : request.params().entrySet()) {
-            if (entry.getKey().startsWith("sp_")) {
-                updateRequest.addScriptParam(entry.getKey().substring(3), entry.getValue());
+            Map<String, Object> scriptParams = new HashMap<>();
+            for (Map.Entry<String, String> entry : request.params().entrySet()) {
+                if (entry.getKey().startsWith("sp_")) {
+                    scriptParams.put(entry.getKey().substring(3), entry.getValue());
+                }
             }
+            updateRequest.script(new Script(scriptValue.script(), scriptValue.scriptType(), scriptParameterParser.lang(), scriptParams));
         }
         String sField = request.param("fields");
         if (sField != null) {
diff --git a/src/main/java/org/elasticsearch/script/AbstractScriptParser.java b/src/main/java/org/elasticsearch/script/AbstractScriptParser.java
new file mode 100644
index 00000000000..8198dd18ebc
--- /dev/null
+++ b/src/main/java/org/elasticsearch/script/AbstractScriptParser.java
@@ -0,0 +1,196 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.script;
+
+import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.script.Script.ScriptField;
+import org.elasticsearch.script.Script.ScriptParseException;
+import org.elasticsearch.script.ScriptService.ScriptType;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+public abstract class AbstractScriptParser<S extends Script> {
+
+    protected abstract String parseInlineScript(XContentParser parser) throws IOException;
+
+    protected abstract S createScript(String script, ScriptType type, String lang, Map<String, Object> params);
+
+    protected abstract S createSimpleScript(XContentParser parser) throws IOException;
+
+    @Deprecated
+    protected Map<String, ScriptType> getAdditionalScriptParameters() {
+        return Collections.emptyMap();
+    }
+
+    public S parse(XContentParser parser) throws IOException {
+
+        XContentParser.Token token = parser.currentToken();
+        // If the parser hasn't yet been pushed to the first token, do it now
+        if (token == null) {
+            token = parser.nextToken();
+        }
+
+        if (token == XContentParser.Token.VALUE_STRING) {
+            return createSimpleScript(parser);
+        }
+        if (token != XContentParser.Token.START_OBJECT) {
+            throw new ScriptParseException("expected a string value or an object, but found [{}] instead", token);
+        }
+
+        String script = null;
+        ScriptType type = null;
+        String lang = getDefaultScriptLang();
+        Map<String, Object> params = null;
+
+        String currentFieldName = null;
+        while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
+            if (token == XContentParser.Token.FIELD_NAME) {
+                currentFieldName = parser.currentName();
+            } else if (ScriptType.INLINE.getParseField().match(currentFieldName) || ScriptService.SCRIPT_INLINE.match(currentFieldName)) {
+                type = ScriptType.INLINE;
+                script = parseInlineScript(parser);
+            } else if (ScriptType.FILE.getParseField().match(currentFieldName) || ScriptService.SCRIPT_FILE.match(currentFieldName)) {
+                type = ScriptType.FILE;
+                if (token == XContentParser.Token.VALUE_STRING) {
+                    script = parser.text();
+                } else {
+                    throw new ScriptParseException("expected a string value for field [{}], but found [{}]", currentFieldName, token);
+                }
+            } else if (ScriptType.INDEXED.getParseField().match(currentFieldName) || ScriptService.SCRIPT_ID.match(currentFieldName)) {
+                type = ScriptType.INDEXED;
+                if (token == XContentParser.Token.VALUE_STRING) {
+                    script = parser.text();
+                } else {
+                    throw new ScriptParseException("expected a string value for field [{}], but found [{}]", currentFieldName, token);
+                }
+            } else if (ScriptField.LANG.match(currentFieldName) || ScriptService.SCRIPT_LANG.match(currentFieldName)) {
+                if (token == XContentParser.Token.VALUE_STRING) {
+                    lang = parser.text();
+                } else {
+                    throw new ScriptParseException("expected a string value for field [{}], but found [{}]", currentFieldName, token);
+                }
+            } else if (ScriptField.PARAMS.match(currentFieldName)) {
+                if (token == XContentParser.Token.START_OBJECT) {
+                    params = parser.map();
+                } else {
+                    throw new ScriptParseException("expected an object for field [{}], but found [{}]", currentFieldName, token);
+                }
+            } else {
+                // TODO remove this in 2.0
+                ScriptType paramScriptType = getAdditionalScriptParameters().get(currentFieldName);
+                if (paramScriptType != null) {
+                    script = parseInlineScript(parser);
+                    type = paramScriptType;
+                } else {
+                    throw new ScriptParseException("unexpected field [{}]", currentFieldName);
+                }
+            }
+        }
+        if (script == null) {
+            throw new ScriptParseException("expected one of [{}], [{}] or [{}] fields, but found none", ScriptType.INLINE.getParseField()
+                    .getPreferredName(), ScriptType.FILE.getParseField().getPreferredName(), ScriptType.INDEXED.getParseField()
+                    .getPreferredName());
+        }
+        assert type != null : "if script is not null, type should definitely not be null";
+        return createScript(script, type, lang, params);
+
+    }
+
+    /**
+     * @return the default script language for this parser or <code>null</code>
+     *         to use the default set in the ScriptService
+     */
+    protected String getDefaultScriptLang() {
+        return null;
+    }
+
+    public Script parse(Map<String, Object> config, boolean removeMatchedEntries) {
+        String script = null;
+        ScriptType type = null;
+        String lang = null;
+        Map<String, Object> params = null;
+        for (Iterator<Entry<String, Object>> itr = config.entrySet().iterator(); itr.hasNext();) {
+            Entry<String, Object> entry = itr.next();
+            String parameterName = entry.getKey();
+            Object parameterValue = entry.getValue();
+            if (ScriptField.LANG.match(parameterName) || ScriptService.SCRIPT_LANG.match(parameterName)) {
+                if (parameterValue instanceof String || parameterValue == null) {
+                    lang = (String) parameterValue;
+                    if (removeMatchedEntries) {
+                        itr.remove();
+                    }
+                } else {
+                    throw new ScriptParseException("Value must be of type String: [" + parameterName + "]");
+                }
+            } else if (ScriptField.PARAMS.match(parameterName)) {
+                if (parameterValue instanceof Map || parameterValue == null) {
+                    params = (Map<String, Object>) parameterValue;
+                    if (removeMatchedEntries) {
+                        itr.remove();
+                    }
+                } else {
+                    throw new ScriptParseException("Value must be of type String: [" + parameterName + "]");
+                }
+            } else if (ScriptType.INLINE.getParseField().match(parameterName) || ScriptService.SCRIPT_INLINE.match(parameterName)) {
+                if (parameterValue instanceof String || parameterValue == null) {
+                    script = (String) parameterValue;
+                    type = ScriptType.INLINE;
+                    if (removeMatchedEntries) {
+                        itr.remove();
+                    }
+                } else {
+                    throw new ScriptParseException("Value must be of type String: [" + parameterName + "]");
+                }
+            } else if (ScriptType.FILE.getParseField().match(parameterName) || ScriptService.SCRIPT_FILE.match(parameterName)) {
+                if (parameterValue instanceof String || parameterValue == null) {
+                    script = (String) parameterValue;
+                    type = ScriptType.FILE;
+                    if (removeMatchedEntries) {
+                        itr.remove();
+                    }
+                } else {
+                    throw new ScriptParseException("Value must be of type String: [" + parameterName + "]");
+                }
+            } else if (ScriptType.INDEXED.getParseField().match(parameterName) || ScriptService.SCRIPT_ID.match(parameterName)) {
+                if (parameterValue instanceof String || parameterValue == null) {
+                    script = (String) parameterValue;
+                    type = ScriptType.INDEXED;
+                    if (removeMatchedEntries) {
+                        itr.remove();
+                    }
+                } else {
+                    throw new ScriptParseException("Value must be of type String: [" + parameterName + "]");
+                }
+            }
+        }
+        if (script == null) {
+            throw new ScriptParseException("expected one of [{}], [{}] or [{}] fields, but found none", ScriptType.INLINE.getParseField()
+                    .getPreferredName(), ScriptType.FILE.getParseField().getPreferredName(), ScriptType.INDEXED.getParseField()
+                    .getPreferredName());
+        }
+        assert type != null : "if script is not null, type should definitely not be null";
+        return createScript(script, type, lang, params);
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/elasticsearch/script/Script.java b/src/main/java/org/elasticsearch/script/Script.java
index 655ff82c08e..d826eaad8ed 100644
--- a/src/main/java/org/elasticsearch/script/Script.java
+++ b/src/main/java/org/elasticsearch/script/Script.java
@@ -19,52 +19,93 @@
 
 package org.elasticsearch.script;
 
+import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.common.Nullable;
+import org.elasticsearch.common.ParseField;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.io.stream.Streamable;
+import org.elasticsearch.common.logging.support.LoggerMessageFormat;
+import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.script.ScriptService.ScriptType;
+
+import java.io.IOException;
 import java.util.Map;
 
-
-import static org.elasticsearch.script.ScriptService.ScriptType;
-
 /**
  * Script holds all the parameters necessary to compile or find in cache and then execute a script.
  */
-public class Script {
+public class Script implements ToXContent, Streamable {
 
-    private final String lang;
-    private final String script;
-    private final ScriptType type;
-    private final Map<String, Object> params;
+    public static final ScriptType DEFAULT_TYPE = ScriptType.INLINE;
+    private static final ScriptParser PARSER = new ScriptParser();
+
+    private String script;
+    private @Nullable ScriptType type;
+    private @Nullable String lang;
+    private @Nullable Map<String, Object> params;
+
+    /**
+     * For Serialization
+     */
+    Script() {
+    }
+
+    /**
+     * Constructor for simple inline script. The script will have no lang or
+     * params set.
+     * 
+     * @param script
+     *            The inline script to execute.
+     */
+    public Script(String script) {
+        if (script == null) {
+            throw new IllegalArgumentException("The parameter script (String) must not be null in Script.");
+        }
+        this.script = script;
+    }
+
+    /**
+     * For sub-classes to use to override the default language
+     */
+    protected Script(String script, String lang) {
+        if (script == null) {
+            throw new IllegalArgumentException("The parameter script (String) must not be null in Script.");
+        }
+        this.script = script;
+        this.lang = lang;
+    }
 
     /**
      * Constructor for Script.
-     * @param lang The language of the script to be compiled/executed.
-     * @param script The cache key of the script to be compiled/executed.  For dynamic scripts this is the actual
-     *               script source code.  For indexed scripts this is the id used in the request.  For on disk scripts
-     *               this is the file name.
-     * @param type The type of script -- dynamic, indexed, or file.
-     * @param params The map of parameters the script will be executed with.
+     * 
+     * @param script
+     *            The cache key of the script to be compiled/executed. For
+     *            inline scripts this is the actual script source code. For
+     *            indexed scripts this is the id used in the request. For on
+     *            file scripts this is the file name.
+     * @param type
+     *            The type of script -- dynamic, indexed, or file.
+     * @param lang
+     *            The language of the script to be compiled/executed.
+     * @param params
+     *            The map of parameters the script will be executed with.
      */
-    public Script(String lang, String script, ScriptType type, Map<String, Object> params) {
+    public Script(String script, ScriptType type, @Nullable String lang, @Nullable Map<String, Object> params) {
         if (script == null) {
             throw new IllegalArgumentException("The parameter script (String) must not be null in Script.");
         }
         if (type == null) {
             throw new IllegalArgumentException("The parameter type (ScriptType) must not be null in Script.");
         }
-
-        this.lang = lang;
         this.script = script;
         this.type = type;
+        this.lang = lang;
         this.params = params;
     }
 
-    /**
-     * Method for getting language.
-     * @return The language of the script to be compiled/executed.
-     */
-    public String getLang() {
-        return lang;
-    }
-
     /**
      * Method for getting the script.
      * @return The cache key of the script to be compiled/executed.  For dynamic scripts this is the actual
@@ -77,17 +118,190 @@ public class Script {
 
     /**
      * Method for getting the type.
-     * @return The type of script -- dynamic, indexed, or file.
+     * 
+     * @return The type of script -- inline, indexed, or file.
      */
     public ScriptType getType() {
-        return type;
+        return type == null ? DEFAULT_TYPE : type;
+    }
+
+    /**
+     * Method for getting language.
+     * 
+     * @return The language of the script to be compiled/executed.
+     */
+    public String getLang() {
+        return lang;
     }
 
     /**
      * Method for getting the parameters.
+     * 
      * @return The map of parameters the script will be executed with.
      */
     public Map<String, Object> getParams() {
         return params;
     }
+
+    @Override
+    public final void readFrom(StreamInput in) throws IOException {
+        script = in.readString();
+        if (in.readBoolean()) {
+            type = ScriptType.readFrom(in);
+        }
+        lang = in.readOptionalString();
+        if (in.readBoolean()) {
+            params = in.readMap();
+        }
+        doReadFrom(in);
+    }
+
+    protected void doReadFrom(StreamInput in) throws IOException {
+        // For sub-classes to Override
+    }
+
+    @Override
+    public final void writeTo(StreamOutput out) throws IOException {
+        out.writeString(script);
+        boolean hasType = type != null;
+        out.writeBoolean(hasType);
+        if (hasType) {
+            ScriptType.writeTo(type, out);
+        }
+        out.writeOptionalString(lang);
+        boolean hasParams = params != null;
+        out.writeBoolean(hasParams);
+        if (hasParams) {
+            out.writeMap(params);
+        }
+        doWriteTo(out);
+    }
+
+    protected void doWriteTo(StreamOutput out) throws IOException {
+        // For sub-classes to Override
+    }
+
+    @Override
+    public final XContentBuilder toXContent(XContentBuilder builder, Params builderParams) throws IOException {
+        if (type == null) {
+            return builder.value(script);
+        }
+
+        builder.startObject();
+        scriptFieldToXContent(script, type, builder, builderParams);
+        if (lang != null) {
+            builder.field(ScriptField.LANG.getPreferredName(), lang);
+        }
+        if (params != null) {
+            builder.field(ScriptField.PARAMS.getPreferredName(), params);
+        }
+        builder.endObject();
+        return builder;
+    }
+
+    protected XContentBuilder scriptFieldToXContent(String script, ScriptType type, XContentBuilder builder, Params builderParams)
+            throws IOException {
+        builder.field(type.getParseField().getPreferredName(), script);
+        return builder;
+    }
+
+    public static Script readScript(StreamInput in) throws IOException {
+        Script script = new Script();
+        script.readFrom(in);
+        return script;
+    }
+
+    public static Script parse(Map<String, Object> config, boolean removeMatchedEntries) {
+        return PARSER.parse(config, removeMatchedEntries);
+    }
+
+    public static Script parse(XContentParser parser) throws IOException {
+        return PARSER.parse(parser);
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((lang == null) ? 0 : lang.hashCode());
+        result = prime * result + ((params == null) ? 0 : params.hashCode());
+        result = prime * result + ((script == null) ? 0 : script.hashCode());
+        result = prime * result + ((type == null) ? 0 : type.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Script other = (Script) obj;
+        if (lang == null) {
+            if (other.lang != null)
+                return false;
+        } else if (!lang.equals(other.lang))
+            return false;
+        if (params == null) {
+            if (other.params != null)
+                return false;
+        } else if (!params.equals(other.params))
+            return false;
+        if (script == null) {
+            if (other.script != null)
+                return false;
+        } else if (!script.equals(other.script))
+            return false;
+        if (type != other.type)
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "[script: " + script + ", type: " + type.getParseField().getPreferredName() + ", lang: " + lang + ", params: " + params
+                + "]";
+    }
+
+    private static class ScriptParser extends AbstractScriptParser<Script> {
+
+        @Override
+        protected Script createSimpleScript(XContentParser parser) throws IOException {
+            if (parser.currentToken() == XContentParser.Token.VALUE_STRING) {
+                return new Script(parser.text());
+            } else {
+                throw new ScriptParseException("expected a string value for field [{}], but found [{}]", parser.currentName(),
+                        parser.currentToken());
+            }
+        }
+
+        @Override
+        protected Script createScript(String script, ScriptType type, String lang, Map<String, Object> params) {
+            return new Script(script, type, lang, params);
+        }
+
+        @Override
+        protected String parseInlineScript(XContentParser parser) throws IOException {
+            return parser.text();
+        }
+    }
+
+    public static interface ScriptField {
+        ParseField SCRIPT = new ParseField("script");
+        ParseField LANG = new ParseField("lang");
+        ParseField PARAMS = new ParseField("params");
+    }
+
+    public static class ScriptParseException extends ElasticsearchException {
+
+        public ScriptParseException(String msg, Object... args) {
+            super(LoggerMessageFormat.format(msg, args));
+        }
+
+        public ScriptParseException(String msg, Throwable cause, Object... args) {
+            super(LoggerMessageFormat.format(msg, args), cause);
+        }
+    }
 }
diff --git a/src/main/java/org/elasticsearch/script/ScriptParameterParser.java b/src/main/java/org/elasticsearch/script/ScriptParameterParser.java
index 8addcd6ebc7..8588c405585 100644
--- a/src/main/java/org/elasticsearch/script/ScriptParameterParser.java
+++ b/src/main/java/org/elasticsearch/script/ScriptParameterParser.java
@@ -19,10 +19,10 @@
 
 package org.elasticsearch.script;
 
-import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.xcontent.ToXContent.Params;
 import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.script.Script.ScriptParseException;
 import org.elasticsearch.script.ScriptService.ScriptType;
 
 import java.io.IOException;
@@ -113,7 +113,7 @@ public class ScriptParameterParser {
                        itr.remove();
                    }
                 } else {
-                   throw new ScriptParameterParseException("Value must be of type String: [" + parameterName + "]");
+                    throw new ScriptParseException("Value must be of type String: [" + parameterName + "]");
                }
             } else {
                 for (ParseField parameter : inlineParameters) {
@@ -123,7 +123,7 @@ public class ScriptParameterParser {
                         if (parameterValue instanceof String) {
                             stringValue = (String) parameterValue;
                         } else {
-                            throw new ScriptParameterParseException("Value must be of type String: [" + parameterName + "]");
+                            throw new ScriptParseException("Value must be of type String: [" + parameterName + "]");
                         }
                         putParameterValue(coreParameterName, stringValue, ScriptType.INLINE);
                         if (removeMatchedEntries) {
@@ -138,7 +138,7 @@ public class ScriptParameterParser {
                         if (parameterValue instanceof String) {
                             stringValue = (String) parameterValue;
                         } else {
-                            throw new ScriptParameterParseException("Value must be of type String: [" + parameterName + "]");
+                            throw new ScriptParseException("Value must be of type String: [" + parameterName + "]");
                         }
                         putParameterValue(coreParameterName, stringValue, ScriptType.FILE);
                         if (removeMatchedEntries) {
@@ -153,7 +153,7 @@ public class ScriptParameterParser {
                         if (parameterValue instanceof String) {
                             stringValue = (String) parameterValue;
                         } else {
-                            throw new ScriptParameterParseException("Value must be of type String: [" + parameterName + "]");
+                            throw new ScriptParseException("Value must be of type String: [" + parameterName + "]");
                         }
                         putParameterValue(coreParameterName, stringValue, ScriptType.INDEXED);
                         if (removeMatchedEntries) {
@@ -169,7 +169,7 @@ public class ScriptParameterParser {
         if (parameterValues.get(coreParameterName) == null) {
             parameterValues.put(coreParameterName, new ScriptParameterValue(script, scriptType));
         } else {
-            throw new ScriptParameterParseException("Only one of [" + coreParameterName + ", " + coreParameterName
+            throw new ScriptParseException("Only one of [" + coreParameterName + ", " + coreParameterName
                     + FILE_SUFFIX + ", " + coreParameterName + INDEXED_SUFFIX + "] is allowed.");
         }
     }
@@ -231,11 +231,4 @@ public class ScriptParameterParser {
             return scriptType;
         }
     }
-
-    public static class ScriptParameterParseException extends ElasticsearchException {
-
-        public ScriptParameterParseException(String msg) {
-            super(msg);
-        }
-    }
 }
diff --git a/src/main/java/org/elasticsearch/script/ScriptService.java b/src/main/java/org/elasticsearch/script/ScriptService.java
index 3bbec6b225e..f0a50189cd2 100644
--- a/src/main/java/org/elasticsearch/script/ScriptService.java
+++ b/src/main/java/org/elasticsearch/script/ScriptService.java
@@ -103,9 +103,25 @@ public class ScriptService extends AbstractComponent implements Closeable {
 
     private Client client = null;
 
+    /**
+     * @deprecated Use {@link ScriptField} instead. This should be removed in
+     *             2.0
+     */
     public static final ParseField SCRIPT_LANG = new ParseField("lang","script_lang");
+    /**
+     * @deprecated Use {@link ScriptType#getParseField()} instead. This should
+     *             be removed in 2.0
+     */
     public static final ParseField SCRIPT_FILE = new ParseField("script_file");
+    /**
+     * @deprecated Use {@link ScriptType#getParseField()} instead. This should
+     *             be removed in 2.0
+     */
     public static final ParseField SCRIPT_ID = new ParseField("script_id");
+    /**
+     * @deprecated Use {@link ScriptType#getParseField()} instead. This should
+     *             be removed in 2.0
+     */
     public static final ParseField SCRIPT_INLINE = new ParseField("script");
 
     @Inject
@@ -300,24 +316,27 @@ public class ScriptService extends AbstractComponent implements Closeable {
     private void validate(BytesReference scriptBytes, String scriptLang) {
         try {
             XContentParser parser = XContentFactory.xContent(scriptBytes).createParser(scriptBytes);
-            TemplateQueryParser.TemplateContext context = TemplateQueryParser.parse(parser, "params", "script", "template");
-            if (Strings.hasLength(context.template())){
+            parser.nextToken();
+            Template template = TemplateQueryParser.parse(parser, "params", "script", "template");
+            if (Strings.hasLength(template.getScript())) {
                 //Just try and compile it
                 //This will have the benefit of also adding the script to the cache if it compiles
                 try {
                     //we don't know yet what the script will be used for, but if all of the operations for this lang with
                     //indexed scripts are disabled, it makes no sense to even compile it and cache it.
                     if (isAnyScriptContextEnabled(scriptLang, getScriptEngineServiceForLang(scriptLang), ScriptType.INDEXED)) {
-                        CompiledScript compiledScript = compileInternal(new Script(scriptLang, context.template(), ScriptType.INLINE, null));
+                        CompiledScript compiledScript = compileInternal(template);
                         if (compiledScript == null) {
-                            throw new IllegalArgumentException("Unable to parse [" + context.template() +
+                            throw new IllegalArgumentException("Unable to parse [" + template.getScript() +
                                     "] lang [" + scriptLang + "] (ScriptService.compile returned null)");
                         }
                     } else {
-                        logger.warn("skipping compile of script [{}], lang [{}] as all scripted operations are disabled for indexed scripts", context.template(), scriptLang);
+                        logger.warn(
+                                "skipping compile of script [{}], lang [{}] as all scripted operations are disabled for indexed scripts",
+                                template.getScript(), scriptLang);
                     }
                 } catch (Exception e) {
-                    throw new IllegalArgumentException("Unable to parse [" + context.template() +
+                    throw new IllegalArgumentException("Unable to parse [" + template.getScript() +
                             "] lang [" + scriptLang + "]", e);
                 }
             } else {
@@ -524,49 +543,41 @@ public class ScriptService extends AbstractComponent implements Closeable {
      */
     public static enum ScriptType {
 
-        INLINE,
-        INDEXED,
-        FILE;
+        INLINE(0, "inline"),
+        INDEXED(1, "id"),
+        FILE(2, "file");
 
-        private static final int INLINE_VAL = 0;
-        private static final int INDEXED_VAL = 1;
-        private static final int FILE_VAL = 2;
+        private final int val;
+        private final ParseField parseField;
 
         public static ScriptType readFrom(StreamInput in) throws IOException {
             int scriptTypeVal = in.readVInt();
-            switch (scriptTypeVal) {
-                case INDEXED_VAL:
-                    return INDEXED;
-                case INLINE_VAL:
-                    return INLINE;
-                case FILE_VAL:
-                    return FILE;
-                default:
-                    throw new IllegalArgumentException("Unexpected value read for ScriptType got [" + scriptTypeVal +
-                            "] expected one of [" + INLINE_VAL + "," + INDEXED_VAL + "," + FILE_VAL + "]");
+            for (ScriptType type : values()) {
+                if (type.val == scriptTypeVal) {
+                    return type;
+                }
             }
+            throw new IllegalArgumentException("Unexpected value read for ScriptType got [" + scriptTypeVal + "] expected one of ["
+                    + INLINE.val + "," + FILE.val + "," + INDEXED.val + "]");
         }
 
         public static void writeTo(ScriptType scriptType, StreamOutput out) throws IOException{
             if (scriptType != null) {
-                switch (scriptType){
-                    case INDEXED:
-                        out.writeVInt(INDEXED_VAL);
-                        return;
-                    case INLINE:
-                        out.writeVInt(INLINE_VAL);
-                        return;
-                    case FILE:
-                        out.writeVInt(FILE_VAL);
-                        return;
-                    default:
-                        throw new IllegalStateException("Unknown ScriptType " + scriptType);
-                }
+                out.writeVInt(scriptType.val);
             } else {
-                out.writeVInt(INLINE_VAL); //Default to inline
+                out.writeVInt(INLINE.val); //Default to inline
             }
         }
 
+        private ScriptType(int val, String name) {
+            this.val = val;
+            this.parseField = new ParseField(name);
+        }
+
+        public ParseField getParseField() {
+            return parseField;
+        }
+
         @Override
         public String toString() {
             return name().toLowerCase(Locale.ROOT);
diff --git a/src/main/java/org/elasticsearch/script/Template.java b/src/main/java/org/elasticsearch/script/Template.java
new file mode 100644
index 00000000000..c50a57087bb
--- /dev/null
+++ b/src/main/java/org/elasticsearch/script/Template.java
@@ -0,0 +1,198 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.script;
+
+import org.elasticsearch.common.Nullable;
+import org.elasticsearch.common.bytes.BytesArray;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.script.ScriptService.ScriptType;
+import org.elasticsearch.script.mustache.MustacheScriptEngineService;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+
+public class Template extends Script {
+
+    private XContentType contentType;
+
+    public Template() {
+        super();
+    }
+
+    /**
+     * Constructor for simple inline template. The template will have no lang,
+     * content type or params set.
+     * 
+     * @param template
+     *            The inline template.
+     */
+    public Template(String template) {
+        super(template, MustacheScriptEngineService.NAME);
+    }
+
+    /**
+     * Constructor for Template.
+     * 
+     * @param template
+     *            The cache key of the template to be compiled/executed. For
+     *            inline templates this is the actual templates source code. For
+     *            indexed templates this is the id used in the request. For on
+     *            file templates this is the file name.
+     * @param type
+     *            The type of template -- dynamic, indexed, or file.
+     * @param lang
+     *            The language of the template to be compiled/executed.
+     * @param xContentType
+     *            The {@link XContentType} of the template.
+     * @param params
+     *            The map of parameters the template will be executed with.
+     */
+    public Template(String template, ScriptType type, @Nullable String lang, @Nullable XContentType xContentType,
+            @Nullable Map<String, Object> params) {
+        super(template, type, lang, params);
+        this.contentType = xContentType;
+    }
+
+    /**
+     * Method for getting the {@link XContentType} of the template.
+     * 
+     * @return The {@link XContentType} of the template.
+     */
+    public XContentType getContentType() {
+        return contentType;
+    }
+
+    @Override
+    protected void doReadFrom(StreamInput in) throws IOException {
+        if (in.readBoolean()) {
+            this.contentType = XContentType.readFrom(in);
+        }
+    }
+
+    @Override
+    protected void doWriteTo(StreamOutput out) throws IOException {
+        boolean hasContentType = contentType != null;
+        out.writeBoolean(hasContentType);
+        if (hasContentType) {
+            XContentType.writeTo(contentType, out);
+        }
+    }
+
+    @Override
+    protected XContentBuilder scriptFieldToXContent(String template, ScriptType type, XContentBuilder builder, Params builderParams)
+            throws IOException {
+        if (type == ScriptType.INLINE && contentType != null && builder.contentType() == contentType) {
+            builder.rawField(type.getParseField().getPreferredName(), new BytesArray(template));
+        } else {
+            builder.field(type.getParseField().getPreferredName(), template);
+        }
+        return builder;
+    }
+
+    public static Template readTemplate(StreamInput in) throws IOException {
+        Template template = new Template();
+        template.readFrom(in);
+        return template;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static Script parse(Map<String, Object> config, boolean removeMatchedEntries) {
+        return new TemplateParser(Collections.EMPTY_MAP).parse(config, removeMatchedEntries);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static Template parse(XContentParser parser) throws IOException {
+        return new TemplateParser(Collections.EMPTY_MAP).parse(parser);
+    }
+
+    @Deprecated
+    public static Template parse(XContentParser parser, Map<String, ScriptType> additionalTemplateFieldNames) throws IOException {
+        return new TemplateParser(additionalTemplateFieldNames).parse(parser);
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = super.hashCode();
+        result = prime * result + ((contentType == null) ? 0 : contentType.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!super.equals(obj))
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Template other = (Template) obj;
+        if (contentType != other.contentType)
+            return false;
+        return true;
+    }
+
+    private static class TemplateParser extends AbstractScriptParser<Template> {
+
+        private XContentType contentType = null;
+        private final Map<String, ScriptType> additionalTemplateFieldNames;
+
+        public TemplateParser(Map<String, ScriptType> additionalTemplateFieldNames) {
+            this.additionalTemplateFieldNames = additionalTemplateFieldNames;
+        }
+
+        @Override
+        protected Template createSimpleScript(XContentParser parser) throws IOException {
+            return new Template(String.valueOf(parser.objectText()), ScriptType.INLINE, MustacheScriptEngineService.NAME, contentType, null);
+        }
+
+        @Override
+        protected Template createScript(String script, ScriptType type, String lang, Map<String, Object> params) {
+            return new Template(script, type, lang == null ? MustacheScriptEngineService.NAME : lang, contentType, params);
+        }
+
+        @Override
+        protected String parseInlineScript(XContentParser parser) throws IOException {
+            if (parser.currentToken() == XContentParser.Token.START_OBJECT) {
+                contentType = parser.contentType();
+                XContentBuilder builder = XContentFactory.contentBuilder(contentType);
+                return builder.copyCurrentStructure(parser).bytes().toUtf8();
+            } else {
+                return parser.text();
+            }
+        }
+
+        @Override
+        protected Map<String, ScriptType> getAdditionalScriptParameters() {
+            return additionalTemplateFieldNames;
+        }
+
+        @Override
+        protected String getDefaultScriptLang() {
+            return MustacheScriptEngineService.NAME;
+        }
+    }
+}
diff --git a/src/main/java/org/elasticsearch/search/SearchService.java b/src/main/java/org/elasticsearch/search/SearchService.java
index 15a691f3360..2c203aa7851 100644
--- a/src/main/java/org/elasticsearch/search/SearchService.java
+++ b/src/main/java/org/elasticsearch/search/SearchService.java
@@ -72,9 +72,10 @@ import org.elasticsearch.indices.IndicesWarmer.TerminationHandle;
 import org.elasticsearch.indices.IndicesWarmer.WarmerContext;
 import org.elasticsearch.indices.cache.query.IndicesQueryCache;
 import org.elasticsearch.script.ExecutableScript;
-import org.elasticsearch.script.Script;
+import org.elasticsearch.script.Script.ScriptParseException;
 import org.elasticsearch.script.ScriptContext;
 import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.Template;
 import org.elasticsearch.script.mustache.MustacheScriptEngineService;
 import org.elasticsearch.search.dfs.CachedDfSource;
 import org.elasticsearch.search.dfs.DfsPhase;
@@ -670,35 +671,41 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
     private void parseTemplate(ShardSearchRequest request) {
 
         final ExecutableScript executable;
-        if (hasLength(request.templateName())) {
-            executable = this.scriptService.executable(new Script(MustacheScriptEngineService.NAME, request.templateName(), request.templateType(), request.templateParams()), ScriptContext.Standard.SEARCH);
+        if (request.template() != null) {
+            executable = this.scriptService.executable(request.template(), ScriptContext.Standard.SEARCH);
         } else {
             if (!hasLength(request.templateSource())) {
                 return;
             }
             XContentParser parser = null;
-            TemplateQueryParser.TemplateContext templateContext = null;
+            Template template = null;
 
             try {
                 parser = XContentFactory.xContent(request.templateSource()).createParser(request.templateSource());
-                templateContext = TemplateQueryParser.parse(parser, "params", "template");
+                template = TemplateQueryParser.parse(parser, "params", "template");
 
-                if (templateContext.scriptType() == ScriptService.ScriptType.INLINE) {
+                if (template.getType() == ScriptService.ScriptType.INLINE) {
                     //Try to double parse for nested template id/file
                     parser = null;
                     try {
-                        byte[] templateBytes = templateContext.template().getBytes(Charsets.UTF_8);
+                        byte[] templateBytes = template.getScript().getBytes(Charsets.UTF_8);
                         parser = XContentFactory.xContent(templateBytes).createParser(templateBytes);
                     } catch (ElasticsearchParseException epe) {
                         //This was an non-nested template, the parse failure was due to this, it is safe to assume this refers to a file
                         //for backwards compatibility and keep going
-                        templateContext = new TemplateQueryParser.TemplateContext(ScriptService.ScriptType.FILE, templateContext.template(), templateContext.params());
+                        template = new Template(template.getScript(), ScriptService.ScriptType.FILE, MustacheScriptEngineService.NAME,
+                                null, template.getParams());
                     }
                     if (parser != null) {
-                        TemplateQueryParser.TemplateContext innerContext = TemplateQueryParser.parse(parser, "params");
-                        if (hasLength(innerContext.template()) && !innerContext.scriptType().equals(ScriptService.ScriptType.INLINE)) {
-                            //An inner template referring to a filename or id
-                            templateContext = new TemplateQueryParser.TemplateContext(innerContext.scriptType(), innerContext.template(), templateContext.params());
+                        try {
+                            Template innerTemplate = TemplateQueryParser.parse(parser);
+                            if (hasLength(innerTemplate.getScript()) && !innerTemplate.getType().equals(ScriptService.ScriptType.INLINE)) {
+                                //An inner template referring to a filename or id
+                                template = new Template(innerTemplate.getScript(), innerTemplate.getType(),
+                                        MustacheScriptEngineService.NAME, null, template.getParams());
+                            }
+                        } catch (ScriptParseException e) {
+                            // No inner template found, use original template from above
                         }
                     }
                 }
@@ -708,10 +715,10 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
                 Releasables.closeWhileHandlingException(parser);
             }
 
-            if (!hasLength(templateContext.template())) {
+            if (!hasLength(template.getScript())) {
                 throw new ElasticsearchParseException("Template must have [template] field configured");
             }
-            executable = this.scriptService.executable(new Script(MustacheScriptEngineService.NAME, templateContext.template(), templateContext.scriptType(), templateContext.params()), ScriptContext.Standard.SEARCH);
+            executable = this.scriptService.executable(template, ScriptContext.Standard.SEARCH);
         }
 
         BytesReference processedQuery = (BytesReference) executable.run();
diff --git a/src/main/java/org/elasticsearch/search/aggregations/ValuesSourceAggregationBuilder.java b/src/main/java/org/elasticsearch/search/aggregations/ValuesSourceAggregationBuilder.java
index 8d34d68ead3..0c305237f3d 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/ValuesSourceAggregationBuilder.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/ValuesSourceAggregationBuilder.java
@@ -20,7 +20,10 @@
 package org.elasticsearch.search.aggregations;
 
 import com.google.common.collect.Maps;
+
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.ScriptService.ScriptType;
 
 import java.io.IOException;
 import java.util.Map;
@@ -30,9 +33,13 @@ import java.util.Map;
  */
 public abstract class ValuesSourceAggregationBuilder<B extends ValuesSourceAggregationBuilder<B>> extends AggregationBuilder<B> {
 
+    private Script script;
     private String field;
-    private String script;
+    @Deprecated
+    private String scriptString;
+    @Deprecated
     private String lang;
+    @Deprecated
     private Map<String, Object> params;
     private Object missing;
 
@@ -68,19 +75,44 @@ public abstract class ValuesSourceAggregationBuilder<B extends ValuesSourceAggre
      * @return          This builder (fluent interface support)
      */
     @SuppressWarnings("unchecked")
-    public B script(String script) {
+    public B script(Script script) {
         this.script = script;
         return (B) this;
     }
 
+    /**
+     * Sets the script which generates the values. If the script is configured
+     * along with the field (as in {@link #field(String)}), then this script
+     * will be treated as a {@code value script}. A <i>value script</i> will be
+     * applied on the values that are extracted from the field data (you can
+     * refer to that value in the script using the {@code _value} reserved
+     * variable). If only the script is configured (and the no field is
+     * configured next to it), then the script will be responsible to generate
+     * the values that will be aggregated.
+     *
+     * @param script
+     *            The configured script.
+     * @return This builder (fluent interface support)
+     * @deprecated Use {@link #script(Script)} instead.
+     */
+    @Deprecated
+    @SuppressWarnings("unchecked")
+    public B script(String script) {
+        this.scriptString = script;
+        return (B) this;
+    }
+
     /**
      * Sets the language of the script (if one is defined).
      * <p/>
      * Also see {@link #script(String)}.
      *
-     * @param lang    The language of the script.
-     * @return        This builder (fluent interface support)
+     * @param lang
+     *            The language of the script.
+     * @return This builder (fluent interface support)
+     * @deprecated Use {@link #script(Script)} instead.
      */
+    @Deprecated
     @SuppressWarnings("unchecked")
     public B lang(String lang) {
         this.lang = lang;
@@ -88,12 +120,17 @@ public abstract class ValuesSourceAggregationBuilder<B extends ValuesSourceAggre
     }
 
     /**
-     * Sets the value of a parameter that is used in the script (if one is configured).
+     * Sets the value of a parameter that is used in the script (if one is
+     * configured).
      *
-     * @param name      The name of the parameter.
-     * @param value     The value of the parameter.
-     * @return          This builder (fluent interface support)
+     * @param name
+     *            The name of the parameter.
+     * @param value
+     *            The value of the parameter.
+     * @return This builder (fluent interface support)
+     * @deprecated Use {@link #script(Script)} instead.
      */
+    @Deprecated
     @SuppressWarnings("unchecked")
     public B param(String name, Object value) {
         if (params == null) {
@@ -104,11 +141,15 @@ public abstract class ValuesSourceAggregationBuilder<B extends ValuesSourceAggre
     }
 
     /**
-     * Sets the values of a parameters that are used in the script (if one is configured).
+     * Sets the values of a parameters that are used in the script (if one is
+     * configured).
      *
-     * @param params    The the parameters.
-     * @return          This builder (fluent interface support)
+     * @param params
+     *            The the parameters.
+     * @return This builder (fluent interface support)
+     * @deprecated Use {@link #script(Script)} instead.
      */
+    @Deprecated
     @SuppressWarnings("unchecked")
     public B params(Map<String, Object> params) {
         if (this.params == null) {
@@ -127,25 +168,24 @@ public abstract class ValuesSourceAggregationBuilder<B extends ValuesSourceAggre
     }
 
     @Override
-    protected final XContentBuilder internalXContent(XContentBuilder builder, Params params) throws IOException {
+    protected final XContentBuilder internalXContent(XContentBuilder builder, Params builderParams) throws IOException {
         builder.startObject();
         if (field != null) {
             builder.field("field", field);
         }
-        if (script != null) {
+
+        if (script == null) {
+            if (scriptString != null) {
+                builder.field("script", new Script(scriptString, ScriptType.INLINE, lang, params));
+            }
+        } else {
             builder.field("script", script);
         }
-        if (lang != null) {
-            builder.field("lang", lang);
-        }
-        if (this.params != null) {
-            builder.field("params").map(this.params);
-        }
         if (missing != null) {
             builder.field("missing", missing);
         }
 
-        doInternalXContent(builder, params);
+        doInternalXContent(builder, builderParams);
         return builder.endObject();
     }
 
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsBuilder.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsBuilder.java
index 77ef7d3dc8d..046b1c55a4c 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsBuilder.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsBuilder.java
@@ -261,7 +261,7 @@ public class SignificantTermsBuilder extends AggregationBuilder<SignificantTerms
             filterBuilder.toXContent(builder, params); 
         }
         if (significanceHeuristicBuilder != null) {
-            significanceHeuristicBuilder.toXContent(builder);
+            significanceHeuristicBuilder.toXContent(builder, params);
         }
 
         return builder.endObject();
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ChiSquare.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ChiSquare.java
index 88c87944f4c..cc9303a635f 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ChiSquare.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ChiSquare.java
@@ -105,10 +105,11 @@ public class ChiSquare extends NXYSignificanceHeuristic {
         }
 
         @Override
-        public void toXContent(XContentBuilder builder) throws IOException {
+        public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
             builder.startObject(STREAM.getName());
             super.build(builder);
             builder.endObject();
+            return builder;
         }
     }
 }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java
index 37d11e6589b..5fd6a5ad937 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/GND.java
@@ -139,10 +139,11 @@ public class GND extends NXYSignificanceHeuristic {
         }
 
         @Override
-        public void toXContent(XContentBuilder builder) throws IOException {
+        public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
             builder.startObject(STREAM.getName());
             builder.field(BACKGROUND_IS_SUPERSET.getPreferredName(), backgroundIsSuperset);
             builder.endObject();
+            return builder;
         }
     }
 }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java
index 6c3753190b1..f7fdf224df1 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/JLHScore.java
@@ -124,8 +124,9 @@ public class JLHScore extends SignificanceHeuristic {
     public static class JLHScoreBuilder implements SignificanceHeuristicBuilder {
 
         @Override
-        public void toXContent(XContentBuilder builder) throws IOException {
+        public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
             builder.startObject(STREAM.getName()).endObject();
+            return builder;
         }
     }
 }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/MutualInformation.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/MutualInformation.java
index 922b8a1b1b1..b4529b82671 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/MutualInformation.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/MutualInformation.java
@@ -138,10 +138,11 @@ public class MutualInformation extends NXYSignificanceHeuristic {
         }
 
         @Override
-        public void toXContent(XContentBuilder builder) throws IOException {
+        public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
             builder.startObject(STREAM.getName());
             super.build(builder);
             builder.endObject();
+            return builder;
         }
     }
 }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java
index 487c05c180d..a55dc044c85 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/PercentageScore.java
@@ -93,8 +93,9 @@ public class PercentageScore extends SignificanceHeuristic {
     public static class PercentageScoreBuilder implements SignificanceHeuristicBuilder {
 
         @Override
-        public void toXContent(XContentBuilder builder) throws IOException {
+        public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
             builder.startObject(STREAM.getName()).endObject();
+            return builder;
         }
     }
 }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java
index 559d02fc4de..24d5ef7126d 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/ScriptHeuristic.java
@@ -30,13 +30,21 @@ import org.elasticsearch.common.logging.ESLoggerFactory;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.query.QueryParsingException;
-import org.elasticsearch.script.*;
+import org.elasticsearch.script.ExecutableScript;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.Script.ScriptField;
+import org.elasticsearch.script.ScriptContext;
+import org.elasticsearch.script.ScriptParameterParser;
+import org.elasticsearch.script.ScriptParameterParser.ScriptParameterValue;
+import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.search.aggregations.InternalAggregation;
 
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.Map;
 
+import static com.google.common.collect.Maps.newHashMap;
+
 public class ScriptHeuristic extends SignificanceHeuristic {
 
     protected static final ParseField NAMES_FIELD = new ParseField("script_heuristic");
@@ -44,16 +52,14 @@ public class ScriptHeuristic extends SignificanceHeuristic {
     private final LongAccessor supersetSizeHolder;
     private final LongAccessor subsetDfHolder;
     private final LongAccessor supersetDfHolder;
-    ExecutableScript script = null;
-    String scriptLang;
-    String scriptString;
-    ScriptService.ScriptType scriptType;
-    Map<String, Object> params;
+    ExecutableScript searchScript = null;
+    Script script;
 
     public static final SignificanceHeuristicStreams.Stream STREAM = new SignificanceHeuristicStreams.Stream() {
         @Override
         public SignificanceHeuristic readResult(StreamInput in) throws IOException {
-            return new ScriptHeuristic(null, in.readOptionalString(), in.readString(), ScriptService.ScriptType.readFrom(in), in.readMap());
+            Script script = Script.readScript(in);
+            return new ScriptHeuristic(null, script);
         }
 
         @Override
@@ -62,32 +68,29 @@ public class ScriptHeuristic extends SignificanceHeuristic {
         }
     };
 
-    public ScriptHeuristic(ExecutableScript searchScript, String scriptLang, String scriptString, ScriptService.ScriptType scriptType, Map<String, Object> params) {
+    public ScriptHeuristic(ExecutableScript searchScript, Script script) {
         subsetSizeHolder = new LongAccessor();
         supersetSizeHolder = new LongAccessor();
         subsetDfHolder = new LongAccessor();
         supersetDfHolder = new LongAccessor();
-        this.script = searchScript;
-        if (script != null) {
-            script.setNextVar("_subset_freq", subsetDfHolder);
-            script.setNextVar("_subset_size", subsetSizeHolder);
-            script.setNextVar("_superset_freq", supersetDfHolder);
-            script.setNextVar("_superset_size", supersetSizeHolder);
+        this.searchScript = searchScript;
+        if (searchScript != null) {
+            searchScript.setNextVar("_subset_freq", subsetDfHolder);
+            searchScript.setNextVar("_subset_size", subsetSizeHolder);
+            searchScript.setNextVar("_superset_freq", supersetDfHolder);
+            searchScript.setNextVar("_superset_size", supersetSizeHolder);
         }
-        this.scriptLang = scriptLang;
-        this.scriptString = scriptString;
-        this.scriptType = scriptType;
-        this.params = params;
+        this.script = script;
 
 
     }
 
     public void initialize(InternalAggregation.ReduceContext context) {
-        script = context.scriptService().executable(new Script(scriptLang, scriptString, scriptType, params), ScriptContext.Standard.AGGS);
-        script.setNextVar("_subset_freq", subsetDfHolder);
-        script.setNextVar("_subset_size", subsetSizeHolder);
-        script.setNextVar("_superset_freq", supersetDfHolder);
-        script.setNextVar("_superset_size", supersetSizeHolder);
+        searchScript = context.scriptService().executable(script, ScriptContext.Standard.AGGS);
+        searchScript.setNextVar("_subset_freq", subsetDfHolder);
+        searchScript.setNextVar("_subset_size", subsetSizeHolder);
+        searchScript.setNextVar("_superset_freq", supersetDfHolder);
+        searchScript.setNextVar("_superset_size", supersetSizeHolder);
     }
 
     /**
@@ -101,7 +104,7 @@ public class ScriptHeuristic extends SignificanceHeuristic {
      */
     @Override
     public double getScore(long subsetFreq, long subsetSize, long supersetFreq, long supersetSize) {
-        if (script == null) {
+        if (searchScript == null) {
             //In tests, wehn calling assertSearchResponse(..) the response is streamed one additional time with an arbitrary version, see assertVersionSerializable(..).
             // Now, for version before 1.5.0 the score is computed after streaming the response but for scripts the script does not exists yet.
             // assertSearchResponse() might therefore fail although there is no problem.
@@ -113,16 +116,13 @@ public class ScriptHeuristic extends SignificanceHeuristic {
         supersetSizeHolder.value = supersetSize;
         subsetDfHolder.value = subsetFreq;
         supersetDfHolder.value = supersetFreq;
-        return ((Number) script.run()).doubleValue();
+        return ((Number) searchScript.run()).doubleValue();
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeString(STREAM.getName());
-        out.writeOptionalString(scriptLang);
-        out.writeString(scriptString);
-        ScriptService.ScriptType.writeTo(scriptType, out);
-        out.writeMap(params);
+        script.writeTo(out);
     }
 
     public static class ScriptHeuristicParser implements SignificanceHeuristicParser {
@@ -135,18 +135,18 @@ public class ScriptHeuristic extends SignificanceHeuristic {
         @Override
         public SignificanceHeuristic parse(XContentParser parser) throws IOException, QueryParsingException {
             NAMES_FIELD.match(parser.currentName(), ParseField.EMPTY_FLAGS);
-            String script = null;
-            String scriptLang;
+            Script script = null;
             XContentParser.Token token;
-            Map<String, Object> params = new HashMap<>();
+            Map<String, Object> params = null;
             String currentFieldName = null;
-            ScriptService.ScriptType scriptType = ScriptService.ScriptType.INLINE;
             ScriptParameterParser scriptParameterParser = new ScriptParameterParser();
             while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
                 if (token.equals(XContentParser.Token.FIELD_NAME)) {
                     currentFieldName = parser.currentName();
                 } else if (token == XContentParser.Token.START_OBJECT) {
-                    if ("params".equals(currentFieldName)) {
+                    if (ScriptField.SCRIPT.match(currentFieldName)) {
+                        script = Script.parse(parser);
+                    } else if ("params".equals(currentFieldName)) { // TODO remove in 2.0 (here to support old script APIs)
                         params = parser.map();
                     } else {
                         throw new ElasticsearchParseException("unknown object " + currentFieldName + " in script_heuristic");
@@ -156,23 +156,28 @@ public class ScriptHeuristic extends SignificanceHeuristic {
                 }
             }
 
-            ScriptParameterParser.ScriptParameterValue scriptValue = scriptParameterParser.getDefaultScriptParameterValue();
-            if (scriptValue != null) {
-                script = scriptValue.script();
-                scriptType = scriptValue.scriptType();
+            if (script == null) { // Didn't find anything using the new API so try using the old one instead
+                ScriptParameterValue scriptValue = scriptParameterParser.getDefaultScriptParameterValue();
+                if (scriptValue != null) {
+                    if (params == null) {
+                        params = newHashMap();
+                    }
+                    script = new Script(scriptValue.script(), scriptValue.scriptType(), scriptParameterParser.lang(), params);
+                }
+            } else if (params != null) {
+                throw new ElasticsearchParseException("script params must be specified inside script object");
             }
-            scriptLang = scriptParameterParser.lang();
 
             if (script == null) {
                 throw new ElasticsearchParseException("No script found in script_heuristic");
             }
             ExecutableScript searchScript;
             try {
-                searchScript = scriptService.executable(new Script(scriptLang, script, scriptType, params), ScriptContext.Standard.AGGS);
+                searchScript = scriptService.executable(script, ScriptContext.Standard.AGGS);
             } catch (Exception e) {
                 throw new ElasticsearchParseException("The script [" + script + "] could not be loaded", e);
             }
-            return new ScriptHeuristic(searchScript, scriptLang, script, scriptType, params);
+            return new ScriptHeuristic(searchScript, script);
         }
 
         @Override
@@ -183,55 +188,82 @@ public class ScriptHeuristic extends SignificanceHeuristic {
 
     public static class ScriptHeuristicBuilder implements SignificanceHeuristicBuilder {
 
-        private String script = null;
+        private Script script = null;
+        private String scriptString = null;
+        private ScriptType type = null;
         private String lang = null;
         private Map<String, Object> params = null;
-        private String scriptId;
-        private String scriptFile;
-        public ScriptHeuristicBuilder setScript(String script) {
+
+        public ScriptHeuristicBuilder setScript(Script script) {
             this.script = script;
             return this;
         }
 
-        public ScriptHeuristicBuilder setScriptFile(String script) {
-            this.scriptFile = script;
+        /**
+         * @deprecated use {@link #setScript(Script)}
+         */
+        @Deprecated
+        public ScriptHeuristicBuilder setScript(String script) {
+            if (script != null) {
+                this.scriptString = script;
+                this.type = ScriptType.INLINE;
+            }
             return this;
         }
 
+        /**
+         * @deprecated use {@link #setScript(Script)}
+         */
+        @Deprecated
+        public ScriptHeuristicBuilder setScriptFile(String script) {
+            if (script != null) {
+                this.scriptString = script;
+                this.type = ScriptType.FILE;
+            }
+            return this;
+        }
+
+        /**
+         * @deprecated use {@link #setScript(Script)}
+         */
+        @Deprecated
         public ScriptHeuristicBuilder setLang(String lang) {
             this.lang = lang;
             return this;
         }
 
+        /**
+         * @deprecated use {@link #setScript(Script)}
+         */
+        @Deprecated
         public ScriptHeuristicBuilder setParams(Map<String, Object> params) {
             this.params = params;
             return this;
         }
 
+        /**
+         * @deprecated use {@link #setScript(Script)}
+         */
+        @Deprecated
         public ScriptHeuristicBuilder setScriptId(String scriptId) {
-            this.scriptId = scriptId;
+            if (scriptId != null) {
+                this.scriptString = scriptId;
+                this.type = ScriptType.INDEXED;
+            }
             return this;
         }
 
         @Override
-        public void toXContent(XContentBuilder builder) throws IOException {
+        public XContentBuilder toXContent(XContentBuilder builder, Params builderParams) throws IOException {
             builder.startObject(STREAM.getName());
-            if (script != null) {
-                builder.field("script", script);
-            }
-            if (lang != null) {
-                builder.field("lang", lang);
-            }
-            if (params != null) {
-                builder.field("params", params);
-            }
-            if (scriptId != null) {
-                builder.field("script_id", scriptId);
-            }
-            if (scriptFile != null) {
-                builder.field("script_file", scriptFile);
+            builder.field(ScriptField.SCRIPT.getPreferredName());
+            if (script == null) {
+                new Script(scriptString, type, lang, params).toXContent(builder, builderParams);
+            } else {
+                script.toXContent(builder, builderParams);
             }
             builder.endObject();
+            return builder;
         }
 
     }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicBuilder.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicBuilder.java
index f0dda8438dc..6c669ec9850 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicBuilder.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/heuristics/SignificanceHeuristicBuilder.java
@@ -20,12 +20,8 @@
 
 package org.elasticsearch.search.aggregations.bucket.significant.heuristics;
 
-import org.elasticsearch.common.xcontent.XContentBuilder;
-
-import java.io.IOException;
+import org.elasticsearch.common.xcontent.ToXContent;
 
 
-public interface SignificanceHeuristicBuilder {
-
-    public void toXContent(XContentBuilder builder) throws IOException;
+public interface SignificanceHeuristicBuilder extends ToXContent {
 }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java
index 7f774eab488..f4d726aa49f 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/InternalScriptedMetric.java
@@ -22,10 +22,10 @@ package org.elasticsearch.search.aggregations.metrics.scripted;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.script.CompiledScript;
 import org.elasticsearch.script.ExecutableScript;
 import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptContext;
-import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.search.aggregations.AggregationStreams;
 import org.elasticsearch.search.aggregations.InternalAggregation;
 import org.elasticsearch.search.aggregations.metrics.InternalMetricsAggregation;
@@ -54,10 +54,7 @@ public class InternalScriptedMetric extends InternalMetricsAggregation implement
         AggregationStreams.registerStream(STREAM, TYPE.stream());
     }
 
-    private String scriptLang;
-    private ScriptType scriptType;
-    private String reduceScript;
-    private Map<String, Object> reduceParams;
+    private Script reduceScript;
     private Object aggregation;
 
     private InternalScriptedMetric() {
@@ -67,14 +64,10 @@ public class InternalScriptedMetric extends InternalMetricsAggregation implement
         super(name, pipelineAggregators, metaData);
     }
 
-    public InternalScriptedMetric(String name, Object aggregation, String scriptLang, ScriptType scriptType, String reduceScript,
-            Map<String, Object> reduceParams, List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) {
+    public InternalScriptedMetric(String name, Object aggregation, Script reduceScript, List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) {
         this(name, pipelineAggregators, metaData);
         this.aggregation = aggregation;
-        this.scriptType = scriptType;
         this.reduceScript = reduceScript;
-        this.reduceParams = reduceParams;
-        this.scriptLang = scriptLang;
     }
 
     @Override
@@ -92,21 +85,19 @@ public class InternalScriptedMetric extends InternalMetricsAggregation implement
         InternalScriptedMetric firstAggregation = ((InternalScriptedMetric) aggregations.get(0));
         Object aggregation;
         if (firstAggregation.reduceScript != null) {
-            Map<String, Object> params;
-            if (firstAggregation.reduceParams != null) {
-                params = new HashMap<>(firstAggregation.reduceParams);
-            } else {
-                params = new HashMap<>();
+            Map<String, Object> vars = new HashMap<>();
+            vars.put("_aggs", aggregationObjects);
+            if (firstAggregation.reduceScript.getParams() != null) {
+                vars.putAll(firstAggregation.reduceScript.getParams());
             }
-            params.put("_aggs", aggregationObjects);
-            ExecutableScript script = reduceContext.scriptService().executable(new Script(firstAggregation.scriptLang, firstAggregation.reduceScript,
-                    firstAggregation.scriptType, params), ScriptContext.Standard.AGGS);
+            CompiledScript compiledScript = reduceContext.scriptService().compile(firstAggregation.reduceScript,
+                    ScriptContext.Standard.AGGS);
+            ExecutableScript script = reduceContext.scriptService().executable(compiledScript, vars);
             aggregation = script.run();
         } else {
             aggregation = aggregationObjects;
         }
-        return new InternalScriptedMetric(firstAggregation.getName(), aggregation, firstAggregation.scriptLang, firstAggregation.scriptType,
-                firstAggregation.reduceScript, firstAggregation.reduceParams, pipelineAggregators(), getMetaData());
+        return new InternalScriptedMetric(firstAggregation.getName(), aggregation, firstAggregation.reduceScript, pipelineAggregators(), getMetaData());
 
     }
 
@@ -128,19 +119,19 @@ public class InternalScriptedMetric extends InternalMetricsAggregation implement
 
     @Override
     protected void doReadFrom(StreamInput in) throws IOException {
-        scriptLang = in.readOptionalString();
-        scriptType = ScriptType.readFrom(in);
-        reduceScript = in.readOptionalString();
-        reduceParams = in.readMap();
+        if (in.readBoolean()) {
+            reduceScript = Script.readScript(in);
+        }
         aggregation = in.readGenericValue();
     }
 
     @Override
     protected void doWriteTo(StreamOutput out) throws IOException {
-        out.writeOptionalString(scriptLang);
-        ScriptType.writeTo(scriptType, out);
-        out.writeOptionalString(reduceScript);
-        out.writeMap(reduceParams);
+        boolean hasScript = reduceScript != null;
+        out.writeBoolean(hasScript);
+        if (hasScript) {
+            reduceScript.writeTo(out);
+        }
         out.writeGenericValue(aggregation);
     }
 
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java
index fd00f9f3c5f..a24dd4d3a7e 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java
@@ -25,7 +25,6 @@ import org.elasticsearch.script.LeafSearchScript;
 import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptContext;
 import org.elasticsearch.script.ScriptService;
-import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.script.SearchScript;
 import org.elasticsearch.search.SearchParseException;
 import org.elasticsearch.search.aggregations.Aggregator;
@@ -47,42 +46,23 @@ import java.util.Map.Entry;
 
 public class ScriptedMetricAggregator extends MetricsAggregator {
 
-    private final String scriptLang;
     private final SearchScript mapScript;
     private final ExecutableScript combineScript;
-    private final String reduceScript;
-    // initial parameters for same shard scripts {init, map, combine}
-    // state can be passed in params between them too
-    private final Map<String, Object> params;
-    // initial parameters for {reduce}
-    private final Map<String, Object> reduceParams;
-    private final ScriptType reduceScriptType;
+    private final Script reduceScript;
+    private Map<String, Object> params;
 
-    protected ScriptedMetricAggregator(String name, String scriptLang, ScriptType initScriptType, String initScript,
-            ScriptType mapScriptType, String mapScript, ScriptType combineScriptType, String combineScript, ScriptType reduceScriptType,
-            String reduceScript, Map<String, Object> params, Map<String, Object> reduceParams, AggregationContext context,
-            Aggregator parent, List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) throws IOException {
+    protected ScriptedMetricAggregator(String name, Script initScript, Script mapScript, Script combineScript, Script reduceScript,
+            Map<String, Object> params, AggregationContext context, Aggregator parent, List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData)
+            throws IOException {
         super(name, context, parent, pipelineAggregators, metaData);
-        this.scriptLang = scriptLang;
-        this.reduceScriptType = reduceScriptType;
-        if (params == null) {
-            this.params = new HashMap<>();
-            this.params.put("_agg", new HashMap<>());
-        } else {
-            this.params = new HashMap<>(params);
-        }
-        if (reduceParams == null) {
-            this.reduceParams = new HashMap<>();
-        } else {
-            this.reduceParams = reduceParams;
-        }
+        this.params = params;
         ScriptService scriptService = context.searchContext().scriptService();
         if (initScript != null) {
-            scriptService.executable(new Script(scriptLang, initScript, initScriptType, this.params), ScriptContext.Standard.AGGS).run();
+            scriptService.executable(initScript, ScriptContext.Standard.AGGS).run();
         }
-        this.mapScript = scriptService.search(context.searchContext().lookup(), new Script(scriptLang, mapScript, mapScriptType, this.params), ScriptContext.Standard.AGGS);
+        this.mapScript = scriptService.search(context.searchContext().lookup(), mapScript, ScriptContext.Standard.AGGS);
         if (combineScript != null) {
-            this.combineScript = scriptService.executable(new Script(scriptLang, combineScript, combineScriptType, this.params), ScriptContext.Standard.AGGS);
+            this.combineScript = scriptService.executable(combineScript, ScriptContext.Standard.AGGS);
         } else {
             this.combineScript = null;
         }
@@ -116,43 +96,31 @@ public class ScriptedMetricAggregator extends MetricsAggregator {
         } else {
             aggregation = params.get("_agg");
         }
-        return new InternalScriptedMetric(name, aggregation, scriptLang, reduceScriptType, reduceScript, reduceParams, pipelineAggregators(),
+        return new InternalScriptedMetric(name, aggregation, reduceScript, pipelineAggregators(),
                 metaData());
     }
 
     @Override
     public InternalAggregation buildEmptyAggregation() {
-        return new InternalScriptedMetric(name, null, scriptLang, reduceScriptType, reduceScript, reduceParams, pipelineAggregators(), metaData());
+        return new InternalScriptedMetric(name, null, reduceScript, pipelineAggregators(), metaData());
     }
 
     public static class Factory extends AggregatorFactory {
 
-        private String scriptLang;
-        private ScriptType initScriptType;
-        private ScriptType mapScriptType;
-        private ScriptType combineScriptType;
-        private ScriptType reduceScriptType;
-        private String initScript;
-        private String mapScript;
-        private String combineScript;
-        private String reduceScript;
+        private Script initScript;
+        private Script mapScript;
+        private Script combineScript;
+        private Script reduceScript;
         private Map<String, Object> params;
-        private Map<String, Object> reduceParams;
 
-        public Factory(String name, String scriptLang, ScriptType initScriptType, String initScript, ScriptType mapScriptType, String mapScript, ScriptType combineScriptType, String combineScript, ScriptType reduceScriptType, String reduceScript,
-                Map<String, Object> params, Map<String, Object> reduceParams) {
+        public Factory(String name, Script initScript, Script mapScript, Script combineScript, Script reduceScript,
+                Map<String, Object> params) {
             super(name, InternalScriptedMetric.TYPE.name());
-            this.scriptLang = scriptLang;
-            this.initScriptType = initScriptType;
-            this.mapScriptType = mapScriptType;
-            this.combineScriptType = combineScriptType;
-            this.reduceScriptType = reduceScriptType;
             this.initScript = initScript;
             this.mapScript = mapScript;
             this.combineScript = combineScript;
             this.reduceScript = reduceScript;
             this.params = params;
-            this.reduceParams = reduceParams;
         }
 
         @Override
@@ -161,16 +129,35 @@ public class ScriptedMetricAggregator extends MetricsAggregator {
             if (collectsFromSingleBucket == false) {
                 return asMultiBucketAggregator(this, context, parent);
             }
-            Map<String, Object> params = null;
-            if (this.params != null) {
-                params = deepCopyParams(this.params, context.searchContext());
+            Map<String, Object> params = this.params;
+            if (params != null) {
+                params = deepCopyParams(params, context.searchContext());
+            } else {
+                params = new HashMap<>();
+                params.put("_agg", new HashMap<String, Object>());
             }
-            Map<String, Object> reduceParams = null;
-            if (this.reduceParams != null) {
-                reduceParams = deepCopyParams(this.reduceParams, context.searchContext());
+            return new ScriptedMetricAggregator(name, insertParams(initScript, params), insertParams(mapScript, params), insertParams(
+                    combineScript, params), deepCopyScript(reduceScript, context.searchContext()), params, context, parent, pipelineAggregators,
+                    metaData);
+            }
+
+        private static Script insertParams(Script script, Map<String, Object> params) {
+            if (script == null) {
+                return null;
+            }
+            return new Script(script.getScript(), script.getType(), script.getLang(), params);
+        }
+
+        private static Script deepCopyScript(Script script, SearchContext context) {
+            if (script != null) {
+                Map<String, Object> params = script.getParams();
+                if (params != null) {
+                    params = deepCopyParams(params, context);
+                }
+                return new Script(script.getScript(), script.getType(), script.getLang(), params);
+            } else {
+                return null;
             }
-            return new ScriptedMetricAggregator(name, scriptLang, initScriptType, initScript, mapScriptType, mapScript, combineScriptType,
-                    combineScript, reduceScriptType, reduceScript, params, reduceParams, context, parent, pipelineAggregators, metaData);
         }
         
         @SuppressWarnings({ "unchecked" })
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricBuilder.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricBuilder.java
index e6fceb4abef..2e305aa3beb 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricBuilder.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricBuilder.java
@@ -20,6 +20,7 @@
 package org.elasticsearch.search.aggregations.metrics.scripted;
 
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptParameterParser;
 import org.elasticsearch.search.aggregations.metrics.MetricsAggregationBuilder;
 
@@ -31,20 +32,38 @@ import java.util.Map;
  */
 public class ScriptedMetricBuilder extends MetricsAggregationBuilder {
 
+    private Script initScript = null;
+    private Script mapScript = null;
+    private Script combineScript = null;
+    private Script reduceScript = null;
     private Map<String, Object> params = null;
+    @Deprecated
     private Map<String, Object> reduceParams = null;
-    private String initScript = null;
-    private String mapScript = null;
-    private String combineScript = null;
-    private String reduceScript = null;
+    @Deprecated
+    private String initScriptString = null;
+    @Deprecated
+    private String mapScriptString = null;
+    @Deprecated
+    private String combineScriptString = null;
+    @Deprecated
+    private String reduceScriptString = null;
+    @Deprecated
     private String initScriptFile = null;
+    @Deprecated
     private String mapScriptFile = null;
+    @Deprecated
     private String combineScriptFile = null;
+    @Deprecated
     private String reduceScriptFile = null;
+    @Deprecated
     private String initScriptId = null;
+    @Deprecated
     private String mapScriptId = null;
+    @Deprecated
     private String combineScriptId = null;
+    @Deprecated
     private String reduceScriptId = null;
+    @Deprecated
     private String lang = null;
 
     /**
@@ -54,6 +73,38 @@ public class ScriptedMetricBuilder extends MetricsAggregationBuilder {
         super(name, InternalScriptedMetric.TYPE.name());
     }
 
+    /**
+     * Set the <tt>init</tt> script.
+     */
+    public ScriptedMetricBuilder initScript(Script initScript) {
+        this.initScript = initScript;
+        return this;
+    }
+
+    /**
+     * Set the <tt>map</tt> script.
+     */
+    public ScriptedMetricBuilder mapScript(Script mapScript) {
+        this.mapScript = mapScript;
+        return this;
+    }
+
+    /**
+     * Set the <tt>combine</tt> script.
+     */
+    public ScriptedMetricBuilder combineScript(Script combineScript) {
+        this.combineScript = combineScript;
+        return this;
+    }
+
+    /**
+     * Set the <tt>reduce</tt> script.
+     */
+    public ScriptedMetricBuilder reduceScript(Script reduceScript) {
+        this.reduceScript = reduceScript;
+        return this;
+    }
+
     /**
      * Set parameters that will be available in the <tt>init</tt>, <tt>map</tt>
      * and <tt>combine</tt> phases.
@@ -65,7 +116,10 @@ public class ScriptedMetricBuilder extends MetricsAggregationBuilder {
 
     /**
      * Set parameters that will be available in the <tt>reduce</tt> phase.
+     * 
+     * @deprecated Use {@link #reduceScript(Script)} instead.
      */
+    @Deprecated
     public ScriptedMetricBuilder reduceParams(Map<String, Object> reduceParams) {
         this.reduceParams = reduceParams;
         return this;
@@ -73,39 +127,54 @@ public class ScriptedMetricBuilder extends MetricsAggregationBuilder {
 
     /**
      * Set the <tt>init</tt> script.
+     * 
+     * @deprecated Use {@link #initScript(Script)} instead.
      */
+    @Deprecated
     public ScriptedMetricBuilder initScript(String initScript) {
-        this.initScript = initScript;
+        this.initScriptString = initScript;
         return this;
     }
 
     /**
      * Set the <tt>map</tt> script.
+     * 
+     * @deprecated Use {@link #mapScript(Script)} instead.
      */
+    @Deprecated
     public ScriptedMetricBuilder mapScript(String mapScript) {
-        this.mapScript = mapScript;
+        this.mapScriptString = mapScript;
         return this;
     }
 
     /**
      * Set the <tt>combine</tt> script.
+     * 
+     * @deprecated Use {@link #combineScript(Script)} instead.
      */
+    @Deprecated
     public ScriptedMetricBuilder combineScript(String combineScript) {
-        this.combineScript = combineScript;
+        this.combineScriptString = combineScript;
         return this;
     }
 
     /**
      * Set the <tt>reduce</tt> script.
+     * 
+     * @deprecated Use {@link #reduceScript(Script)} instead.
      */
+    @Deprecated
     public ScriptedMetricBuilder reduceScript(String reduceScript) {
-        this.reduceScript = reduceScript;
+        this.reduceScriptString = reduceScript;
         return this;
     }
 
     /**
      * Set the <tt>init</tt> script file.
+     * 
+     * @deprecated Use {@link #initScript(Script)} instead.
      */
+    @Deprecated
     public ScriptedMetricBuilder initScriptFile(String initScriptFile) {
         this.initScriptFile = initScriptFile;
         return this;
@@ -113,7 +182,10 @@ public class ScriptedMetricBuilder extends MetricsAggregationBuilder {
 
     /**
      * Set the <tt>map</tt> script file.
+     * 
+     * @deprecated Use {@link #mapScript(Script)} instead.
      */
+    @Deprecated
     public ScriptedMetricBuilder mapScriptFile(String mapScriptFile) {
         this.mapScriptFile = mapScriptFile;
         return this;
@@ -121,7 +193,10 @@ public class ScriptedMetricBuilder extends MetricsAggregationBuilder {
 
     /**
      * Set the <tt>combine</tt> script file.
+     * 
+     * @deprecated Use {@link #combineScript(Script)} instead.
      */
+    @Deprecated
     public ScriptedMetricBuilder combineScriptFile(String combineScriptFile) {
         this.combineScriptFile = combineScriptFile;
         return this;
@@ -129,7 +204,10 @@ public class ScriptedMetricBuilder extends MetricsAggregationBuilder {
 
     /**
      * Set the <tt>reduce</tt> script file.
+     * 
+     * @deprecated Use {@link #reduceScript(Script)} instead.
      */
+    @Deprecated
     public ScriptedMetricBuilder reduceScriptFile(String reduceScriptFile) {
         this.reduceScriptFile = reduceScriptFile;
         return this;
@@ -137,7 +215,10 @@ public class ScriptedMetricBuilder extends MetricsAggregationBuilder {
 
     /**
      * Set the indexed <tt>init</tt> script id.
+     * 
+     * @deprecated Use {@link #initScript(Script)} instead.
      */
+    @Deprecated
     public ScriptedMetricBuilder initScriptId(String initScriptId) {
         this.initScriptId = initScriptId;
         return this;
@@ -145,7 +226,10 @@ public class ScriptedMetricBuilder extends MetricsAggregationBuilder {
 
     /**
      * Set the indexed <tt>map</tt> script id.
+     * 
+     * @deprecated Use {@link #mapScript(Script)} instead.
      */
+    @Deprecated
     public ScriptedMetricBuilder mapScriptId(String mapScriptId) {
         this.mapScriptId = mapScriptId;
         return this;
@@ -153,7 +237,10 @@ public class ScriptedMetricBuilder extends MetricsAggregationBuilder {
 
     /**
      * Set the indexed <tt>combine</tt> script id.
+     * 
+     * @deprecated Use {@link #combineScript(Script)} instead.
      */
+    @Deprecated
     public ScriptedMetricBuilder combineScriptId(String combineScriptId) {
         this.combineScriptId = combineScriptId;
         return this;
@@ -161,7 +248,10 @@ public class ScriptedMetricBuilder extends MetricsAggregationBuilder {
 
     /**
      * Set the indexed <tt>reduce</tt> script id.
+     * 
+     * @deprecated Use {@link #reduceScript(Script)} instead.
      */
+    @Deprecated
     public ScriptedMetricBuilder reduceScriptId(String reduceScriptId) {
         this.reduceScriptId = reduceScriptId;
         return this;
@@ -169,7 +259,12 @@ public class ScriptedMetricBuilder extends MetricsAggregationBuilder {
 
     /**
      * Set the script language.
+     * 
+     * @deprecated Use {@link #initScript(Script)}, {@link #mapScript(Script)},
+     *             {@link #combineScript(Script)}, and
+     *             {@link #reduceScript(Script)} instead.
      */
+    @Deprecated
     public ScriptedMetricBuilder lang(String lang) {
         this.lang = lang;
         return this;
@@ -177,6 +272,23 @@ public class ScriptedMetricBuilder extends MetricsAggregationBuilder {
 
     @Override
     protected void internalXContent(XContentBuilder builder, Params builderParams) throws IOException {
+
+        if (initScript != null) {
+            builder.field(ScriptedMetricParser.INIT_SCRIPT_FIELD.getPreferredName(), initScript);
+        }
+
+        if (mapScript != null) {
+            builder.field(ScriptedMetricParser.MAP_SCRIPT_FIELD.getPreferredName(), mapScript);
+        }
+
+        if (combineScript != null) {
+            builder.field(ScriptedMetricParser.COMBINE_SCRIPT_FIELD.getPreferredName(), combineScript);
+        }
+
+        if (reduceScript != null) {
+            builder.field(ScriptedMetricParser.REDUCE_SCRIPT_FIELD.getPreferredName(), reduceScript);
+        }
+
         if (params != null) {
             builder.field(ScriptedMetricParser.PARAMS_FIELD.getPreferredName());
             builder.map(params);
@@ -187,20 +299,20 @@ public class ScriptedMetricBuilder extends MetricsAggregationBuilder {
             builder.map(reduceParams);
         }
         
-        if (initScript != null) {
-            builder.field(ScriptedMetricParser.INIT_SCRIPT, initScript);
+        if (initScriptString != null) {
+            builder.field(ScriptedMetricParser.INIT_SCRIPT, initScriptString);
         }
         
-        if (mapScript != null) {
-            builder.field(ScriptedMetricParser.MAP_SCRIPT, mapScript);
+        if (mapScriptString != null) {
+            builder.field(ScriptedMetricParser.MAP_SCRIPT, mapScriptString);
         }
         
-        if (combineScript != null) {
-            builder.field(ScriptedMetricParser.COMBINE_SCRIPT, combineScript);
+        if (combineScriptString != null) {
+            builder.field(ScriptedMetricParser.COMBINE_SCRIPT, combineScriptString);
         }
         
-        if (reduceScript != null) {
-            builder.field(ScriptedMetricParser.REDUCE_SCRIPT, reduceScript);
+        if (reduceScriptString != null) {
+            builder.field(ScriptedMetricParser.REDUCE_SCRIPT, reduceScriptString);
         }
         
         if (initScriptFile != null) {
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricParser.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricParser.java
index c37d0aaccf8..99120cc968d 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricParser.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricParser.java
@@ -21,9 +21,9 @@ package org.elasticsearch.search.aggregations.metrics.scripted;
 
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptParameterParser;
 import org.elasticsearch.script.ScriptParameterParser.ScriptParameterValue;
-import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.search.SearchParseException;
 import org.elasticsearch.search.aggregations.Aggregator;
 import org.elasticsearch.search.aggregations.AggregatorFactory;
@@ -40,6 +40,10 @@ public class ScriptedMetricParser implements Aggregator.Parser {
     public static final String MAP_SCRIPT = "map_script";
     public static final String COMBINE_SCRIPT = "combine_script";
     public static final String REDUCE_SCRIPT = "reduce_script";
+    public static final ParseField INIT_SCRIPT_FIELD = new ParseField("init_script");
+    public static final ParseField MAP_SCRIPT_FIELD = new ParseField("map_script");
+    public static final ParseField COMBINE_SCRIPT_FIELD = new ParseField("combine_script");
+    public static final ParseField REDUCE_SCRIPT_FIELD = new ParseField("reduce_script");
     public static final ParseField PARAMS_FIELD = new ParseField("params");
     public static final ParseField REDUCE_PARAMS_FIELD = new ParseField("reduce_params");
     public static final ParseField LANG_FIELD = new ParseField("lang");
@@ -51,7 +55,10 @@ public class ScriptedMetricParser implements Aggregator.Parser {
 
     @Override
     public AggregatorFactory parse(String aggregationName, XContentParser parser, SearchContext context) throws IOException {
-        String scriptLang;
+        Script initScript = null;
+        Script mapScript = null;
+        Script combineScript = null;
+        Script reduceScript = null;
         Map<String, Object> params = null;
         Map<String, Object> reduceParams = null;
         XContentParser.Token token;
@@ -67,7 +74,15 @@ public class ScriptedMetricParser implements Aggregator.Parser {
             if (token == XContentParser.Token.FIELD_NAME) {
                 currentFieldName = parser.currentName();
             } else if (token == XContentParser.Token.START_OBJECT) {
-                if (PARAMS_FIELD.match(currentFieldName)) {
+                if (INIT_SCRIPT_FIELD.match(currentFieldName)) {
+                    initScript = Script.parse(parser);
+                } else if (MAP_SCRIPT_FIELD.match(currentFieldName)) {
+                    mapScript = Script.parse(parser);
+                } else if (COMBINE_SCRIPT_FIELD.match(currentFieldName)) {
+                    combineScript = Script.parse(parser);
+                } else if (REDUCE_SCRIPT_FIELD.match(currentFieldName)) {
+                    reduceScript = Script.parse(parser);
+                } else if (PARAMS_FIELD.match(currentFieldName)) {
                     params = parser.map();
                 } else if (REDUCE_PARAMS_FIELD.match(currentFieldName)) {
                   reduceParams = parser.map();
@@ -85,42 +100,54 @@ public class ScriptedMetricParser implements Aggregator.Parser {
                         parser.getTokenLocation());
             }
         }
-        
-        ScriptParameterValue initScriptValue = scriptParameterParser.getScriptParameterValue(INIT_SCRIPT);
-        String initScript = null;
-        ScriptType initScriptType = null;
-        if (initScriptValue != null) {
-            initScript = initScriptValue.script();
-            initScriptType = initScriptValue.scriptType();
+
+        if (initScript == null) { // Didn't find anything using the new API so try using the old one instead
+            ScriptParameterValue scriptValue = scriptParameterParser.getScriptParameterValue(INIT_SCRIPT);
+            if (scriptValue != null) {
+                initScript = new Script(scriptValue.script(), scriptValue.scriptType(), scriptParameterParser.lang(), params);
+            }
+        } else if (initScript.getParams() != null) {
+            throw new SearchParseException(
+                    context,
+                    "init_script params are not supported. Parameters for the init_script must be specified in the params field on the scripted_metric aggregator not inside the init_script object",
+                    parser.getTokenLocation());
         }
-        ScriptParameterValue mapScriptValue = scriptParameterParser.getScriptParameterValue(MAP_SCRIPT);
-        String mapScript = null;
-        ScriptType mapScriptType = null;
-        if (mapScriptValue != null) {
-            mapScript = mapScriptValue.script();
-            mapScriptType = mapScriptValue.scriptType();
+
+        if (mapScript == null) { // Didn't find anything using the new API so try using the old one instead
+            ScriptParameterValue scriptValue = scriptParameterParser.getScriptParameterValue(MAP_SCRIPT);
+            if (scriptValue != null) {
+                mapScript = new Script(scriptValue.script(), scriptValue.scriptType(), scriptParameterParser.lang(), params);
+            }
+        } else if (mapScript.getParams() != null) {
+            throw new SearchParseException(
+                    context,
+                    "map_script params are not supported. Parameters for the map_script must be specified in the params field on the scripted_metric aggregator not inside the map_script object",
+                    parser.getTokenLocation());
         }
-        ScriptParameterValue combineScriptValue = scriptParameterParser.getScriptParameterValue(COMBINE_SCRIPT);
-        String combineScript = null;
-        ScriptType combineScriptType = null;
-        if (combineScriptValue != null) {
-            combineScript = combineScriptValue.script();
-            combineScriptType = combineScriptValue.scriptType();
+
+        if (combineScript == null) { // Didn't find anything using the new API so try using the old one instead
+            ScriptParameterValue scriptValue = scriptParameterParser.getScriptParameterValue(COMBINE_SCRIPT);
+            if (scriptValue != null) {
+                combineScript = new Script(scriptValue.script(), scriptValue.scriptType(), scriptParameterParser.lang(), params);
+            }
+        } else if (combineScript.getParams() != null) {
+            throw new SearchParseException(
+                    context,
+                    "combine_script params are not supported. Parameters for the combine_script must be specified in the params field on the scripted_metric aggregator not inside the combine_script object",
+                    parser.getTokenLocation());
         }
-        ScriptParameterValue reduceScriptValue = scriptParameterParser.getScriptParameterValue(REDUCE_SCRIPT);
-        String reduceScript = null;
-        ScriptType reduceScriptType = null;
-        if (reduceScriptValue != null) {
-            reduceScript = reduceScriptValue.script();
-            reduceScriptType = reduceScriptValue.scriptType();
+
+        if (reduceScript == null) { // Didn't find anything using the new API so try using the old one instead
+            ScriptParameterValue scriptValue = scriptParameterParser.getScriptParameterValue(REDUCE_SCRIPT);
+            if (scriptValue != null) {
+                reduceScript = new Script(scriptValue.script(), scriptValue.scriptType(), scriptParameterParser.lang(), reduceParams);
+            }
         }
-        scriptLang = scriptParameterParser.lang();
         
         if (mapScript == null) {
             throw new SearchParseException(context, "map_script field is required in [" + aggregationName + "].", parser.getTokenLocation());
         }
-        return new ScriptedMetricAggregator.Factory(aggregationName, scriptLang, initScriptType, initScript, mapScriptType, mapScript,
-                combineScriptType, combineScript, reduceScriptType, reduceScript, params, reduceParams);
+        return new ScriptedMetricAggregator.Factory(aggregationName, initScript, mapScript, combineScript, reduceScript, params);
     }
 
 }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsBuilder.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsBuilder.java
index dac1abf3a68..b59af08e634 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsBuilder.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsBuilder.java
@@ -21,6 +21,7 @@ package org.elasticsearch.search.aggregations.metrics.tophits;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.highlight.HighlightBuilder;
@@ -146,33 +147,60 @@ public class TopHitsBuilder extends AbstractAggregationBuilder {
      * @param name   The name that will represent this value in the return hit
      * @param script The script to use
      */
+    public TopHitsBuilder addScriptField(String name, Script script) {
+        sourceBuilder().scriptField(name, script);
+        return this;
+    }
+
+    /**
+     * Adds a script based field to load and return. The field does not have to
+     * be stored, but its recommended to use non analyzed or numeric fields.
+     *
+     * @param name
+     *            The name that will represent this value in the return hit
+     * @param script
+     *            The script to use
+     * @deprecated Use {@link #addScriptField(String, Script)} instead.
+     */
+    @Deprecated
     public TopHitsBuilder addScriptField(String name, String script) {
         sourceBuilder().scriptField(name, script);
         return this;
     }
 
     /**
-     * Adds a script based field to load and return. The field does not have to be stored,
-     * but its recommended to use non analyzed or numeric fields.
+     * Adds a script based field to load and return. The field does not have to
+     * be stored, but its recommended to use non analyzed or numeric fields.
      *
-     * @param name   The name that will represent this value in the return hit
-     * @param script The script to use
-     * @param params Parameters that the script can use.
+     * @param name
+     *            The name that will represent this value in the return hit
+     * @param script
+     *            The script to use
+     * @param params
+     *            Parameters that the script can use.
+     * @deprecated Use {@link #addScriptField(String, Script)} instead.
      */
+    @Deprecated
     public TopHitsBuilder addScriptField(String name, String script, Map<String, Object> params) {
         sourceBuilder().scriptField(name, script, params);
         return this;
     }
 
     /**
-     * Adds a script based field to load and return. The field does not have to be stored,
-     * but its recommended to use non analyzed or numeric fields.
+     * Adds a script based field to load and return. The field does not have to
+     * be stored, but its recommended to use non analyzed or numeric fields.
      *
-     * @param name   The name that will represent this value in the return hit
-     * @param lang   The language of the script
-     * @param script The script to use
-     * @param params Parameters that the script can use (can be <tt>null</tt>).
+     * @param name
+     *            The name that will represent this value in the return hit
+     * @param lang
+     *            The language of the script
+     * @param script
+     *            The script to use
+     * @param params
+     *            Parameters that the script can use (can be <tt>null</tt>).
+     * @deprecated Use {@link #addScriptField(String, Script)} instead.
      */
+    @Deprecated
     public TopHitsBuilder addScriptField(String name, String lang, String script, Map<String, Object> params) {
         sourceBuilder().scriptField(name, lang, script, params);
         return this;
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParser.java b/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParser.java
index 35bc30a48fa..409f74ffa08 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParser.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceParser.java
@@ -29,8 +29,12 @@ import org.elasticsearch.index.mapper.core.BooleanFieldMapper;
 import org.elasticsearch.index.mapper.core.DateFieldMapper;
 import org.elasticsearch.index.mapper.core.NumberFieldMapper;
 import org.elasticsearch.index.mapper.ip.IpFieldMapper;
-import org.elasticsearch.script.*;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.Script.ScriptField;
+import org.elasticsearch.script.ScriptContext;
+import org.elasticsearch.script.ScriptParameterParser;
 import org.elasticsearch.script.ScriptParameterParser.ScriptParameterValue;
+import org.elasticsearch.script.SearchScript;
 import org.elasticsearch.search.SearchParseException;
 import org.elasticsearch.search.aggregations.InternalAggregation;
 import org.elasticsearch.search.aggregations.support.format.ValueFormat;
@@ -39,6 +43,8 @@ import org.elasticsearch.search.internal.SearchContext;
 import java.io.IOException;
 import java.util.Map;
 
+import static com.google.common.collect.Maps.newHashMap;
+
 /**
  *
  */
@@ -62,10 +68,9 @@ public class ValuesSourceParser<VS extends ValuesSource> {
 
     private static class Input {
         String field = null;
-        String script = null;
-        ScriptService.ScriptType scriptType = null;
-        String lang = null;
-        Map<String, Object> params = null;
+        Script script = null;
+        @Deprecated
+        Map<String, Object> params = null; // TODO Remove in 2.0
         ValueType valueType = null;
         String format = null;
         Object missing = null;
@@ -119,7 +124,10 @@ public class ValuesSourceParser<VS extends ValuesSource> {
             return true;
         }
         if (scriptable && token == XContentParser.Token.START_OBJECT) {
-            if ("params".equals(currentFieldName)) {
+            if (ScriptField.SCRIPT.match(currentFieldName)) {
+                input.script = Script.parse(parser);
+                return true;
+            } else if ("params".equals(currentFieldName)) {
                 input.params = parser.map();
                 return true;
             }
@@ -130,13 +138,16 @@ public class ValuesSourceParser<VS extends ValuesSource> {
     }
 
     public ValuesSourceConfig<VS> config() {
-        
-        ScriptParameterValue scriptValue = scriptParameterParser.getDefaultScriptParameterValue();
-        if (scriptValue != null) {
-            input.script = scriptValue.script();
-            input.scriptType = scriptValue.scriptType();
+
+        if (input.script == null) { // Didn't find anything using the new API so try using the old one instead
+            ScriptParameterValue scriptValue = scriptParameterParser.getDefaultScriptParameterValue();
+            if (scriptValue != null) {
+                if (input.params == null) {
+                    input.params = newHashMap();
+                }
+                input.script = new Script(scriptValue.script(), scriptValue.scriptType(), scriptParameterParser.lang(), input.params);
+            }
         }
-        input.lang = scriptParameterParser.lang();
         
         ValueType valueType = input.valueType != null ? input.valueType : targetValueType;
 
@@ -195,7 +206,7 @@ public class ValuesSourceParser<VS extends ValuesSource> {
     }
 
     private SearchScript createScript() {
-        return input.script == null ? null : context.scriptService().search(context.lookup(), new Script(input.lang, input.script, input.scriptType, input.params), ScriptContext.Standard.AGGS);
+        return input.script == null ? null : context.scriptService().search(context.lookup(), input.script, ScriptContext.Standard.AGGS);
     }
 
     private static ValueFormat resolveFormat(@Nullable String format, @Nullable ValueType valueType) {
diff --git a/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
index 55e74d9303d..accea6043a5 100644
--- a/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
+++ b/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
@@ -23,6 +23,7 @@ import com.carrotsearch.hppc.ObjectFloatHashMap;
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
+
 import org.elasticsearch.ElasticsearchGenerationException;
 import org.elasticsearch.action.support.QuerySourceBuilder;
 import org.elasticsearch.action.support.ToXContentToBytes;
@@ -35,6 +36,8 @@ import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.fetch.innerhits.InnerHitsBuilder;
 import org.elasticsearch.search.fetch.source.FetchSourceContext;
@@ -594,6 +597,24 @@ public class SearchSourceBuilder extends ToXContentToBytes {
      * @param script
      *            The script
      */
+    public SearchSourceBuilder scriptField(String name, Script script) {
+        if (scriptFields == null) {
+            scriptFields = Lists.newArrayList();
+        }
+        scriptFields.add(new ScriptField(name, script));
+        return this;
+    }
+
+    /**
+     * Adds a script field under the given name with the provided script.
+     *
+     * @param name
+     *            The name of the field
+     * @param script
+     *            The script
+     * @deprecated Use {@link #scriptField(String, Script)} instead.
+     */
+    @Deprecated
     public SearchSourceBuilder scriptField(String name, String script) {
         return scriptField(name, null, script, null);
     }
@@ -607,7 +628,9 @@ public class SearchSourceBuilder extends ToXContentToBytes {
      *            The script to execute
      * @param params
      *            The script parameters
+     * @deprecated Use {@link #scriptField(String, Script)} instead.
      */
+    @Deprecated
     public SearchSourceBuilder scriptField(String name, String script, Map<String, Object> params) {
         return scriptField(name, null, script, params);
     }
@@ -623,13 +646,11 @@ public class SearchSourceBuilder extends ToXContentToBytes {
      *            The script to execute
      * @param params
      *            The script parameters (can be <tt>null</tt>)
+     * @deprecated Use {@link #scriptField(String, Script)} instead.
      */
+    @Deprecated
     public SearchSourceBuilder scriptField(String name, String lang, String script, Map<String, Object> params) {
-        if (scriptFields == null) {
-            scriptFields = Lists.newArrayList();
-        }
-        scriptFields.add(new ScriptField(name, lang, script, params));
-        return this;
+        return scriptField(name, new Script(script, ScriptType.INLINE, lang, params));
     }
 
     /**
@@ -746,13 +767,6 @@ public class SearchSourceBuilder extends ToXContentToBytes {
             for (ScriptField scriptField : scriptFields) {
                 builder.startObject(scriptField.fieldName());
                 builder.field("script", scriptField.script());
-                if (scriptField.lang() != null) {
-                    builder.field("lang", scriptField.lang());
-                }
-                if (scriptField.params() != null) {
-                    builder.field("params");
-                    builder.map(scriptField.params());
-                }
                 builder.endObject();
             }
             builder.endObject();
@@ -857,31 +871,19 @@ public class SearchSourceBuilder extends ToXContentToBytes {
 
     private static class ScriptField {
         private final String fieldName;
-        private final String script;
-        private final String lang;
-        private final Map<String, Object> params;
+        private final Script script;
 
-        private ScriptField(String fieldName, String lang, String script, Map<String, Object> params) {
+        private ScriptField(String fieldName, Script script) {
             this.fieldName = fieldName;
-            this.lang = lang;
             this.script = script;
-            this.params = params;
         }
 
         public String fieldName() {
             return fieldName;
         }
 
-        public String script() {
+        public Script script() {
             return script;
         }
-
-        public String lang() {
-            return this.lang;
-        }
-
-        public Map<String, Object> params() {
-            return params;
-        }
     }
 }
diff --git a/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsParseElement.java b/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsParseElement.java
index 10614656f09..6888cedf1f3 100644
--- a/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsParseElement.java
+++ b/src/main/java/org/elasticsearch/search/fetch/script/ScriptFieldsParseElement.java
@@ -20,13 +20,20 @@
 package org.elasticsearch.search.fetch.script;
 
 import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.script.*;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.Script.ScriptField;
+import org.elasticsearch.script.ScriptContext;
+import org.elasticsearch.script.ScriptParameterParser;
 import org.elasticsearch.script.ScriptParameterParser.ScriptParameterValue;
+import org.elasticsearch.script.SearchScript;
 import org.elasticsearch.search.SearchParseElement;
+import org.elasticsearch.search.SearchParseException;
 import org.elasticsearch.search.internal.SearchContext;
 
 import java.util.Map;
 
+import static com.google.common.collect.Maps.newHashMap;
+
 /**
  * <pre>
  * "script_fields" : {
@@ -53,15 +60,18 @@ public class ScriptFieldsParseElement implements SearchParseElement {
             } else if (token == XContentParser.Token.START_OBJECT) {
                 String fieldName = currentFieldName;
                 ScriptParameterParser scriptParameterParser = new ScriptParameterParser();
-                String script = null;
-                ScriptService.ScriptType scriptType = null;
+                Script script = null;
                 Map<String, Object> params = null;
                 boolean ignoreException = false;
                 while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
                     if (token == XContentParser.Token.FIELD_NAME) {
                         currentFieldName = parser.currentName();
                     } else if (token == XContentParser.Token.START_OBJECT) {
-                        params = parser.map();
+                        if (ScriptField.SCRIPT.match(currentFieldName)) {
+                            script = Script.parse(parser);
+                        } else if ("params".equals(currentFieldName)) {
+                            params = parser.map();
+                        }
                     } else if (token.isValue()) {
                         if ("ignore_failure".equals(currentFieldName)) {
                             ignoreException = parser.booleanValue();
@@ -71,12 +81,24 @@ public class ScriptFieldsParseElement implements SearchParseElement {
                     }
                 }
 
-                ScriptParameterValue scriptValue = scriptParameterParser.getDefaultScriptParameterValue();
-                if (scriptValue != null) {
-                    script = scriptValue.script();
-                    scriptType = scriptValue.scriptType();
+                if (script == null) { // Didn't find anything using the new API so try using the old one instead
+                    ScriptParameterValue scriptValue = scriptParameterParser.getDefaultScriptParameterValue();
+                    if (scriptValue != null) {
+                        if (params == null) {
+                            params = newHashMap();
+                        }
+                        script = new Script(scriptValue.script(), scriptValue.scriptType(), scriptParameterParser.lang(), params);
+                    }
+                } else if (params != null) {
+                    throw new SearchParseException(context, "script params must be specified inside script object",
+                            parser.getTokenLocation());
                 }
-                SearchScript searchScript = context.scriptService().search(context.lookup(), new Script(scriptParameterParser.lang(), script, scriptType, params), ScriptContext.Standard.SEARCH);
+
+                if (script == null) {
+                    throw new SearchParseException(context, "must specify a script in script fields", parser.getTokenLocation());
+                }
+
+                SearchScript searchScript = context.scriptService().search(context.lookup(), script, ScriptContext.Standard.SEARCH);
                 context.scriptFields().add(new ScriptFieldsContext.ScriptField(fieldName, searchScript, ignoreException));
             }
         }
diff --git a/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java b/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java
index c1b5ec9e7d0..8c2b67ef5a8 100644
--- a/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java
+++ b/src/main/java/org/elasticsearch/search/internal/ShardSearchLocalRequest.java
@@ -29,11 +29,10 @@ import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.index.shard.ShardId;
-import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.Template;
 import org.elasticsearch.search.Scroll;
 
 import java.io.IOException;
-import java.util.Map;
 
 import static org.elasticsearch.search.Scroll.readScroll;
 
@@ -70,9 +69,7 @@ public class ShardSearchLocalRequest extends ContextAndHeaderHolder implements S
     private BytesReference source;
     private BytesReference extraSource;
     private BytesReference templateSource;
-    private String templateName;
-    private ScriptService.ScriptType templateType;
-    private Map<String, Object> templateParams;
+    private Template template;
     private Boolean queryCache;
     private long nowInMillis;
 
@@ -85,9 +82,7 @@ public class ShardSearchLocalRequest extends ContextAndHeaderHolder implements S
                 searchRequest.source(), searchRequest.types(), searchRequest.queryCache());
         this.extraSource = searchRequest.extraSource();
         this.templateSource = searchRequest.templateSource();
-        this.templateName = searchRequest.templateName();
-        this.templateType = searchRequest.templateType();
-        this.templateParams = searchRequest.templateParams();
+        this.template = searchRequest.template();
         this.scroll = searchRequest.scroll();
         this.filteringAliases = filteringAliases;
         this.nowInMillis = nowInMillis;
@@ -166,18 +161,8 @@ public class ShardSearchLocalRequest extends ContextAndHeaderHolder implements S
     }
 
     @Override
-    public String templateName() {
-        return templateName;
-    }
-
-    @Override
-    public ScriptService.ScriptType templateType() {
-        return templateType;
-    }
-
-    @Override
-    public Map<String, Object> templateParams() {
-        return templateParams;
+    public Template template() {
+        return template;
     }
 
     @Override
@@ -213,10 +198,8 @@ public class ShardSearchLocalRequest extends ContextAndHeaderHolder implements S
         nowInMillis = in.readVLong();
 
         templateSource = in.readBytesReference();
-        templateName = in.readOptionalString();
-        templateType = ScriptService.ScriptType.readFrom(in);
         if (in.readBoolean()) {
-            templateParams = (Map<String, Object>) in.readGenericValue();
+            template = Template.readTemplate(in);
         }
         queryCache = in.readOptionalBoolean();
     }
@@ -243,12 +226,10 @@ public class ShardSearchLocalRequest extends ContextAndHeaderHolder implements S
         }
 
         out.writeBytesReference(templateSource);
-        out.writeOptionalString(templateName);
-        ScriptService.ScriptType.writeTo(templateType, out);
-        boolean existTemplateParams = templateParams != null;
-        out.writeBoolean(existTemplateParams);
-        if (existTemplateParams) {
-            out.writeGenericValue(templateParams);
+        boolean hasTemplate = template != null;
+        out.writeBoolean(hasTemplate);
+        if (hasTemplate) {
+            template.writeTo(out);
         }
         out.writeOptionalBoolean(queryCache);
     }
diff --git a/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java b/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java
index 8c73ed6026a..0411521d78d 100644
--- a/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java
+++ b/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java
@@ -24,11 +24,10 @@ import org.elasticsearch.common.HasContext;
 import org.elasticsearch.common.HasContextAndHeaders;
 import org.elasticsearch.common.HasHeaders;
 import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.Template;
 import org.elasticsearch.search.Scroll;
 
 import java.io.IOException;
-import java.util.Map;
 
 /**
  * Shard level request that represents a search.
@@ -57,11 +56,7 @@ public interface ShardSearchRequest extends HasContextAndHeaders {
 
     long nowInMillis();
 
-    String templateName();
-
-    ScriptService.ScriptType templateType();
-
-    Map<String, Object> templateParams();
+    Template template();
 
     BytesReference templateSource();
 
diff --git a/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java b/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java
index e39775245f7..3609fc3699d 100644
--- a/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java
+++ b/src/main/java/org/elasticsearch/search/internal/ShardSearchTransportRequest.java
@@ -28,12 +28,11 @@ import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.Template;
 import org.elasticsearch.search.Scroll;
 import org.elasticsearch.transport.TransportRequest;
 
 import java.io.IOException;
-import java.util.Map;
 
 /**
  * Shard level search request that represents an actual search sent from the coordinating node to the nodes holding
@@ -123,18 +122,8 @@ public class ShardSearchTransportRequest extends TransportRequest implements Sha
     }
 
     @Override
-    public String templateName() {
-        return shardSearchLocalRequest.templateName();
-    }
-
-    @Override
-    public ScriptService.ScriptType templateType() {
-        return shardSearchLocalRequest.templateType();
-    }
-
-    @Override
-    public Map<String, Object> templateParams() {
-        return shardSearchLocalRequest.templateParams();
+    public Template template() {
+        return shardSearchLocalRequest.template();
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java b/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java
index f228279b672..36b651a2220 100644
--- a/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java
+++ b/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java
@@ -19,11 +19,13 @@
 
 package org.elasticsearch.search.sort;
 
-import com.google.common.collect.Maps;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.ScriptService.ScriptType;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -31,42 +33,68 @@ import java.util.Map;
  */
 public class ScriptSortBuilder extends SortBuilder {
 
-    private String lang;
+    private Script script;
 
-    private final String script;
+    @Deprecated
+    private String scriptString;
 
     private final String type;
 
-    private SortOrder order;
+    @Deprecated
+    private String lang;
 
+    @Deprecated
     private Map<String, Object> params;
 
+    private SortOrder order;
+
     private String sortMode;
 
     private QueryBuilder nestedFilter;
 
     private String nestedPath;
 
+    /**
+     * Constructs a script sort builder with the given script.
+     *
+     * @param script
+     *            The script to use.
+     */
+    public ScriptSortBuilder(Script script, String type) {
+        this.script = script;
+        this.type = type;
+    }
+
     /**
      * Constructs a script sort builder with the script and the type.
      *
-     * @param script The script to use.
-     * @param type   The type, can either be "string" or "number".
+     * @param script
+     *            The script to use.
+     * @param type
+     *            The type, can either be "string" or "number".
+     *
+     * @deprecated Use {@link #ScriptSortBuilder(Script, String)} instead.
      */
+    @Deprecated
     public ScriptSortBuilder(String script, String type) {
-        this.script = script;
+        this.scriptString = script;
         this.type = type;
     }
 
     /**
      * Adds a parameter to the script.
      *
-     * @param name  The name of the parameter.
-     * @param value The value of the parameter.
+     * @param name
+     *            The name of the parameter.
+     * @param value
+     *            The value of the parameter.
+     *
+     * @deprecated Use {@link #ScriptSortBuilder(Script, String)} instead.
      */
+    @Deprecated
     public ScriptSortBuilder param(String name, Object value) {
         if (params == null) {
-            params = Maps.newHashMap();
+            params = new HashMap<>();
         }
         params.put(name, value);
         return this;
@@ -75,13 +103,28 @@ public class ScriptSortBuilder extends SortBuilder {
     /**
      * Sets parameters for the script.
      *
-     * @param params The script parameters
+     * @param params
+     *            The script parameters
+     *
+     * @deprecated Use {@link #ScriptSortBuilder(Script, String)} instead.
      */
+    @Deprecated
     public ScriptSortBuilder setParams(Map<String, Object> params) {
         this.params = params;
         return this;
     }
 
+    /**
+     * The language of the script.
+     *
+     * @deprecated Use {@link #ScriptSortBuilder(Script, String)} instead.
+     */
+    @Deprecated
+    public ScriptSortBuilder lang(String lang) {
+        this.lang = lang;
+        return this;
+    }
+
     /**
      * Sets the sort order.
      */
@@ -99,14 +142,6 @@ public class ScriptSortBuilder extends SortBuilder {
         return this;
     }
 
-    /**
-     * The language of the script.
-     */
-    public ScriptSortBuilder lang(String lang) {
-        this.lang = lang;
-        return this;
-    }
-
     /**
      * Defines which distance to use for sorting in the case a document contains multiple geo points.
      * Possible values: min and max
@@ -135,19 +170,18 @@ public class ScriptSortBuilder extends SortBuilder {
     }
 
     @Override
-    public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+    public XContentBuilder toXContent(XContentBuilder builder, Params builderParams) throws IOException {
         builder.startObject("_script");
-        builder.field("script", script);
+        if (script == null) {
+
+            builder.field("script", new Script(scriptString, ScriptType.INLINE, lang, params));
+        } else {
+            builder.field("script", script);
+        }
         builder.field("type", type);
         if (order == SortOrder.DESC) {
             builder.field("reverse", true);
         }
-        if (lang != null) {
-            builder.field("lang", lang);
-        }
-        if (this.params != null) {
-            builder.field("params", this.params);
-        }
         if (sortMode != null) {
             builder.field("mode", sortMode);
         }
diff --git a/src/main/java/org/elasticsearch/search/sort/ScriptSortParser.java b/src/main/java/org/elasticsearch/search/sort/ScriptSortParser.java
index bd852d418e8..46792fdae22 100644
--- a/src/main/java/org/elasticsearch/search/sort/ScriptSortParser.java
+++ b/src/main/java/org/elasticsearch/search/sort/ScriptSortParser.java
@@ -41,8 +41,10 @@ import org.elasticsearch.index.fielddata.fieldcomparator.DoubleValuesComparatorS
 import org.elasticsearch.index.query.support.NestedInnerQueryParseSupport;
 import org.elasticsearch.script.LeafSearchScript;
 import org.elasticsearch.script.Script;
+import org.elasticsearch.script.Script.ScriptField;
 import org.elasticsearch.script.ScriptContext;
-import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.ScriptParameterParser;
+import org.elasticsearch.script.ScriptParameterParser.ScriptParameterValue;
 import org.elasticsearch.script.SearchScript;
 import org.elasticsearch.search.MultiValueMode;
 import org.elasticsearch.search.SearchParseException;
@@ -51,6 +53,8 @@ import org.elasticsearch.search.internal.SearchContext;
 import java.io.IOException;
 import java.util.Map;
 
+import static com.google.common.collect.Maps.newHashMap;
+
 /**
  *
  */
@@ -66,8 +70,8 @@ public class ScriptSortParser implements SortParser {
 
     @Override
     public SortField parse(XContentParser parser, SearchContext context) throws Exception {
-        String script = null;
-        String scriptLang = null;
+        ScriptParameterParser scriptParameterParser = new ScriptParameterParser();
+        Script script = null;
         String type = null;
         Map<String, Object> params = null;
         boolean reverse = false;
@@ -76,12 +80,13 @@ public class ScriptSortParser implements SortParser {
 
         XContentParser.Token token;
         String currentName = parser.currentName();
-        ScriptService.ScriptType scriptType = ScriptService.ScriptType.INLINE;
         while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
             if (token == XContentParser.Token.FIELD_NAME) {
                 currentName = parser.currentName();
             } else if (token == XContentParser.Token.START_OBJECT) {
-                if ("params".equals(currentName)) {
+                if (ScriptField.SCRIPT.match(currentName)) {
+                    script = Script.parse(parser);
+                } else if ("params".equals(currentName)) {
                     params = parser.map();
                 } else if ("nested_filter".equals(currentName) || "nestedFilter".equals(currentName)) {
                     if (nestedHelper == null) {
@@ -94,17 +99,8 @@ public class ScriptSortParser implements SortParser {
                     reverse = parser.booleanValue();
                 } else if ("order".equals(currentName)) {
                     reverse = "desc".equals(parser.text());
-                } else if (ScriptService.SCRIPT_INLINE.match(currentName)) {
-                    script = parser.text();
-                    scriptType = ScriptService.ScriptType.INLINE;
-                } else if (ScriptService.SCRIPT_ID.match(currentName)) {
-                    script = parser.text();
-                    scriptType = ScriptService.ScriptType.INDEXED;
-                } else if (ScriptService.SCRIPT_FILE.match(currentName)) {
-                    script = parser.text();
-                    scriptType = ScriptService.ScriptType.FILE;
-                } else if (ScriptService.SCRIPT_LANG.match(currentName)) {
-                    scriptLang = parser.text();
+                } else if (scriptParameterParser.token(currentName, token, parser)) {
+                    // Do Nothing (handled by ScriptParameterParser
                 } else if ("type".equals(currentName)) {
                     type = parser.text();
                 } else if ("mode".equals(currentName)) {
@@ -118,13 +114,25 @@ public class ScriptSortParser implements SortParser {
             }
         }
 
+        if (script == null) { // Didn't find anything using the new API so try using the old one instead
+            ScriptParameterValue scriptValue = scriptParameterParser.getDefaultScriptParameterValue();
+            if (scriptValue != null) {
+                if (params == null) {
+                    params = newHashMap();
+                }
+                script = new Script(scriptValue.script(), scriptValue.scriptType(), scriptParameterParser.lang(), params);
+            }
+        } else if (params != null) {
+            throw new SearchParseException(context, "script params must be specified inside script object", parser.getTokenLocation());
+        }
+
         if (script == null) {
             throw new SearchParseException(context, "_script sorting requires setting the script to sort by", parser.getTokenLocation());
         }
         if (type == null) {
             throw new SearchParseException(context, "_script sorting requires setting the type of the script", parser.getTokenLocation());
         }
-        final SearchScript searchScript = context.scriptService().search(context.lookup(), new Script(scriptLang, script, scriptType, params), ScriptContext.Standard.SEARCH);
+        final SearchScript searchScript = context.scriptService().search(context.lookup(), script, ScriptContext.Standard.SEARCH);
 
         if (STRING_SORT_TYPE.equals(type) && (sortMode == MultiValueMode.SUM || sortMode == MultiValueMode.AVG)) {
             throw new SearchParseException(context, "type [string] doesn't support mode [" + sortMode + "]", parser.getTokenLocation());
diff --git a/src/main/java/org/elasticsearch/search/sort/SortBuilders.java b/src/main/java/org/elasticsearch/search/sort/SortBuilders.java
index ea5f31f1153..01134ca2648 100644
--- a/src/main/java/org/elasticsearch/search/sort/SortBuilders.java
+++ b/src/main/java/org/elasticsearch/search/sort/SortBuilders.java
@@ -19,6 +19,8 @@
 
 package org.elasticsearch.search.sort;
 
+import org.elasticsearch.script.Script;
+
 /**
  * A set of static factory methods for {@link SortBuilder}s.
  *
@@ -48,6 +50,20 @@ public class SortBuilders {
      * @param script The script to use.
      * @param type   The type, can either be "string" or "number".
      */
+    public static ScriptSortBuilder scriptSort(Script script, String type) {
+        return new ScriptSortBuilder(script, type);
+    }
+
+    /**
+     * Constructs a new script based sort.
+     *
+     * @param script
+     *            The script to use.
+     * @param type
+     *            The type, can either be "string" or "number".
+     * @deprecated Use {@link #scriptSort(Script, String)} instead.
+     */
+    @Deprecated
     public static ScriptSortBuilder scriptSort(String script, String type) {
         return new ScriptSortBuilder(script, type);
     }
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java
index 453dbdc3eb5..4bb59952336 100644
--- a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java
+++ b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java
@@ -22,7 +22,6 @@ import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Terms;
 import org.apache.lucene.util.BytesRef;
-import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
 import org.elasticsearch.index.analysis.ShingleTokenFilterFactory;
@@ -30,10 +29,8 @@ import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.query.IndexQueryParserService;
 import org.elasticsearch.script.CompiledScript;
-import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptContext;
-import org.elasticsearch.script.ScriptService.ScriptType;
-import org.elasticsearch.script.mustache.MustacheScriptEngineService;
+import org.elasticsearch.script.Template;
 import org.elasticsearch.search.suggest.SuggestContextParser;
 import org.elasticsearch.search.suggest.SuggestUtils;
 import org.elasticsearch.search.suggest.SuggestionSearchContext;
@@ -138,24 +135,14 @@ public final class PhraseSuggestParser implements SuggestContextParser {
                         if (token == XContentParser.Token.FIELD_NAME) {
                             fieldName = parser.currentName();
                         } else if ("query".equals(fieldName) || "filter".equals(fieldName)) {
-                            String templateNameOrTemplateContent;
-                            if (token == XContentParser.Token.START_OBJECT) {
-                                XContentBuilder builder = XContentBuilder.builder(parser.contentType().xContent());
-                                builder.copyCurrentStructure(parser);
-                                templateNameOrTemplateContent = builder.string();
-                            } else {
-                                templateNameOrTemplateContent = parser.text();
-                            }
-                            if (templateNameOrTemplateContent == null) {
-                                throw new IllegalArgumentException("suggester[phrase][collate] no query/filter found in collate object");
-                            }
+                            Template template = Template.parse(parser);
                             if (suggestion.getCollateFilterScript() != null) {
                                 throw new IllegalArgumentException("suggester[phrase][collate] filter already set, doesn't support additional [" + fieldName + "]");
                             }
                             if (suggestion.getCollateQueryScript() != null) {
                                 throw new IllegalArgumentException("suggester[phrase][collate] query already set, doesn't support additional [" + fieldName + "]");
                             }
-                            CompiledScript compiledScript = suggester.scriptService().compile(new Script(MustacheScriptEngineService.NAME, templateNameOrTemplateContent, ScriptType.INLINE, null), ScriptContext.Standard.SEARCH);
+                            CompiledScript compiledScript = suggester.scriptService().compile(template, ScriptContext.Standard.SEARCH);
                             if ("query".equals(fieldName)) {
                                 suggestion.setCollateQueryScript(compiledScript);
                             } else {
diff --git a/src/test/java/org/elasticsearch/action/IndicesRequestTests.java b/src/test/java/org/elasticsearch/action/IndicesRequestTests.java
index 7825d62fe81..a89180f0768 100644
--- a/src/test/java/org/elasticsearch/action/IndicesRequestTests.java
+++ b/src/test/java/org/elasticsearch/action/IndicesRequestTests.java
@@ -90,21 +90,37 @@ import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.action.SearchServiceTransportAction;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
+import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
+import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
 import org.elasticsearch.threadpool.ThreadPool;
-import org.elasticsearch.transport.*;
+import org.elasticsearch.transport.Transport;
+import org.elasticsearch.transport.TransportChannel;
+import org.elasticsearch.transport.TransportModule;
+import org.elasticsearch.transport.TransportRequest;
+import org.elasticsearch.transport.TransportRequestHandler;
+import org.elasticsearch.transport.TransportService;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
-import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
-import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.emptyIterable;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.instanceOf;
 
 @ClusterScope(scope = Scope.SUITE, numClientNodes = 1, minNumDataNodes = 2)
 @Slow
@@ -240,7 +256,7 @@ public class IndicesRequestTests extends ElasticsearchIntegrationTest {
 
         String indexOrAlias = randomIndexOrAlias();
         client().prepareIndex(indexOrAlias, "type", "id").setSource("field", "value").get();
-        UpdateRequest updateRequest = new UpdateRequest(indexOrAlias, "type", "id").script("ctx.op='delete'");
+        UpdateRequest updateRequest = new UpdateRequest(indexOrAlias, "type", "id").script(new Script("ctx.op='delete'"));
         UpdateResponse updateResponse = internalCluster().clientNodeClient().update(updateRequest).actionGet();
         assertThat(updateResponse.isCreated(), equalTo(false));
 
diff --git a/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java b/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java
index 040bb81ef6b..8600092f1d7 100644
--- a/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java
+++ b/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java
@@ -20,6 +20,7 @@
 package org.elasticsearch.action.bulk;
 
 import com.google.common.base.Charsets;
+
 import org.apache.lucene.util.Constants;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.delete.DeleteRequest;
@@ -28,15 +29,18 @@ import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesArray;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import static org.elasticsearch.common.io.Streams.copyToStringFromClasspath;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.notNullValue;
 
 public class BulkRequestTests extends ElasticsearchTestCase {
 
@@ -83,10 +87,14 @@ public class BulkRequestTests extends ElasticsearchTestCase {
         assertThat(((UpdateRequest) bulkRequest.requests().get(1)).id(), equalTo("0"));
         assertThat(((UpdateRequest) bulkRequest.requests().get(1)).type(), equalTo("type1"));
         assertThat(((UpdateRequest) bulkRequest.requests().get(1)).index(), equalTo("index1"));
-        assertThat(((UpdateRequest) bulkRequest.requests().get(1)).script(), equalTo("counter += param1"));
-        assertThat(((UpdateRequest) bulkRequest.requests().get(1)).scriptLang(), equalTo("js"));
-        assertThat(((UpdateRequest) bulkRequest.requests().get(1)).scriptParams().size(), equalTo(1));
-        assertThat(((Integer) ((UpdateRequest) bulkRequest.requests().get(1)).scriptParams().get("param1")), equalTo(1));
+        Script script = ((UpdateRequest) bulkRequest.requests().get(1)).script();
+        assertThat(script, notNullValue());
+        assertThat(script.getScript(), equalTo("counter += param1"));
+        assertThat(script.getLang(), equalTo("js"));
+        Map<String, Object> scriptParams = script.getParams();
+        assertThat(scriptParams, notNullValue());
+        assertThat(scriptParams.size(), equalTo(1));
+        assertThat(((Integer) scriptParams.get("param1")), equalTo(1));
         assertThat(((UpdateRequest) bulkRequest.requests().get(1)).upsertRequest().source().toUtf8(), equalTo("{\"counter\":1}"));
     }
 
diff --git a/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java b/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java
index 2779557d0c2..4292b7df613 100644
--- a/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java
+++ b/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java
@@ -21,12 +21,16 @@ package org.elasticsearch.action.update;
 
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.junit.Test;
 
 import java.util.Map;
 
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
 
 public class UpdateRequestTests extends ElasticsearchTestCase {
 
@@ -37,7 +41,94 @@ public class UpdateRequestTests extends ElasticsearchTestCase {
         request.source(XContentFactory.jsonBuilder().startObject()
                 .field("script", "script1")
                 .endObject());
-        assertThat(request.script(), equalTo("script1"));
+        Script script = request.script();
+        assertThat(script, notNullValue());
+        assertThat(script.getScript(), equalTo("script1"));
+        assertThat(script.getType(), equalTo(ScriptType.INLINE));
+        assertThat(script.getLang(), nullValue());
+        Map<String, Object> params = script.getParams();
+        assertThat(params, nullValue());
+
+        // script with params
+        request = new UpdateRequest("test", "type", "1");
+        request.source(XContentFactory.jsonBuilder().startObject().startObject("script").field("inline", "script1").startObject("params")
+                .field("param1", "value1").endObject().endObject().endObject());
+        script = request.script();
+        assertThat(script, notNullValue());
+        assertThat(script.getScript(), equalTo("script1"));
+        assertThat(script.getType(), equalTo(ScriptType.INLINE));
+        assertThat(script.getLang(), nullValue());
+        params = script.getParams();
+        assertThat(params, notNullValue());
+        assertThat(params.size(), equalTo(1));
+        assertThat(params.get("param1").toString(), equalTo("value1"));
+
+        request = new UpdateRequest("test", "type", "1");
+        request.source(XContentFactory.jsonBuilder().startObject().startObject("script").startObject("params").field("param1", "value1")
+                .endObject().field("inline", "script1").endObject().endObject());
+        script = request.script();
+        assertThat(script, notNullValue());
+        assertThat(script.getScript(), equalTo("script1"));
+        assertThat(script.getType(), equalTo(ScriptType.INLINE));
+        assertThat(script.getLang(), nullValue());
+        params = script.getParams();
+        assertThat(params, notNullValue());
+        assertThat(params.size(), equalTo(1));
+        assertThat(params.get("param1").toString(), equalTo("value1"));
+
+        // script with params and upsert
+        request = new UpdateRequest("test", "type", "1");
+        request.source(XContentFactory.jsonBuilder().startObject().startObject("script").startObject("params").field("param1", "value1")
+                .endObject().field("inline", "script1").endObject().startObject("upsert").field("field1", "value1").startObject("compound")
+                .field("field2", "value2").endObject().endObject().endObject());
+        script = request.script();
+        assertThat(script, notNullValue());
+        assertThat(script.getScript(), equalTo("script1"));
+        assertThat(script.getType(), equalTo(ScriptType.INLINE));
+        assertThat(script.getLang(), nullValue());
+        params = script.getParams();
+        assertThat(params, notNullValue());
+        assertThat(params.size(), equalTo(1));
+        assertThat(params.get("param1").toString(), equalTo("value1"));
+        Map<String, Object> upsertDoc = XContentHelper.convertToMap(request.upsertRequest().source(), true).v2();
+        assertThat(upsertDoc.get("field1").toString(), equalTo("value1"));
+        assertThat(((Map) upsertDoc.get("compound")).get("field2").toString(), equalTo("value2"));
+
+        request = new UpdateRequest("test", "type", "1");
+        request.source(XContentFactory.jsonBuilder().startObject().startObject("upsert").field("field1", "value1").startObject("compound")
+                .field("field2", "value2").endObject().endObject().startObject("script").startObject("params").field("param1", "value1")
+                .endObject().field("inline", "script1").endObject().endObject());
+        script = request.script();
+        assertThat(script, notNullValue());
+        assertThat(script.getScript(), equalTo("script1"));
+        assertThat(script.getType(), equalTo(ScriptType.INLINE));
+        assertThat(script.getLang(), nullValue());
+        params = script.getParams();
+        assertThat(params, notNullValue());
+        assertThat(params.size(), equalTo(1));
+        assertThat(params.get("param1").toString(), equalTo("value1"));
+        upsertDoc = XContentHelper.convertToMap(request.upsertRequest().source(), true).v2();
+        assertThat(upsertDoc.get("field1").toString(), equalTo("value1"));
+        assertThat(((Map) upsertDoc.get("compound")).get("field2").toString(), equalTo("value2"));
+
+        // script with doc
+        request = new UpdateRequest("test", "type", "1");
+        request.source(XContentFactory.jsonBuilder().startObject().startObject("doc").field("field1", "value1").startObject("compound")
+                .field("field2", "value2").endObject().endObject().endObject());
+        Map<String, Object> doc = request.doc().sourceAsMap();
+        assertThat(doc.get("field1").toString(), equalTo("value1"));
+        assertThat(((Map) doc.get("compound")).get("field2").toString(), equalTo("value2"));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testUpdateRequestOldAPI() throws Exception {
+        UpdateRequest request = new UpdateRequest("test", "type", "1");
+        // simple script
+        request.source(XContentFactory.jsonBuilder().startObject().field("script", "script1").endObject());
+        assertThat(request.scriptString(), equalTo("script1"));
 
         // script with params
         request = new UpdateRequest("test", "type", "1");
@@ -45,7 +136,8 @@ public class UpdateRequestTests extends ElasticsearchTestCase {
                 .field("script", "script1")
                 .startObject("params").field("param1", "value1").endObject()
                 .endObject());
-        assertThat(request.script(), equalTo("script1"));
+        assertThat(request.scriptString(), notNullValue());
+        assertThat(request.scriptString(), equalTo("script1"));
         assertThat(request.scriptParams().get("param1").toString(), equalTo("value1"));
 
         request = new UpdateRequest("test", "type", "1");
@@ -53,7 +145,8 @@ public class UpdateRequestTests extends ElasticsearchTestCase {
                 .startObject("params").field("param1", "value1").endObject()
                 .field("script", "script1")
                 .endObject());
-        assertThat(request.script(), equalTo("script1"));
+        assertThat(request.scriptString(), notNullValue());
+        assertThat(request.scriptString(), equalTo("script1"));
         assertThat(request.scriptParams().get("param1").toString(), equalTo("value1"));
 
         // script with params and upsert
@@ -63,7 +156,8 @@ public class UpdateRequestTests extends ElasticsearchTestCase {
                 .field("script", "script1")
                 .startObject("upsert").field("field1", "value1").startObject("compound").field("field2", "value2").endObject().endObject()
                 .endObject());
-        assertThat(request.script(), equalTo("script1"));
+        assertThat(request.scriptString(), notNullValue());
+        assertThat(request.scriptString(), equalTo("script1"));
         assertThat(request.scriptParams().get("param1").toString(), equalTo("value1"));
         Map<String, Object> upsertDoc = XContentHelper.convertToMap(request.upsertRequest().source(), true).v2();
         assertThat(upsertDoc.get("field1").toString(), equalTo("value1"));
@@ -75,7 +169,8 @@ public class UpdateRequestTests extends ElasticsearchTestCase {
                 .startObject("params").field("param1", "value1").endObject()
                 .field("script", "script1")
                 .endObject());
-        assertThat(request.script(), equalTo("script1"));
+        assertThat(request.scriptString(), notNullValue());
+        assertThat(request.scriptString(), equalTo("script1"));
         assertThat(request.scriptParams().get("param1").toString(), equalTo("value1"));
         upsertDoc = XContentHelper.convertToMap(request.upsertRequest().source(), true).v2();
         assertThat(upsertDoc.get("field1").toString(), equalTo("value1"));
@@ -87,7 +182,8 @@ public class UpdateRequestTests extends ElasticsearchTestCase {
                 .startObject("upsert").field("field1", "value1").startObject("compound").field("field2", "value2").endObject().endObject()
                 .field("script", "script1")
                 .endObject());
-        assertThat(request.script(), equalTo("script1"));
+        assertThat(request.scriptString(), notNullValue());
+        assertThat(request.scriptString(), equalTo("script1"));
         assertThat(request.scriptParams().get("param1").toString(), equalTo("value1"));
         upsertDoc = XContentHelper.convertToMap(request.upsertRequest().source(), true).v2();
         assertThat(upsertDoc.get("field1").toString(), equalTo("value1"));
diff --git a/src/test/java/org/elasticsearch/benchmark/scripts/expression/ScriptComparisonBenchmark.java b/src/test/java/org/elasticsearch/benchmark/scripts/expression/ScriptComparisonBenchmark.java
index 6c8f605293b..d0f534327a1 100644
--- a/src/test/java/org/elasticsearch/benchmark/scripts/expression/ScriptComparisonBenchmark.java
+++ b/src/test/java/org/elasticsearch/benchmark/scripts/expression/ScriptComparisonBenchmark.java
@@ -29,6 +29,8 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.node.Node;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.search.sort.ScriptSortBuilder;
 import org.elasticsearch.search.sort.SortBuilders;
 import org.joda.time.PeriodType;
@@ -142,7 +144,7 @@ public class ScriptComparisonBenchmark {
     }
 
     static TimeValue timeQueries(Client client, String lang, String script, int numQueries) {
-        ScriptSortBuilder sort = SortBuilders.scriptSort(script, "number").lang(lang);
+        ScriptSortBuilder sort = SortBuilders.scriptSort(new Script(script, ScriptType.INLINE, lang, null), "number");
         SearchRequestBuilder req = client.prepareSearch(indexName)
                 .setQuery(QueryBuilders.matchAllQuery())
                 .addSort(sort);
diff --git a/src/test/java/org/elasticsearch/benchmark/scripts/score/BasicScriptBenchmark.java b/src/test/java/org/elasticsearch/benchmark/scripts/score/BasicScriptBenchmark.java
index a832ffdd9c2..7ef820c6cab 100644
--- a/src/test/java/org/elasticsearch/benchmark/scripts/score/BasicScriptBenchmark.java
+++ b/src/test/java/org/elasticsearch/benchmark/scripts/score/BasicScriptBenchmark.java
@@ -32,6 +32,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.functionscore.script.ScriptScoreFunctionBuilder;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.ScriptService.ScriptType;
 import org.joda.time.DateTime;
 
 import java.io.BufferedWriter;
@@ -40,8 +42,13 @@ import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.security.SecureRandom;
-import java.util.*;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Random;
 
 import static org.elasticsearch.client.Requests.searchRequest;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
@@ -276,8 +283,8 @@ public class BasicScriptBenchmark {
             String[] terms = getTerms(nTerms + 1);
             params.put("text", terms);
             String infoString = "Results for native script with " + (nTerms + 1) + " terms:";
-            ScriptScoreFunctionBuilder scriptFunction = (langNative == true) ? scriptFunction(script, "native", params) : scriptFunction(
-                    script, params);
+            ScriptScoreFunctionBuilder scriptFunction = (langNative == true) ? scriptFunction(new Script(script, ScriptType.INLINE,
+                    "native", params)) : scriptFunction(new Script(script, ScriptType.INLINE, null, params));
             SearchRequest request = searchRequest().searchType(SearchType.QUERY_THEN_FETCH).source(
                     searchSource()
                             .explain(false)
@@ -292,7 +299,8 @@ public class BasicScriptBenchmark {
     static List<Entry<String, RequestInfo>> initScriptMatchAllSearchRequests(String script, boolean langNative) {
         List<Entry<String, RequestInfo>> nativeSearchRequests = new ArrayList<>();
         String infoString = "Results for constant score script:";
-        ScriptScoreFunctionBuilder scriptFunction = (langNative == true) ? scriptFunction(script, "native") : scriptFunction(script);
+        ScriptScoreFunctionBuilder scriptFunction = (langNative == true) ? scriptFunction(new Script(script, ScriptType.INLINE, "native",
+                null)) : scriptFunction(new Script(script));
         SearchRequest request = searchRequest().searchType(SearchType.QUERY_THEN_FETCH).source(
                 searchSource().explain(false).size(0)
                         .query(functionScoreQuery(QueryBuilders.matchAllQuery(), scriptFunction).boostMode(CombineFunction.REPLACE)));
diff --git a/src/test/java/org/elasticsearch/benchmark/search/aggregations/TimeDataHistogramAggregationBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/aggregations/TimeDataHistogramAggregationBenchmark.java
index ef0ebd5525b..96203ccba19 100644
--- a/src/test/java/org/elasticsearch/benchmark/search/aggregations/TimeDataHistogramAggregationBenchmark.java
+++ b/src/test/java/org/elasticsearch/benchmark/search/aggregations/TimeDataHistogramAggregationBenchmark.java
@@ -20,6 +20,7 @@
 package org.elasticsearch.benchmark.search.aggregations;
 
 import com.google.common.collect.Lists;
+
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse;
 import org.elasticsearch.action.admin.indices.stats.CommonStatsFlags;
@@ -38,11 +39,15 @@ import org.elasticsearch.index.fielddata.IndexFieldData;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.indices.IndexAlreadyExistsException;
 import org.elasticsearch.node.Node;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.concurrent.ThreadLocalRandom;
 
 import static org.elasticsearch.client.Requests.createIndexRequest;
@@ -207,9 +212,13 @@ public class TimeDataHistogramAggregationBenchmark {
     }
 
     private static SearchResponse doTermsAggsSearch(String name, String field, float matchPercentage) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("matchP", matchPercentage);
         SearchResponse response = client.prepareSearch()
                 .setSize(0)
-                .setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.scriptQuery("random()<matchP").addParam("matchP", matchPercentage)))
+                .setQuery(
+                        QueryBuilders.constantScoreQuery(QueryBuilders.scriptQuery(new Script("random()<matchP", ScriptType.INLINE, null,
+                                params))))
                 .addAggregation(AggregationBuilders.histogram(name).field(field).interval(3600 * 1000)).get();
 
         if (response.getHits().totalHits() < COUNT * matchPercentage * 0.7) {
diff --git a/src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java b/src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java
index bacf5761760..21e8682bbc1 100644
--- a/src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java
+++ b/src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java
@@ -20,6 +20,7 @@
 package org.elasticsearch.cluster;
 
 import com.google.common.base.Predicate;
+
 import org.elasticsearch.action.ActionRequestBuilder;
 import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
@@ -35,18 +36,23 @@ import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.discovery.DiscoverySettings;
 import org.elasticsearch.discovery.MasterNotDiscoveredException;
 import org.elasticsearch.rest.RestStatus;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
+import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
 import org.junit.Test;
 
 import java.util.HashMap;
 
 import static org.elasticsearch.action.percolate.PercolateSourceBuilder.docBuilder;
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
-import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
-import static org.hamcrest.Matchers.*;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertExists;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.lessThan;
 
 /**
  */
@@ -133,12 +139,15 @@ public class NoMasterNodeTests extends ElasticsearchIntegrationTest {
                 ClusterBlockException.class, RestStatus.SERVICE_UNAVAILABLE
         );
 
-        checkWriteAction(false, timeout,
-                client().prepareUpdate("test", "type1", "1").setScript("test script", ScriptService.ScriptType.INLINE).setTimeout(timeout));
+        checkWriteAction(
+                false, timeout,
+                client().prepareUpdate("test", "type1", "1")
+                        .setScript(new Script("test script", ScriptService.ScriptType.INLINE, null, null)).setTimeout(timeout));
 
-
-        checkWriteAction(autoCreateIndex, timeout,
-                client().prepareUpdate("no_index", "type1", "1").setScript("test script", ScriptService.ScriptType.INLINE).setTimeout(timeout));
+        checkWriteAction(
+                autoCreateIndex, timeout,
+                client().prepareUpdate("no_index", "type1", "1")
+                        .setScript(new Script("test script", ScriptService.ScriptType.INLINE, null, null)).setTimeout(timeout));
 
 
         checkWriteAction(false, timeout,
diff --git a/src/test/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunctionTests.java b/src/test/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunctionTests.java
index 77499cd9608..2ae7df16bc6 100644
--- a/src/test/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunctionTests.java
+++ b/src/test/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunctionTests.java
@@ -22,6 +22,7 @@ package org.elasticsearch.common.lucene.search.function;
 import org.apache.lucene.index.LeafReaderContext;
 import org.elasticsearch.script.AbstractFloatSearchScript;
 import org.elasticsearch.script.LeafSearchScript;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptException;
 import org.elasticsearch.script.SearchScript;
 import org.elasticsearch.test.ElasticsearchTestCase;
@@ -38,7 +39,7 @@ public class ScriptScoreFunctionTests extends ElasticsearchTestCase {
      */
     @Test
     public void testScriptScoresReturnsNaN() throws IOException {
-        ScoreFunction scoreFunction = new ScriptScoreFunction("Float.NaN", null, new FloatValueScript(Float.NaN));
+        ScoreFunction scoreFunction = new ScriptScoreFunction(new Script("Float.NaN"), new FloatValueScript(Float.NaN));
         LeafScoreFunction leafScoreFunction = scoreFunction.getLeafScoreFunction(null);
         try {
             leafScoreFunction.score(randomInt(), randomFloat());
diff --git a/src/test/java/org/elasticsearch/document/BulkTests.java b/src/test/java/org/elasticsearch/document/BulkTests.java
index 9246bc0c069..edb38190f55 100644
--- a/src/test/java/org/elasticsearch/document/BulkTests.java
+++ b/src/test/java/org/elasticsearch/document/BulkTests.java
@@ -42,6 +42,7 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.VersionType;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.junit.Test;
@@ -82,6 +83,99 @@ public class BulkTests extends ElasticsearchIntegrationTest {
         }
 
         bulkResponse = client().prepareBulk()
+                .add(client().prepareUpdate().setIndex(indexOrAlias()).setType("type1").setId("1")
+                        .setScript(new Script("ctx._source.field += 1", ScriptService.ScriptType.INLINE, null, null)))
+                .add(client().prepareUpdate().setIndex(indexOrAlias()).setType("type1").setId("2")
+                        .setScript(new Script("ctx._source.field += 1", ScriptService.ScriptType.INLINE, null, null)).setRetryOnConflict(3))
+                .add(client().prepareUpdate().setIndex(indexOrAlias()).setType("type1").setId("3")
+                        .setDoc(jsonBuilder().startObject().field("field1", "test").endObject())).execute().actionGet();
+
+        assertThat(bulkResponse.hasFailures(), equalTo(false));
+        assertThat(bulkResponse.getItems().length, equalTo(3));
+        for (BulkItemResponse bulkItemResponse : bulkResponse) {
+            assertThat(bulkItemResponse.getIndex(), equalTo("test"));
+        }
+        assertThat(((UpdateResponse) bulkResponse.getItems()[0].getResponse()).getId(), equalTo("1"));
+        assertThat(((UpdateResponse) bulkResponse.getItems()[0].getResponse()).getVersion(), equalTo(2l));
+        assertThat(((UpdateResponse) bulkResponse.getItems()[1].getResponse()).getId(), equalTo("2"));
+        assertThat(((UpdateResponse) bulkResponse.getItems()[1].getResponse()).getVersion(), equalTo(2l));
+        assertThat(((UpdateResponse) bulkResponse.getItems()[2].getResponse()).getId(), equalTo("3"));
+        assertThat(((UpdateResponse) bulkResponse.getItems()[2].getResponse()).getVersion(), equalTo(2l));
+
+        GetResponse getResponse = client().prepareGet().setIndex("test").setType("type1").setId("1").setFields("field").execute()
+                .actionGet();
+        assertThat(getResponse.isExists(), equalTo(true));
+        assertThat(getResponse.getVersion(), equalTo(2l));
+        assertThat(((Long) getResponse.getField("field").getValue()), equalTo(2l));
+
+        getResponse = client().prepareGet().setIndex("test").setType("type1").setId("2").setFields("field").execute().actionGet();
+        assertThat(getResponse.isExists(), equalTo(true));
+        assertThat(getResponse.getVersion(), equalTo(2l));
+        assertThat(((Long) getResponse.getField("field").getValue()), equalTo(3l));
+
+        getResponse = client().prepareGet().setIndex("test").setType("type1").setId("3").setFields("field1").execute().actionGet();
+        assertThat(getResponse.isExists(), equalTo(true));
+        assertThat(getResponse.getVersion(), equalTo(2l));
+        assertThat(getResponse.getField("field1").getValue().toString(), equalTo("test"));
+
+        bulkResponse = client()
+                .prepareBulk()
+                .add(client().prepareUpdate().setIndex(indexOrAlias()).setType("type1").setId("6")
+                        .setScript(new Script("ctx._source.field += 1", ScriptService.ScriptType.INLINE, null, null))
+                        .setUpsert(jsonBuilder().startObject().field("field", 0).endObject()))
+                .add(client().prepareUpdate().setIndex(indexOrAlias()).setType("type1").setId("7")
+                        .setScript(new Script("ctx._source.field += 1", ScriptService.ScriptType.INLINE, null, null)))
+                .add(client().prepareUpdate().setIndex(indexOrAlias()).setType("type1").setId("2")
+                        .setScript(new Script("ctx._source.field += 1", ScriptService.ScriptType.INLINE, null, null))).execute()
+                .actionGet();
+
+        assertThat(bulkResponse.hasFailures(), equalTo(true));
+        assertThat(bulkResponse.getItems().length, equalTo(3));
+        assertThat(((UpdateResponse) bulkResponse.getItems()[0].getResponse()).getId(), equalTo("6"));
+        assertThat(((UpdateResponse) bulkResponse.getItems()[0].getResponse()).getVersion(), equalTo(1l));
+        assertThat(bulkResponse.getItems()[1].getResponse(), nullValue());
+        assertThat(bulkResponse.getItems()[1].getFailure().getIndex(), equalTo("test"));
+        assertThat(bulkResponse.getItems()[1].getFailure().getId(), equalTo("7"));
+        assertThat(bulkResponse.getItems()[1].getFailure().getMessage(), containsString("document missing"));
+        assertThat(((UpdateResponse) bulkResponse.getItems()[2].getResponse()).getId(), equalTo("2"));
+        assertThat(((UpdateResponse) bulkResponse.getItems()[2].getResponse()).getIndex(), equalTo("test"));
+        assertThat(((UpdateResponse) bulkResponse.getItems()[2].getResponse()).getVersion(), equalTo(3l));
+
+        getResponse = client().prepareGet().setIndex("test").setType("type1").setId("6").setFields("field").execute().actionGet();
+        assertThat(getResponse.isExists(), equalTo(true));
+        assertThat(getResponse.getVersion(), equalTo(1l));
+        assertThat(((Long) getResponse.getField("field").getValue()), equalTo(0l));
+
+        getResponse = client().prepareGet().setIndex("test").setType("type1").setId("7").setFields("field").execute().actionGet();
+        assertThat(getResponse.isExists(), equalTo(false));
+
+        getResponse = client().prepareGet().setIndex("test").setType("type1").setId("2").setFields("field").execute().actionGet();
+        assertThat(getResponse.isExists(), equalTo(true));
+        assertThat(getResponse.getVersion(), equalTo(3l));
+        assertThat(((Long) getResponse.getField("field").getValue()), equalTo(4l));
+    }
+
+    @Test
+    public void testBulkUpdate_simpleOldScriptAPI() throws Exception {
+        assertAcked(prepareCreate("test").addAlias(new Alias("alias")));
+        ensureGreen();
+
+        BulkResponse bulkResponse = client().prepareBulk()
+                .add(client().prepareIndex().setIndex(indexOrAlias()).setType("type1").setId("1").setSource("field", 1))
+                .add(client().prepareIndex().setIndex(indexOrAlias()).setType("type1").setId("2").setSource("field", 2).setCreate(true))
+                .add(client().prepareIndex().setIndex(indexOrAlias()).setType("type1").setId("3").setSource("field", 3))
+                .add(client().prepareIndex().setIndex(indexOrAlias()).setType("type1").setId("4").setSource("field", 4))
+                .add(client().prepareIndex().setIndex(indexOrAlias()).setType("type1").setId("5").setSource("field", 5)).execute()
+                .actionGet();
+
+        assertThat(bulkResponse.hasFailures(), equalTo(false));
+        assertThat(bulkResponse.getItems().length, equalTo(5));
+        for (BulkItemResponse bulkItemResponse : bulkResponse) {
+            assertThat(bulkItemResponse.getIndex(), equalTo("test"));
+        }
+
+        bulkResponse = client()
+                .prepareBulk()
                 .add(client().prepareUpdate().setIndex(indexOrAlias()).setType("type1").setId("1")
                         .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE))
                 .add(client().prepareUpdate().setIndex(indexOrAlias()).setType("type1").setId("2")
@@ -215,6 +309,50 @@ public class BulkTests extends ElasticsearchIntegrationTest {
         assertThat(bulkResponse.getItems().length, equalTo(3));
 
         bulkResponse = client().prepareBulk()
+                .add(client().prepareUpdate().setIndex("test").setType("type1").setId("1")
+                        .setScript(new Script("ctx._source.field += a", ScriptService.ScriptType.INLINE, null, null)).setFields("field"))
+                .add(client().prepareUpdate().setIndex("test").setType("type1").setId("2")
+                        .setScript(new Script("ctx._source.field += 1", ScriptService.ScriptType.INLINE, null, null)).setFields("field"))
+                .add(client().prepareUpdate().setIndex("test").setType("type1").setId("3")
+                        .setScript(new Script("ctx._source.field += a", ScriptService.ScriptType.INLINE, null, null)).setFields("field"))
+                .execute().actionGet();
+
+        assertThat(bulkResponse.hasFailures(), equalTo(true));
+        assertThat(bulkResponse.getItems().length, equalTo(3));
+        assertThat(bulkResponse.getItems()[0].getFailure().getId(), equalTo("1"));
+        assertThat(bulkResponse.getItems()[0].getFailure().getMessage(), containsString("failed to execute script"));
+        assertThat(bulkResponse.getItems()[0].getResponse(), nullValue());
+
+        assertThat(((UpdateResponse) bulkResponse.getItems()[1].getResponse()).getId(), equalTo("2"));
+        assertThat(((UpdateResponse) bulkResponse.getItems()[1].getResponse()).getVersion(), equalTo(2l));
+        assertThat(((Integer) ((UpdateResponse) bulkResponse.getItems()[1].getResponse()).getGetResult().field("field").getValue()),
+                equalTo(2));
+        assertThat(bulkResponse.getItems()[1].getFailure(), nullValue());
+
+        assertThat(bulkResponse.getItems()[2].getFailure().getId(), equalTo("3"));
+        assertThat(bulkResponse.getItems()[2].getFailure().getMessage(), containsString("failed to execute script"));
+        assertThat(bulkResponse.getItems()[2].getResponse(), nullValue());
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testBulkUpdate_malformedScriptsOldScriptAPI() throws Exception {
+
+        createIndex("test");
+        ensureGreen();
+
+        BulkResponse bulkResponse = client().prepareBulk()
+                .add(client().prepareIndex().setIndex("test").setType("type1").setId("1").setSource("field", 1))
+                .add(client().prepareIndex().setIndex("test").setType("type1").setId("2").setSource("field", 1))
+                .add(client().prepareIndex().setIndex("test").setType("type1").setId("3").setSource("field", 1)).execute().actionGet();
+
+        assertThat(bulkResponse.hasFailures(), equalTo(false));
+        assertThat(bulkResponse.getItems().length, equalTo(3));
+
+        bulkResponse = client()
+                .prepareBulk()
                 .add(client().prepareUpdate().setIndex("test").setType("type1").setId("1")
                         .setScript("ctx._source.field += a", ScriptService.ScriptType.INLINE).setFields("field"))
                 .add(client().prepareUpdate().setIndex("test").setType("type1").setId("2")
@@ -254,6 +392,141 @@ public class BulkTests extends ElasticsearchIntegrationTest {
             builder.add(
                     client().prepareUpdate()
                             .setIndex("test").setType("type1").setId(Integer.toString(i))
+                    .setScript(new Script("ctx._source.counter += 1", ScriptService.ScriptType.INLINE, null, null)).setFields("counter")
+                    .setUpsert(jsonBuilder().startObject().field("counter", 1).endObject()));
+        }
+
+        BulkResponse response = builder.execute().actionGet();
+        assertThat(response.hasFailures(), equalTo(false));
+        assertThat(response.getItems().length, equalTo(numDocs));
+        for (int i = 0; i < numDocs; i++) {
+            assertThat(response.getItems()[i].getId(), equalTo(Integer.toString(i)));
+            assertThat(response.getItems()[i].getVersion(), equalTo(1l));
+            assertThat(response.getItems()[i].getIndex(), equalTo("test"));
+            assertThat(response.getItems()[i].getType(), equalTo("type1"));
+            assertThat(response.getItems()[i].getOpType(), equalTo("update"));
+            assertThat(((UpdateResponse) response.getItems()[i].getResponse()).getId(), equalTo(Integer.toString(i)));
+            assertThat(((UpdateResponse) response.getItems()[i].getResponse()).getVersion(), equalTo(1l));
+            assertThat(((Integer) ((UpdateResponse) response.getItems()[i].getResponse()).getGetResult().field("counter").getValue()),
+                    equalTo(1));
+
+            for (int j = 0; j < 5; j++) {
+                GetResponse getResponse = client().prepareGet("test", "type1", Integer.toString(i)).setFields("counter").execute()
+                        .actionGet();
+                assertThat(getResponse.isExists(), equalTo(true));
+                assertThat(getResponse.getVersion(), equalTo(1l));
+                assertThat((Long) getResponse.getField("counter").getValue(), equalTo(1l));
+            }
+        }
+
+        builder = client().prepareBulk();
+        for (int i = 0; i < numDocs; i++) {
+            UpdateRequestBuilder updateBuilder = client().prepareUpdate().setIndex("test").setType("type1").setId(Integer.toString(i))
+                    .setFields("counter");
+            if (i % 2 == 0) {
+                updateBuilder.setScript(new Script("ctx._source.counter += 1", ScriptService.ScriptType.INLINE, null, null));
+            } else {
+                updateBuilder.setDoc(jsonBuilder().startObject().field("counter", 2).endObject());
+            }
+            if (i % 3 == 0) {
+                updateBuilder.setRetryOnConflict(3);
+            }
+
+            builder.add(updateBuilder);
+        }
+
+        response = builder.execute().actionGet();
+        assertThat(response.hasFailures(), equalTo(false));
+        assertThat(response.getItems().length, equalTo(numDocs));
+        for (int i = 0; i < numDocs; i++) {
+            assertThat(response.getItems()[i].getId(), equalTo(Integer.toString(i)));
+            assertThat(response.getItems()[i].getVersion(), equalTo(2l));
+            assertThat(response.getItems()[i].getIndex(), equalTo("test"));
+            assertThat(response.getItems()[i].getType(), equalTo("type1"));
+            assertThat(response.getItems()[i].getOpType(), equalTo("update"));
+            assertThat(((UpdateResponse) response.getItems()[i].getResponse()).getId(), equalTo(Integer.toString(i)));
+            assertThat(((UpdateResponse) response.getItems()[i].getResponse()).getVersion(), equalTo(2l));
+            assertThat(((Integer) ((UpdateResponse) response.getItems()[i].getResponse()).getGetResult().field("counter").getValue()),
+                    equalTo(2));
+        }
+
+        builder = client().prepareBulk();
+        int maxDocs = numDocs / 2 + numDocs;
+        for (int i = (numDocs / 2); i < maxDocs; i++) {
+            builder.add(client().prepareUpdate().setIndex("test").setType("type1").setId(Integer.toString(i))
+                    .setScript(new Script("ctx._source.counter += 1", ScriptService.ScriptType.INLINE, null, null)));
+        }
+        response = builder.execute().actionGet();
+        assertThat(response.hasFailures(), equalTo(true));
+        assertThat(response.getItems().length, equalTo(numDocs));
+        for (int i = 0; i < numDocs; i++) {
+            int id = i + (numDocs / 2);
+            if (i >= (numDocs / 2)) {
+                assertThat(response.getItems()[i].getFailure().getId(), equalTo(Integer.toString(id)));
+                assertThat(response.getItems()[i].getFailure().getMessage(), containsString("document missing"));
+            } else {
+                assertThat(response.getItems()[i].getId(), equalTo(Integer.toString(id)));
+                assertThat(response.getItems()[i].getVersion(), equalTo(3l));
+                assertThat(response.getItems()[i].getIndex(), equalTo("test"));
+                assertThat(response.getItems()[i].getType(), equalTo("type1"));
+                assertThat(response.getItems()[i].getOpType(), equalTo("update"));
+            }
+        }
+
+        builder = client().prepareBulk();
+        for (int i = 0; i < numDocs; i++) {
+            builder.add(client().prepareUpdate().setIndex("test").setType("type1").setId(Integer.toString(i))
+                    .setScript(new Script("ctx.op = \"none\"", ScriptService.ScriptType.INLINE, null, null)));
+        }
+        response = builder.execute().actionGet();
+        assertThat(response.buildFailureMessage(), response.hasFailures(), equalTo(false));
+        assertThat(response.getItems().length, equalTo(numDocs));
+        for (int i = 0; i < numDocs; i++) {
+            assertThat(response.getItems()[i].getItemId(), equalTo(i));
+            assertThat(response.getItems()[i].getId(), equalTo(Integer.toString(i)));
+            assertThat(response.getItems()[i].getIndex(), equalTo("test"));
+            assertThat(response.getItems()[i].getType(), equalTo("type1"));
+            assertThat(response.getItems()[i].getOpType(), equalTo("update"));
+        }
+
+        builder = client().prepareBulk();
+        for (int i = 0; i < numDocs; i++) {
+            builder.add(client().prepareUpdate().setIndex("test").setType("type1").setId(Integer.toString(i))
+                    .setScript(new Script("ctx.op = \"delete\"", ScriptService.ScriptType.INLINE, null, null)));
+        }
+        response = builder.execute().actionGet();
+        assertThat(response.hasFailures(), equalTo(false));
+        assertThat(response.getItems().length, equalTo(numDocs));
+        for (int i = 0; i < numDocs; i++) {
+            assertThat(response.getItems()[i].getItemId(), equalTo(i));
+            assertThat(response.getItems()[i].getId(), equalTo(Integer.toString(i)));
+            assertThat(response.getItems()[i].getIndex(), equalTo("test"));
+            assertThat(response.getItems()[i].getType(), equalTo("type1"));
+            assertThat(response.getItems()[i].getOpType(), equalTo("update"));
+            for (int j = 0; j < 5; j++) {
+                GetResponse getResponse = client().prepareGet("test", "type1", Integer.toString(i)).setFields("counter").execute()
+                        .actionGet();
+                assertThat(getResponse.isExists(), equalTo(false));
+            }
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testBulkUpdate_largerVolumeOldScriptAPI() throws Exception {
+        createIndex("test");
+        ensureGreen();
+
+        int numDocs = scaledRandomIntBetween(100, 2000);
+        if (numDocs % 2 == 1) {
+            numDocs++; // this test needs an even num of docs
+        }
+        logger.info("Bulk-Indexing {} docs", numDocs);
+        BulkRequestBuilder builder = client().prepareBulk();
+        for (int i = 0; i < numDocs; i++) {
+            builder.add(client().prepareUpdate().setIndex("test").setType("type1").setId(Integer.toString(i))
                             .setScript("ctx._source.counter += 1", ScriptService.ScriptType.INLINE).setFields("counter")
                             .setUpsert(jsonBuilder().startObject().field("counter", 1).endObject())
             );
diff --git a/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTest.java b/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTest.java
index c17a775c85a..426185cc06f 100644
--- a/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTest.java
+++ b/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTest.java
@@ -20,6 +20,8 @@ package org.elasticsearch.index.query;
 
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.script.ScriptService.ScriptType;
+import org.elasticsearch.script.Template;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.junit.Test;
 
@@ -34,6 +36,23 @@ public class TemplateQueryBuilderTest extends ElasticsearchTestCase {
 
     @Test
     public void testJSONGeneration() throws IOException {
+        Map<String, Object> vars = new HashMap<>();
+        vars.put("template", "filled");
+        TemplateQueryBuilder builder = new TemplateQueryBuilder(
+                new Template("I am a $template string", ScriptType.INLINE, null, null, vars));
+        XContentBuilder content = XContentFactory.jsonBuilder();
+        content.startObject();
+        builder.doXContent(content, null);
+        content.endObject();
+        content.close();
+        assertEquals("{\"template\":{\"inline\":\"I am a $template string\",\"params\":{\"template\":\"filled\"}}}", content.string());
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testJSONGenerationOldScriptAPI() throws IOException {
         Map<String, Object> vars = new HashMap<>();
         vars.put("template", "filled");
         TemplateQueryBuilder builder = new TemplateQueryBuilder("I am a $template string", vars);
@@ -42,6 +61,6 @@ public class TemplateQueryBuilderTest extends ElasticsearchTestCase {
         builder.doXContent(content, null);
         content.endObject();
         content.close();
-        assertEquals(content.string(), "{\"template\":{\"query\":\"I am a $template string\",\"params\":{\"template\":\"filled\"}}}");
+        assertEquals("{\"template\":{\"inline\":\"I am a $template string\",\"params\":{\"template\":\"filled\"}}}", content.string());
     }
 }
diff --git a/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTest.java b/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTest.java
index ec9be8b591f..ad737fd797d 100644
--- a/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTest.java
+++ b/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTest.java
@@ -107,12 +107,11 @@ public class TemplateQueryParserTest extends ElasticsearchTestCase {
 
     @Test
     public void testParser() throws IOException {
-        String templateString = "{\"template\": {"
-                + "\"query\":{\"match_{{template}}\": {}},"
-                + "\"params\":{\"template\":\"all\"}}" + "}";
+        String templateString = "{" + "\"query\":{\"match_{{template}}\": {}}," + "\"params\":{\"template\":\"all\"}" + "}";
 
         XContentParser templateSourceParser = XContentFactory.xContent(templateString).createParser(templateString);
         context.reset(templateSourceParser);
+        templateSourceParser.nextToken();
 
         TemplateQueryParser parser = injector.getInstance(TemplateQueryParser.class);
         Query query = parser.parse(context);
@@ -121,10 +120,11 @@ public class TemplateQueryParserTest extends ElasticsearchTestCase {
 
     @Test
     public void testParserCanExtractTemplateNames() throws Exception {
-        String templateString = "{ \"template\": { \"file\": \"storedTemplate\" ,\"params\":{\"template\":\"all\" } } } ";
+        String templateString = "{ \"file\": \"storedTemplate\" ,\"params\":{\"template\":\"all\" } } ";
 
         XContentParser templateSourceParser = XContentFactory.xContent(templateString).createParser(templateString);
         context.reset(templateSourceParser);
+        templateSourceParser.nextToken();
 
         TemplateQueryParser parser = injector.getInstance(TemplateQueryParser.class);
         Query query = parser.parse(context);
diff --git a/src/test/java/org/elasticsearch/index/query/TemplateQueryTest.java b/src/test/java/org/elasticsearch/index/query/TemplateQueryTest.java
index dd1c61b64c1..4ba9b010eb5 100644
--- a/src/test/java/org/elasticsearch/index/query/TemplateQueryTest.java
+++ b/src/test/java/org/elasticsearch/index/query/TemplateQueryTest.java
@@ -33,6 +33,8 @@ import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.ScriptService.ScriptType;
+import org.elasticsearch.script.Template;
 import org.elasticsearch.script.mustache.MustacheScriptEngineService;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.junit.Before;
@@ -46,7 +48,9 @@ import java.util.Map;
 
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFailures;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 
@@ -77,8 +81,8 @@ public class TemplateQueryTest extends ElasticsearchIntegrationTest {
         Map<String, Object> vars = new HashMap<>();
         vars.put("template", "all");
 
-        TemplateQueryBuilder builder = new TemplateQueryBuilder(
-                "{\"match_{{template}}\": {}}\"", vars);
+        TemplateQueryBuilder builder = new TemplateQueryBuilder(new Template("{\"match_{{template}}\": {}}\"", ScriptType.INLINE, null,
+                null, vars));
         SearchResponse sr = client().prepareSearch().setQuery(builder)
                 .execute().actionGet();
         assertHitCount(sr, 2);
@@ -123,8 +127,8 @@ public class TemplateQueryTest extends ElasticsearchIntegrationTest {
     public void testTemplateWOReplacementInBody() throws IOException {
         Map<String, Object> vars = new HashMap<>();
 
-        TemplateQueryBuilder builder = new TemplateQueryBuilder(
-                "{\"match_all\": {}}\"", vars);
+        TemplateQueryBuilder builder = new TemplateQueryBuilder(new Template(
+                "{\"match_all\": {}}\"", ScriptType.INLINE, null, null, vars));
         SearchResponse sr = client().prepareSearch().setQuery(builder)
                 .execute().actionGet();
         assertHitCount(sr, 2);
@@ -135,8 +139,8 @@ public class TemplateQueryTest extends ElasticsearchIntegrationTest {
         Map<String, Object> vars = new HashMap<>();
         vars.put("template", "all");
 
-        TemplateQueryBuilder builder = new TemplateQueryBuilder(
-                "storedTemplate", ScriptService.ScriptType.FILE, vars);
+        TemplateQueryBuilder builder = new TemplateQueryBuilder(new Template(
+                "storedTemplate", ScriptService.ScriptType.FILE, null, null, vars));
         SearchResponse sr = client().prepareSearch().setQuery(builder)
                 .execute().actionGet();
         assertHitCount(sr, 2);
@@ -214,15 +218,17 @@ public class TemplateQueryTest extends ElasticsearchIntegrationTest {
         templateParams.put("myField", "theField");
         templateParams.put("myValue", "foo");
 
-        SearchResponse searchResponse = client().prepareSearch("test").setTypes("type").setTemplateName("full-query-template")
-                .setTemplateParams(templateParams).setTemplateType(ScriptService.ScriptType.FILE).get();
+        SearchResponse searchResponse = client().prepareSearch("test").setTypes("type")
+                .setTemplate(new Template("full-query-template", ScriptType.FILE, MustacheScriptEngineService.NAME, null, templateParams))
+                .get();
         assertHitCount(searchResponse, 4);
         // size kicks in here...
         assertThat(searchResponse.getHits().getHits().length, is(2));
 
         templateParams.put("myField", "otherField");
-        searchResponse = client().prepareSearch("test").setTypes("type").setTemplateName("full-query-template")
-                .setTemplateParams(templateParams).setTemplateType(ScriptService.ScriptType.FILE).get();
+        searchResponse = client().prepareSearch("test").setTypes("type")
+                .setTemplate(new Template("full-query-template", ScriptType.FILE, MustacheScriptEngineService.NAME, null, templateParams))
+                .get();
         assertHitCount(searchResponse, 1);
     }
 
@@ -264,23 +270,28 @@ public class TemplateQueryTest extends ElasticsearchIntegrationTest {
         builders.add(client().prepareIndex("test", "type", "4").setSource("{\"theField\":\"foo 4\"}"));
         builders.add(client().prepareIndex("test", "type", "5").setSource("{\"theField\":\"bar\"}"));
 
-        indexRandom(true,builders);
+        indexRandom(true, builders);
 
         Map<String, Object> templateParams = Maps.newHashMap();
         templateParams.put("fieldParam", "foo");
 
-        SearchResponse searchResponse = client().prepareSearch("test").setTypes("type").
-                setTemplateName("testTemplate").setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(templateParams).get();
+        SearchResponse searchResponse = client().prepareSearch("test").setTypes("type")
+                .setTemplate(new Template("testTemplate", ScriptType.INDEXED, MustacheScriptEngineService.NAME, null, templateParams))
+                .get();
         assertHitCount(searchResponse, 4);
 
-        DeleteIndexedScriptResponse deleteResponse = client().prepareDeleteIndexedScript(MustacheScriptEngineService.NAME,"testTemplate").get();
+        DeleteIndexedScriptResponse deleteResponse = client().prepareDeleteIndexedScript(MustacheScriptEngineService.NAME, "testTemplate")
+                .get();
         assertTrue(deleteResponse.isFound());
 
         getResponse = client().prepareGetIndexedScript(MustacheScriptEngineService.NAME, "testTemplate").get();
         assertFalse(getResponse.isExists());
 
-        client().prepareSearch("test").setTypes("type").
-                setTemplateName("/template_index/mustache/1000").setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(templateParams).get();
+        client().prepareSearch("test")
+                .setTypes("type")
+                .setTemplate(
+                        new Template("/template_index/mustache/1000", ScriptType.INDEXED, MustacheScriptEngineService.NAME, null,
+                                templateParams)).get();
     }
 
     @Test
@@ -322,45 +333,61 @@ public class TemplateQueryTest extends ElasticsearchIntegrationTest {
         builders.add(client().prepareIndex("test", "type", "4").setSource("{\"theField\":\"foo 4\"}"));
         builders.add(client().prepareIndex("test", "type", "5").setSource("{\"theField\":\"bar\"}"));
 
-        indexRandom(true,builders);
+        indexRandom(true, builders);
 
         Map<String, Object> templateParams = Maps.newHashMap();
         templateParams.put("fieldParam", "foo");
 
-        SearchResponse searchResponse = client().prepareSearch("test").setTypes("type").
-                setTemplateName("/mustache/1a").setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(templateParams).get();
+        SearchResponse searchResponse = client()
+                .prepareSearch("test")
+                .setTypes("type")
+                .setTemplate(
+                        new Template("/mustache/1a", ScriptService.ScriptType.INDEXED, MustacheScriptEngineService.NAME, null,
+                                templateParams)).get();
         assertHitCount(searchResponse, 4);
 
         try {
-            client().prepareSearch("test").setTypes("type").
-                    setTemplateName("/template_index/mustache/1000").setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(templateParams).get();
+            client().prepareSearch("test")
+                    .setTypes("type")
+                    .setTemplate(
+                            new Template("/template_index/mustache/1000", ScriptService.ScriptType.INDEXED,
+                                    MustacheScriptEngineService.NAME, null, templateParams)).get();
             fail("shouldn't get here");
         } catch (SearchPhaseExecutionException spee) {
             //all good
         }
 
         try {
-            searchResponse = client().prepareSearch("test").setTypes("type").
-                    setTemplateName("/myindex/mustache/1").setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(templateParams).get();
+            searchResponse = client()
+                    .prepareSearch("test")
+                    .setTypes("type")
+                    .setTemplate(
+                            new Template("/myindex/mustache/1", ScriptService.ScriptType.INDEXED, MustacheScriptEngineService.NAME, null,
+                                    templateParams)).get();
             assertFailures(searchResponse);
         } catch (SearchPhaseExecutionException spee) {
             //all good
         }
 
-        searchResponse = client().prepareSearch("test").setTypes("type").
-                setTemplateName("1a").setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(templateParams).get();
+        searchResponse = client().prepareSearch("test").setTypes("type")
+                .setTemplate(new Template("1a", ScriptService.ScriptType.INDEXED, MustacheScriptEngineService.NAME, null, templateParams))
+                .get();
         assertHitCount(searchResponse, 4);
 
         templateParams.put("fieldParam", "bar");
-        searchResponse = client().prepareSearch("test").setTypes("type").
-                setTemplateName("/mustache/2").setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(templateParams).get();
+        searchResponse = client()
+                .prepareSearch("test")
+                .setTypes("type")
+                .setTemplate(
+                        new Template("/mustache/2", ScriptService.ScriptType.INDEXED, MustacheScriptEngineService.NAME, null,
+                                templateParams)).get();
         assertHitCount(searchResponse, 1);
 
         Map<String, Object> vars = new HashMap<>();
         vars.put("fieldParam", "bar");
 
-        TemplateQueryBuilder builder = new TemplateQueryBuilder(
-                "3", ScriptService.ScriptType.INDEXED, vars);
+        TemplateQueryBuilder builder = new TemplateQueryBuilder(new Template(
+                "3", ScriptService.ScriptType.INDEXED, null, null, vars));
         SearchResponse sr = client().prepareSearch().setQuery(builder)
                 .execute().actionGet();
         assertHitCount(sr, 1);
@@ -388,29 +415,35 @@ public class TemplateQueryTest extends ElasticsearchIntegrationTest {
             PutIndexedScriptResponse scriptResponse = client().preparePutIndexedScript(MustacheScriptEngineService.NAME, "git01", 
                     "{\"query\": {\"match\": {\"searchtext\": {\"query\": \"{{P_Keyword1}}\",\"type\": \"ooophrase_prefix\"}}}}").get();
             assertEquals(i * 2 - 1, scriptResponse.getVersion());
-    
+
             GetIndexedScriptResponse getResponse = client().prepareGetIndexedScript(MustacheScriptEngineService.NAME, "git01").get();
             assertTrue(getResponse.isExists());
-    
+
             Map<String, Object> templateParams = Maps.newHashMap();
             templateParams.put("P_Keyword1", "dev");
-    
+
             try {
-                client().prepareSearch("testindex").setTypes("test").
-                    setTemplateName("git01").setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(templateParams).get();
+                client().prepareSearch("testindex")
+                        .setTypes("test")
+                        .setTemplate(
+                                new Template("git01", ScriptService.ScriptType.INDEXED, MustacheScriptEngineService.NAME, null,
+                                        templateParams)).get();
                 fail("Broken test template is parsing w/o error.");
             } catch (SearchPhaseExecutionException e) {
                 // the above is expected to fail
             }
-    
-            PutIndexedScriptRequestBuilder builder = client()
-                    .preparePutIndexedScript(MustacheScriptEngineService.NAME, "git01",
-                            "{\"query\": {\"match\": {\"searchtext\": {\"query\": \"{{P_Keyword1}}\",\"type\": \"phrase_prefix\"}}}}")
-                    .setOpType(OpType.INDEX);
+
+            PutIndexedScriptRequestBuilder builder = client().preparePutIndexedScript(MustacheScriptEngineService.NAME, "git01",
+                    "{\"query\": {\"match\": {\"searchtext\": {\"query\": \"{{P_Keyword1}}\",\"type\": \"phrase_prefix\"}}}}").setOpType(
+                    OpType.INDEX);
             scriptResponse = builder.get();
             assertEquals(i * 2, scriptResponse.getVersion());
-            SearchResponse searchResponse = client().prepareSearch("testindex").setTypes("test").
-                    setTemplateName("git01").setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(templateParams).get();
+            SearchResponse searchResponse = client()
+                    .prepareSearch("testindex")
+                    .setTypes("test")
+                    .setTemplate(
+                            new Template("git01", ScriptService.ScriptType.INDEXED, MustacheScriptEngineService.NAME, null, templateParams))
+                    .get();
             assertHitCount(searchResponse, 1);
         }
     }
@@ -442,9 +475,292 @@ public class TemplateQueryTest extends ElasticsearchIntegrationTest {
       String[] fieldParams = {"foo","bar"};
       arrayTemplateParams.put("fieldParam", fieldParams);
 
-      SearchResponse searchResponse = client().prepareSearch("test").setTypes("type").
-              setTemplateName("/mustache/4").setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(arrayTemplateParams).get();
-      assertHitCount(searchResponse, 5);
+        SearchResponse searchResponse = client()
+                .prepareSearch("test")
+                .setTypes("type")
+                .setTemplate(
+                        new Template("/mustache/4", ScriptService.ScriptType.INDEXED, MustacheScriptEngineService.NAME, null,
+                                arrayTemplateParams)).get();
+        assertHitCount(searchResponse, 5);
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testTemplateInBodyOldScriptAPI() throws IOException {
+        Map<String, Object> vars = new HashMap<>();
+        vars.put("template", "all");
+
+        TemplateQueryBuilder builder = new TemplateQueryBuilder("{\"match_{{template}}\": {}}\"", vars);
+        SearchResponse sr = client().prepareSearch().setQuery(builder).execute().actionGet();
+        assertHitCount(sr, 2);
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testTemplateWOReplacementInBodyOldScriptAPI() throws IOException {
+        Map<String, Object> vars = new HashMap<>();
+
+        TemplateQueryBuilder builder = new TemplateQueryBuilder("{\"match_all\": {}}\"", vars);
+        SearchResponse sr = client().prepareSearch().setQuery(builder).execute().actionGet();
+        assertHitCount(sr, 2);
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testTemplateInFileOldScriptAPI() {
+        Map<String, Object> vars = new HashMap<>();
+        vars.put("template", "all");
+
+        TemplateQueryBuilder builder = new TemplateQueryBuilder("storedTemplate", ScriptService.ScriptType.FILE, vars);
+        SearchResponse sr = client().prepareSearch().setQuery(builder).execute().actionGet();
+        assertHitCount(sr, 2);
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testIndexedTemplateOldScriptAPI() throws Exception {
+        createIndex(ScriptService.SCRIPT_INDEX);
+        ensureGreen(ScriptService.SCRIPT_INDEX);
+        List<IndexRequestBuilder> builders = new ArrayList<>();
+        builders.add(client().prepareIndex(ScriptService.SCRIPT_INDEX, MustacheScriptEngineService.NAME, "1a").setSource(
+                "{" + "\"template\":{" + "                \"query\":{" + "                   \"match\":{"
+                        + "                    \"theField\" : \"{{fieldParam}}\"}" + "       }" + "}" + "}"));
+        builders.add(client().prepareIndex(ScriptService.SCRIPT_INDEX, MustacheScriptEngineService.NAME, "2").setSource(
+                "{" + "\"template\":{" + "                \"query\":{" + "                   \"match\":{"
+                        + "                    \"theField\" : \"{{fieldParam}}\"}" + "       }" + "}" + "}"));
+
+        builders.add(client().prepareIndex(ScriptService.SCRIPT_INDEX, MustacheScriptEngineService.NAME, "3").setSource(
+                "{" + "\"template\":{" + "             \"match\":{" + "                    \"theField\" : \"{{fieldParam}}\"}" + "       }"
+                        + "}"));
+
+        indexRandom(true, builders);
+
+        builders.clear();
+
+        builders.add(client().prepareIndex("test", "type", "1").setSource("{\"theField\":\"foo\"}"));
+        builders.add(client().prepareIndex("test", "type", "2").setSource("{\"theField\":\"foo 2\"}"));
+        builders.add(client().prepareIndex("test", "type", "3").setSource("{\"theField\":\"foo 3\"}"));
+        builders.add(client().prepareIndex("test", "type", "4").setSource("{\"theField\":\"foo 4\"}"));
+        builders.add(client().prepareIndex("test", "type", "5").setSource("{\"theField\":\"bar\"}"));
+
+        indexRandom(true, builders);
+
+        Map<String, Object> templateParams = Maps.newHashMap();
+        templateParams.put("fieldParam", "foo");
+
+        SearchResponse searchResponse = client().prepareSearch("test").setTypes("type").setTemplateName("/mustache/1a")
+                .setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(templateParams).get();
+        assertHitCount(searchResponse, 4);
+
+        try {
+            client().prepareSearch("test").setTypes("type").setTemplateName("/template_index/mustache/1000")
+                    .setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(templateParams).get();
+            fail("shouldn't get here");
+        } catch (SearchPhaseExecutionException spee) {
+            //all good
+        }
+
+        try {
+            searchResponse = client().prepareSearch("test").setTypes("type").setTemplateName("/myindex/mustache/1")
+                    .setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(templateParams).get();
+            assertFailures(searchResponse);
+        } catch (SearchPhaseExecutionException spee) {
+            //all good
+        }
+
+        searchResponse = client().prepareSearch("test").setTypes("type").setTemplateName("1a")
+                .setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(templateParams).get();
+        assertHitCount(searchResponse, 4);
+
+        templateParams.put("fieldParam", "bar");
+        searchResponse = client().prepareSearch("test").setTypes("type").setTemplateName("/mustache/2")
+                .setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(templateParams).get();
+        assertHitCount(searchResponse, 1);
+
+        Map<String, Object> vars = new HashMap<>();
+        vars.put("fieldParam", "bar");
+
+        TemplateQueryBuilder builder = new TemplateQueryBuilder("3", ScriptService.ScriptType.INDEXED, vars);
+        SearchResponse sr = client().prepareSearch().setQuery(builder).execute().actionGet();
+        assertHitCount(sr, 1);
+
+        String query = "{\"template\": {\"id\": \"3\",\"params\" : {\"fieldParam\" : \"foo\"}}}";
+        sr = client().prepareSearch().setQuery(query).get();
+        assertHitCount(sr, 4);
+
+        query = "{\"template\": {\"id\": \"/mustache/3\",\"params\" : {\"fieldParam\" : \"foo\"}}}";
+        sr = client().prepareSearch().setQuery(query).get();
+        assertHitCount(sr, 4);
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testThatParametersCanBeSetOldScriptAPI() throws Exception {
+        index("test", "type", "1", jsonBuilder().startObject().field("theField", "foo").endObject());
+        index("test", "type", "2", jsonBuilder().startObject().field("theField", "foo 2").endObject());
+        index("test", "type", "3", jsonBuilder().startObject().field("theField", "foo 3").endObject());
+        index("test", "type", "4", jsonBuilder().startObject().field("theField", "foo 4").endObject());
+        index("test", "type", "5", jsonBuilder().startObject().field("otherField", "foo").endObject());
+        refresh();
+
+        Map<String, Object> templateParams = Maps.newHashMap();
+        templateParams.put("mySize", "2");
+        templateParams.put("myField", "theField");
+        templateParams.put("myValue", "foo");
+
+        SearchResponse searchResponse = client().prepareSearch("test").setTypes("type").setTemplateName("full-query-template")
+                .setTemplateParams(templateParams).setTemplateType(ScriptService.ScriptType.FILE).get();
+        assertHitCount(searchResponse, 4);
+        // size kicks in here...
+        assertThat(searchResponse.getHits().getHits().length, is(2));
+
+        templateParams.put("myField", "otherField");
+        searchResponse = client().prepareSearch("test").setTypes("type").setTemplateName("full-query-template")
+                .setTemplateParams(templateParams).setTemplateType(ScriptService.ScriptType.FILE).get();
+        assertHitCount(searchResponse, 1);
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test(expected = SearchPhaseExecutionException.class)
+    public void testIndexedTemplateClientOldScriptAPI() throws Exception {
+        createIndex(ScriptService.SCRIPT_INDEX);
+        ensureGreen(ScriptService.SCRIPT_INDEX);
+
+        PutIndexedScriptResponse scriptResponse = client().preparePutIndexedScript(
+                MustacheScriptEngineService.NAME,
+                "testTemplate",
+                "{" + "\"template\":{" + "                \"query\":{" + "                   \"match\":{"
+                        + "                    \"theField\" : \"{{fieldParam}}\"}" + "       }" + "}" + "}").get();
+
+        assertTrue(scriptResponse.isCreated());
+
+        scriptResponse = client().preparePutIndexedScript(
+                MustacheScriptEngineService.NAME,
+                "testTemplate",
+                "{" + "\"template\":{" + "                \"query\":{" + "                   \"match\":{"
+                        + "                    \"theField\" : \"{{fieldParam}}\"}" + "       }" + "}" + "}").get();
+
+        assertEquals(scriptResponse.getVersion(), 2);
+
+        GetIndexedScriptResponse getResponse = client().prepareGetIndexedScript(MustacheScriptEngineService.NAME, "testTemplate").get();
+        assertTrue(getResponse.isExists());
+
+        List<IndexRequestBuilder> builders = new ArrayList<>();
+
+        builders.add(client().prepareIndex("test", "type", "1").setSource("{\"theField\":\"foo\"}"));
+        builders.add(client().prepareIndex("test", "type", "2").setSource("{\"theField\":\"foo 2\"}"));
+        builders.add(client().prepareIndex("test", "type", "3").setSource("{\"theField\":\"foo 3\"}"));
+        builders.add(client().prepareIndex("test", "type", "4").setSource("{\"theField\":\"foo 4\"}"));
+        builders.add(client().prepareIndex("test", "type", "5").setSource("{\"theField\":\"bar\"}"));
+
+        indexRandom(true, builders);
+
+        Map<String, Object> templateParams = Maps.newHashMap();
+        templateParams.put("fieldParam", "foo");
+
+        SearchResponse searchResponse = client().prepareSearch("test").setTypes("type").setTemplateName("testTemplate")
+                .setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(templateParams).get();
+        assertHitCount(searchResponse, 4);
+
+        DeleteIndexedScriptResponse deleteResponse = client().prepareDeleteIndexedScript(MustacheScriptEngineService.NAME, "testTemplate")
+                .get();
+        assertTrue(deleteResponse.isFound());
+
+        getResponse = client().prepareGetIndexedScript(MustacheScriptEngineService.NAME, "testTemplate").get();
+        assertFalse(getResponse.isExists());
+
+        client().prepareSearch("test").setTypes("type").setTemplateName("/template_index/mustache/1000")
+                .setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(templateParams).get();
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    // Relates to #10397
+    @Test
+    public void testIndexedTemplateOverwriteOldScriptAPI() throws Exception {
+        createIndex("testindex");
+        ensureGreen("testindex");
+
+        index("testindex", "test", "1", jsonBuilder().startObject().field("searchtext", "dev1").endObject());
+        refresh();
+
+        int iterations = randomIntBetween(2, 11);
+        for (int i = 1; i < iterations; i++) {
+            PutIndexedScriptResponse scriptResponse = client().preparePutIndexedScript(MustacheScriptEngineService.NAME, "git01",
+                    "{\"query\": {\"match\": {\"searchtext\": {\"query\": \"{{P_Keyword1}}\",\"type\": \"ooophrase_prefix\"}}}}").get();
+            assertEquals(i * 2 - 1, scriptResponse.getVersion());
+
+            GetIndexedScriptResponse getResponse = client().prepareGetIndexedScript(MustacheScriptEngineService.NAME, "git01").get();
+            assertTrue(getResponse.isExists());
+
+            Map<String, Object> templateParams = Maps.newHashMap();
+            templateParams.put("P_Keyword1", "dev");
+
+            try {
+                client().prepareSearch("testindex").setTypes("test").setTemplateName("git01")
+                        .setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(templateParams).get();
+                fail("Broken test template is parsing w/o error.");
+            } catch (SearchPhaseExecutionException e) {
+                // the above is expected to fail
+            }
+
+            PutIndexedScriptRequestBuilder builder = client().preparePutIndexedScript(MustacheScriptEngineService.NAME, "git01",
+                    "{\"query\": {\"match\": {\"searchtext\": {\"query\": \"{{P_Keyword1}}\",\"type\": \"phrase_prefix\"}}}}").setOpType(
+                    OpType.INDEX);
+            scriptResponse = builder.get();
+            assertEquals(i * 2, scriptResponse.getVersion());
+            SearchResponse searchResponse = client().prepareSearch("testindex").setTypes("test").setTemplateName("git01")
+                    .setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(templateParams).get();
+            assertHitCount(searchResponse, 1);
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testIndexedTemplateWithArrayOldScriptAPI() throws Exception {
+        createIndex(ScriptService.SCRIPT_INDEX);
+        ensureGreen(ScriptService.SCRIPT_INDEX);
+        List<IndexRequestBuilder> builders = new ArrayList<>();
+
+        String multiQuery = "{\"query\":{\"terms\":{\"theField\":[\"{{#fieldParam}}\",\"{{.}}\",\"{{/fieldParam}}\"]}}}";
+
+        builders.add(client().prepareIndex(ScriptService.SCRIPT_INDEX, MustacheScriptEngineService.NAME, "4").setSource(
+                jsonBuilder().startObject().field("template", multiQuery).endObject()));
+
+        indexRandom(true, builders);
+
+        builders.clear();
+
+        builders.add(client().prepareIndex("test", "type", "1").setSource("{\"theField\":\"foo\"}"));
+        builders.add(client().prepareIndex("test", "type", "2").setSource("{\"theField\":\"foo 2\"}"));
+        builders.add(client().prepareIndex("test", "type", "3").setSource("{\"theField\":\"foo 3\"}"));
+        builders.add(client().prepareIndex("test", "type", "4").setSource("{\"theField\":\"foo 4\"}"));
+        builders.add(client().prepareIndex("test", "type", "5").setSource("{\"theField\":\"bar\"}"));
+
+        indexRandom(true, builders);
+
+        Map<String, Object> arrayTemplateParams = new HashMap<>();
+        String[] fieldParams = { "foo", "bar" };
+        arrayTemplateParams.put("fieldParam", fieldParams);
+
+        SearchResponse searchResponse = client().prepareSearch("test").setTypes("type").setTemplateName("/mustache/4")
+                .setTemplateType(ScriptService.ScriptType.INDEXED).setTemplateParams(arrayTemplateParams).get();
+        assertHitCount(searchResponse, 5);
     }
 
 }
diff --git a/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java b/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java
index 4abc51cfe26..86a698e07dd 100644
--- a/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java
+++ b/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java
@@ -34,6 +34,7 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.sort.SortBuilders;
 import org.elasticsearch.search.sort.SortOrder;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
@@ -521,6 +522,149 @@ public class SimpleNestedTests extends ElasticsearchIntegrationTest {
         assertThat(searchResponse.getHits().hits()[2].sortValues()[0].toString(), equalTo("2"));
 
         searchResponse = client().prepareSearch("test")
+                .setTypes("type1")
+                .setQuery(QueryBuilders.matchAllQuery())
+                .addSort(
+                        SortBuilders.scriptSort(new Script("_fields['nested1.field1'].value + 1"), "number").setNestedPath("nested1")
+                                .order(SortOrder.DESC)).execute().actionGet();
+
+        assertHitCount(searchResponse, 3);
+        assertThat(searchResponse.getHits().hits()[0].id(), equalTo("1"));
+        assertThat(searchResponse.getHits().hits()[0].sortValues()[0].toString(), equalTo("6.0"));
+        assertThat(searchResponse.getHits().hits()[1].id(), equalTo("3"));
+        assertThat(searchResponse.getHits().hits()[1].sortValues()[0].toString(), equalTo("5.0"));
+        assertThat(searchResponse.getHits().hits()[2].id(), equalTo("2"));
+        assertThat(searchResponse.getHits().hits()[2].sortValues()[0].toString(), equalTo("3.0"));
+
+        searchResponse = client()
+                .prepareSearch("test")
+                .setTypes("type1")
+                .setQuery(QueryBuilders.matchAllQuery())
+                .addSort(
+                        SortBuilders.scriptSort(new Script("_fields['nested1.field1'].value + 1"), "number").setNestedPath("nested1")
+                                .sortMode("sum").order(SortOrder.DESC)).execute().actionGet();
+
+        // B/c of sum it is actually +2
+        assertHitCount(searchResponse, 3);
+        assertThat(searchResponse.getHits().hits()[0].id(), equalTo("1"));
+        assertThat(searchResponse.getHits().hits()[0].sortValues()[0].toString(), equalTo("11.0"));
+        assertThat(searchResponse.getHits().hits()[1].id(), equalTo("3"));
+        assertThat(searchResponse.getHits().hits()[1].sortValues()[0].toString(), equalTo("9.0"));
+        assertThat(searchResponse.getHits().hits()[2].id(), equalTo("2"));
+        assertThat(searchResponse.getHits().hits()[2].sortValues()[0].toString(), equalTo("5.0"));
+
+        searchResponse = client()
+                .prepareSearch("test")
+                .setTypes("type1")
+                .setQuery(QueryBuilders.matchAllQuery())
+                .addSort(
+                        SortBuilders.scriptSort(new Script("_fields['nested1.field1'].value"), "number")
+                                .setNestedFilter(rangeQuery("nested1.field1").from(1).to(3)).setNestedPath("nested1").sortMode("avg")
+                                .order(SortOrder.DESC)).execute().actionGet();
+
+        assertHitCount(searchResponse, 3);
+        assertThat(searchResponse.getHits().hits()[0].id(), equalTo("1"));
+        assertThat(searchResponse.getHits().hits()[0].sortValues()[0].toString(), equalTo(Double.toString(Double.MAX_VALUE)));
+        assertThat(searchResponse.getHits().hits()[1].id(), equalTo("3"));
+        assertThat(searchResponse.getHits().hits()[1].sortValues()[0].toString(), equalTo("3.0"));
+        assertThat(searchResponse.getHits().hits()[2].id(), equalTo("2"));
+        assertThat(searchResponse.getHits().hits()[2].sortValues()[0].toString(), equalTo("1.5"));
+
+        searchResponse = client()
+                .prepareSearch("test")
+                .setTypes("type1")
+                .setQuery(QueryBuilders.matchAllQuery())
+                .addSort(
+                        SortBuilders.scriptSort(new Script("_fields['nested1.field1'].value"), "string").setNestedPath("nested1")
+                                .order(SortOrder.DESC)).execute().actionGet();
+
+        assertHitCount(searchResponse, 3);
+        assertThat(searchResponse.getHits().hits()[0].id(), equalTo("1"));
+        assertThat(searchResponse.getHits().hits()[0].sortValues()[0].toString(), equalTo("5"));
+        assertThat(searchResponse.getHits().hits()[1].id(), equalTo("3"));
+        assertThat(searchResponse.getHits().hits()[1].sortValues()[0].toString(), equalTo("4"));
+        assertThat(searchResponse.getHits().hits()[2].id(), equalTo("2"));
+        assertThat(searchResponse.getHits().hits()[2].sortValues()[0].toString(), equalTo("2"));
+
+        searchResponse = client()
+                .prepareSearch("test")
+                .setTypes("type1")
+                .setQuery(QueryBuilders.matchAllQuery())
+                .addSort(
+                        SortBuilders.scriptSort(new Script("_fields['nested1.field1'].value"), "string").setNestedPath("nested1")
+                                .order(SortOrder.ASC)).execute().actionGet();
+
+        assertHitCount(searchResponse, 3);
+        assertThat(searchResponse.getHits().hits()[0].id(), equalTo("2"));
+        assertThat(searchResponse.getHits().hits()[0].sortValues()[0].toString(), equalTo("1"));
+        assertThat(searchResponse.getHits().hits()[1].id(), equalTo("3"));
+        assertThat(searchResponse.getHits().hits()[1].sortValues()[0].toString(), equalTo("3"));
+        assertThat(searchResponse.getHits().hits()[2].id(), equalTo("1"));
+        assertThat(searchResponse.getHits().hits()[2].sortValues()[0].toString(), equalTo("4"));
+
+        try {
+            client().prepareSearch("test")
+                    .setTypes("type1")
+                    .setQuery(QueryBuilders.matchAllQuery())
+                    .addSort(
+                            SortBuilders.scriptSort(new Script("_fields['nested1.field1'].value"), "string").setNestedPath("nested1")
+                                    .sortMode("sum").order(SortOrder.ASC)).execute().actionGet();
+            Assert.fail("SearchPhaseExecutionException should have been thrown");
+        } catch (SearchPhaseExecutionException e) {
+            assertThat(e.toString(), containsString("type [string] doesn't support mode [SUM]"));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testSimpleNestedSortingOldScriptAPI() throws Exception {
+        assertAcked(prepareCreate("test").setSettings(settingsBuilder().put(indexSettings()).put("index.refresh_interval", -1)).addMapping(
+                "type1",
+                jsonBuilder().startObject().startObject("type1").startObject("properties").startObject("nested1").field("type", "nested")
+                        .startObject("properties").startObject("field1").field("type", "long").field("store", "yes").endObject()
+                        .endObject().endObject().endObject().endObject().endObject()));
+        ensureGreen();
+
+        client().prepareIndex("test", "type1", "1")
+                .setSource(
+                        jsonBuilder().startObject().field("field1", 1).startArray("nested1").startObject().field("field1", 5).endObject()
+                                .startObject().field("field1", 4).endObject().endArray().endObject()).execute().actionGet();
+        client().prepareIndex("test", "type1", "2")
+                .setSource(
+                        jsonBuilder().startObject().field("field1", 2).startArray("nested1").startObject().field("field1", 1).endObject()
+                                .startObject().field("field1", 2).endObject().endArray().endObject()).execute().actionGet();
+        client().prepareIndex("test", "type1", "3")
+                .setSource(
+                        jsonBuilder().startObject().field("field1", 3).startArray("nested1").startObject().field("field1", 3).endObject()
+                                .startObject().field("field1", 4).endObject().endArray().endObject()).execute().actionGet();
+        refresh();
+
+        SearchResponse searchResponse = client().prepareSearch("test").setTypes("type1").setQuery(QueryBuilders.matchAllQuery())
+                .addSort(SortBuilders.fieldSort("nested1.field1").order(SortOrder.ASC)).execute().actionGet();
+
+        assertHitCount(searchResponse, 3);
+        assertThat(searchResponse.getHits().hits()[0].id(), equalTo("2"));
+        assertThat(searchResponse.getHits().hits()[0].sortValues()[0].toString(), equalTo("1"));
+        assertThat(searchResponse.getHits().hits()[1].id(), equalTo("3"));
+        assertThat(searchResponse.getHits().hits()[1].sortValues()[0].toString(), equalTo("3"));
+        assertThat(searchResponse.getHits().hits()[2].id(), equalTo("1"));
+        assertThat(searchResponse.getHits().hits()[2].sortValues()[0].toString(), equalTo("4"));
+
+        searchResponse = client().prepareSearch("test").setTypes("type1").setQuery(QueryBuilders.matchAllQuery())
+                .addSort(SortBuilders.fieldSort("nested1.field1").order(SortOrder.DESC)).execute().actionGet();
+
+        assertHitCount(searchResponse, 3);
+        assertThat(searchResponse.getHits().hits()[0].id(), equalTo("1"));
+        assertThat(searchResponse.getHits().hits()[0].sortValues()[0].toString(), equalTo("5"));
+        assertThat(searchResponse.getHits().hits()[1].id(), equalTo("3"));
+        assertThat(searchResponse.getHits().hits()[1].sortValues()[0].toString(), equalTo("4"));
+        assertThat(searchResponse.getHits().hits()[2].id(), equalTo("2"));
+        assertThat(searchResponse.getHits().hits()[2].sortValues()[0].toString(), equalTo("2"));
+
+        searchResponse = client()
+                .prepareSearch("test")
                 .setTypes("type1")
                 .setQuery(QueryBuilders.matchAllQuery())
                 .addSort(SortBuilders.scriptSort("_fields['nested1.field1'].value + 1", "number").setNestedPath("nested1").order(SortOrder.DESC))
diff --git a/src/test/java/org/elasticsearch/percolator/PercolatorTests.java b/src/test/java/org/elasticsearch/percolator/PercolatorTests.java
index 487019a3333..07ef51f32c1 100644
--- a/src/test/java/org/elasticsearch/percolator/PercolatorTests.java
+++ b/src/test/java/org/elasticsearch/percolator/PercolatorTests.java
@@ -46,6 +46,7 @@ import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.QueryParsingException;
 import org.elasticsearch.index.query.functionscore.factor.FactorBuilder;
 import org.elasticsearch.rest.RestStatus;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.highlight.HighlightBuilder;
 import org.elasticsearch.search.sort.SortBuilders;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
@@ -1240,7 +1241,7 @@ public class PercolatorTests extends ElasticsearchIntegrationTest {
                     .setScore(true)
                     .setSize(size)
                     .setPercolateDoc(docBuilder().setDoc("field", "value"))
-                    .setPercolateQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), scriptFunction("doc['level'].value")))
+                    .setPercolateQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), scriptFunction(new Script("doc['level'].value"))))
                     .execute().actionGet();
             assertMatchCount(response, numQueries);
             assertThat(response.getMatches().length, equalTo(size));
@@ -1257,7 +1258,7 @@ public class PercolatorTests extends ElasticsearchIntegrationTest {
                     .setSortByScore(true)
                     .setSize(size)
                     .setPercolateDoc(docBuilder().setDoc("field", "value"))
-                    .setPercolateQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), scriptFunction("doc['level'].value")))
+                    .setPercolateQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), scriptFunction(new Script("doc['level'].value"))))
                     .execute().actionGet();
             assertMatchCount(response, numQueries);
             assertThat(response.getMatches().length, equalTo(size));
@@ -1281,7 +1282,8 @@ public class PercolatorTests extends ElasticsearchIntegrationTest {
                     .setSize(size)
                     .setPercolateDoc(docBuilder().setDoc("field", "value"))
                     .setPercolateQuery(
-                            QueryBuilders.functionScoreQuery(matchQuery("field1", value), scriptFunction("doc['level'].value")).boostMode(
+                            QueryBuilders.functionScoreQuery(matchQuery("field1", value), scriptFunction(new Script("doc['level'].value")))
+                                    .boostMode(
                                     CombineFunction.REPLACE))
                     .execute().actionGet();
 
@@ -1314,7 +1316,7 @@ public class PercolatorTests extends ElasticsearchIntegrationTest {
                 .setSortByScore(true)
                 .setSize(2)
                 .setPercolateDoc(docBuilder().setDoc("field", "value"))
-                .setPercolateQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), scriptFunction("doc['level'].value")))
+                .setPercolateQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), scriptFunction(new Script("doc['level'].value"))))
                 .execute().actionGet();
         assertMatchCount(response, 2l);
         assertThat(response.getMatches()[0].getId().string(), equalTo("2"));
@@ -1325,7 +1327,7 @@ public class PercolatorTests extends ElasticsearchIntegrationTest {
         response = client().preparePercolate().setIndices("my-index").setDocumentType("my-type")
                 .setSortByScore(true)
                 .setPercolateDoc(docBuilder().setDoc("field", "value"))
-                .setPercolateQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), scriptFunction("doc['level'].value")))
+                .setPercolateQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), scriptFunction(new Script("doc['level'].value"))))
                 .execute().actionGet();
         assertThat(response.getCount(), equalTo(0l));
         assertThat(response.getShardFailures().length, greaterThan(0));
@@ -1354,7 +1356,7 @@ public class PercolatorTests extends ElasticsearchIntegrationTest {
         PercolateResponse response = client().preparePercolate().setIndices("my-index").setDocumentType("my-type")
                 .setSize(2)
                 .setPercolateDoc(docBuilder().setDoc("field", "value"))
-                .setPercolateQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), scriptFunction("doc['level'].value")))
+                .setPercolateQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), scriptFunction(new Script("doc['level'].value"))))
                 .addSort(SortBuilders.fieldSort("level"))
                 .get();
 
@@ -1372,7 +1374,7 @@ public class PercolatorTests extends ElasticsearchIntegrationTest {
                 .setSortByScore(true)
                 .setSize(2)
                 .setPercolateDoc(docBuilder().setDoc("field", "value"))
-                .setPercolateQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), scriptFunction("doc['level'].value")))
+                .setPercolateQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), scriptFunction(new Script("doc['level'].value"))))
                 .execute().actionGet();
         assertMatchCount(response, 0l);
     }
@@ -1392,7 +1394,7 @@ public class PercolatorTests extends ElasticsearchIntegrationTest {
                 .setSortByScore(true)
                 .setSize(2)
                 .setPercolateDoc(docBuilder().setDoc("field", "value"))
-                .setPercolateQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), scriptFunction("doc['level'].value")))
+                .setPercolateQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), scriptFunction(new Script("doc['level'].value"))))
                 .execute().actionGet();
         assertMatchCount(response, 0l);
     }
diff --git a/src/test/java/org/elasticsearch/routing/AliasRoutingTests.java b/src/test/java/org/elasticsearch/routing/AliasRoutingTests.java
index 8fd37a7804d..ff2a006a049 100644
--- a/src/test/java/org/elasticsearch/routing/AliasRoutingTests.java
+++ b/src/test/java/org/elasticsearch/routing/AliasRoutingTests.java
@@ -23,12 +23,12 @@ import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.junit.Test;
 
 import static org.elasticsearch.cluster.metadata.AliasAction.newAddAliasAction;
-import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -67,7 +67,7 @@ public class AliasRoutingTests extends ElasticsearchIntegrationTest {
         logger.info("--> updating with id [1] and routing through alias");
         client().prepareUpdate("alias0", "type1", "1")
                 .setUpsert(XContentFactory.jsonBuilder().startObject().field("field", 1).endObject())
-                .setScript("ctx._source.field = 'value2'", ScriptService.ScriptType.INLINE)
+                .setScript(new Script("ctx._source.field = 'value2'", ScriptService.ScriptType.INLINE, null, null))
                 .execute().actionGet();
         for (int i = 0; i < 5; i++) {
             assertThat(client().prepareGet("alias0", "type1", "1").execute().actionGet().isExists(), equalTo(true));
diff --git a/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java b/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java
index 8ad776773ce..c38aec157ff 100644
--- a/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java
+++ b/src/test/java/org/elasticsearch/script/CustomScriptContextTests.java
@@ -54,7 +54,8 @@ public class CustomScriptContextTests extends ElasticsearchIntegrationTest {
         for (String lang : LANG_SET) {
             for (ScriptService.ScriptType scriptType : ScriptService.ScriptType.values()) {
                 try {
-                    scriptService.compile(new Script(lang, "test", scriptType, null), new ScriptContext.Plugin(PLUGIN_NAME, "custom_globally_disabled_op"));
+                    scriptService.compile(new Script("test", scriptType, lang, null), new ScriptContext.Plugin(PLUGIN_NAME,
+                            "custom_globally_disabled_op"));
                     fail("script compilation should have been rejected");
                 } catch(ScriptException e) {
                     assertThat(e.getMessage(), containsString("scripts of type [" + scriptType + "], operation [" + PLUGIN_NAME + "_custom_globally_disabled_op] and lang [" + lang + "] are disabled"));
@@ -63,20 +64,24 @@ public class CustomScriptContextTests extends ElasticsearchIntegrationTest {
         }
 
         try {
-            scriptService.compile(new Script("expression", "1", ScriptService.ScriptType.INLINE, null), new ScriptContext.Plugin(PLUGIN_NAME, "custom_exp_disabled_op"));
+            scriptService.compile(new Script("1", ScriptService.ScriptType.INLINE, "expression", null), new ScriptContext.Plugin(
+                    PLUGIN_NAME, "custom_exp_disabled_op"));
             fail("script compilation should have been rejected");
         } catch(ScriptException e) {
             assertThat(e.getMessage(), containsString("scripts of type [inline], operation [" + PLUGIN_NAME + "_custom_exp_disabled_op] and lang [expression] are disabled"));
         }
 
-        CompiledScript compiledScript = scriptService.compile(new Script("expression", "1", ScriptService.ScriptType.INLINE, null), randomFrom(ScriptContext.Standard.values()));
+        CompiledScript compiledScript = scriptService.compile(new Script("1", ScriptService.ScriptType.INLINE, "expression", null),
+                randomFrom(ScriptContext.Standard.values()));
         assertThat(compiledScript, notNullValue());
 
-        compiledScript = scriptService.compile(new Script("mustache", "1", ScriptService.ScriptType.INLINE, null), new ScriptContext.Plugin(PLUGIN_NAME, "custom_exp_disabled_op"));
+        compiledScript = scriptService.compile(new Script("1", ScriptService.ScriptType.INLINE, "mustache", null),
+                new ScriptContext.Plugin(PLUGIN_NAME, "custom_exp_disabled_op"));
         assertThat(compiledScript, notNullValue());
 
         for (String lang : LANG_SET) {
-            compiledScript = scriptService.compile(new Script(lang, "1", ScriptService.ScriptType.INLINE, null), new ScriptContext.Plugin(PLUGIN_NAME, "custom_op"));
+            compiledScript = scriptService.compile(new Script("1", ScriptService.ScriptType.INLINE, lang, null), new ScriptContext.Plugin(
+                    PLUGIN_NAME, "custom_op"));
             assertThat(compiledScript, notNullValue());
         }
     }
@@ -85,7 +90,9 @@ public class CustomScriptContextTests extends ElasticsearchIntegrationTest {
     public void testCompileNonRegisteredPluginContext() {
         ScriptService scriptService = internalCluster().getInstance(ScriptService.class);
         try {
-            scriptService.compile(new Script(randomFrom(LANG_SET.toArray(new String[LANG_SET.size()])), "test", randomFrom(ScriptService.ScriptType.values()), null), new ScriptContext.Plugin("test", "unknown"));
+            scriptService.compile(
+                    new Script("test", randomFrom(ScriptService.ScriptType.values()), randomFrom(LANG_SET.toArray(new String[LANG_SET
+                            .size()])), null), new ScriptContext.Plugin("test", "unknown"));
             fail("script compilation should have been rejected");
         } catch(IllegalArgumentException e) {
             assertThat(e.getMessage(), containsString("script context [test_unknown] not supported"));
@@ -96,7 +103,9 @@ public class CustomScriptContextTests extends ElasticsearchIntegrationTest {
     public void testCompileNonRegisteredScriptContext() {
         ScriptService scriptService = internalCluster().getInstance(ScriptService.class);
         try {
-            scriptService.compile(new Script(randomFrom(LANG_SET.toArray(new String[LANG_SET.size()])), "test", randomFrom(ScriptService.ScriptType.values()), null), new ScriptContext() {
+            scriptService.compile(
+                    new Script("test", randomFrom(ScriptService.ScriptType.values()), randomFrom(LANG_SET.toArray(new String[LANG_SET
+                            .size()])), null), new ScriptContext() {
                 @Override
                 public String getKey() {
                     return "test";
diff --git a/src/test/java/org/elasticsearch/script/GroovyScriptTests.java b/src/test/java/org/elasticsearch/script/GroovyScriptTests.java
index 9e7776e0dcc..9ceda548b9f 100644
--- a/src/test/java/org/elasticsearch/script/GroovyScriptTests.java
+++ b/src/test/java/org/elasticsearch/script/GroovyScriptTests.java
@@ -19,11 +19,11 @@
 
 package org.elasticsearch.script;
 
-import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.search.SearchPhaseExecutionException;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.common.lucene.search.function.CombineFunction;
+import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.script.groovy.GroovyScriptEngineService;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.junit.Test;
@@ -31,11 +31,11 @@ import org.junit.Test;
 import java.util.List;
 
 import static com.google.common.collect.Lists.newArrayList;
-import static org.elasticsearch.index.query.QueryBuilders.scriptQuery;
 import static org.elasticsearch.index.query.QueryBuilders.constantScoreQuery;
 import static org.elasticsearch.index.query.QueryBuilders.functionScoreQuery;
 import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
 import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
+import static org.elasticsearch.index.query.QueryBuilders.scriptQuery;
 import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.scriptFunction;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertOrderedSearchHits;
@@ -73,7 +73,10 @@ public class GroovyScriptTests extends ElasticsearchIntegrationTest {
         }
         indexRandom(true, false, reqs);
         try {
-            client().prepareSearch("test").setQuery(constantScoreQuery(scriptQuery("1 == not_found").lang(GroovyScriptEngineService.NAME))).get();
+            client().prepareSearch("test")
+                    .setQuery(
+                            constantScoreQuery(scriptQuery(new Script("1 == not_found", ScriptType.INLINE, GroovyScriptEngineService.NAME,
+                                    null)))).get();
             fail("should have thrown an exception");
         } catch (SearchPhaseExecutionException e) {
             assertThat(e.toString()+ "should not contained NotSerializableTransportException",
@@ -85,13 +88,13 @@ public class GroovyScriptTests extends ElasticsearchIntegrationTest {
         }
 
         try {
-            client().prepareSearch("test").setQuery(constantScoreQuery(
-                    scriptQuery("assert false").lang("groovy"))).get();
+            client().prepareSearch("test")
+                    .setQuery(constantScoreQuery(scriptQuery(new Script("assert false", ScriptType.INLINE, "groovy", null)))).get();
             fail("should have thrown an exception");
         } catch (SearchPhaseExecutionException e) {
-            assertThat(e.toString()+ "should not contained NotSerializableTransportException",
+            assertThat(e.toString() + "should not contained NotSerializableTransportException",
                     e.toString().contains("NotSerializableTransportException"), equalTo(false));
-            assertThat(e.toString()+ "should have contained GroovyScriptExecutionException",
+            assertThat(e.toString() + "should have contained GroovyScriptExecutionException",
                     e.toString().contains("GroovyScriptExecutionException"), equalTo(true));
             assertThat(e.toString()+ "should have contained an assert error",
                     e.toString().contains("PowerAssertionError[assert false"), equalTo(true));
@@ -107,7 +110,8 @@ public class GroovyScriptTests extends ElasticsearchIntegrationTest {
 
         // doc[] access
         SearchResponse resp = client().prepareSearch("test").setQuery(functionScoreQuery(matchAllQuery())
-            .add(scriptFunction("doc['bar'].value", "groovy"))
+.add(
+                                scriptFunction(new Script("doc['bar'].value", ScriptType.INLINE, "groovy", null)))
             .boostMode(CombineFunction.REPLACE)).get();
 
         assertNoFailures(resp);
@@ -122,7 +126,7 @@ public class GroovyScriptTests extends ElasticsearchIntegrationTest {
 
         // _score can be accessed
         SearchResponse resp = client().prepareSearch("test").setQuery(functionScoreQuery(matchQuery("foo", "dog"))
-            .add(scriptFunction("_score", "groovy"))
+            .add(scriptFunction(new Script("_score", ScriptType.INLINE, "groovy", null)))
             .boostMode(CombineFunction.REPLACE)).get();
         assertNoFailures(resp);
         assertSearchHits(resp, "3", "1");
@@ -130,9 +134,12 @@ public class GroovyScriptTests extends ElasticsearchIntegrationTest {
         // _score is comparable
         // NOTE: it is important to use 0.0 instead of 0 instead Groovy will do an integer comparison
         // and if the score if between 0 and 1 it will be considered equal to 0 due to the cast
-        resp = client().prepareSearch("test").setQuery(functionScoreQuery(matchQuery("foo", "dog"))
-            .add(scriptFunction("_score > 0.0 ? _score : 0", "groovy"))
-            .boostMode(CombineFunction.REPLACE)).get();
+        resp = client()
+                .prepareSearch("test")
+                .setQuery(
+                        functionScoreQuery(matchQuery("foo", "dog")).add(
+                                scriptFunction(new Script("_score > 0.0 ? _score : 0", ScriptType.INLINE, "groovy", null))).boostMode(
+                                CombineFunction.REPLACE)).get();
         assertNoFailures(resp);
         assertSearchHits(resp, "3", "1");
     }
diff --git a/src/test/java/org/elasticsearch/script/IndexLookupTests.java b/src/test/java/org/elasticsearch/script/IndexLookupTests.java
index b8aa3a8f3e5..fda14ca3dd9 100644
--- a/src/test/java/org/elasticsearch/script/IndexLookupTests.java
+++ b/src/test/java/org/elasticsearch/script/IndexLookupTests.java
@@ -150,9 +150,9 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
         initTestData();
 
         // check term frequencies for 'a'
-        String scriptFieldScript = "term = _index['int_payload_field']['c']; term.tf()";
-        scriptFieldScript = "1";
-        String scoreScript = "term = _index['int_payload_field']['b']; term.tf()";
+        Script scriptFieldScript = new Script("term = _index['int_payload_field']['c']; term.tf()");
+        scriptFieldScript = new Script("1");
+        Script scoreScript = new Script("term = _index['int_payload_field']['b']; term.tf()");
         Map<String, Object> expectedResultsField = new HashMap<>();
         expectedResultsField.put("1", 1);
         expectedResultsField.put("2", 1);
@@ -173,7 +173,7 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
 
         // should throw an exception, we cannot call with different flags twice
         // if the flags of the second call were not included in the first call.
-        String script = "term = _index['int_payload_field']['b']; return _index['int_payload_field'].get('b', _POSITIONS).tf();";
+        Script script = new Script("term = _index['int_payload_field']['b']; return _index['int_payload_field'].get('b', _POSITIONS).tf();");
         try {
             client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()).addScriptField("tvtest", script).execute().actionGet();
         } catch (SearchPhaseExecutionException e) {
@@ -186,13 +186,15 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
         }
 
         // Should not throw an exception this way round
-        script = "term = _index['int_payload_field'].get('b', _POSITIONS | _FREQUENCIES);return _index['int_payload_field']['b'].tf();";
+        script = new Script(
+                "term = _index['int_payload_field'].get('b', _POSITIONS | _FREQUENCIES);return _index['int_payload_field']['b'].tf();");
         client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()).addScriptField("tvtest", script).execute().actionGet();
     }
 
-    private void checkOnlyFunctionScore(String scoreScript, Map<String, Object> expectedScore, int numExpectedDocs) {
+    private void checkOnlyFunctionScore(Script scoreScript, Map<String, Object> expectedScore, int numExpectedDocs) {
         SearchResponse sr = client().prepareSearch("test")
-                .setQuery(QueryBuilders.functionScoreQuery(ScoreFunctionBuilders.scriptFunction(scoreScript))).execute().actionGet();
+                .setQuery(QueryBuilders.functionScoreQuery(ScoreFunctionBuilders.scriptFunction(scoreScript))).execute()
+                .actionGet();
         assertHitCount(sr, numExpectedDocs);
         for (SearchHit hit : sr.getHits().getHits()) {
             assertThat("for doc " + hit.getId(), ((Float) expectedScore.get(hit.getId())).doubleValue(),
@@ -205,8 +207,8 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
 
         initTestData();
 
-        String script = "term = _index['float_payload_field'].get('b'," + includeAllFlag
-                + "); payloadSum=0; for (pos in term) {payloadSum = pos.payloadAsInt(0)}; payloadSum";
+        Script script = new Script("term = _index['float_payload_field'].get('b'," + includeAllFlag
+                + "); payloadSum=0; for (pos in term) {payloadSum = pos.payloadAsInt(0)}; payloadSum");
 
         // non existing field: sum should be 0
         HashMap<String, Object> zeroArray = new HashMap<>();
@@ -215,8 +217,8 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
         zeroArray.put("3", 0);
         checkValueInEachDoc(script, zeroArray, 3);
 
-        script = "term = _index['int_payload_field'].get('b'," + includeAllFlag
-                + "); payloadSum=0; for (pos in term) {payloadSum = payloadSum + pos.payloadAsInt(0)}; payloadSum";
+        script = new Script("term = _index['int_payload_field'].get('b'," + includeAllFlag
+                + "); payloadSum=0; for (pos in term) {payloadSum = payloadSum + pos.payloadAsInt(0)}; payloadSum");
 
         // existing field: sums should be as here:
         zeroArray.put("1", 5);
@@ -231,7 +233,7 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
         initTestData();
 
         // call twice with record: should work as expected
-        String script = createPositionsArrayScriptIterateTwice("b", includeAllFlag, "position");
+        Script script = createPositionsArrayScriptIterateTwice("b", includeAllFlag, "position");
         checkArrayValsInEachDoc(script, expectedPositionsArray, 3);
         script = createPositionsArrayScriptIterateTwice("b", includeAllFlag, "startOffset");
         checkArrayValsInEachDoc(script, expectedStartOffsetsArray, 3);
@@ -262,30 +264,30 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
 
     }
 
-    private String createPositionsArrayScriptGetInfoObjectTwice(String term, String flags, String what) {
+    private Script createPositionsArrayScriptGetInfoObjectTwice(String term, String flags, String what) {
         String script = "term = _index['int_payload_field'].get('" + term + "'," + flags
                 + "); array=[]; for (pos in term) {array.add(pos." + what + ")}; _index['int_payload_field'].get('" + term + "',"
                 + flags + "); array=[]; for (pos in term) {array.add(pos." + what + ")}";
-        return script;
+        return new Script(script);
     }
 
-    private String createPositionsArrayScriptIterateTwice(String term, String flags, String what) {
+    private Script createPositionsArrayScriptIterateTwice(String term, String flags, String what) {
         String script = "term = _index['int_payload_field'].get('" + term + "'," + flags
                 + "); array=[]; for (pos in term) {array.add(pos." + what + ")}; array=[]; for (pos in term) {array.add(pos." + what
                 + ")}; array";
-        return script;
+        return new Script(script);
     }
 
-    private String createPositionsArrayScript(String field, String term, String flags, String what) {
+    private Script createPositionsArrayScript(String field, String term, String flags, String what) {
         String script = "term = _index['" + field + "'].get('" + term + "'," + flags
                 + "); array=[]; for (pos in term) {array.add(pos." + what + ")}; array";
-        return script;
+        return new Script(script);
     }
 
-    private String createPositionsArrayScriptDefaultGet(String field, String term, String what) {
+    private Script createPositionsArrayScriptDefaultGet(String field, String term, String what) {
         String script = "term = _index['" + field + "']['" + term + "']; array=[]; for (pos in term) {array.add(pos." + what
                 + ")}; array";
-        return script;
+        return new Script(script);
     }
 
     @Test
@@ -294,7 +296,7 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
         initTestData();
 
         // check default flag
-        String script = createPositionsArrayScriptDefaultGet("int_payload_field", "b", "position");
+        Script script = createPositionsArrayScriptDefaultGet("int_payload_field", "b", "position");
         // there should be no positions
         /* TODO: the following tests fail with the new postings enum apis because of a bogus assert in BlockDocsEnum
         checkArrayValsInEachDoc(script, emptyArray, 3);
@@ -381,7 +383,7 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
 
     }
 
-    private void checkArrayValsInEachDoc(String script, HashMap<String, List<Object>> expectedArray, int expectedHitSize) {
+    private void checkArrayValsInEachDoc(Script script, HashMap<String, List<Object>> expectedArray, int expectedHitSize) {
         SearchResponse sr = client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()).addScriptField("tvtest", script)
                 .execute().actionGet();
         assertHitCount(sr, expectedHitSize);
@@ -433,36 +435,36 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
                 client().prepareIndex("test", "type1", "6").setSource("int_payload_field", "c|1"));
 
         // get the number of all docs
-        String script = "_index.numDocs()";
+        Script script = new Script("_index.numDocs()");
         checkValueInEachDoc(6, script, 6);
 
         // get the number of docs with field float_payload_field
-        script = "_index['float_payload_field'].docCount()";
+        script = new Script("_index['float_payload_field'].docCount()");
         checkValueInEachDoc(3, script, 6);
 
         // corner case: what if the field does not exist?
-        script = "_index['non_existent_field'].docCount()";
+        script = new Script("_index['non_existent_field'].docCount()");
         checkValueInEachDoc(0, script, 6);
 
         // get the number of all tokens in all docs
-        script = "_index['float_payload_field'].sumttf()";
+        script = new Script("_index['float_payload_field'].sumttf()");
         checkValueInEachDoc(9, script, 6);
 
         // corner case get the number of all tokens in all docs for non existent
         // field
-        script = "_index['non_existent_field'].sumttf()";
+        script = new Script("_index['non_existent_field'].sumttf()");
         checkValueInEachDoc(0, script, 6);
 
         // get the sum of doc freqs in all docs
-        script = "_index['float_payload_field'].sumdf()";
+        script = new Script("_index['float_payload_field'].sumdf()");
         checkValueInEachDoc(5, script, 6);
 
         // get the sum of doc freqs in all docs for non existent field
-        script = "_index['non_existent_field'].sumdf()";
+        script = new Script("_index['non_existent_field'].sumdf()");
         checkValueInEachDoc(0, script, 6);
 
         // check term frequencies for 'a'
-        script = "term = _index['float_payload_field']['a']; if (term != null) {term.tf()}";
+        script = new Script("term = _index['float_payload_field']['a']; if (term != null) {term.tf()}");
         Map<String, Object> expectedResults = new HashMap<>();
         expectedResults.put("1", 2);
         expectedResults.put("2", 0);
@@ -474,7 +476,7 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
         expectedResults.clear();
 
         // check doc frequencies for 'c'
-        script = "term = _index['float_payload_field']['c']; if (term != null) {term.df()}";
+        script = new Script("term = _index['float_payload_field']['c']; if (term != null) {term.df()}");
         expectedResults.put("1", 1l);
         expectedResults.put("2", 1l);
         expectedResults.put("3", 1l);
@@ -485,7 +487,7 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
         expectedResults.clear();
 
         // check doc frequencies for term that does not exist
-        script = "term = _index['float_payload_field']['non_existent_term']; if (term != null) {term.df()}";
+        script = new Script("term = _index['float_payload_field']['non_existent_term']; if (term != null) {term.df()}");
         expectedResults.put("1", 0l);
         expectedResults.put("2", 0l);
         expectedResults.put("3", 0l);
@@ -496,7 +498,7 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
         expectedResults.clear();
 
         // check doc frequencies for term that does not exist
-        script = "term = _index['non_existent_field']['non_existent_term']; if (term != null) {term.tf()}";
+        script = new Script("term = _index['non_existent_field']['non_existent_term']; if (term != null) {term.tf()}");
         expectedResults.put("1", 0);
         expectedResults.put("2", 0);
         expectedResults.put("3", 0);
@@ -507,7 +509,7 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
         expectedResults.clear();
 
         // check total term frequencies for 'a'
-        script = "term = _index['float_payload_field']['a']; if (term != null) {term.ttf()}";
+        script = new Script("term = _index['float_payload_field']['a']; if (term != null) {term.ttf()}");
         expectedResults.put("1", 4l);
         expectedResults.put("2", 4l);
         expectedResults.put("3", 4l);
@@ -569,7 +571,7 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
 
     }
 
-    private void checkExceptions(String script) {
+    private void checkExceptions(Script script) {
         try {
             SearchResponse sr = client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()).addScriptField("tvtest", script)
                     .execute().actionGet();
@@ -587,7 +589,7 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
         }
     }
 
-    private void checkValueInEachDocWithFunctionScore(String fieldScript, Map<String, Object> expectedFieldVals, String scoreScript,
+    private void checkValueInEachDocWithFunctionScore(Script fieldScript, Map<String, Object> expectedFieldVals, Script scoreScript,
             Map<String, Object> expectedScore, int numExpectedDocs) {
         SearchResponse sr = client().prepareSearch("test")
                 .setQuery(QueryBuilders.functionScoreQuery(ScoreFunctionBuilders.scriptFunction(scoreScript)))
@@ -602,7 +604,7 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
         }
     }
 
-    private void checkValueInEachDoc(String script, Map<String, Object> expectedResults, int numExpectedDocs) {
+    private void checkValueInEachDoc(Script script, Map<String, Object> expectedResults, int numExpectedDocs) {
         SearchResponse sr = client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()).addScriptField("tvtest", script)
                 .execute().actionGet();
         assertHitCount(sr, numExpectedDocs);
@@ -613,7 +615,7 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
         }
     }
 
-    private void checkValueInEachDoc(int value, String script, int numExpectedDocs) {
+    private void checkValueInEachDoc(int value, Script script, int numExpectedDocs) {
         SearchResponse sr = client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()).addScriptField("tvtest", script)
                 .execute().actionGet();
         assertHitCount(sr, numExpectedDocs);
@@ -628,4 +630,505 @@ public class IndexLookupTests extends ElasticsearchIntegrationTest {
             }
         }
     }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testCallWithDifferentFlagsFailsOldScriptAPI() throws Exception {
+
+        initTestData();
+
+        // should throw an exception, we cannot call with different flags twice
+        // if the flags of the second call were not included in the first call.
+        String script = "term = _index['int_payload_field']['b']; return _index['int_payload_field'].get('b', _POSITIONS).tf();";
+        try {
+            client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()).addScriptField("tvtest", script).execute().actionGet();
+        } catch (SearchPhaseExecutionException e) {
+            assertThat(
+                    "got: " + e.toString(),
+                    e.toString()
+                            .indexOf(
+                                    "You must call get with all required flags! Instead of  _index['int_payload_field'].get('b', _FREQUENCIES) and _index['int_payload_field'].get('b', _POSITIONS) call  _index['int_payload_field'].get('b', _FREQUENCIES | _POSITIONS)  once]"),
+                    Matchers.greaterThan(-1));
+        }
+
+        // Should not throw an exception this way round
+        script = "term = _index['int_payload_field'].get('b', _POSITIONS | _FREQUENCIES);return _index['int_payload_field']['b'].tf();";
+        client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()).addScriptField("tvtest", script).execute().actionGet();
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testIteratorAndRecordingOldScriptAPI() throws Exception {
+
+        initTestData();
+
+        // call twice with record: should work as expected
+        String script = createPositionsArrayScriptIterateTwiceOldScriptAPI("b", includeAllFlag, "position");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedPositionsArray, 3);
+        script = createPositionsArrayScriptIterateTwiceOldScriptAPI("b", includeAllFlag, "startOffset");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedStartOffsetsArray, 3);
+        script = createPositionsArrayScriptIterateTwiceOldScriptAPI("b", includeAllFlag, "endOffset");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedEndOffsetsArray, 3);
+        script = createPositionsArrayScriptIterateTwiceOldScriptAPI("b", includeAllFlag, "payloadAsInt(-1)");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedPayloadsArray, 3);
+
+        // no record and get iterator twice: should fail
+        script = createPositionsArrayScriptIterateTwiceOldScriptAPI("b", includeAllWithoutRecordFlag, "position");
+        checkExceptionsOldScriptAPI(script);
+        script = createPositionsArrayScriptIterateTwiceOldScriptAPI("b", includeAllWithoutRecordFlag, "startOffset");
+        checkExceptionsOldScriptAPI(script);
+        script = createPositionsArrayScriptIterateTwiceOldScriptAPI("b", includeAllWithoutRecordFlag, "endOffset");
+        checkExceptionsOldScriptAPI(script);
+        script = createPositionsArrayScriptIterateTwiceOldScriptAPI("b", includeAllWithoutRecordFlag, "payloadAsInt(-1)");
+        checkExceptionsOldScriptAPI(script);
+
+        // no record and get termObject twice and iterate: should fail
+        script = createPositionsArrayScriptGetInfoObjectTwiceOldScriptAPI("b", includeAllWithoutRecordFlag, "position");
+        checkExceptionsOldScriptAPI(script);
+        script = createPositionsArrayScriptGetInfoObjectTwiceOldScriptAPI("b", includeAllWithoutRecordFlag, "startOffset");
+        checkExceptionsOldScriptAPI(script);
+        script = createPositionsArrayScriptGetInfoObjectTwiceOldScriptAPI("b", includeAllWithoutRecordFlag, "endOffset");
+        checkExceptionsOldScriptAPI(script);
+        script = createPositionsArrayScriptGetInfoObjectTwiceOldScriptAPI("b", includeAllWithoutRecordFlag, "payloadAsInt(-1)");
+        checkExceptionsOldScriptAPI(script);
+
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    private String createPositionsArrayScriptGetInfoObjectTwiceOldScriptAPI(String term, String flags, String what) {
+        String script = "term = _index['int_payload_field'].get('" + term + "'," + flags + "); array=[]; for (pos in term) {array.add(pos."
+                + what + ")}; _index['int_payload_field'].get('" + term + "'," + flags + "); array=[]; for (pos in term) {array.add(pos."
+                + what + ")}";
+        return script;
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    private String createPositionsArrayScriptIterateTwiceOldScriptAPI(String term, String flags, String what) {
+        String script = "term = _index['int_payload_field'].get('" + term + "'," + flags + "); array=[]; for (pos in term) {array.add(pos."
+                + what + ")}; array=[]; for (pos in term) {array.add(pos." + what + ")}; array";
+        return script;
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    private String createPositionsArrayScriptOldScriptAPI(String field, String term, String flags, String what) {
+        String script = "term = _index['" + field + "'].get('" + term + "'," + flags + "); array=[]; for (pos in term) {array.add(pos."
+                + what + ")}; array";
+        return script;
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    private String createPositionsArrayScriptDefaultGetOldScriptAPI(String field, String term, String what) {
+        String script = "term = _index['" + field + "']['" + term + "']; array=[]; for (pos in term) {array.add(pos." + what + ")}; array";
+        return script;
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testFlagsOldScriptAPI() throws Exception {
+
+        initTestData();
+
+        // check default flag
+        String script = createPositionsArrayScriptDefaultGetOldScriptAPI("int_payload_field", "b", "position");
+        // there should be no positions
+        /*
+         * TODO: the following tests fail with the new postings enum apis
+         * because of a bogus assert in BlockDocsEnum
+         * checkArrayValsInEachDoc(script, emptyArray, 3); script =
+         * createPositionsArrayScriptDefaultGet("int_payload_field", "b",
+         * "startOffset"); // there should be no offsets
+         * checkArrayValsInEachDoc(script, emptyArray, 3); script =
+         * createPositionsArrayScriptDefaultGet("int_payload_field", "b",
+         * "endOffset"); // there should be no offsets
+         * checkArrayValsInEachDoc(script, emptyArray, 3); script =
+         * createPositionsArrayScriptDefaultGet("int_payload_field", "b",
+         * "payloadAsInt(-1)"); // there should be no payload
+         * checkArrayValsInEachDoc(script, emptyArray, 3);
+         * 
+         * // check FLAG_FREQUENCIES flag script =
+         * createPositionsArrayScript("int_payload_field", "b", "_FREQUENCIES",
+         * "position"); // there should be no positions
+         * checkArrayValsInEachDoc(script, emptyArray, 3); script =
+         * createPositionsArrayScript("int_payload_field", "b", "_FREQUENCIES",
+         * "startOffset"); // there should be no offsets
+         * checkArrayValsInEachDoc(script, emptyArray, 3); script =
+         * createPositionsArrayScript("int_payload_field", "b", "_FREQUENCIES",
+         * "endOffset"); // there should be no offsets
+         * checkArrayValsInEachDoc(script, emptyArray, 3); script =
+         * createPositionsArrayScript("int_payload_field", "b", "_FREQUENCIES",
+         * "payloadAsInt(-1)"); // there should be no payloads
+         * checkArrayValsInEachDoc(script, emptyArray, 3);
+         */
+
+        // check FLAG_POSITIONS flag
+        script = createPositionsArrayScriptOldScriptAPI("int_payload_field", "b", "_POSITIONS", "position");
+        // there should be positions
+        checkArrayValsInEachDocOldScriptAPI(script, expectedPositionsArray, 3);
+        /*
+         * TODO: these tests make a bogus assumption that asking for positions
+         * will return only positions script =
+         * createPositionsArrayScript("int_payload_field", "b", "_POSITIONS",
+         * "startOffset"); // there should be no offsets
+         * checkArrayValsInEachDoc(script, emptyArray, 3); script =
+         * createPositionsArrayScript("int_payload_field", "b", "_POSITIONS",
+         * "endOffset"); // there should be no offsets
+         * checkArrayValsInEachDoc(script, emptyArray, 3); script =
+         * createPositionsArrayScript("int_payload_field", "b", "_POSITIONS",
+         * "payloadAsInt(-1)"); // there should be no payloads
+         * checkArrayValsInEachDoc(script, emptyArray, 3);
+         */
+
+        // check FLAG_OFFSETS flag
+        script = createPositionsArrayScriptOldScriptAPI("int_payload_field", "b", "_OFFSETS", "position");
+        // there should be positions and s forth ...
+        checkArrayValsInEachDocOldScriptAPI(script, expectedPositionsArray, 3);
+        script = createPositionsArrayScriptOldScriptAPI("int_payload_field", "b", "_OFFSETS", "startOffset");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedStartOffsetsArray, 3);
+        script = createPositionsArrayScriptOldScriptAPI("int_payload_field", "b", "_OFFSETS", "endOffset");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedEndOffsetsArray, 3);
+        script = createPositionsArrayScriptOldScriptAPI("int_payload_field", "b", "_OFFSETS", "payloadAsInt(-1)");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedPayloadsArray, 3);
+
+        // check FLAG_PAYLOADS flag
+        script = createPositionsArrayScriptOldScriptAPI("int_payload_field", "b", "_PAYLOADS", "position");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedPositionsArray, 3);
+        script = createPositionsArrayScriptOldScriptAPI("int_payload_field", "b", "_PAYLOADS", "startOffset");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedStartOffsetsArray, 3);
+        script = createPositionsArrayScriptOldScriptAPI("int_payload_field", "b", "_PAYLOADS", "endOffset");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedEndOffsetsArray, 3);
+        script = createPositionsArrayScriptOldScriptAPI("int_payload_field", "b", "_PAYLOADS", "payloadAsInt(-1)");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedPayloadsArray, 3);
+
+        // check all flags
+        String allFlags = "_POSITIONS | _OFFSETS | _PAYLOADS";
+        script = createPositionsArrayScriptOldScriptAPI("int_payload_field", "b", allFlags, "position");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedPositionsArray, 3);
+        script = createPositionsArrayScriptOldScriptAPI("int_payload_field", "b", allFlags, "startOffset");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedStartOffsetsArray, 3);
+        script = createPositionsArrayScriptOldScriptAPI("int_payload_field", "b", allFlags, "endOffset");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedEndOffsetsArray, 3);
+        script = createPositionsArrayScriptOldScriptAPI("int_payload_field", "b", allFlags, "payloadAsInt(-1)");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedPayloadsArray, 3);
+
+        // check all flags without record
+        script = createPositionsArrayScriptOldScriptAPI("int_payload_field", "b", includeAllWithoutRecordFlag, "position");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedPositionsArray, 3);
+        script = createPositionsArrayScriptOldScriptAPI("int_payload_field", "b", includeAllWithoutRecordFlag, "startOffset");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedStartOffsetsArray, 3);
+        script = createPositionsArrayScriptOldScriptAPI("int_payload_field", "b", includeAllWithoutRecordFlag, "endOffset");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedEndOffsetsArray, 3);
+        script = createPositionsArrayScriptOldScriptAPI("int_payload_field", "b", includeAllWithoutRecordFlag, "payloadAsInt(-1)");
+        checkArrayValsInEachDocOldScriptAPI(script, expectedPayloadsArray, 3);
+
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testAllExceptPosAndOffsetOldSciptAPI() throws Exception {
+        XContentBuilder mapping = XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("properties")
+                .startObject("float_payload_field").field("type", "string").field("index_options", "offsets").field("term_vector", "no")
+                .field("analyzer", "payload_float").endObject().startObject("string_payload_field").field("type", "string")
+                .field("index_options", "offsets").field("term_vector", "no").field("analyzer", "payload_string").endObject()
+                .startObject("int_payload_field").field("type", "string").field("index_options", "offsets")
+                .field("analyzer", "payload_int").endObject().endObject().endObject().endObject();
+        assertAcked(prepareCreate("test").addMapping("type1", mapping).setSettings(
+                Settings.settingsBuilder().put(indexSettings())
+                        .put("index.analysis.analyzer.payload_float.tokenizer", "whitespace")
+                        .putArray("index.analysis.analyzer.payload_float.filter", "delimited_float")
+                        .put("index.analysis.filter.delimited_float.delimiter", "|")
+                        .put("index.analysis.filter.delimited_float.encoding", "float")
+                        .put("index.analysis.filter.delimited_float.type", "delimited_payload_filter")
+                        .put("index.analysis.analyzer.payload_string.tokenizer", "whitespace")
+                        .putArray("index.analysis.analyzer.payload_string.filter", "delimited_string")
+                        .put("index.analysis.filter.delimited_string.delimiter", "|")
+                        .put("index.analysis.filter.delimited_string.encoding", "identity")
+                        .put("index.analysis.filter.delimited_string.type", "delimited_payload_filter")
+                        .put("index.analysis.analyzer.payload_int.tokenizer", "whitespace")
+                        .putArray("index.analysis.analyzer.payload_int.filter", "delimited_int")
+                        .put("index.analysis.filter.delimited_int.delimiter", "|")
+                        .put("index.analysis.filter.delimited_int.encoding", "int")
+                        .put("index.analysis.filter.delimited_int.type", "delimited_payload_filter").put("index.number_of_shards", 1)));
+        ensureYellow();
+        indexRandom(true, client().prepareIndex("test", "type1", "1").setSource("float_payload_field", "a|1 b|2 a|3 b "), client()
+                .prepareIndex("test", "type1", "2").setSource("string_payload_field", "a|a b|b a|a b "),
+                client().prepareIndex("test", "type1", "3").setSource("float_payload_field", "a|4 b|5 a|6 b "),
+                client().prepareIndex("test", "type1", "4").setSource("string_payload_field", "a|b b|a a|b b "),
+                client().prepareIndex("test", "type1", "5").setSource("float_payload_field", "c "),
+                client().prepareIndex("test", "type1", "6").setSource("int_payload_field", "c|1"));
+
+        // get the number of all docs
+        String script = "_index.numDocs()";
+        checkValueInEachDocOldScriptAPI(6, script, 6);
+
+        // get the number of docs with field float_payload_field
+        script = "_index['float_payload_field'].docCount()";
+        checkValueInEachDocOldScriptAPI(3, script, 6);
+
+        // corner case: what if the field does not exist?
+        script = "_index['non_existent_field'].docCount()";
+        checkValueInEachDocOldScriptAPI(0, script, 6);
+
+        // get the number of all tokens in all docs
+        script = "_index['float_payload_field'].sumttf()";
+        checkValueInEachDocOldScriptAPI(9, script, 6);
+
+        // corner case get the number of all tokens in all docs for non existent
+        // field
+        script = "_index['non_existent_field'].sumttf()";
+        checkValueInEachDocOldScriptAPI(0, script, 6);
+
+        // get the sum of doc freqs in all docs
+        script = "_index['float_payload_field'].sumdf()";
+        checkValueInEachDocOldScriptAPI(5, script, 6);
+
+        // get the sum of doc freqs in all docs for non existent field
+        script = "_index['non_existent_field'].sumdf()";
+        checkValueInEachDocOldScriptAPI(0, script, 6);
+
+        // check term frequencies for 'a'
+        script = "term = _index['float_payload_field']['a']; if (term != null) {term.tf()}";
+        Map<String, Object> expectedResults = new HashMap<>();
+        expectedResults.put("1", 2);
+        expectedResults.put("2", 0);
+        expectedResults.put("3", 2);
+        expectedResults.put("4", 0);
+        expectedResults.put("5", 0);
+        expectedResults.put("6", 0);
+        checkValueInEachDocOldScriptAPI(script, expectedResults, 6);
+        expectedResults.clear();
+
+        // check doc frequencies for 'c'
+        script = "term = _index['float_payload_field']['c']; if (term != null) {term.df()}";
+        expectedResults.put("1", 1l);
+        expectedResults.put("2", 1l);
+        expectedResults.put("3", 1l);
+        expectedResults.put("4", 1l);
+        expectedResults.put("5", 1l);
+        expectedResults.put("6", 1l);
+        checkValueInEachDocOldScriptAPI(script, expectedResults, 6);
+        expectedResults.clear();
+
+        // check doc frequencies for term that does not exist
+        script = "term = _index['float_payload_field']['non_existent_term']; if (term != null) {term.df()}";
+        expectedResults.put("1", 0l);
+        expectedResults.put("2", 0l);
+        expectedResults.put("3", 0l);
+        expectedResults.put("4", 0l);
+        expectedResults.put("5", 0l);
+        expectedResults.put("6", 0l);
+        checkValueInEachDocOldScriptAPI(script, expectedResults, 6);
+        expectedResults.clear();
+
+        // check doc frequencies for term that does not exist
+        script = "term = _index['non_existent_field']['non_existent_term']; if (term != null) {term.tf()}";
+        expectedResults.put("1", 0);
+        expectedResults.put("2", 0);
+        expectedResults.put("3", 0);
+        expectedResults.put("4", 0);
+        expectedResults.put("5", 0);
+        expectedResults.put("6", 0);
+        checkValueInEachDocOldScriptAPI(script, expectedResults, 6);
+        expectedResults.clear();
+
+        // check total term frequencies for 'a'
+        script = "term = _index['float_payload_field']['a']; if (term != null) {term.ttf()}";
+        expectedResults.put("1", 4l);
+        expectedResults.put("2", 4l);
+        expectedResults.put("3", 4l);
+        expectedResults.put("4", 4l);
+        expectedResults.put("5", 4l);
+        expectedResults.put("6", 4l);
+        checkValueInEachDocOldScriptAPI(script, expectedResults, 6);
+        expectedResults.clear();
+
+        // check float payload for 'b'
+        HashMap<String, List<Object>> expectedPayloadsArray = new HashMap<>();
+        script = createPositionsArrayScriptOldScriptAPI("float_payload_field", "b", includeAllFlag, "payloadAsFloat(-1)");
+        float missingValue = -1;
+        List<Object> payloadsFor1 = new ArrayList<>();
+        payloadsFor1.add(2f);
+        payloadsFor1.add(missingValue);
+        expectedPayloadsArray.put("1", payloadsFor1);
+        List<Object> payloadsFor2 = new ArrayList<>();
+        payloadsFor2.add(5f);
+        payloadsFor2.add(missingValue);
+        expectedPayloadsArray.put("3", payloadsFor2);
+        expectedPayloadsArray.put("6", new ArrayList<>());
+        expectedPayloadsArray.put("5", new ArrayList<>());
+        expectedPayloadsArray.put("4", new ArrayList<>());
+        expectedPayloadsArray.put("2", new ArrayList<>());
+        checkArrayValsInEachDocOldScriptAPI(script, expectedPayloadsArray, 6);
+
+        // check string payload for 'b'
+        expectedPayloadsArray.clear();
+        payloadsFor1.clear();
+        payloadsFor2.clear();
+        script = createPositionsArrayScriptOldScriptAPI("string_payload_field", "b", includeAllFlag, "payloadAsString()");
+        payloadsFor1.add("b");
+        payloadsFor1.add(null);
+        expectedPayloadsArray.put("2", payloadsFor1);
+        payloadsFor2.add("a");
+        payloadsFor2.add(null);
+        expectedPayloadsArray.put("4", payloadsFor2);
+        expectedPayloadsArray.put("6", new ArrayList<>());
+        expectedPayloadsArray.put("5", new ArrayList<>());
+        expectedPayloadsArray.put("3", new ArrayList<>());
+        expectedPayloadsArray.put("1", new ArrayList<>());
+        checkArrayValsInEachDocOldScriptAPI(script, expectedPayloadsArray, 6);
+
+        // check int payload for 'c'
+        expectedPayloadsArray.clear();
+        payloadsFor1.clear();
+        payloadsFor2.clear();
+        script = createPositionsArrayScriptOldScriptAPI("int_payload_field", "c", includeAllFlag, "payloadAsInt(-1)");
+        payloadsFor1 = new ArrayList<>();
+        payloadsFor1.add(1);
+        expectedPayloadsArray.put("6", payloadsFor1);
+        expectedPayloadsArray.put("5", new ArrayList<>());
+        expectedPayloadsArray.put("4", new ArrayList<>());
+        expectedPayloadsArray.put("3", new ArrayList<>());
+        expectedPayloadsArray.put("2", new ArrayList<>());
+        expectedPayloadsArray.put("1", new ArrayList<>());
+        checkArrayValsInEachDocOldScriptAPI(script, expectedPayloadsArray, 6);
+
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    private void checkArrayValsInEachDocOldScriptAPI(Script script, HashMap<String, List<Object>> expectedArray, int expectedHitSize) {
+        SearchResponse sr = client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()).addScriptField("tvtest", script)
+                .execute().actionGet();
+        assertHitCount(sr, expectedHitSize);
+        int nullCounter = 0;
+        for (SearchHit hit : sr.getHits().getHits()) {
+            Object result = hit.getFields().get("tvtest").getValues();
+            Object expectedResult = expectedArray.get(hit.getId());
+            assertThat("for doc " + hit.getId(), result, equalTo(expectedResult));
+            if (expectedResult != null) {
+                nullCounter++;
+            }
+        }
+        assertThat(nullCounter, equalTo(expectedArray.size()));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    private void checkExceptionsOldScriptAPI(String script) {
+        try {
+            SearchResponse sr = client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()).addScriptField("tvtest", script)
+                    .execute().actionGet();
+            assertThat(sr.getHits().hits().length, equalTo(0));
+            ShardSearchFailure[] shardFails = sr.getShardFailures();
+            for (ShardSearchFailure fail : shardFails) {
+                assertThat(fail.reason().indexOf("Cannot iterate twice! If you want to iterate more that once, add _CACHE explicitly."),
+                        Matchers.greaterThan(-1));
+            }
+        } catch (SearchPhaseExecutionException ex) {
+            assertThat("got " + ex.toString(),
+                    ex.toString().indexOf("Cannot iterate twice! If you want to iterate more that once, add _CACHE explicitly."),
+                    Matchers.greaterThan(-1));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    private void checkValueInEachDocWithFunctionScoreOldScriptAPI(String fieldScript, Map<String, Object> expectedFieldVals,
+            String scoreScript, Map<String, Object> expectedScore, int numExpectedDocs) {
+        SearchResponse sr = client().prepareSearch("test")
+                .setQuery(QueryBuilders.functionScoreQuery(ScoreFunctionBuilders.scriptFunction(new Script(scoreScript))))
+                .addScriptField("tvtest", fieldScript).execute().actionGet();
+        assertHitCount(sr, numExpectedDocs);
+        for (SearchHit hit : sr.getHits().getHits()) {
+            Object result = hit.getFields().get("tvtest").getValues().get(0);
+            Object expectedResult = expectedFieldVals.get(hit.getId());
+            assertThat("for doc " + hit.getId(), result, equalTo(expectedResult));
+            assertThat("for doc " + hit.getId(), ((Float) expectedScore.get(hit.getId())).doubleValue(),
+                    Matchers.closeTo(hit.score(), 1.e-4));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    private void checkOnlyFunctionScoreOldScriptAPI(String scoreScript, Map<String, Object> expectedScore, int numExpectedDocs) {
+        SearchResponse sr = client().prepareSearch("test")
+                .setQuery(QueryBuilders.functionScoreQuery(ScoreFunctionBuilders.scriptFunction(new Script(scoreScript)))).execute()
+                .actionGet();
+        assertHitCount(sr, numExpectedDocs);
+        for (SearchHit hit : sr.getHits().getHits()) {
+            assertThat("for doc " + hit.getId(), ((Float) expectedScore.get(hit.getId())).doubleValue(),
+                    Matchers.closeTo(hit.score(), 1.e-4));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    private void checkValueInEachDocOldScriptAPI(String script, Map<String, Object> expectedResults, int numExpectedDocs) {
+        SearchResponse sr = client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()).addScriptField("tvtest", script)
+                .execute().actionGet();
+        assertHitCount(sr, numExpectedDocs);
+        for (SearchHit hit : sr.getHits().getHits()) {
+            Object result = hit.getFields().get("tvtest").getValues().get(0);
+            Object expectedResult = expectedResults.get(hit.getId());
+            assertThat("for doc " + hit.getId(), result, equalTo(expectedResult));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    private void checkValueInEachDocOldScriptAPI(int value, String script, int numExpectedDocs) {
+        SearchResponse sr = client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()).addScriptField("tvtest", script)
+                .execute().actionGet();
+        assertHitCount(sr, numExpectedDocs);
+        for (SearchHit hit : sr.getHits().getHits()) {
+            Object result = hit.getFields().get("tvtest").getValues().get(0);
+            if (result instanceof Integer) {
+                assertThat((Integer) result, equalTo(value));
+            } else if (result instanceof Long) {
+                assertThat(((Long) result).intValue(), equalTo(value));
+            } else {
+                fail();
+            }
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    private void checkArrayValsInEachDocOldScriptAPI(String script, HashMap<String, List<Object>> expectedArray, int expectedHitSize) {
+        SearchResponse sr = client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()).addScriptField("tvtest", script)
+                .execute().actionGet();
+        assertHitCount(sr, expectedHitSize);
+        int nullCounter = 0;
+        for (SearchHit hit : sr.getHits().getHits()) {
+            Object result = hit.getFields().get("tvtest").getValues();
+            Object expectedResult = expectedArray.get(hit.getId());
+            assertThat("for doc " + hit.getId(), result, equalTo(expectedResult));
+            if (expectedResult != null) {
+                nullCounter++;
+            }
+        }
+        assertThat(nullCounter, equalTo(expectedArray.size()));
+    }
 }
diff --git a/src/test/java/org/elasticsearch/script/IndexedScriptTests.java b/src/test/java/org/elasticsearch/script/IndexedScriptTests.java
index d3dbcb78e17..d8d493acb3f 100644
--- a/src/test/java/org/elasticsearch/script/IndexedScriptTests.java
+++ b/src/test/java/org/elasticsearch/script/IndexedScriptTests.java
@@ -38,7 +38,9 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.notNullValue;
 
 public class IndexedScriptTests extends ElasticsearchIntegrationTest {
 
@@ -119,6 +121,29 @@ public class IndexedScriptTests extends ElasticsearchIntegrationTest {
             client().prepareIndex(ScriptService.SCRIPT_INDEX, GroovyScriptEngineService.NAME, "script1").setSource("{\"script\":\"2\"}").get();
         }
         client().prepareIndex("test", "scriptTest", "1").setSource("{\"theField\":\"foo\"}").get();
+        try {
+            client().prepareUpdate("test", "scriptTest", "1")
+                    .setScript(new Script("script1", ScriptService.ScriptType.INDEXED, GroovyScriptEngineService.NAME, null)).get();
+            fail("update script should have been rejected");
+        } catch (Exception e) {
+            assertThat(e.getMessage(), containsString("failed to execute script"));
+            assertThat(ExceptionsHelper.detailedMessage(e),
+                    containsString("scripts of type [indexed], operation [update] and lang [groovy] are disabled"));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testDisabledUpdateIndexedScriptsOnlyOldScriptAPI() {
+        if (randomBoolean()) {
+            client().preparePutIndexedScript(GroovyScriptEngineService.NAME, "script1", "{\"script\":\"2\"}").get();
+        } else {
+            client().prepareIndex(ScriptService.SCRIPT_INDEX, GroovyScriptEngineService.NAME, "script1").setSource("{\"script\":\"2\"}")
+                    .get();
+        }
+        client().prepareIndex("test", "scriptTest", "1").setSource("{\"theField\":\"foo\"}").get();
         try {
             client().prepareUpdate("test", "scriptTest", "1").setScript("script1", ScriptService.ScriptType.INDEXED).setScriptLang(GroovyScriptEngineService.NAME).get();
             fail("update script should have been rejected");
@@ -152,6 +177,41 @@ public class IndexedScriptTests extends ElasticsearchIntegrationTest {
             client().prepareIndex(ScriptService.SCRIPT_INDEX, ExpressionScriptEngineService.NAME, "script1").setSource("{\"script\":\"2\"}").get();
         }
         client().prepareIndex("test", "scriptTest", "1").setSource("{\"theField\":\"foo\"}").get();
+        try {
+            client().prepareUpdate("test", "scriptTest", "1")
+                    .setScript(new Script("script1", ScriptService.ScriptType.INDEXED, ExpressionScriptEngineService.NAME, null)).get();
+            fail("update script should have been rejected");
+        } catch(Exception e) {
+            assertThat(e.getMessage(), containsString("failed to execute script"));
+            assertThat(e.getCause().toString(), containsString("scripts of type [indexed], operation [update] and lang [expression] are disabled"));
+        }
+        try {
+            String query = "{ \"script_fields\" : { \"test1\" : { \"script_id\" : \"script1\", \"lang\":\"expression\" }}}";
+            client().prepareSearch().setSource(query).setIndices("test").setTypes("scriptTest").get();
+            fail("search script should have been rejected");
+        } catch(Exception e) {
+            assertThat(e.toString(), containsString("scripts of type [indexed], operation [search] and lang [expression] are disabled"));
+        }
+        try {
+            String source = "{\"aggs\": {\"test\": { \"terms\" : { \"script_id\":\"script1\", \"script_lang\":\"expression\" } } } }";
+            client().prepareSearch("test").setSource(source).get();
+        } catch(Exception e) {
+            assertThat(e.toString(), containsString("scripts of type [indexed], operation [aggs] and lang [expression] are disabled"));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testAllOpsDisabledIndexedScriptsOldScriptAPI() throws IOException {
+        if (randomBoolean()) {
+            client().preparePutIndexedScript(ExpressionScriptEngineService.NAME, "script1", "{\"script\":\"2\"}").get();
+        } else {
+            client().prepareIndex(ScriptService.SCRIPT_INDEX, ExpressionScriptEngineService.NAME, "script1")
+                    .setSource("{\"script\":\"2\"}").get();
+        }
+        client().prepareIndex("test", "scriptTest", "1").setSource("{\"theField\":\"foo\"}").get();
         try {
             client().prepareUpdate("test", "scriptTest", "1").setScript("script1", ScriptService.ScriptType.INDEXED).setScriptLang(ExpressionScriptEngineService.NAME).get();
             fail("update script should have been rejected");
diff --git a/src/test/java/org/elasticsearch/script/NativeScriptTests.java b/src/test/java/org/elasticsearch/script/NativeScriptTests.java
index c478c6d313c..9d07b17a91d 100644
--- a/src/test/java/org/elasticsearch/script/NativeScriptTests.java
+++ b/src/test/java/org/elasticsearch/script/NativeScriptTests.java
@@ -21,6 +21,7 @@ package org.elasticsearch.script;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
+
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.inject.Injector;
 import org.elasticsearch.common.inject.ModulesBuilder;
@@ -60,7 +61,8 @@ public class NativeScriptTests extends ElasticsearchTestCase {
 
         ScriptService scriptService = injector.getInstance(ScriptService.class);
 
-        ExecutableScript executable = scriptService.executable(new Script(NativeScriptEngineService.NAME, "my", ScriptType.INLINE, null), ScriptContext.Standard.SEARCH);
+        ExecutableScript executable = scriptService.executable(new Script("my", ScriptType.INLINE, NativeScriptEngineService.NAME, null),
+                ScriptContext.Standard.SEARCH);
         assertThat(executable.run().toString(), equalTo("test"));
         terminate(injector.getInstance(ThreadPool.class));
     }
@@ -85,7 +87,8 @@ public class NativeScriptTests extends ElasticsearchTestCase {
         ScriptService scriptService = new ScriptService(settings, environment, scriptEngineServices, resourceWatcherService, scriptContextRegistry);
 
         for (ScriptContext scriptContext : scriptContextRegistry.scriptContexts()) {
-            assertThat(scriptService.compile(new Script(NativeScriptEngineService.NAME, "my", ScriptType.INLINE, null), scriptContext), notNullValue());
+            assertThat(scriptService.compile(new Script("my", ScriptType.INLINE, NativeScriptEngineService.NAME, null), scriptContext),
+                    notNullValue());
         }
     }
 
diff --git a/src/test/java/org/elasticsearch/script/OnDiskScriptTests.java b/src/test/java/org/elasticsearch/script/OnDiskScriptTests.java
index ea464c489b6..b49486f0509 100644
--- a/src/test/java/org/elasticsearch/script/OnDiskScriptTests.java
+++ b/src/test/java/org/elasticsearch/script/OnDiskScriptTests.java
@@ -136,6 +136,39 @@ public class OnDiskScriptTests extends ElasticsearchIntegrationTest {
         } catch(Exception e) {
             assertThat(e.toString(), containsString("scripts of type [file], operation [search] and lang [mustache] are disabled"));
         }
+        try {
+            client().prepareUpdate("test", "scriptTest", "1")
+                    .setScript(new Script("script1", ScriptService.ScriptType.FILE, MustacheScriptEngineService.NAME, null)).get();
+            fail("update script should have been rejected");
+        } catch (Exception e) {
+            assertThat(e.getMessage(), containsString("failed to execute script"));
+            assertThat(e.getCause().toString(),
+                    containsString("scripts of type [file], operation [update] and lang [mustache] are disabled"));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testAllOpsDisabledOnDiskScriptsOldScriptAPI() {
+        //whether we even compile or cache the on disk scripts doesn't change the end result (the returned error)
+        client().prepareIndex("test", "scriptTest", "1").setSource("{\"theField\":\"foo\"}").get();
+        refresh();
+        String source = "{\"aggs\": {\"test\": { \"terms\" : { \"script_file\":\"script1\", \"lang\": \"mustache\" } } } }";
+        try {
+            client().prepareSearch("test").setSource(source).get();
+            fail("aggs script should have been rejected");
+        } catch (Exception e) {
+            assertThat(e.toString(), containsString("scripts of type [file], operation [aggs] and lang [mustache] are disabled"));
+        }
+        String query = "{ \"query\" : { \"match_all\": {}} , \"script_fields\" : { \"test1\" : { \"script_file\" : \"script1\", \"lang\":\"mustache\" }}, size:1}";
+        try {
+            client().prepareSearch().setSource(query).setIndices("test").setTypes("scriptTest").get();
+            fail("search script should have been rejected");
+        } catch (Exception e) {
+            assertThat(e.toString(), containsString("scripts of type [file], operation [search] and lang [mustache] are disabled"));
+        }
         try {
             client().prepareUpdate("test", "scriptTest", "1").setScript("script1", ScriptService.ScriptType.FILE).setScriptLang(MustacheScriptEngineService.NAME).get();
             fail("update script should have been rejected");
diff --git a/src/test/java/org/elasticsearch/script/ScriptFieldTests.java b/src/test/java/org/elasticsearch/script/ScriptFieldTests.java
index 6c6a022fb31..81319f67798 100644
--- a/src/test/java/org/elasticsearch/script/ScriptFieldTests.java
+++ b/src/test/java/org/elasticsearch/script/ScriptFieldTests.java
@@ -24,9 +24,11 @@ import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.plugins.AbstractPlugin;
+import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
+import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
 
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
@@ -50,6 +52,36 @@ public class ScriptFieldTests extends ElasticsearchIntegrationTest {
 
     public void testNativeScript() throws InterruptedException, ExecutionException {
 
+        indexRandom(true, client().prepareIndex("test", "type1", "1").setSource("text", "doc1"), client()
+                .prepareIndex("test", "type1", "2").setSource("text", "doc2"),
+                client().prepareIndex("test", "type1", "3").setSource("text", "doc3"), client().prepareIndex("test", "type1", "4")
+                        .setSource("text", "doc4"), client().prepareIndex("test", "type1", "5").setSource("text", "doc5"), client()
+                        .prepareIndex("test", "type1", "6").setSource("text", "doc6"));
+
+        client().admin().indices().prepareFlush("test").execute().actionGet();
+        SearchResponse sr = client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery())
+                .addScriptField("int", new Script("int", ScriptType.INLINE, "native", null))
+                .addScriptField("float", new Script("float", ScriptType.INLINE, "native", null))
+                .addScriptField("double", new Script("double", ScriptType.INLINE, "native", null))
+                .addScriptField("long", new Script("long", ScriptType.INLINE, "native", null)).execute().actionGet();
+        assertThat(sr.getHits().hits().length, equalTo(6));
+        for (SearchHit hit : sr.getHits().getHits()) {
+            Object result = hit.getFields().get("int").getValues().get(0);
+            assertThat(result, equalTo((Object) intArray));
+            result = hit.getFields().get("long").getValues().get(0);
+            assertThat(result, equalTo((Object) longArray));
+            result = hit.getFields().get("float").getValues().get(0);
+            assertThat(result, equalTo((Object) floatArray));
+            result = hit.getFields().get("double").getValues().get(0);
+            assertThat(result, equalTo((Object) doubleArray));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    public void testNativeScriptOldScriptAPI() throws InterruptedException, ExecutionException {
+
         indexRandom(true, client().prepareIndex("test", "type1", "1").setSource("text", "doc1"), client()
                 .prepareIndex("test", "type1", "2").setSource("text", "doc2"),
                 client().prepareIndex("test", "type1", "3").setSource("text", "doc3"), client().prepareIndex("test", "type1", "4")
diff --git a/src/test/java/org/elasticsearch/script/ScriptParameterParserTest.java b/src/test/java/org/elasticsearch/script/ScriptParameterParserTest.java
index e23930a8cfb..e0c66fd09dd 100644
--- a/src/test/java/org/elasticsearch/script/ScriptParameterParserTest.java
+++ b/src/test/java/org/elasticsearch/script/ScriptParameterParserTest.java
@@ -25,7 +25,7 @@ import org.elasticsearch.common.xcontent.ToXContent.MapParams;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
-import org.elasticsearch.script.ScriptParameterParser.ScriptParameterParseException;
+import org.elasticsearch.script.Script.ScriptParseException;
 import org.elasticsearch.script.ScriptParameterParser.ScriptParameterValue;
 import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.test.ElasticsearchTestCase;
@@ -170,7 +170,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         assertThat(paramParser.lang(), nullValue());
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testTokenSingleParameterDelcaredTwiceInlineFile() throws IOException {
         XContentParser parser = XContentHelper.createParser(new BytesArray("{ \"foo\" : \"scriptValue\", \"foo_file\" : \"scriptValue\" }"));
         Token token = parser.nextToken();
@@ -190,7 +190,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         paramParser.token(parser.currentName(), parser.currentToken(), parser);
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testTokenSingleParameterDelcaredTwiceInlineIndexed() throws IOException {
         XContentParser parser = XContentHelper.createParser(new BytesArray("{ \"foo\" : \"scriptValue\", \"foo_id\" : \"scriptValue\" }"));
         Token token = parser.nextToken();
@@ -210,7 +210,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         paramParser.token(parser.currentName(), parser.currentToken(), parser);
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testTokenSingleParameterDelcaredTwiceFileInline() throws IOException {
         XContentParser parser = XContentHelper.createParser(new BytesArray("{ \"foo_file\" : \"scriptValue\", \"foo\" : \"scriptValue\" }"));
         Token token = parser.nextToken();
@@ -230,7 +230,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         paramParser.token(parser.currentName(), parser.currentToken(), parser);
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testTokenSingleParameterDelcaredTwiceFileIndexed() throws IOException {
         XContentParser parser = XContentHelper.createParser(new BytesArray("{ \"foo_file\" : \"scriptValue\", \"foo_id\" : \"scriptValue\" }"));
         Token token = parser.nextToken();
@@ -250,7 +250,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         paramParser.token(parser.currentName(), parser.currentToken(), parser);
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testTokenSingleParameterDelcaredTwiceIndexedInline() throws IOException {
         XContentParser parser = XContentHelper.createParser(new BytesArray("{ \"foo_id\" : \"scriptValue\", \"foo\" : \"scriptValue\" }"));
         Token token = parser.nextToken();
@@ -270,7 +270,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         paramParser.token(parser.currentName(), parser.currentToken(), parser);
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testTokenSingleParameterDelcaredTwiceIndexedFile() throws IOException {
         XContentParser parser = XContentHelper.createParser(new BytesArray("{ \"foo_id\" : \"scriptValue\", \"foo_file\" : \"scriptValue\" }"));
         Token token = parser.nextToken();
@@ -649,7 +649,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         assertThat(config.isEmpty(), equalTo(true));
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testConfigSingleParameterDelcaredTwiceInlineFile() throws IOException {
         Map<String, Object> config = new LinkedHashMap<>();
         config.put("foo", "scriptValue");
@@ -660,7 +660,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         paramParser.parseConfig(config, true);
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testConfigSingleParameterDelcaredTwiceInlineIndexed() throws IOException {
         Map<String, Object> config = new LinkedHashMap<>();
         config.put("foo", "scriptValue");
@@ -671,7 +671,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         paramParser.parseConfig(config, true);
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testConfigSingleParameterDelcaredTwiceFileInline() throws IOException {
         Map<String, Object> config = new LinkedHashMap<>();
         config.put("foo_file", "scriptValue");
@@ -682,7 +682,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         paramParser.parseConfig(config, true);
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testConfigSingleParameterDelcaredTwiceFileIndexed() throws IOException {
         Map<String, Object> config = new LinkedHashMap<>();
         config.put("foo_file", "scriptValue");
@@ -693,7 +693,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         paramParser.parseConfig(config, true);
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testConfigSingleParameterDelcaredTwiceIndexedInline() throws IOException {
         Map<String, Object> config = new LinkedHashMap<>();
         config.put("foo_id", "scriptValue");
@@ -704,7 +704,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         paramParser.parseConfig(config, true);
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testConfigSingleParameterDelcaredTwiceIndexedFile() throws IOException {
         Map<String, Object> config = new LinkedHashMap<>();
         config.put("foo_id", "scriptValue");
@@ -861,7 +861,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         assertThat((String) config.get("other_file"), equalTo("barScriptValue"));
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testConfigMultipleParametersInlineWrongType() throws IOException {
         Map<String, Object> config = new HashMap<>();
         config.put("foo", 1l);
@@ -882,7 +882,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         paramParser.parseConfig(config, true);
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testConfigMultipleParametersFileWrongType() throws IOException {
         Map<String, Object> config = new HashMap<>();
         config.put("foo", "fooScriptValue");
@@ -903,7 +903,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         paramParser.parseConfig(config, true);
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testConfigMultipleParametersIndexedWrongType() throws IOException {
         Map<String, Object> config = new HashMap<>();
         config.put("foo", "fooScriptValue");
@@ -924,7 +924,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         paramParser.parseConfig(config, true);
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testConfigMultipleParametersLangWrongType() throws IOException {
         Map<String, Object> config = new HashMap<>();
         config.put("foo", "fooScriptValue");
@@ -1039,7 +1039,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         assertThat(paramParser.lang(), nullValue());
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testParamsSingleParameterDelcaredTwiceInlineFile() throws IOException {
         Map<String, String> config = new LinkedHashMap<>();
         config.put("foo", "scriptValue");
@@ -1051,7 +1051,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         paramParser.parseParams(params);
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testParamsSingleParameterDelcaredTwiceInlineIndexed() throws IOException {
         Map<String, String> config = new LinkedHashMap<>();
         config.put("foo", "scriptValue");
@@ -1063,7 +1063,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         paramParser.parseParams(params);
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testParamsSingleParameterDelcaredTwiceFileInline() throws IOException {
         Map<String, String> config = new LinkedHashMap<>();
         config.put("foo_file", "scriptValue");
@@ -1075,7 +1075,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         paramParser.parseParams(params);
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testParamsSingleParameterDelcaredTwiceFileIndexed() throws IOException {
         Map<String, String> config = new LinkedHashMap<>();
         config.put("foo_file", "scriptValue");
@@ -1087,7 +1087,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         paramParser.parseParams(params);
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testParamsSingleParameterDelcaredTwiceIndexedInline() throws IOException {
         Map<String, String> config = new LinkedHashMap<>();
         config.put("foo_id", "scriptValue");
@@ -1099,7 +1099,7 @@ public class ScriptParameterParserTest extends ElasticsearchTestCase {
         paramParser.parseParams(params);
     }
 
-    @Test(expected=ScriptParameterParseException.class)
+    @Test(expected = ScriptParseException.class)
     public void testParamsSingleParameterDelcaredTwiceIndexedFile() throws IOException {
         Map<String, String> config = new LinkedHashMap<>();
         config.put("foo_id", "scriptValue");
diff --git a/src/test/java/org/elasticsearch/script/ScriptServiceTests.java b/src/test/java/org/elasticsearch/script/ScriptServiceTests.java
index 862831606d3..a43edcbc0b7 100644
--- a/src/test/java/org/elasticsearch/script/ScriptServiceTests.java
+++ b/src/test/java/org/elasticsearch/script/ScriptServiceTests.java
@@ -20,6 +20,7 @@ package org.elasticsearch.script;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
+
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.io.Streams;
 import org.elasticsearch.common.settings.Settings;
@@ -43,7 +44,9 @@ import java.util.Set;
 
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.sameInstance;
 
 public class ScriptServiceTests extends ElasticsearchTestCase {
 
@@ -131,7 +134,8 @@ public class ScriptServiceTests extends ElasticsearchTestCase {
         resourceWatcherService.notifyNow();
 
         logger.info("--> verify that file with extension was correctly processed");
-        CompiledScript compiledScript = scriptService.compile(new Script("test", "test_script", ScriptType.FILE, null), ScriptContext.Standard.SEARCH);
+        CompiledScript compiledScript = scriptService.compile(new Script("test_script", ScriptType.FILE, "test", null),
+                ScriptContext.Standard.SEARCH);
         assertThat(compiledScript.compiled(), equalTo((Object) "compiled_test_file"));
 
         logger.info("--> delete both files");
@@ -141,7 +145,7 @@ public class ScriptServiceTests extends ElasticsearchTestCase {
 
         logger.info("--> verify that file with extension was correctly removed");
         try {
-            scriptService.compile(new Script("test", "test_script", ScriptType.FILE, null), ScriptContext.Standard.SEARCH);
+            scriptService.compile(new Script("test_script", ScriptType.FILE, "test", null), ScriptContext.Standard.SEARCH);
             fail("the script test_script should no longer exist");
         } catch (IllegalArgumentException ex) {
             assertThat(ex.getMessage(), containsString("Unable to find on disk script test_script"));
@@ -152,17 +156,21 @@ public class ScriptServiceTests extends ElasticsearchTestCase {
     public void testScriptsSameNameDifferentLanguage() throws IOException {
         buildScriptService(Settings.EMPTY);
         createFileScripts("groovy", "expression");
-        CompiledScript groovyScript = scriptService.compile(new Script(GroovyScriptEngineService.NAME, "file_script", ScriptType.FILE, null), randomFrom(scriptContexts));
+        CompiledScript groovyScript = scriptService.compile(
+                new Script("file_script", ScriptType.FILE, GroovyScriptEngineService.NAME, null), randomFrom(scriptContexts));
         assertThat(groovyScript.lang(), equalTo(GroovyScriptEngineService.NAME));
-        CompiledScript expressionScript = scriptService.compile(new Script(ExpressionScriptEngineService.NAME, "file_script", ScriptType.FILE, null), randomFrom(scriptContexts));
+        CompiledScript expressionScript = scriptService.compile(new Script("file_script", ScriptType.FILE,
+                ExpressionScriptEngineService.NAME, null), randomFrom(scriptContexts));
         assertThat(expressionScript.lang(), equalTo(ExpressionScriptEngineService.NAME));
     }
 
     @Test
     public void testInlineScriptCompiledOnceMultipleLangAcronyms() throws IOException {
         buildScriptService(Settings.EMPTY);
-        CompiledScript compiledScript1 = scriptService.compile(new Script("test", "script", ScriptType.INLINE, null), randomFrom(scriptContexts));
-        CompiledScript compiledScript2 = scriptService.compile(new Script("test2", "script", ScriptType.INLINE, null), randomFrom(scriptContexts));
+        CompiledScript compiledScript1 = scriptService.compile(new Script("script", ScriptType.INLINE, "test", null),
+                randomFrom(scriptContexts));
+        CompiledScript compiledScript2 = scriptService.compile(new Script("script", ScriptType.INLINE, "test2", null),
+                randomFrom(scriptContexts));
         assertThat(compiledScript1, sameInstance(compiledScript2));
     }
 
@@ -170,8 +178,10 @@ public class ScriptServiceTests extends ElasticsearchTestCase {
     public void testFileScriptCompiledOnceMultipleLangAcronyms() throws IOException {
         buildScriptService(Settings.EMPTY);
         createFileScripts("test");
-        CompiledScript compiledScript1 = scriptService.compile(new Script("test", "file_script", ScriptType.FILE, null), randomFrom(scriptContexts));
-        CompiledScript compiledScript2 = scriptService.compile(new Script("test2", "file_script", ScriptType.FILE, null), randomFrom(scriptContexts));
+        CompiledScript compiledScript1 = scriptService.compile(new Script("file_script", ScriptType.FILE, "test", null),
+                randomFrom(scriptContexts));
+        CompiledScript compiledScript2 = scriptService.compile(new Script("file_script", ScriptType.FILE, "test2", null),
+                randomFrom(scriptContexts));
         assertThat(compiledScript1, sameInstance(compiledScript2));
     }
 
@@ -348,7 +358,8 @@ public class ScriptServiceTests extends ElasticsearchTestCase {
         for (ScriptEngineService scriptEngineService : scriptEngineServices) {
             for (String type : scriptEngineService.types()) {
                 try {
-                    scriptService.compile(new Script(type, "test", randomFrom(ScriptType.values()), null), new ScriptContext.Plugin(pluginName, unknownContext));
+                    scriptService.compile(new Script("test", randomFrom(ScriptType.values()), type, null), new ScriptContext.Plugin(
+                            pluginName, unknownContext));
                     fail("script compilation should have been rejected");
                 } catch(IllegalArgumentException e) {
                     assertThat(e.getMessage(), containsString("script context [" + pluginName + "_" + unknownContext + "] not supported"));
@@ -367,7 +378,7 @@ public class ScriptServiceTests extends ElasticsearchTestCase {
 
     private void assertCompileRejected(String lang, String script, ScriptType scriptType, ScriptContext scriptContext) {
         try {
-            scriptService.compile(new Script(lang, script, scriptType, null), scriptContext);
+            scriptService.compile(new Script(script, scriptType, lang, null), scriptContext);
             fail("compile should have been rejected for lang [" + lang + "], script_type [" + scriptType + "], scripted_op [" + scriptContext + "]");
         } catch(ScriptException e) {
             //all good
@@ -375,7 +386,7 @@ public class ScriptServiceTests extends ElasticsearchTestCase {
     }
 
     private void assertCompileAccepted(String lang, String script, ScriptType scriptType, ScriptContext scriptContext) {
-        assertThat(scriptService.compile(new Script(lang, script, scriptType, null), scriptContext), notNullValue());
+        assertThat(scriptService.compile(new Script(script, scriptType, lang, null), scriptContext), notNullValue());
     }
 
     public static class TestEngineService implements ScriptEngineService {
diff --git a/src/test/java/org/elasticsearch/script/expression/ExpressionScriptTests.java b/src/test/java/org/elasticsearch/script/expression/ExpressionScriptTests.java
index cf01a3e4cc9..065e03cb731 100644
--- a/src/test/java/org/elasticsearch/script/expression/ExpressionScriptTests.java
+++ b/src/test/java/org/elasticsearch/script/expression/ExpressionScriptTests.java
@@ -26,6 +26,8 @@ import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.metrics.stats.Stats;
@@ -55,7 +57,8 @@ public class ExpressionScriptTests extends ElasticsearchIntegrationTest {
         SearchRequestBuilder req = client().prepareSearch().setIndices("test");
         req.setQuery(QueryBuilders.matchAllQuery())
            .addSort(SortBuilders.fieldSort("_uid")
-                                .order(SortOrder.ASC)).addScriptField("foo", "expression", script, paramsMap);
+.order(SortOrder.ASC))
+                .addScriptField("foo", new Script(script, ScriptType.INLINE, "expression", paramsMap));
         return req;
     }
 
@@ -84,7 +87,7 @@ public class ExpressionScriptTests extends ElasticsearchIntegrationTest {
             client().prepareIndex("test", "doc", "1").setSource("text", "hello goodbye"),
             client().prepareIndex("test", "doc", "2").setSource("text", "hello hello hello goodbye"),
             client().prepareIndex("test", "doc", "3").setSource("text", "hello hello goodebye"));
-        ScoreFunctionBuilder score = ScoreFunctionBuilders.scriptFunction("1 / _score", "expression");
+        ScoreFunctionBuilder score = ScoreFunctionBuilders.scriptFunction(new Script("1 / _score", ScriptType.INLINE, "expression", null));
         SearchRequestBuilder req = client().prepareSearch().setIndices("test");
         req.setQuery(QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("text", "hello"), score).boostMode("replace"));
         req.setSearchType(SearchType.DFS_QUERY_THEN_FETCH); // make sure DF is consistent
@@ -367,7 +370,9 @@ public class ExpressionScriptTests extends ElasticsearchIntegrationTest {
 
         SearchRequestBuilder req = client().prepareSearch().setIndices("test");
         req.setQuery(QueryBuilders.matchAllQuery())
-           .addAggregation(AggregationBuilders.terms("term_agg").field("text").script("_value").lang(ExpressionScriptEngineService.NAME));
+.addAggregation(
+                AggregationBuilders.terms("term_agg").field("text")
+                        .script(new Script("_value", ScriptType.INLINE, ExpressionScriptEngineService.NAME, null)));
 
         String message;
         try {
diff --git a/src/test/java/org/elasticsearch/search/aggregations/EquivalenceTests.java b/src/test/java/org/elasticsearch/search/aggregations/EquivalenceTests.java
index bd14009e683..109d0951a56 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/EquivalenceTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/EquivalenceTests.java
@@ -31,6 +31,8 @@ import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.RangeQueryBuilder;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode;
 import org.elasticsearch.search.aggregations.bucket.filter.Filter;
 import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
@@ -46,6 +48,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.extendedStats;
@@ -300,8 +303,12 @@ public class EquivalenceTests extends ElasticsearchIntegrationTest {
         }
         assertNoFailures(client().admin().indices().prepareRefresh("idx").setIndicesOptions(IndicesOptions.lenientExpandOpen()).execute().get());
 
+        Map<String, Object> params = new HashMap<>();
+        params.put("interval", interval);
         SearchResponse resp = client().prepareSearch("idx")
-                .addAggregation(terms("terms").field("values").collectMode(randomFrom(SubAggCollectionMode.values())).script("floor(_value / interval)").param("interval", interval).size(maxNumTerms))
+                .addAggregation(
+                        terms("terms").field("values").collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .script(new Script("floor(_value / interval)", ScriptType.INLINE, null, params)).size(maxNumTerms))
                 .addAggregation(histogram("histo").field("values").interval(interval).minDocCount(1))
                 .execute().actionGet();
 
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java
index d66a244b632..4b65a6a40c7 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramTests.java
@@ -24,6 +24,7 @@ import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.common.joda.Joda;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.mapper.core.DateFieldMapper;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
 import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
 import org.elasticsearch.search.aggregations.bucket.histogram.Histogram.Bucket;
@@ -522,9 +523,8 @@ public class DateHistogramTests extends ElasticsearchIntegrationTest {
         SearchResponse response = client().prepareSearch("idx")
                 .addAggregation(dateHistogram("histo")
                         .field("date")
-                        .script("new DateTime(_value).plusMonths(1).getMillis()")
-                        .interval(DateHistogramInterval.MONTH))
-                .execute().actionGet();
+.script(new Script("new DateTime(_value).plusMonths(1).getMillis()"))
+                                .interval(DateHistogramInterval.MONTH)).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -557,6 +557,8 @@ public class DateHistogramTests extends ElasticsearchIntegrationTest {
         assertThat(bucket.getDocCount(), equalTo(3l));
     }
 
+    
+
     /*
     [ Jan 2, Feb 3]
     [ Feb 2, Mar 3]
@@ -660,9 +662,8 @@ public class DateHistogramTests extends ElasticsearchIntegrationTest {
         SearchResponse response = client().prepareSearch("idx")
                 .addAggregation(dateHistogram("histo")
                         .field("dates")
-                        .script("new DateTime(_value, DateTimeZone.UTC).plusMonths(1).getMillis()")
-                        .interval(DateHistogramInterval.MONTH))
-                .execute().actionGet();
+                                .script(new Script("new DateTime(_value, DateTimeZone.UTC).plusMonths(1).getMillis()"))
+                                .interval(DateHistogramInterval.MONTH)).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -717,10 +718,8 @@ public class DateHistogramTests extends ElasticsearchIntegrationTest {
         SearchResponse response = client().prepareSearch("idx")
                 .addAggregation(dateHistogram("histo")
                         .field("dates")
-                        .script("new DateTime((long)_value, DateTimeZone.UTC).plusMonths(1).getMillis()")
-                        .interval(DateHistogramInterval.MONTH)
-                        .subAggregation(max("max")))
-                .execute().actionGet();
+                                .script(new Script("new DateTime((long)_value, DateTimeZone.UTC).plusMonths(1).getMillis()"))
+                                .interval(DateHistogramInterval.MONTH).subAggregation(max("max"))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -782,7 +781,7 @@ public class DateHistogramTests extends ElasticsearchIntegrationTest {
     @Test
     public void script_SingleValue() throws Exception {
         SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(dateHistogram("histo").script("doc['date'].value").interval(DateHistogramInterval.MONTH))
+                .addAggregation(dateHistogram("histo").script(new Script("doc['date'].value")).interval(DateHistogramInterval.MONTH))
                 .execute().actionGet();
 
         assertSearchResponse(response);
@@ -819,10 +818,8 @@ public class DateHistogramTests extends ElasticsearchIntegrationTest {
     public void script_SingleValue_WithSubAggregator_Inherited() throws Exception {
         SearchResponse response = client().prepareSearch("idx")
                 .addAggregation(dateHistogram("histo")
-                        .script("doc['date'].value")
-                        .interval(DateHistogramInterval.MONTH)
-                        .subAggregation(max("max")))
-                .execute().actionGet();
+.script(new Script("doc['date'].value")).interval(DateHistogramInterval.MONTH)
+                                .subAggregation(max("max"))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -866,7 +863,7 @@ public class DateHistogramTests extends ElasticsearchIntegrationTest {
     @Test
     public void script_MultiValued() throws Exception {
         SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(dateHistogram("histo").script("doc['dates'].values").interval(DateHistogramInterval.MONTH))
+                .addAggregation(dateHistogram("histo").script(new Script("doc['dates'].values")).interval(DateHistogramInterval.MONTH))
                 .execute().actionGet();
 
         assertSearchResponse(response);
@@ -906,6 +903,8 @@ public class DateHistogramTests extends ElasticsearchIntegrationTest {
         assertThat(bucket.getDocCount(), equalTo(3l));
     }
 
+    
+
       /*
     [ Jan 2, Feb 3]
     [ Feb 2, Mar 3]
@@ -919,10 +918,8 @@ public class DateHistogramTests extends ElasticsearchIntegrationTest {
     public void script_MultiValued_WithAggregatorInherited() throws Exception {
         SearchResponse response = client().prepareSearch("idx")
                 .addAggregation(dateHistogram("histo")
-                        .script("doc['dates'].values")
-                        .interval(DateHistogramInterval.MONTH)
-                        .subAggregation(max("max")))
-                .execute().actionGet();
+.script(new Script("doc['dates'].values")).interval(DateHistogramInterval.MONTH)
+                                .subAggregation(max("max"))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -1317,4 +1314,378 @@ public class DateHistogramTests extends ElasticsearchIntegrationTest {
             assertThat(e.toString(), containsString("IllegalArgumentException"));
         }
     }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void singleValuedField_WithValueScriptOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        dateHistogram("histo").field("date")
+                        .script("new DateTime(_value).plusMonths(1).getMillis()")
+                        .interval(DateHistogramInterval.MONTH))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+        Histogram histo = response.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        assertThat(histo.getName(), equalTo("histo"));
+    
+        List<? extends Bucket> buckets = histo.getBuckets();
+        assertThat(buckets.size(), equalTo(3));
+    
+        DateTime key = new DateTime(2012, 2, 1, 0, 0, DateTimeZone.UTC);
+        Histogram.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(1l));
+    
+        key = new DateTime(2012, 3, 1, 0, 0, DateTimeZone.UTC);
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(2l));
+    
+        key = new DateTime(2012, 4, 1, 0, 0, DateTimeZone.UTC);
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(3l));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    /**
+     * The script will change to document date values to the following:
+     *
+     * doc 1: [ Feb 2, Mar 3] doc 2: [ Mar 2, Apr 3] doc 3: [ Mar 15, Apr 16]
+     * doc 4: [ Apr 2, May 3] doc 5: [ Apr 15, May 16] doc 6: [ Apr 23, May 24]
+     */
+    @Test
+    public void multiValuedField_WithValueScriptOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        dateHistogram("histo").field("dates")
+                        .script("new DateTime(_value, DateTimeZone.UTC).plusMonths(1).getMillis()")
+                        .interval(DateHistogramInterval.MONTH))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+        Histogram histo = response.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        assertThat(histo.getName(), equalTo("histo"));
+        List<? extends Bucket> buckets = histo.getBuckets();
+        assertThat(buckets.size(), equalTo(4));
+    
+        DateTime key = new DateTime(2012, 2, 1, 0, 0, DateTimeZone.UTC);
+        Histogram.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(1l));
+    
+        key = new DateTime(2012, 3, 1, 0, 0, DateTimeZone.UTC);
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(3l));
+    
+        key = new DateTime(2012, 4, 1, 0, 0, DateTimeZone.UTC);
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(5l));
+    
+        key = new DateTime(2012, 5, 1, 0, 0, DateTimeZone.UTC);
+        bucket = buckets.get(3);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(3l));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    /**
+     * The script will change to document date values to the following:
+     *
+     * doc 1: [ Feb 2, Mar 3] doc 2: [ Mar 2, Apr 3] doc 3: [ Mar 15, Apr 16]
+     * doc 4: [ Apr 2, May 3] doc 5: [ Apr 15, May 16] doc 6: [ Apr 23, May 24]
+     *
+     */
+    @Test
+    public void multiValuedField_WithValueScript_WithInheritedSubAggregatorOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        dateHistogram("histo").field("dates")
+                        .script("new DateTime((long)_value, DateTimeZone.UTC).plusMonths(1).getMillis()")
+                        .interval(DateHistogramInterval.MONTH)
+                        .subAggregation(max("max")))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+        Histogram histo = response.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        assertThat(histo.getName(), equalTo("histo"));
+        List<? extends Bucket> buckets = histo.getBuckets();
+        assertThat(buckets.size(), equalTo(4));
+    
+        DateTime key = new DateTime(2012, 2, 1, 0, 0, DateTimeZone.UTC);
+        Histogram.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(1l));
+        Max max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+        assertThat((long) max.getValue(), equalTo(new DateTime(2012, 3, 3, 0, 0, DateTimeZone.UTC).getMillis()));
+    
+        key = new DateTime(2012, 3, 1, 0, 0, DateTimeZone.UTC);
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(3l));
+        max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+        assertThat((long) max.getValue(), equalTo(new DateTime(2012, 4, 16, 0, 0, DateTimeZone.UTC).getMillis()));
+    
+        key = new DateTime(2012, 4, 1, 0, 0, DateTimeZone.UTC);
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(5l));
+        max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+        assertThat((long) max.getValue(), equalTo(new DateTime(2012, 5, 24, 0, 0, DateTimeZone.UTC).getMillis()));
+    
+        key = new DateTime(2012, 5, 1, 0, 0, DateTimeZone.UTC);
+        bucket = buckets.get(3);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(3l));
+        max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+        assertThat((long) max.getValue(), equalTo(new DateTime(2012, 5, 24, 0, 0, DateTimeZone.UTC).getMillis()));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    /**
+     * Jan 2 Feb 2 Feb 15 Mar 2 Mar 15 Mar 23
+     */
+    @Test
+    public void script_SingleValueOldScriptAPI() throws Exception {
+        SearchResponse response = client().prepareSearch("idx")
+                .addAggregation(dateHistogram("histo").script("doc['date'].value").interval(DateHistogramInterval.MONTH))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+        Histogram histo = response.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        assertThat(histo.getName(), equalTo("histo"));
+        List<? extends Bucket> buckets = histo.getBuckets();
+        assertThat(buckets.size(), equalTo(3));
+    
+        DateTime key = new DateTime(2012, 1, 1, 0, 0, DateTimeZone.UTC);
+        Histogram.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(1l));
+    
+        key = new DateTime(2012, 2, 1, 0, 0, DateTimeZone.UTC);
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(2l));
+    
+        key = new DateTime(2012, 3, 1, 0, 0, DateTimeZone.UTC);
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(3l));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_SingleValue_WithSubAggregator_InheritedOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        dateHistogram("histo")
+                        .script("doc['date'].value")
+                        .interval(DateHistogramInterval.MONTH)
+                        .subAggregation(max("max")))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+        Histogram histo = response.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        assertThat(histo.getName(), equalTo("histo"));
+        List<? extends Bucket> buckets = histo.getBuckets();
+        assertThat(buckets.size(), equalTo(3));
+    
+        DateTime key = new DateTime(2012, 1, 1, 0, 0, DateTimeZone.UTC);
+        Histogram.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(1l));
+        Max max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+        assertThat(max.getValue(), equalTo((double) new DateTime(2012, 1, 2, 0, 0, DateTimeZone.UTC).getMillis()));
+    
+        key = new DateTime(2012, 2, 1, 0, 0, DateTimeZone.UTC);
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(2l));
+        max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+        assertThat(max.getValue(), equalTo((double) new DateTime(2012, 2, 15, 0, 0, DateTimeZone.UTC).getMillis()));
+    
+        key = new DateTime(2012, 3, 1, 0, 0, DateTimeZone.UTC);
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(3l));
+        max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+        assertThat(max.getValue(), equalTo((double) new DateTime(2012, 3, 23, 0, 0, DateTimeZone.UTC).getMillis()));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_MultiValuedOldScriptAPI() throws Exception {
+        SearchResponse response = client().prepareSearch("idx")
+                .addAggregation(dateHistogram("histo").script("doc['dates'].values").interval(DateHistogramInterval.MONTH))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+        Histogram histo = response.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        assertThat(histo.getName(), equalTo("histo"));
+        List<? extends Bucket> buckets = histo.getBuckets();
+        assertThat(buckets.size(), equalTo(4));
+    
+        DateTime key = new DateTime(2012, 1, 1, 0, 0, DateTimeZone.UTC);
+        Histogram.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(1l));
+    
+        key = new DateTime(2012, 2, 1, 0, 0, DateTimeZone.UTC);
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(3l));
+    
+        key = new DateTime(2012, 3, 1, 0, 0, DateTimeZone.UTC);
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(5l));
+    
+        key = new DateTime(2012, 4, 1, 0, 0, DateTimeZone.UTC);
+        bucket = buckets.get(3);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(3l));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_MultiValued_WithAggregatorInheritedOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        dateHistogram("histo")
+                        .script("doc['dates'].values")
+                        .interval(DateHistogramInterval.MONTH)
+                        .subAggregation(max("max")))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+        Histogram histo = response.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        assertThat(histo.getName(), equalTo("histo"));
+        List<? extends Bucket> buckets = histo.getBuckets();
+        assertThat(buckets.size(), equalTo(4));
+    
+        DateTime key = new DateTime(2012, 1, 1, 0, 0, DateTimeZone.UTC);
+        Histogram.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(1l));
+        Max max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+        assertThat((long) max.getValue(), equalTo(new DateTime(2012, 2, 3, 0, 0, DateTimeZone.UTC).getMillis()));
+    
+        key = new DateTime(2012, 2, 1, 0, 0, DateTimeZone.UTC);
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(3l));
+        max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+        assertThat((long) max.getValue(), equalTo(new DateTime(2012, 3, 16, 0, 0, DateTimeZone.UTC).getMillis()));
+    
+        key = new DateTime(2012, 3, 1, 0, 0, DateTimeZone.UTC);
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(5l));
+        max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+        assertThat((long) max.getValue(), equalTo(new DateTime(2012, 4, 24, 0, 0, DateTimeZone.UTC).getMillis()));
+    
+        key = new DateTime(2012, 4, 1, 0, 0, DateTimeZone.UTC);
+        bucket = buckets.get(3);
+        assertThat(bucket, notNullValue());
+        assertThat(bucket.getKeyAsString(), equalTo(getBucketKeyAsString(key)));
+        assertThat(((DateTime) bucket.getKey()), equalTo(key));
+        assertThat(bucket.getDocCount(), equalTo(3l));
+        max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+        assertThat((long) max.getValue(), equalTo(new DateTime(2012, 4, 24, 0, 0, DateTimeZone.UTC).getMillis()));
+    }
 }
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java
index 6eec4c42268..589b2b39bc5 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeTests.java
@@ -20,6 +20,7 @@ package org.elasticsearch.search.aggregations.bucket;
 
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
 import org.elasticsearch.search.aggregations.bucket.range.Range;
 import org.elasticsearch.search.aggregations.bucket.range.Range.Bucket;
@@ -108,14 +109,13 @@ public class DateRangeTests extends ElasticsearchIntegrationTest {
         if (randomBoolean()) {
             rangeBuilder.field("date");
         } else {
-            rangeBuilder.script("doc['date'].value");
+            rangeBuilder.script(new Script("doc['date'].value"));
         }
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(rangeBuilder
-                        .addUnboundedTo("a long time ago", "now-50y")
-                        .addRange("recently", "now-50y", "now-1y")
-                        .addUnboundedFrom("last year", "now-1y"))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        rangeBuilder.addUnboundedTo("a long time ago", "now-50y").addRange("recently", "now-50y", "now-1y")
+                                .addUnboundedFrom("last year", "now-1y")).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -583,15 +583,12 @@ public class DateRangeTests extends ElasticsearchIntegrationTest {
         SearchResponse response = client().prepareSearch("idx")
                 .addAggregation(dateRange("range")
                         .field("dates")
-                        .script("new DateTime(_value.longValue(), DateTimeZone.UTC).plusMonths(1).getMillis()")
-                        .addUnboundedTo(date(2, 15))
-                        .addRange(date(2, 15), date(3, 15))
-                        .addUnboundedFrom(date(3, 15)))
-                .execute().actionGet();
+                                .script(new Script("new DateTime(_value.longValue(), DateTimeZone.UTC).plusMonths(1).getMillis()"))
+                                .addUnboundedTo(date(2, 15)).addRange(date(2, 15), date(3, 15)).addUnboundedFrom(date(3, 15))).execute()
+                .actionGet();
 
         assertSearchResponse(response);
 
-
         Range range = response.getAggregations().get("range");
         assertThat(range, notNullValue());
         assertThat(range.getName(), equalTo("range"));
@@ -626,6 +623,8 @@ public class DateRangeTests extends ElasticsearchIntegrationTest {
         assertThat(bucket.getDocCount(), equalTo(numDocs - 1l));
     }
 
+    
+
     /*
         Feb 2,  Mar 3,      1
         Mar 2,  Apr 3,      2
@@ -640,16 +639,12 @@ public class DateRangeTests extends ElasticsearchIntegrationTest {
         SearchResponse response = client().prepareSearch("idx")
                 .addAggregation(dateRange("range")
                         .field("dates")
-                        .script("new DateTime(_value.longValue(), DateTimeZone.UTC).plusMonths(1).getMillis()")
-                        .addUnboundedTo(date(2, 15))
-                        .addRange(date(2, 15), date(3, 15))
-                        .addUnboundedFrom(date(3, 15))
-                        .subAggregation(max("max")))
-                .execute().actionGet();
+                                .script(new Script("new DateTime(_value.longValue(), DateTimeZone.UTC).plusMonths(1).getMillis()"))
+                                .addUnboundedTo(date(2, 15)).addRange(date(2, 15), date(3, 15)).addUnboundedFrom(date(3, 15))
+                                .subAggregation(max("max"))).execute().actionGet();
 
         assertSearchResponse(response);
 
-
         Range range = response.getAggregations().get("range");
         assertThat(range, notNullValue());
         assertThat(range.getName(), equalTo("range"));
@@ -696,7 +691,7 @@ public class DateRangeTests extends ElasticsearchIntegrationTest {
     public void script_SingleValue() throws Exception {
         SearchResponse response = client().prepareSearch("idx")
                 .addAggregation(dateRange("range")
-                        .script("doc['date'].value")
+.script(new Script("doc['date'].value"))
                         .addUnboundedTo(date(2, 15))
                         .addRange(date(2, 15), date(3, 15))
                         .addUnboundedFrom(date(3, 15)))
@@ -741,18 +736,15 @@ public class DateRangeTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void script_SingleValue_WithSubAggregator_Inherited() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(dateRange("range")
-                        .script("doc['date'].value")
-                        .addUnboundedTo(date(2, 15))
-                        .addRange(date(2, 15), date(3, 15))
-                        .addUnboundedFrom(date(3, 15))
-                        .subAggregation(max("max")))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        dateRange("range").script(new Script("doc['date'].value")).addUnboundedTo(date(2, 15))
+                                .addRange(date(2, 15), date(3, 15)).addUnboundedFrom(date(3, 15)).subAggregation(max("max"))).execute()
+                .actionGet();
 
         assertSearchResponse(response);
 
-
         Range range = response.getAggregations().get("range");
         assertThat(range, notNullValue());
         assertThat(range.getName(), equalTo("range"));
@@ -795,6 +787,8 @@ public class DateRangeTests extends ElasticsearchIntegrationTest {
         assertThat(max, notNullValue());
     }
 
+    
+
     /*
         Jan 2,  Feb 3,      1
         Feb 2,  Mar 3,      2
@@ -806,17 +800,14 @@ public class DateRangeTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void script_MultiValued() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(dateRange("range")
-                        .script("doc['dates'].values")
-                        .addUnboundedTo(date(2, 15))
-                        .addRange(date(2, 15), date(3, 15))
-                        .addUnboundedFrom(date(3, 15)))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        dateRange("range").script(new Script("doc['dates'].values")).addUnboundedTo(date(2, 15))
+                                .addRange(date(2, 15), date(3, 15)).addUnboundedFrom(date(3, 15))).execute().actionGet();
 
         assertSearchResponse(response);
 
-
         Range range = response.getAggregations().get("range");
         assertThat(range, notNullValue());
         assertThat(range.getName(), equalTo("range"));
@@ -855,16 +846,12 @@ public class DateRangeTests extends ElasticsearchIntegrationTest {
     public void script_MultiValued_WithAggregatorInherited() throws Exception {
         SearchResponse response = client().prepareSearch("idx")
                 .addAggregation(dateRange("range")
-                        .script("doc['dates'].values")
-                        .addUnboundedTo(date(2, 15))
-                        .addRange(date(2, 15), date(3, 15))
-                        .addUnboundedFrom(date(3, 15))
-                        .subAggregation(min("min")))
-                .execute().actionGet();
+.script(new Script("doc['dates'].values")).addUnboundedTo(date(2, 15))
+                                .addRange(date(2, 15), date(3, 15)).addUnboundedFrom(date(3, 15)).subAggregation(min("min"))).execute()
+                .actionGet();
 
         assertSearchResponse(response);
 
-
         Range range = response.getAggregations().get("range");
         assertThat(range, notNullValue());
         assertThat(range.getName(), equalTo("range"));
@@ -1078,5 +1065,381 @@ public class DateRangeTests extends ElasticsearchIntegrationTest {
 
     }
 
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void dateMathOldScriptAPI() throws Exception {
+        DateRangeBuilder rangeBuilder = dateRange("range");
+        if (randomBoolean()) {
+            rangeBuilder.field("date");
+        } else {
+            rangeBuilder.script("doc['date'].value");
+        }
+        SearchResponse response = client().prepareSearch("idx")
+                .addAggregation(rangeBuilder
+                        .addUnboundedTo("a long time ago", "now-50y")
+                        .addRange("recently", "now-50y", "now-1y")
+                        .addUnboundedFrom("last year", "now-1y"))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        assertThat(range.getBuckets().size(), equalTo(3));
+    
+        // TODO: use diamond once JI-9019884 is fixed
+        List<Range.Bucket> buckets = new ArrayList<Range.Bucket>(range.getBuckets());
+    
+        Range.Bucket bucket = buckets.get(0);
+        assertThat((String) bucket.getKey(), equalTo("a long time ago"));
+        assertThat(bucket.getKeyAsString(), equalTo("a long time ago"));
+        assertThat(bucket.getDocCount(), equalTo(0L));
+    
+        bucket = buckets.get(1);
+        assertThat((String) bucket.getKey(), equalTo("recently"));
+        assertThat(bucket.getKeyAsString(), equalTo("recently"));
+        assertThat(bucket.getDocCount(), equalTo((long) numDocs));
+    
+        bucket = buckets.get(2);
+        assertThat((String) bucket.getKey(), equalTo("last year"));
+        assertThat(bucket.getKeyAsString(), equalTo("last year"));
+        assertThat(bucket.getDocCount(), equalTo(0L));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void multiValuedField_WithValueScriptOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        dateRange("range").field("dates")
+                        .script("new DateTime(_value.longValue(), DateTimeZone.UTC).plusMonths(1).getMillis()")
+                        .addUnboundedTo(date(2, 15))
+                        .addRange(date(2, 15), date(3, 15))
+                        .addUnboundedFrom(date(3, 15)))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+    
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(buckets.size(), equalTo(3));
+    
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-2012-02-15T00:00:00.000Z"));
+        assertThat(((DateTime) bucket.getFrom()), nullValue());
+        assertThat(((DateTime) bucket.getTo()), equalTo(date(2, 15)));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("2012-02-15T00:00:00.000Z"));
+        assertThat(bucket.getDocCount(), equalTo(1l));
+    
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("2012-02-15T00:00:00.000Z-2012-03-15T00:00:00.000Z"));
+        assertThat(((DateTime) bucket.getFrom()), equalTo(date(2, 15)));
+        assertThat(((DateTime) bucket.getTo()), equalTo(date(3, 15)));
+        assertThat(bucket.getFromAsString(), equalTo("2012-02-15T00:00:00.000Z"));
+        assertThat(bucket.getToAsString(), equalTo("2012-03-15T00:00:00.000Z"));
+        assertThat(bucket.getDocCount(), equalTo(2l));
+    
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("2012-03-15T00:00:00.000Z-*"));
+        assertThat(((DateTime) bucket.getFrom()), equalTo(date(3, 15)));
+        assertThat(((DateTime) bucket.getTo()), nullValue());
+        assertThat(bucket.getFromAsString(), equalTo("2012-03-15T00:00:00.000Z"));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(numDocs - 1l));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void multiValuedField_WithValueScript_WithInheritedSubAggregatorOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        dateRange("range").field("dates")
+                        .script("new DateTime(_value.longValue(), DateTimeZone.UTC).plusMonths(1).getMillis()")
+                        .addUnboundedTo(date(2, 15))
+                        .addRange(date(2, 15), date(3, 15))
+                        .addUnboundedFrom(date(3, 15))
+                        .subAggregation(max("max")))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+    
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(buckets.size(), equalTo(3));
+    
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-2012-02-15T00:00:00.000Z"));
+        assertThat(((DateTime) bucket.getFrom()), nullValue());
+        assertThat(((DateTime) bucket.getTo()), equalTo(date(2, 15)));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("2012-02-15T00:00:00.000Z"));
+        assertThat(bucket.getDocCount(), equalTo(1l));
+        Max max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+        assertThat(max.getValue(), equalTo((double) date(3, 3).getMillis()));
+    
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("2012-02-15T00:00:00.000Z-2012-03-15T00:00:00.000Z"));
+        assertThat(((DateTime) bucket.getFrom()), equalTo(date(2, 15)));
+        assertThat(((DateTime) bucket.getTo()), equalTo(date(3, 15)));
+        assertThat(bucket.getFromAsString(), equalTo("2012-02-15T00:00:00.000Z"));
+        assertThat(bucket.getToAsString(), equalTo("2012-03-15T00:00:00.000Z"));
+        assertThat(bucket.getDocCount(), equalTo(2l));
+        max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+        assertThat(max.getValue(), equalTo((double) date(4, 3).getMillis()));
+    
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("2012-03-15T00:00:00.000Z-*"));
+        assertThat(((DateTime) bucket.getFrom()), equalTo(date(3, 15)));
+        assertThat(((DateTime) bucket.getTo()), nullValue());
+        assertThat(bucket.getFromAsString(), equalTo("2012-03-15T00:00:00.000Z"));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(numDocs - 1l));
+        max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_SingleValueOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        dateRange("range").script("doc['date'].value").addUnboundedTo(date(2, 15)).addRange(date(2, 15), date(3, 15))
+                                .addUnboundedFrom(date(3, 15))).execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(buckets.size(), equalTo(3));
+    
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-2012-02-15T00:00:00.000Z"));
+        assertThat(((DateTime) bucket.getFrom()), nullValue());
+        assertThat(((DateTime) bucket.getTo()), equalTo(date(2, 15)));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("2012-02-15T00:00:00.000Z"));
+        assertThat(bucket.getDocCount(), equalTo(2l));
+    
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("2012-02-15T00:00:00.000Z-2012-03-15T00:00:00.000Z"));
+        assertThat(((DateTime) bucket.getFrom()), equalTo(date(2, 15)));
+        assertThat(((DateTime) bucket.getTo()), equalTo(date(3, 15)));
+        assertThat(bucket.getFromAsString(), equalTo("2012-02-15T00:00:00.000Z"));
+        assertThat(bucket.getToAsString(), equalTo("2012-03-15T00:00:00.000Z"));
+        assertThat(bucket.getDocCount(), equalTo(2l));
+    
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("2012-03-15T00:00:00.000Z-*"));
+        assertThat(((DateTime) bucket.getFrom()), equalTo(date(3, 15)));
+        assertThat(((DateTime) bucket.getTo()), nullValue());
+        assertThat(bucket.getFromAsString(), equalTo("2012-03-15T00:00:00.000Z"));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(numDocs - 4l));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_SingleValue_WithSubAggregator_InheritedOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        dateRange("range")
+                        .script("doc['date'].value")
+                        .addUnboundedTo(date(2, 15))
+                        .addRange(date(2, 15), date(3, 15))
+                        .addUnboundedFrom(date(3, 15))
+                        .subAggregation(max("max")))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+    
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(buckets.size(), equalTo(3));
+    
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-2012-02-15T00:00:00.000Z"));
+        assertThat(((DateTime) bucket.getFrom()), nullValue());
+        assertThat(((DateTime) bucket.getTo()), equalTo(date(2, 15)));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("2012-02-15T00:00:00.000Z"));
+        assertThat(bucket.getDocCount(), equalTo(2l));
+        Max max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+        assertThat(max.getValue(), equalTo((double) date(2, 2).getMillis()));
+    
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("2012-02-15T00:00:00.000Z-2012-03-15T00:00:00.000Z"));
+        assertThat(((DateTime) bucket.getFrom()), equalTo(date(2, 15)));
+        assertThat(((DateTime) bucket.getTo()), equalTo(date(3, 15)));
+        assertThat(bucket.getFromAsString(), equalTo("2012-02-15T00:00:00.000Z"));
+        assertThat(bucket.getToAsString(), equalTo("2012-03-15T00:00:00.000Z"));
+        assertThat(bucket.getDocCount(), equalTo(2l));
+        max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+        assertThat(max.getValue(), equalTo((double) date(3, 2).getMillis()));
+    
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("2012-03-15T00:00:00.000Z-*"));
+        assertThat(((DateTime) bucket.getFrom()), equalTo(date(3, 15)));
+        assertThat(((DateTime) bucket.getTo()), nullValue());
+        assertThat(bucket.getFromAsString(), equalTo("2012-03-15T00:00:00.000Z"));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(numDocs - 4l));
+        max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_MultiValuedOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        dateRange("range")
+                        .script("doc['dates'].values")
+                        .addUnboundedTo(date(2, 15))
+                        .addRange(date(2, 15), date(3, 15))
+                        .addUnboundedFrom(date(3, 15)))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+    
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(buckets.size(), equalTo(3));
+    
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-2012-02-15T00:00:00.000Z"));
+        assertThat(((DateTime) bucket.getFrom()), nullValue());
+        assertThat(((DateTime) bucket.getTo()), equalTo(date(2, 15)));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("2012-02-15T00:00:00.000Z"));
+        assertThat(bucket.getDocCount(), equalTo(2l));
+    
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("2012-02-15T00:00:00.000Z-2012-03-15T00:00:00.000Z"));
+        assertThat(((DateTime) bucket.getFrom()), equalTo(date(2, 15)));
+        assertThat(((DateTime) bucket.getTo()), equalTo(date(3, 15)));
+        assertThat(bucket.getFromAsString(), equalTo("2012-02-15T00:00:00.000Z"));
+        assertThat(bucket.getToAsString(), equalTo("2012-03-15T00:00:00.000Z"));
+        assertThat(bucket.getDocCount(), equalTo(3l));
+    
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("2012-03-15T00:00:00.000Z-*"));
+        assertThat(((DateTime) bucket.getFrom()), equalTo(date(3, 15)));
+        assertThat(((DateTime) bucket.getTo()), nullValue());
+        assertThat(bucket.getFromAsString(), equalTo("2012-03-15T00:00:00.000Z"));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(numDocs - 2l));
+    }
+
+    @Test
+    public void script_MultiValued_WithAggregatorInheritedOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        dateRange("range")
+                        .script("doc['dates'].values")
+                        .addUnboundedTo(date(2, 15))
+                        .addRange(date(2, 15), date(3, 15))
+                        .addUnboundedFrom(date(3, 15))
+                        .subAggregation(min("min")))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+    
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(buckets.size(), equalTo(3));
+    
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-2012-02-15T00:00:00.000Z"));
+        assertThat(((DateTime) bucket.getFrom()), nullValue());
+        assertThat(((DateTime) bucket.getTo()), equalTo(date(2, 15)));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("2012-02-15T00:00:00.000Z"));
+        assertThat(bucket.getDocCount(), equalTo(2l));
+        Min min = bucket.getAggregations().get("min");
+        assertThat(min, notNullValue());
+        assertThat(min.getValue(), equalTo((double) date(1, 2).getMillis()));
+    
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("2012-02-15T00:00:00.000Z-2012-03-15T00:00:00.000Z"));
+        assertThat(((DateTime) bucket.getFrom()), equalTo(date(2, 15)));
+        assertThat(((DateTime) bucket.getTo()), equalTo(date(3, 15)));
+        assertThat(bucket.getFromAsString(), equalTo("2012-02-15T00:00:00.000Z"));
+        assertThat(bucket.getToAsString(), equalTo("2012-03-15T00:00:00.000Z"));
+        assertThat(bucket.getDocCount(), equalTo(3l));
+        min = bucket.getAggregations().get("min");
+        assertThat(min, notNullValue());
+        assertThat(min.getValue(), equalTo((double) date(2, 2).getMillis()));
+    
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("2012-03-15T00:00:00.000Z-*"));
+        assertThat(((DateTime) bucket.getFrom()), equalTo(date(3, 15)));
+        assertThat(((DateTime) bucket.getTo()), nullValue());
+        assertThat(bucket.getFromAsString(), equalTo("2012-03-15T00:00:00.000Z"));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(numDocs - 2l));
+        min = bucket.getAggregations().get("min");
+        assertThat(min, notNullValue());
+        assertThat(min.getValue(), equalTo((double) date(2, 15).getMillis()));
+    }
+
 
 }
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsTests.java
index 29f596c03e1..69f3cff44e2 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsTests.java
@@ -23,6 +23,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode;
 import org.elasticsearch.search.aggregations.bucket.filter.Filter;
 import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
@@ -449,7 +450,7 @@ public class DoubleTermsTests extends AbstractTermsTests {
                 .addAggregation(terms("terms")
                         .field(SINGLE_VALUED_FIELD_NAME)
                         .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("_value + 1"))
+                                .script(new Script("_value + 1")))
                 .execute().actionGet();
 
         assertSearchResponse(response);
@@ -504,7 +505,7 @@ public class DoubleTermsTests extends AbstractTermsTests {
                 .addAggregation(terms("terms")
                         .field(MULTI_VALUED_FIELD_NAME)
                         .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("_value + 1"))
+                                .script(new Script("_value + 1")))
                 .execute().actionGet();
 
         assertSearchResponse(response);
@@ -534,7 +535,7 @@ public class DoubleTermsTests extends AbstractTermsTests {
                 .addAggregation(terms("terms")
                         .field(MULTI_VALUED_FIELD_NAME)
                         .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("(long) _value / 1000 + 1"))
+                                .script(new Script("(long) _value / 1000 + 1")))
                 .execute().actionGet();
 
         assertSearchResponse(response);
@@ -575,7 +576,7 @@ public class DoubleTermsTests extends AbstractTermsTests {
                 .addAggregation(terms("terms")
                         .field(MULTI_VALUED_FIELD_NAME)
                         .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("_value + 1")
+                                .script(new Script("_value + 1"))
                         .subAggregation(sum("sum")))
                 .execute().actionGet();
 
@@ -609,15 +610,15 @@ public class DoubleTermsTests extends AbstractTermsTests {
 
     @Test
     public void script_SingleValue() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("doc['" + MULTI_VALUED_FIELD_NAME + "'].value"))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).script(
+                                new Script("doc['" + MULTI_VALUED_FIELD_NAME + "'].value"))).execute().actionGet();
 
         assertSearchResponse(response);
 
-
         Terms terms = response.getAggregations().get("terms");
         assertThat(terms, notNullValue());
         assertThat(terms.getName(), equalTo("terms"));
@@ -663,15 +664,15 @@ public class DoubleTermsTests extends AbstractTermsTests {
 
     @Test
     public void script_MultiValued() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("doc['" + MULTI_VALUED_FIELD_NAME + "']"))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).script(
+                                new Script("doc['" + MULTI_VALUED_FIELD_NAME + "']"))).execute().actionGet();
 
         assertSearchResponse(response);
 
-
         Terms terms = response.getAggregations().get("terms");
         assertThat(terms, notNullValue());
         assertThat(terms.getName(), equalTo("terms"));
@@ -701,7 +702,7 @@ public class DoubleTermsTests extends AbstractTermsTests {
             SearchResponse response = client().prepareSearch("idx").setTypes("type")
                     .addAggregation(terms("terms")
                             .collectMode(randomFrom(SubAggCollectionMode.values()))
-                            .script("doc['" + MULTI_VALUED_FIELD_NAME + "']")
+                                    .script(new Script("doc['" + MULTI_VALUED_FIELD_NAME + "']"))
                             .subAggregation(sum("sum")))
                     .execute().actionGet();
 
@@ -719,7 +720,7 @@ public class DoubleTermsTests extends AbstractTermsTests {
         SearchResponse response = client().prepareSearch("idx").setTypes("type")
                 .addAggregation(terms("terms")
                         .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("doc['" + MULTI_VALUED_FIELD_NAME + "']")
+                                .script(new Script("doc['" + MULTI_VALUED_FIELD_NAME + "']"))
                         .valueType(Terms.ValueType.DOUBLE)
                         .subAggregation(sum("sum")))
                 .execute().actionGet();
@@ -818,13 +819,13 @@ public class DoubleTermsTests extends AbstractTermsTests {
     @Test
     public void singleValuedField_OrderedBySingleValueSubAggregationAsc() throws Exception {
         boolean asc = true;
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.aggregation("avg_i", asc))
-                        .subAggregation(avg("avg_i").field(SINGLE_VALUED_FIELD_NAME))
-                ).execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").field(SINGLE_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .order(Terms.Order.aggregation("avg_i", asc)).subAggregation(avg("avg_i").field(SINGLE_VALUED_FIELD_NAME)))
+                .execute().actionGet();
 
 
         assertSearchResponse(response);
@@ -848,15 +849,18 @@ public class DoubleTermsTests extends AbstractTermsTests {
     @Test
     public void singleValuedField_OrderedBySingleValueSubAggregationAscWithSubTermsAgg() throws Exception {
         boolean asc = true;
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.aggregation("avg_i", asc))
-                        .subAggregation(avg("avg_i").field(SINGLE_VALUED_FIELD_NAME)).subAggregation(terms("subTerms").field(MULTI_VALUED_FIELD_NAME)
-                                .collectMode(randomFrom(SubAggCollectionMode.values())))
-                ).execute().actionGet();
-
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms")
+                                .field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .order(Terms.Order.aggregation("avg_i", asc))
+                                .subAggregation(avg("avg_i").field(SINGLE_VALUED_FIELD_NAME))
+                                .subAggregation(
+                                        terms("subTerms").field(MULTI_VALUED_FIELD_NAME).collectMode(
+                                                randomFrom(SubAggCollectionMode.values())))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -891,13 +895,13 @@ public class DoubleTermsTests extends AbstractTermsTests {
     @Test
     public void singleValuedField_OrderedBySingleBucketSubAggregationAsc() throws Exception {
         boolean asc = randomBoolean();
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("num_tags")
-                        .field("num_tag")
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.aggregation("filter", asc))
-                        .subAggregation(filter("filter").filter(QueryBuilders.matchAllQuery()))
-                ).execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("num_tags").field("num_tag").collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .order(Terms.Order.aggregation("filter", asc))
+                                .subAggregation(filter("filter").filter(QueryBuilders.matchAllQuery()))).execute().actionGet();
 
 
         assertSearchResponse(response);
@@ -929,15 +933,18 @@ public class DoubleTermsTests extends AbstractTermsTests {
     @Test
     public void singleValuedField_OrderedBySubAggregationAsc_MultiHierarchyLevels() throws Exception {
         boolean asc = randomBoolean();
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("tags")
-                        .field("num_tag")
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.aggregation("filter1>filter2>max", asc))
-                        .subAggregation(filter("filter1").filter(QueryBuilders.matchAllQuery())
-                                .subAggregation(filter("filter2").filter(QueryBuilders.matchAllQuery())
-                                        .subAggregation(max("max").field(SINGLE_VALUED_FIELD_NAME))))
-                ).execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("tags")
+                                .field("num_tag")
+                                .collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .order(Terms.Order.aggregation("filter1>filter2>max", asc))
+                                .subAggregation(
+                                        filter("filter1").filter(QueryBuilders.matchAllQuery()).subAggregation(
+                                                filter("filter2").filter(QueryBuilders.matchAllQuery()).subAggregation(
+                                                        max("max").field(SINGLE_VALUED_FIELD_NAME))))).execute().actionGet();
 
 
         assertSearchResponse(response);
@@ -985,12 +992,11 @@ public class DoubleTermsTests extends AbstractTermsTests {
     public void singleValuedField_OrderedByMissingSubAggregation() throws Exception {
         for (String index : Arrays.asList("idx", "idx_unmapped")) {
             try {
-                client().prepareSearch(index).setTypes("type")
-                        .addAggregation(terms("terms")
-                                .field(SINGLE_VALUED_FIELD_NAME)
-                                .collectMode(randomFrom(SubAggCollectionMode.values()))
-                                .order(Terms.Order.aggregation("avg_i", true))
-                        ).execute().actionGet();
+                client().prepareSearch(index)
+                        .setTypes("type")
+                        .addAggregation(
+                                terms("terms").field(SINGLE_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
+                                        .order(Terms.Order.aggregation("avg_i", true))).execute().actionGet();
 
                 fail("Expected search to fail when trying to sort terms aggregation by sug-aggregation that doesn't exist");
 
@@ -1004,14 +1010,16 @@ public class DoubleTermsTests extends AbstractTermsTests {
     public void singleValuedField_OrderedByNonMetricsOrMultiBucketSubAggregation() throws Exception {
         for (String index : Arrays.asList("idx", "idx_unmapped")) {
             try {
-                client().prepareSearch(index).setTypes("type")
-                        .addAggregation(terms("terms")
-                                .field(SINGLE_VALUED_FIELD_NAME)
-                                .collectMode(randomFrom(SubAggCollectionMode.values()))
-                                .order(Terms.Order.aggregation("num_tags", true))
-                                .subAggregation(terms("num_tags").field("num_tags")
-                                        .collectMode(randomFrom(SubAggCollectionMode.values())))
-                        ).execute().actionGet();
+                client().prepareSearch(index)
+                        .setTypes("type")
+                        .addAggregation(
+                                terms("terms")
+                                        .field(SINGLE_VALUED_FIELD_NAME)
+                                        .collectMode(randomFrom(SubAggCollectionMode.values()))
+                                        .order(Terms.Order.aggregation("num_tags", true))
+                                        .subAggregation(
+                                                terms("num_tags").field("num_tags").collectMode(randomFrom(SubAggCollectionMode.values()))))
+                        .execute().actionGet();
 
                 fail("Expected search to fail when trying to sort terms aggregation by sug-aggregation which is not of a metrics type");
 
@@ -1025,13 +1033,12 @@ public class DoubleTermsTests extends AbstractTermsTests {
     public void singleValuedField_OrderedByMultiValuedSubAggregation_WithUknownMetric() throws Exception {
         for (String index : Arrays.asList("idx", "idx_unmapped")) {
             try {
-                client().prepareSearch(index).setTypes("type")
-                        .addAggregation(terms("terms")
-                                .field(SINGLE_VALUED_FIELD_NAME + "2")
-                                .collectMode(randomFrom(SubAggCollectionMode.values()))
-                                .order(Terms.Order.aggregation("stats.foo", true))
-                                .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME))
-                        ).execute().actionGet();
+                client().prepareSearch(index)
+                        .setTypes("type")
+                        .addAggregation(
+                                terms("terms").field(SINGLE_VALUED_FIELD_NAME + "2").collectMode(randomFrom(SubAggCollectionMode.values()))
+                                        .order(Terms.Order.aggregation("stats.foo", true))
+                                        .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME))).execute().actionGet();
 
                 fail("Expected search to fail when trying to sort terms aggregation by multi-valued sug-aggregation " +
                         "with an unknown specified metric to order by");
@@ -1046,13 +1053,12 @@ public class DoubleTermsTests extends AbstractTermsTests {
     public void singleValuedField_OrderedByMultiValuedSubAggregation_WithoutMetric() throws Exception {
         for (String index : Arrays.asList("idx", "idx_unmapped")) {
             try {
-                client().prepareSearch(index).setTypes("type")
-                        .addAggregation(terms("terms")
-                                .field(SINGLE_VALUED_FIELD_NAME)
-                                .collectMode(randomFrom(SubAggCollectionMode.values()))
-                                .order(Terms.Order.aggregation("stats", true))
-                                .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME))
-                        ).execute().actionGet();
+                client().prepareSearch(index)
+                        .setTypes("type")
+                        .addAggregation(
+                                terms("terms").field(SINGLE_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
+                                        .order(Terms.Order.aggregation("stats", true))
+                                        .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME))).execute().actionGet();
 
                 fail("Expected search to fail when trying to sort terms aggregation by multi-valued sug-aggregation " +
                         "where the metric name is not specified");
@@ -1066,13 +1072,13 @@ public class DoubleTermsTests extends AbstractTermsTests {
     @Test
     public void singleValuedField_OrderedBySingleValueSubAggregationDesc() throws Exception {
         boolean asc = false;
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.aggregation("avg_i", asc))
-                        .subAggregation(avg("avg_i").field(SINGLE_VALUED_FIELD_NAME))
-                ).execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").field(SINGLE_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .order(Terms.Order.aggregation("avg_i", asc)).subAggregation(avg("avg_i").field(SINGLE_VALUED_FIELD_NAME)))
+                .execute().actionGet();
 
 
         assertSearchResponse(response);
@@ -1099,13 +1105,13 @@ public class DoubleTermsTests extends AbstractTermsTests {
     @Test
     public void singleValuedField_OrderedByMultiValueSubAggregationAsc() throws Exception {
         boolean asc = true;
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.aggregation("stats.avg", asc))
-                        .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME))
-                ).execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").field(SINGLE_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .order(Terms.Order.aggregation("stats.avg", asc))
+                                .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -1130,13 +1136,13 @@ public class DoubleTermsTests extends AbstractTermsTests {
     @Test
     public void singleValuedField_OrderedByMultiValueSubAggregationDesc() throws Exception {
         boolean asc = false;
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.aggregation("stats.avg", asc))
-                        .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME))
-                ).execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").field(SINGLE_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .order(Terms.Order.aggregation("stats.avg", asc))
+                                .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -1161,13 +1167,13 @@ public class DoubleTermsTests extends AbstractTermsTests {
     @Test
     public void singleValuedField_OrderedByMultiValueExtendedStatsAsc() throws Exception {
         boolean asc = true;
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.aggregation("stats.variance", asc))
-                        .subAggregation(extendedStats("stats").field(SINGLE_VALUED_FIELD_NAME))
-                ).execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").field(SINGLE_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .order(Terms.Order.aggregation("stats.variance", asc))
+                                .subAggregation(extendedStats("stats").field(SINGLE_VALUED_FIELD_NAME))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -1191,12 +1197,15 @@ public class DoubleTermsTests extends AbstractTermsTests {
 
     @Test
     public void script_Score() {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .setQuery(functionScoreQuery(matchAllQuery()).add(ScoreFunctionBuilders.scriptFunction("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value")))
-                .addAggregation(terms("terms")
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("ceil(_score.doubleValue()/3)")
-                ).execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .setQuery(
+                        functionScoreQuery(matchAllQuery()).add(
+                                ScoreFunctionBuilders.scriptFunction(new Script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value"))))
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).script(
+                                new Script("ceil(_score.doubleValue()/3)"))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -1257,14 +1266,13 @@ public class DoubleTermsTests extends AbstractTermsTests {
     }
 
     private void assertMultiSortResponse(double[] expectedKeys, Terms.Order... order) {
-        SearchResponse response = client().prepareSearch("sort_idx").setTypes("multi_sort_type")
-                .addAggregation(terms("terms")
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.compound(order))
-                        .subAggregation(avg("avg_l").field("l"))
-                        .subAggregation(sum("sum_d").field("d"))
-                ).execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("sort_idx")
+                .setTypes("multi_sort_type")
+                .addAggregation(
+                        terms("terms").field(SINGLE_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .order(Terms.Order.compound(order)).subAggregation(avg("avg_l").field("l"))
+                                .subAggregation(sum("sum_d").field("d"))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -1292,4 +1300,294 @@ public class DoubleTermsTests extends AbstractTermsTests {
     public void otherDocCount() {
         testOtherDocCount(SINGLE_VALUED_FIELD_NAME, MULTI_VALUED_FIELD_NAME);
     }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void singleValuedField_WithValueScriptOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").field(SINGLE_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .script("_value + 1")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(5));
+
+        for (int i = 0; i < 5; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("" + (i + 1d));
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("" + (i + 1d)));
+            assertThat(bucket.getKeyAsNumber().intValue(), equalTo(i + 1));
+            assertThat(bucket.getDocCount(), equalTo(1l));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void multiValuedField_WithValueScriptOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").field(MULTI_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .script("_value + 1")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(6));
+
+        for (int i = 0; i < 6; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("" + (i + 1d));
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("" + (i + 1d)));
+            assertThat(bucket.getKeyAsNumber().intValue(), equalTo(i + 1));
+            if (i == 0 || i == 5) {
+                assertThat(bucket.getDocCount(), equalTo(1l));
+            } else {
+                assertThat(bucket.getDocCount(), equalTo(2l));
+            }
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void multiValuedField_WithValueScript_NotUniqueOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").field(MULTI_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .script("(long) _value / 1000 + 1")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(1));
+
+        Terms.Bucket bucket = terms.getBucketByKey("1.0");
+        assertThat(bucket, notNullValue());
+        assertThat(key(bucket), equalTo("1.0"));
+        assertThat(bucket.getKeyAsNumber().intValue(), equalTo(1));
+        assertThat(bucket.getDocCount(), equalTo(5l));
+    }
+
+    /*
+     * 
+     * [1, 2] [2, 3] [3, 4] [4, 5] [5, 6]
+     * 
+     * 1 - count: 1 - sum: 1 2 - count: 2 - sum: 4 3 - count: 2 - sum: 6 4 -
+     * count: 2 - sum: 8 5 - count: 2 - sum: 10 6 - count: 1 - sum: 6
+     */
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void multiValuedField_WithValueScript_WithInheritedSubAggregatorOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").field(MULTI_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .script("_value + 1").subAggregation(sum("sum"))).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(6));
+
+        for (int i = 0; i < 6; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("" + (i + 1d));
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("" + (i + 1d)));
+            assertThat(bucket.getKeyAsNumber().doubleValue(), equalTo(i + 1d));
+            final long count = i == 0 || i == 5 ? 1 : 2;
+            double s = 0;
+            for (int j = 0; j < NUM_DOCS; ++j) {
+                if (i == j || i == j + 1) {
+                    s += j + 1;
+                    s += j + 1 + 1;
+                }
+            }
+            assertThat(bucket.getDocCount(), equalTo(count));
+            Sum sum = bucket.getAggregations().get("sum");
+            assertThat(sum, notNullValue());
+            assertThat(sum.getValue(), equalTo(s));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_SingleValueOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).script(
+                                "doc['" + MULTI_VALUED_FIELD_NAME + "'].value")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(5));
+
+        for (int i = 0; i < 5; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("" + (double) i);
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("" + (double) i));
+            assertThat(bucket.getKeyAsNumber().intValue(), equalTo(i));
+            assertThat(bucket.getDocCount(), equalTo(1l));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_MultiValuedOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).script(
+                                "doc['" + MULTI_VALUED_FIELD_NAME + "']")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(6));
+
+        for (int i = 0; i < 6; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("" + (double) i);
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("" + (double) i));
+            assertThat(bucket.getKeyAsNumber().intValue(), equalTo(i));
+            if (i == 0 || i == 5) {
+                assertThat(bucket.getDocCount(), equalTo(1l));
+            } else {
+                assertThat(bucket.getDocCount(), equalTo(2l));
+            }
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_MultiValued_WithAggregatorInherited_NoExplicitTypeOldScriptAPI() throws Exception {
+
+        // since no type is explicitly defined, es will assume all values returned by the script to be strings (bytes),
+        // so the aggregation should fail, since the "sum" aggregation can only operation on numeric values.
+
+        try {
+
+            SearchResponse response = client()
+                    .prepareSearch("idx")
+                    .setTypes("type")
+                    .addAggregation(
+                            terms("terms").collectMode(randomFrom(SubAggCollectionMode.values()))
+                                    .script("doc['" + MULTI_VALUED_FIELD_NAME + "']").subAggregation(sum("sum"))).execute().actionGet();
+
+            fail("expected to fail as sub-aggregation sum requires a numeric value source context, but there is none");
+
+        } catch (Exception e) {
+            // expected
+        }
+
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_MultiValued_WithAggregatorInherited_WithExplicitTypeOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .script("doc['" + MULTI_VALUED_FIELD_NAME + "']").valueType(Terms.ValueType.DOUBLE)
+                                .subAggregation(sum("sum"))).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(6));
+
+        for (int i = 0; i < 6; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("" + i + ".0");
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("" + i + ".0"));
+            assertThat(bucket.getKeyAsNumber().intValue(), equalTo(i));
+            final long count = i == 0 || i == 5 ? 1 : 2;
+            double s = 0;
+            for (int j = 0; j < NUM_DOCS; ++j) {
+                if (i == j || i == j + 1) {
+                    s += j;
+                    s += j + 1;
+                }
+            }
+            assertThat(bucket.getDocCount(), equalTo(count));
+            Sum sum = bucket.getAggregations().get("sum");
+            assertThat(sum, notNullValue());
+            assertThat(sum.getValue(), equalTo(s));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_ScoreOldScriptAPI() {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .setQuery(
+                        functionScoreQuery(matchAllQuery()).add(
+                                ScoreFunctionBuilders.scriptFunction(new Script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value"))))
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).script("ceil(_score.doubleValue()/3)"))
+                .execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(3));
+
+        for (int i = 0; i < 3; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("" + (double) i);
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("" + (double) i));
+            assertThat(bucket.getKeyAsNumber().intValue(), equalTo(i));
+            assertThat(bucket.getDocCount(), equalTo(i == 1 ? 3L : 1L));
+        }
+    }
 }
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java
index 47814ffae1d..2d1012f2b51 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramTests.java
@@ -23,6 +23,7 @@ import com.carrotsearch.hppc.LongHashSet;
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.search.SearchPhaseExecutionException;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode;
 import org.elasticsearch.search.aggregations.bucket.filter.Filter;
 import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
@@ -598,12 +599,11 @@ public class HistogramTests extends ElasticsearchIntegrationTest {
     @Test
     public void singleValuedField_WithValueScript() throws Exception {
         SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(histogram("histo").field(SINGLE_VALUED_FIELD_NAME).script("_value + 1").interval(interval))
+                .addAggregation(histogram("histo").field(SINGLE_VALUED_FIELD_NAME).script(new Script("_value + 1")).interval(interval))
                 .execute().actionGet();
 
         assertSearchResponse(response);
 
-
         final int numBuckets = (numDocs + 1) / interval - 2 / interval + 1;
         final long[] counts = new long[(numDocs + 1) / interval + 1];
         for (int i = 0; i < numDocs; ++i) {
@@ -675,12 +675,11 @@ public class HistogramTests extends ElasticsearchIntegrationTest {
     @Test
     public void multiValuedField_WithValueScript() throws Exception {
         SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(histogram("histo").field(MULTI_VALUED_FIELD_NAME).script("_value + 1").interval(interval))
+                .addAggregation(histogram("histo").field(MULTI_VALUED_FIELD_NAME).script(new Script("_value + 1")).interval(interval))
                 .execute().actionGet();
 
         assertSearchResponse(response);
 
-
         final int numBuckets = (numDocs + 2) / interval - 2 / interval + 1;
         final long[] counts = new long[(numDocs + 2) / interval + 1];
         for (int i = 0; i < numDocs; ++i) {
@@ -710,14 +709,17 @@ public class HistogramTests extends ElasticsearchIntegrationTest {
     @Test
     public void multiValuedField_WithValueScript_WithInheritedSubAggregator() throws Exception {
         SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(histogram("histo").field(MULTI_VALUED_FIELD_NAME).script("_value + 1").interval(interval)
-                        .subAggregation(terms(MULTI_VALUED_FIELD_NAME)
-                                .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.term(true))))
-                .execute().actionGet();
+                .addAggregation(
+                        histogram("histo")
+                                .field(MULTI_VALUED_FIELD_NAME)
+                                .script(new Script("_value + 1"))
+                                .interval(interval)
+                                .subAggregation(
+                                        terms(MULTI_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values())).order(
+                                                Terms.Order.term(true)))).execute().actionGet();
 
         assertSearchResponse(response);
 
-
         final int numBuckets = (numDocs + 2) / interval - 2 / interval + 1;
         final long[] counts = new long[(numDocs + 2) / interval + 1];
         for (int i = 0; i < numDocs; ++i) {
@@ -757,12 +759,11 @@ public class HistogramTests extends ElasticsearchIntegrationTest {
     @Test
     public void script_SingleValue() throws Exception {
         SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(histogram("histo").script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value").interval(interval))
+                .addAggregation(histogram("histo").script(new Script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value")).interval(interval))
                 .execute().actionGet();
 
         assertSearchResponse(response);
 
-
         Histogram histo = response.getAggregations().get("histo");
         assertThat(histo, notNullValue());
         assertThat(histo.getName(), equalTo("histo"));
@@ -779,14 +780,14 @@ public class HistogramTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void script_SingleValue_WithSubAggregator_Inherited() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(histogram("histo").script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value").interval(interval)
-                        .subAggregation(sum("sum")))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        histogram("histo").script(new Script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value")).interval(interval)
+                                .subAggregation(sum("sum"))).execute().actionGet();
 
         assertSearchResponse(response);
 
-
         Histogram histo = response.getAggregations().get("histo");
         assertThat(histo, notNullValue());
         assertThat(histo.getName(), equalTo("histo"));
@@ -815,12 +816,11 @@ public class HistogramTests extends ElasticsearchIntegrationTest {
     @Test
     public void script_MultiValued() throws Exception {
         SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(histogram("histo").script("doc['" + MULTI_VALUED_FIELD_NAME + "']").interval(interval))
+                .addAggregation(histogram("histo").script(new Script("doc['" + MULTI_VALUED_FIELD_NAME + "']")).interval(interval))
                 .execute().actionGet();
 
         assertSearchResponse(response);
 
-
         Histogram histo = response.getAggregations().get("histo");
         assertThat(histo, notNullValue());
         assertThat(histo.getName(), equalTo("histo"));
@@ -837,14 +837,14 @@ public class HistogramTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void script_MultiValued_WithAggregatorInherited() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(histogram("histo").script("doc['" + MULTI_VALUED_FIELD_NAME + "']").interval(interval)
-                        .subAggregation(sum("sum")))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        histogram("histo").script(new Script("doc['" + MULTI_VALUED_FIELD_NAME + "']")).interval(interval)
+                                .subAggregation(sum("sum"))).execute().actionGet();
 
         assertSearchResponse(response);
 
-
         Histogram histo = response.getAggregations().get("histo");
         assertThat(histo, notNullValue());
         assertThat(histo.getName(), equalTo("histo"));
@@ -1019,4 +1019,254 @@ public class HistogramTests extends ElasticsearchIntegrationTest {
         }
     }
 
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void singleValuedField_WithValueScriptOldScriptAPI() throws Exception {
+        SearchResponse response = client().prepareSearch("idx")
+                .addAggregation(histogram("histo").field(SINGLE_VALUED_FIELD_NAME).script("_value + 1").interval(interval))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+    
+        final int numBuckets = (numDocs + 1) / interval - 2 / interval + 1;
+        final long[] counts = new long[(numDocs + 1) / interval + 1];
+        for (int i = 0; i < numDocs; ++i) {
+            ++counts[(i + 2) / interval];
+        }
+    
+        Histogram histo = response.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        assertThat(histo.getName(), equalTo("histo"));
+        List<? extends Bucket> buckets = histo.getBuckets();
+        assertThat(buckets.size(), equalTo(numBuckets));
+    
+        for (int i = 0; i < numBuckets; i++) {
+            Histogram.Bucket bucket = buckets.get(i);
+            assertThat(bucket, notNullValue());
+            int key = ((2 / interval) + i) * interval;
+            assertThat(((Number) bucket.getKey()).longValue(), equalTo((long) key));
+            assertThat(bucket.getDocCount(), equalTo(counts[key / interval]));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void multiValuedField_WithValueScriptOldScriptAPI() throws Exception {
+        SearchResponse response = client().prepareSearch("idx")
+                .addAggregation(histogram("histo").field(MULTI_VALUED_FIELD_NAME).script("_value + 1").interval(interval))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+    
+        final int numBuckets = (numDocs + 2) / interval - 2 / interval + 1;
+        final long[] counts = new long[(numDocs + 2) / interval + 1];
+        for (int i = 0; i < numDocs; ++i) {
+            final int bucket1 = (i + 2) / interval;
+            final int bucket2 = (i + 3) / interval;
+            ++counts[bucket1];
+            if (bucket1 != bucket2) {
+                ++counts[bucket2];
+            }
+        }
+    
+        Histogram histo = response.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        assertThat(histo.getName(), equalTo("histo"));
+        List<? extends Bucket> buckets = histo.getBuckets();
+        assertThat(buckets.size(), equalTo(numBuckets));
+    
+        for (int i = 0; i < numBuckets; i++) {
+            Histogram.Bucket bucket = buckets.get(i);
+            assertThat(bucket, notNullValue());
+            int key = ((2 / interval) + i) * interval;
+            assertThat(((Number) bucket.getKey()).longValue(), equalTo((long) key));
+            assertThat(bucket.getDocCount(), equalTo(counts[key / interval]));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void multiValuedField_WithValueScript_WithInheritedSubAggregatorOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(histogram("histo").field(MULTI_VALUED_FIELD_NAME).script("_value + 1").interval(interval)
+                        .subAggregation(terms(MULTI_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.term(true))))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+    
+        final int numBuckets = (numDocs + 2) / interval - 2 / interval + 1;
+        final long[] counts = new long[(numDocs + 2) / interval + 1];
+        for (int i = 0; i < numDocs; ++i) {
+            final int bucket1 = (i + 2) / interval;
+            final int bucket2 = (i + 3) / interval;
+            ++counts[bucket1];
+            if (bucket1 != bucket2) {
+                ++counts[bucket2];
+            }
+        }
+    
+        Histogram histo = response.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        assertThat(histo.getName(), equalTo("histo"));
+        List<? extends Bucket> buckets = histo.getBuckets();
+        assertThat(buckets.size(), equalTo(numBuckets));
+    
+        for (int i = 0; i < numBuckets; i++) {
+            Histogram.Bucket bucket = buckets.get(i);
+            assertThat(bucket, notNullValue());
+            int key = ((2 / interval) + i) * interval;
+            assertThat(((Number) bucket.getKey()).longValue(), equalTo((long) key));
+            assertThat(bucket.getDocCount(), equalTo(counts[key / interval]));
+            Terms terms = bucket.getAggregations().get(MULTI_VALUED_FIELD_NAME);
+            assertThat(terms, notNullValue());
+            assertThat(terms.getName(), equalTo(MULTI_VALUED_FIELD_NAME));
+            int minTerm = Math.max(2, key - 1);
+            int maxTerm = Math.min(numDocs + 2, (key / interval + 1) * interval);
+            assertThat(terms.getBuckets().size(), equalTo(maxTerm - minTerm + 1));
+            Iterator<Terms.Bucket> iter = terms.getBuckets().iterator();
+            for (int j = minTerm; j <= maxTerm; ++j) {
+                assertThat(iter.next().getKeyAsNumber().longValue(), equalTo((long) j));
+            }
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_SingleValueOldScriptAPI() throws Exception {
+        SearchResponse response = client().prepareSearch("idx")
+                .addAggregation(histogram("histo").script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value").interval(interval))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+    
+        Histogram histo = response.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        assertThat(histo.getName(), equalTo("histo"));
+        List<? extends Bucket> buckets = histo.getBuckets();
+        assertThat(buckets.size(), equalTo(numValueBuckets));
+    
+        for (int i = 0; i < numValueBuckets; ++i) {
+            Histogram.Bucket bucket = buckets.get(i);
+            assertThat(bucket, notNullValue());
+            assertThat(((Number) bucket.getKey()).longValue(), equalTo((long) i * interval));
+            assertThat(bucket.getDocCount(), equalTo(valueCounts[i]));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_SingleValue_WithSubAggregator_InheritedOldScriptAPI() throws Exception {
+        SearchResponse response = client().prepareSearch("idx")
+                .addAggregation(histogram("histo").script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value").interval(interval)
+                        .subAggregation(sum("sum")))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+    
+        Histogram histo = response.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        assertThat(histo.getName(), equalTo("histo"));
+        assertThat(histo.getBuckets().size(), equalTo(numValueBuckets));
+    
+        // TODO: use diamond once JI-9019884 is fixed
+        List<Histogram.Bucket> buckets = new ArrayList<Histogram.Bucket>(histo.getBuckets());
+        for (int i = 0; i < numValueBuckets; ++i) {
+            Histogram.Bucket bucket = buckets.get(i);
+            assertThat(bucket, notNullValue());
+            assertThat(((Number) bucket.getKey()).longValue(), equalTo((long) i * interval));
+            assertThat(bucket.getDocCount(), equalTo(valueCounts[i]));
+            assertThat(bucket.getAggregations().asList().isEmpty(), is(false));
+            Sum sum = bucket.getAggregations().get("sum");
+            assertThat(sum, notNullValue());
+            long s = 0;
+            for (int j = 0; j < numDocs; ++j) {
+                if ((j + 1) / interval == i) {
+                    s += j + 1;
+                }
+            }
+            assertThat(sum.getValue(), equalTo((double) s));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_MultiValuedOldScriptAPI() throws Exception {
+        SearchResponse response = client().prepareSearch("idx")
+                .addAggregation(histogram("histo").script("doc['" + MULTI_VALUED_FIELD_NAME + "']").interval(interval))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+    
+        Histogram histo = response.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        assertThat(histo.getName(), equalTo("histo"));
+        List<? extends Bucket> buckets = histo.getBuckets();
+        assertThat(buckets.size(), equalTo(numValuesBuckets));
+    
+        for (int i = 0; i < numValuesBuckets; ++i) {
+            Histogram.Bucket bucket = buckets.get(i);
+            assertThat(bucket, notNullValue());
+            assertThat(((Number) bucket.getKey()).longValue(), equalTo((long) i * interval));
+            assertThat(bucket.getDocCount(), equalTo(valuesCounts[i]));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_MultiValued_WithAggregatorInheritedOldScriptAPi() throws Exception {
+        SearchResponse response = client().prepareSearch("idx")
+                .addAggregation(histogram("histo").script("doc['" + MULTI_VALUED_FIELD_NAME + "']").interval(interval)
+                        .subAggregation(sum("sum")))
+                .execute().actionGet();
+    
+        assertSearchResponse(response);
+    
+    
+        Histogram histo = response.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        assertThat(histo.getName(), equalTo("histo"));
+        List<? extends Bucket> buckets = histo.getBuckets();
+        assertThat(buckets.size(), equalTo(numValuesBuckets));
+    
+        for (int i = 0; i < numValuesBuckets; ++i) {
+            Histogram.Bucket bucket = buckets.get(i);
+            assertThat(bucket, notNullValue());
+            assertThat(((Number) bucket.getKey()).longValue(), equalTo((long) i * interval));
+            assertThat(bucket.getDocCount(), equalTo(valuesCounts[i]));
+            assertThat(bucket.getAggregations().asList().isEmpty(), is(false));
+            Sum sum = bucket.getAggregations().get("sum");
+            assertThat(sum, notNullValue());
+            long s = 0;
+            for (int j = 0; j < numDocs; ++j) {
+                if ((j + 1) / interval == i || (j + 2) / interval == i) {
+                    s += j + 1;
+                    s += j + 2;
+                }
+            }
+            assertThat(sum.getValue(), equalTo((double) s));
+        }
+    }
+
 }
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeTests.java
index f1cc2baef85..59674eac1c0 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeTests.java
@@ -21,6 +21,7 @@ package org.elasticsearch.search.aggregations.bucket;
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.index.mapper.ip.IpFieldMapper;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
 import org.elasticsearch.search.aggregations.bucket.range.Range;
 import org.elasticsearch.search.aggregations.bucket.range.Range.Bucket;
@@ -344,18 +345,14 @@ public class IPv4RangeTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void singleValuedField_WithValueScript() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(ipRange("range")
-                        .field("ip")
-                        .script("_value")
-                        .addUnboundedTo("10.0.0.100")
-                        .addRange("10.0.0.100", "10.0.0.200")
-                        .addUnboundedFrom("10.0.0.200"))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        ipRange("range").field("ip").script(new Script("_value")).addUnboundedTo("10.0.0.100")
+                                .addRange("10.0.0.100", "10.0.0.200").addUnboundedFrom("10.0.0.200")).execute().actionGet();
 
         assertSearchResponse(response);
 
-
         Range range = response.getAggregations().get("range");
         assertThat(range, notNullValue());
         assertThat(range.getName(), equalTo("range"));
@@ -456,14 +453,11 @@ public class IPv4RangeTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void multiValuedField_WithValueScript() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(ipRange("range")
-                        .field("ips")
-                        .script("_value")
-                        .addUnboundedTo("10.0.0.100")
-                        .addRange("10.0.0.100", "10.0.0.200")
-                        .addUnboundedFrom("10.0.0.200"))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        ipRange("range").field("ips").script(new Script("_value")).addUnboundedTo("10.0.0.100")
+                                .addRange("10.0.0.100", "10.0.0.200").addUnboundedFrom("10.0.0.200")).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -504,19 +498,15 @@ public class IPv4RangeTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void multiValuedField_WithValueScript_WithInheritedSubAggregator() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(ipRange("range")
-                        .field("ips")
-                        .script("_value")
-                        .addUnboundedTo("10.0.0.100")
-                        .addRange("10.0.0.100", "10.0.0.200")
-                        .addUnboundedFrom("10.0.0.200")
-                        .subAggregation(max("max")))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        ipRange("range").field("ips").script(new Script("_value")).addUnboundedTo("10.0.0.100")
+                                .addRange("10.0.0.100", "10.0.0.200").addUnboundedFrom("10.0.0.200").subAggregation(max("max"))).execute()
+                .actionGet();
 
         assertSearchResponse(response);
 
-
         Range range = response.getAggregations().get("range");
         assertThat(range, notNullValue());
         assertThat(range.getName(), equalTo("range"));
@@ -562,13 +552,11 @@ public class IPv4RangeTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void script_SingleValue() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(ipRange("range")
-                        .script("doc['ip'].value")
-                        .addUnboundedTo("10.0.0.100")
-                        .addRange("10.0.0.100", "10.0.0.200")
-                        .addUnboundedFrom("10.0.0.200"))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        ipRange("range").script(new Script("doc['ip'].value")).addUnboundedTo("10.0.0.100")
+                                .addRange("10.0.0.100", "10.0.0.200").addUnboundedFrom("10.0.0.200")).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -609,14 +597,12 @@ public class IPv4RangeTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void script_SingleValue_WithSubAggregator_Inherited() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(ipRange("range")
-                        .script("doc['ip'].value")
-                        .addUnboundedTo("10.0.0.100")
-                        .addRange("10.0.0.100", "10.0.0.200")
-                        .addUnboundedFrom("10.0.0.200")
-                        .subAggregation(max("max")))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        ipRange("range").script(new Script("doc['ip'].value")).addUnboundedTo("10.0.0.100")
+                                .addRange("10.0.0.100", "10.0.0.200").addUnboundedFrom("10.0.0.200").subAggregation(max("max"))).execute()
+                .actionGet();
 
         assertSearchResponse(response);
 
@@ -666,13 +652,11 @@ public class IPv4RangeTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void script_MultiValued() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(ipRange("range")
-                        .script("doc['ips'].values")
-                        .addUnboundedTo("10.0.0.100")
-                        .addRange("10.0.0.100", "10.0.0.200")
-                        .addUnboundedFrom("10.0.0.200"))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        ipRange("range").script(new Script("doc['ips'].values")).addUnboundedTo("10.0.0.100")
+                                .addRange("10.0.0.100", "10.0.0.200").addUnboundedFrom("10.0.0.200")).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -713,14 +697,12 @@ public class IPv4RangeTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void script_MultiValued_WithAggregatorInherited() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(ipRange("range")
-                        .script("doc['ips'].values")
-                        .addUnboundedTo("10.0.0.100")
-                        .addRange("10.0.0.100", "10.0.0.200")
-                        .addUnboundedFrom("10.0.0.200")
-                        .subAggregation(max("max")))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        ipRange("range").script(new Script("doc['ips'].values")).addUnboundedTo("10.0.0.100")
+                                .addRange("10.0.0.100", "10.0.0.200").addUnboundedFrom("10.0.0.200").subAggregation(max("max"))).execute()
+                .actionGet();
 
         assertSearchResponse(response);
 
@@ -887,4 +869,360 @@ public class IPv4RangeTests extends ElasticsearchIntegrationTest {
         assertThat(buckets.get(0).getToAsString(), equalTo("10.0.0.10"));
         assertThat(buckets.get(0).getDocCount(), equalTo(0l));
     }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void singleValuedField_WithValueScriptOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        ipRange("range").field("ip").script("_value").addUnboundedTo("10.0.0.100").addRange("10.0.0.100", "10.0.0.200")
+                                .addUnboundedFrom("10.0.0.200")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(range.getBuckets().size(), equalTo(3));
+
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-10.0.0.100"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(Double.NEGATIVE_INFINITY));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("10.0.0.100"));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.100")));
+        assertThat(bucket.getDocCount(), equalTo(100l));
+
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("10.0.0.100-10.0.0.200"));
+        assertThat(bucket.getFromAsString(), equalTo("10.0.0.100"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.100")));
+        assertThat(bucket.getToAsString(), equalTo("10.0.0.200"));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.200")));
+        assertThat(bucket.getDocCount(), equalTo(100l));
+
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("10.0.0.200-*"));
+        assertThat(bucket.getFromAsString(), equalTo("10.0.0.200"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.200")));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(Double.POSITIVE_INFINITY));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(55l));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void multiValuedField_WithValueScriptOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        ipRange("range").field("ips").script("_value").addUnboundedTo("10.0.0.100").addRange("10.0.0.100", "10.0.0.200")
+                                .addUnboundedFrom("10.0.0.200")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(range.getBuckets().size(), equalTo(3));
+
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-10.0.0.100"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(Double.NEGATIVE_INFINITY));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("10.0.0.100"));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.100")));
+        assertThat(bucket.getDocCount(), equalTo(100l));
+
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("10.0.0.100-10.0.0.200"));
+        assertThat(bucket.getFromAsString(), equalTo("10.0.0.100"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.100")));
+        assertThat(bucket.getToAsString(), equalTo("10.0.0.200"));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.200")));
+        assertThat(bucket.getDocCount(), equalTo(101l));
+
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("10.0.0.200-*"));
+        assertThat(bucket.getFromAsString(), equalTo("10.0.0.200"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.200")));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(Double.POSITIVE_INFINITY));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(56l));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void multiValuedField_WithValueScript_WithInheritedSubAggregatorOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        ipRange("range").field("ips").script("_value").addUnboundedTo("10.0.0.100").addRange("10.0.0.100", "10.0.0.200")
+                                .addUnboundedFrom("10.0.0.200").subAggregation(max("max"))).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(range.getBuckets().size(), equalTo(3));
+
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-10.0.0.100"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(Double.NEGATIVE_INFINITY));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("10.0.0.100"));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.100")));
+        assertThat(bucket.getDocCount(), equalTo(100l));
+        Max max = bucket.getAggregations().get("max");
+        assertThat(max, Matchers.notNullValue());
+        assertThat((long) max.getValue(), equalTo(IpFieldMapper.ipToLong("10.0.0.100")));
+
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("10.0.0.100-10.0.0.200"));
+        assertThat(bucket.getFromAsString(), equalTo("10.0.0.100"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.100")));
+        assertThat(bucket.getToAsString(), equalTo("10.0.0.200"));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.200")));
+        assertThat(bucket.getDocCount(), equalTo(101l));
+        max = bucket.getAggregations().get("max");
+        assertThat(max, Matchers.notNullValue());
+        assertThat((long) max.getValue(), equalTo(IpFieldMapper.ipToLong("10.0.0.200")));
+
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("10.0.0.200-*"));
+        assertThat(bucket.getFromAsString(), equalTo("10.0.0.200"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.200")));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(Double.POSITIVE_INFINITY));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(56l));
+        max = bucket.getAggregations().get("max");
+        assertThat(max, Matchers.notNullValue());
+        assertThat((long) max.getValue(), equalTo(IpFieldMapper.ipToLong("10.0.0.255")));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_SingleValueOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        ipRange("range").script("doc['ip'].value").addUnboundedTo("10.0.0.100").addRange("10.0.0.100", "10.0.0.200")
+                                .addUnboundedFrom("10.0.0.200")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(range.getBuckets().size(), equalTo(3));
+
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-10.0.0.100"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(Double.NEGATIVE_INFINITY));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("10.0.0.100"));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.100")));
+        assertThat(bucket.getDocCount(), equalTo(100l));
+
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("10.0.0.100-10.0.0.200"));
+        assertThat(bucket.getFromAsString(), equalTo("10.0.0.100"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.100")));
+        assertThat(bucket.getToAsString(), equalTo("10.0.0.200"));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.200")));
+        assertThat(bucket.getDocCount(), equalTo(100l));
+
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("10.0.0.200-*"));
+        assertThat(bucket.getFromAsString(), equalTo("10.0.0.200"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.200")));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(Double.POSITIVE_INFINITY));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(55l));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_SingleValue_WithSubAggregator_InheritedOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        ipRange("range").script("doc['ip'].value").addUnboundedTo("10.0.0.100").addRange("10.0.0.100", "10.0.0.200")
+                                .addUnboundedFrom("10.0.0.200").subAggregation(max("max"))).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(range.getBuckets().size(), equalTo(3));
+
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-10.0.0.100"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(Double.NEGATIVE_INFINITY));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("10.0.0.100"));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.100")));
+        assertThat(bucket.getDocCount(), equalTo(100l));
+        Max max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+        assertThat(max.getValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.99")));
+
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("10.0.0.100-10.0.0.200"));
+        assertThat(bucket.getFromAsString(), equalTo("10.0.0.100"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.100")));
+        assertThat(bucket.getToAsString(), equalTo("10.0.0.200"));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.200")));
+        assertThat(bucket.getDocCount(), equalTo(100l));
+        max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+        assertThat(max.getValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.199")));
+
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("10.0.0.200-*"));
+        assertThat(bucket.getFromAsString(), equalTo("10.0.0.200"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.200")));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(Double.POSITIVE_INFINITY));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(55l));
+        max = bucket.getAggregations().get("max");
+        assertThat(max, notNullValue());
+        assertThat(max.getValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.254")));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_MultiValuedOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        ipRange("range").script("doc['ips'].values").addUnboundedTo("10.0.0.100").addRange("10.0.0.100", "10.0.0.200")
+                                .addUnboundedFrom("10.0.0.200")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(range.getBuckets().size(), equalTo(3));
+
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-10.0.0.100"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(Double.NEGATIVE_INFINITY));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("10.0.0.100"));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.100")));
+        assertThat(bucket.getDocCount(), equalTo(100l));
+
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("10.0.0.100-10.0.0.200"));
+        assertThat(bucket.getFromAsString(), equalTo("10.0.0.100"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.100")));
+        assertThat(bucket.getToAsString(), equalTo("10.0.0.200"));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.200")));
+        assertThat(bucket.getDocCount(), equalTo(101l));
+
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("10.0.0.200-*"));
+        assertThat(bucket.getFromAsString(), equalTo("10.0.0.200"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.200")));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(Double.POSITIVE_INFINITY));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(56l));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_MultiValued_WithAggregatorInheritedOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        ipRange("range").script("doc['ips'].values").addUnboundedTo("10.0.0.100").addRange("10.0.0.100", "10.0.0.200")
+                                .addUnboundedFrom("10.0.0.200").subAggregation(max("max"))).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(range.getBuckets().size(), equalTo(3));
+
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-10.0.0.100"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(Double.NEGATIVE_INFINITY));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("10.0.0.100"));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.100")));
+        assertThat(bucket.getDocCount(), equalTo(100l));
+        Max max = bucket.getAggregations().get("max");
+        assertThat(max, Matchers.notNullValue());
+        assertThat((long) max.getValue(), equalTo(IpFieldMapper.ipToLong("10.0.0.100")));
+
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("10.0.0.100-10.0.0.200"));
+        assertThat(bucket.getFromAsString(), equalTo("10.0.0.100"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.100")));
+        assertThat(bucket.getToAsString(), equalTo("10.0.0.200"));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.200")));
+        assertThat(bucket.getDocCount(), equalTo(101l));
+        max = bucket.getAggregations().get("max");
+        assertThat(max, Matchers.notNullValue());
+        assertThat((long) max.getValue(), equalTo(IpFieldMapper.ipToLong("10.0.0.200")));
+
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("10.0.0.200-*"));
+        assertThat(bucket.getFromAsString(), equalTo("10.0.0.200"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo((double) IpFieldMapper.ipToLong("10.0.0.200")));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(Double.POSITIVE_INFINITY));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(56l));
+        max = bucket.getAggregations().get("max");
+        assertThat(max, Matchers.notNullValue());
+        assertThat((long) max.getValue(), equalTo(IpFieldMapper.ipToLong("10.0.0.255")));
+    }
 }
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsTests.java
index 9d97dbabd34..b825259ee32 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsTests.java
@@ -22,6 +22,7 @@ import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode;
 import org.elasticsearch.search.aggregations.bucket.filter.Filter;
 import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
@@ -448,7 +449,7 @@ public class LongTermsTests extends AbstractTermsTests {
                 .addAggregation(terms("terms")
                         .field(SINGLE_VALUED_FIELD_NAME)
                         .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("_value + 1"))
+                        .script(new Script("_value + 1")))
                 .execute().actionGet();
 
         assertSearchResponse(response);
@@ -503,7 +504,7 @@ public class LongTermsTests extends AbstractTermsTests {
                 .addAggregation(terms("terms")
                         .field(MULTI_VALUED_FIELD_NAME)
                         .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("_value - 1"))
+                                .script(new Script("_value - 1")))
                 .execute().actionGet();
 
         assertSearchResponse(response);
@@ -533,7 +534,7 @@ public class LongTermsTests extends AbstractTermsTests {
                 .addAggregation(terms("terms")
                         .field(MULTI_VALUED_FIELD_NAME)
                         .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("floor(_value / 1000 + 1)"))
+                                .script(new Script("floor(_value / 1000 + 1)")))
                 .execute().actionGet();
 
         assertSearchResponse(response);
@@ -574,7 +575,7 @@ public class LongTermsTests extends AbstractTermsTests {
                 .addAggregation(terms("terms")
                         .field(MULTI_VALUED_FIELD_NAME)
                         .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("_value + 1")
+                                .script(new Script("_value + 1"))
                         .subAggregation(sum("sum")))
                 .execute().actionGet();
 
@@ -611,7 +612,8 @@ public class LongTermsTests extends AbstractTermsTests {
         SearchResponse response = client().prepareSearch("idx").setTypes("type")
                 .addAggregation(terms("terms")
                         .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value"))
+.script(
+                                new Script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value")))
                 .execute().actionGet();
 
         assertSearchResponse(response);
@@ -665,7 +667,8 @@ public class LongTermsTests extends AbstractTermsTests {
         SearchResponse response = client().prepareSearch("idx").setTypes("type")
                 .addAggregation(terms("terms")
                         .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("doc['" + MULTI_VALUED_FIELD_NAME + "']"))
+.script(
+                                new Script("doc['" + MULTI_VALUED_FIELD_NAME + "']")))
                 .execute().actionGet();
 
         assertSearchResponse(response);
@@ -700,7 +703,7 @@ public class LongTermsTests extends AbstractTermsTests {
             client().prepareSearch("idx").setTypes("type")
                     .addAggregation(terms("terms")
                             .collectMode(randomFrom(SubAggCollectionMode.values()))
-                            .script("doc['" + MULTI_VALUED_FIELD_NAME + "']")
+                                    .script(new Script("doc['" + MULTI_VALUED_FIELD_NAME + "']"))
                             .subAggregation(sum("sum")))
                     .execute().actionGet();
 
@@ -716,7 +719,7 @@ public class LongTermsTests extends AbstractTermsTests {
         SearchResponse response = client().prepareSearch("idx").setTypes("type")
                 .addAggregation(terms("terms")
                         .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("doc['" + MULTI_VALUED_FIELD_NAME + "']")
+                                .script(new Script("doc['" + MULTI_VALUED_FIELD_NAME + "']"))
                         .valueType(Terms.ValueType.LONG)
                         .subAggregation(sum("sum")))
                 .execute().actionGet();
@@ -1264,4 +1267,261 @@ public class LongTermsTests extends AbstractTermsTests {
     public void otherDocCount() {
         testOtherDocCount(SINGLE_VALUED_FIELD_NAME, MULTI_VALUED_FIELD_NAME);
     }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void singleValuedField_WithValueScriptOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").field(SINGLE_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .script("_value + 1")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(5));
+
+        for (int i = 0; i < 5; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("" + (i + 1d));
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("" + (i + 1d)));
+            assertThat(bucket.getKeyAsNumber().intValue(), equalTo(i + 1));
+            assertThat(bucket.getDocCount(), equalTo(1l));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void multiValuedField_WithValueScriptOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").field(MULTI_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .script("_value - 1")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(6));
+
+        for (int i = 0; i < 6; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("" + (i - 1d));
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("" + (i - 1d)));
+            assertThat(bucket.getKeyAsNumber().intValue(), equalTo(i - 1));
+            if (i == 0 || i == 5) {
+                assertThat(bucket.getDocCount(), equalTo(1l));
+            } else {
+                assertThat(bucket.getDocCount(), equalTo(2l));
+            }
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void multiValuedField_WithValueScript_NotUniqueOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").field(MULTI_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .script("floor(_value / 1000 + 1)")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(1));
+
+        Terms.Bucket bucket = terms.getBucketByKey("1.0");
+        assertThat(bucket, notNullValue());
+        assertThat(key(bucket), equalTo("1.0"));
+        assertThat(bucket.getKeyAsNumber().intValue(), equalTo(1));
+        assertThat(bucket.getDocCount(), equalTo(5l));
+    }
+
+    /*
+     * 
+     * [1, 2] [2, 3] [3, 4] [4, 5] [5, 6]
+     * 
+     * 1 - count: 1 - sum: 1 2 - count: 2 - sum: 4 3 - count: 2 - sum: 6 4 -
+     * count: 2 - sum: 8 5 - count: 2 - sum: 10 6 - count: 1 - sum: 6
+     */
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void multiValuedField_WithValueScript_WithInheritedSubAggregatorOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").field(MULTI_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .script("_value + 1").subAggregation(sum("sum"))).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(6));
+
+        for (int i = 0; i < 6; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("" + (i + 1d));
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("" + (i + 1d)));
+            assertThat(bucket.getKeyAsNumber().intValue(), equalTo(i + 1));
+            final long count = i == 0 || i == 5 ? 1 : 2;
+            double s = 0;
+            for (int j = 0; j < NUM_DOCS; ++j) {
+                if (i == j || i == j + 1) {
+                    s += j + 1;
+                    s += j + 1 + 1;
+                }
+            }
+            assertThat(bucket.getDocCount(), equalTo(count));
+            Sum sum = bucket.getAggregations().get("sum");
+            assertThat(sum, notNullValue());
+            assertThat(sum.getValue(), equalTo(s));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_SingleValueOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).script(
+                                "doc['" + SINGLE_VALUED_FIELD_NAME + "'].value")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(5));
+
+        for (int i = 0; i < 5; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("" + i);
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("" + i));
+            assertThat(bucket.getKeyAsNumber().intValue(), equalTo(i));
+            assertThat(bucket.getDocCount(), equalTo(1l));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_MultiValuedOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).script(
+                                "doc['" + MULTI_VALUED_FIELD_NAME + "']")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(6));
+
+        for (int i = 0; i < 6; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("" + i);
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("" + i));
+            assertThat(bucket.getKeyAsNumber().intValue(), equalTo(i));
+            if (i == 0 || i == 5) {
+                assertThat(bucket.getDocCount(), equalTo(1l));
+            } else {
+                assertThat(bucket.getDocCount(), equalTo(2l));
+            }
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_MultiValued_WithAggregatorInherited_NoExplicitTypeOldScriptAPI() throws Exception {
+
+        // since no type ie explicitly defined, es will assume all values returned by the script to be strings (bytes),
+        // so the aggregation should fail, since the "sum" aggregation can only operation on numeric values.
+
+        try {
+
+            client().prepareSearch("idx")
+                    .setTypes("type")
+                    .addAggregation(
+                            terms("terms").collectMode(randomFrom(SubAggCollectionMode.values()))
+                                    .script("doc['" + MULTI_VALUED_FIELD_NAME + "']").subAggregation(sum("sum"))).execute().actionGet();
+
+            fail("expected to fail as sub-aggregation sum requires a numeric value source context, but there is none");
+
+        } catch (Exception e) {
+            // expected
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_MultiValued_WithAggregatorInherited_WithExplicitTypeOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .script("doc['" + MULTI_VALUED_FIELD_NAME + "']").valueType(Terms.ValueType.LONG)
+                                .subAggregation(sum("sum"))).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(6));
+
+        for (int i = 0; i < 6; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("" + i);
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("" + i));
+            assertThat(bucket.getKeyAsNumber().intValue(), equalTo(i));
+            final long count = i == 0 || i == 5 ? 1 : 2;
+            double s = 0;
+            for (int j = 0; j < NUM_DOCS; ++j) {
+                if (i == j || i == j + 1) {
+                    s += j;
+                    s += j + 1;
+                }
+            }
+            assertThat(bucket.getDocCount(), equalTo(count));
+            Sum sum = bucket.getAggregations().get("sum");
+            assertThat(sum, notNullValue());
+            assertThat(sum.getValue(), equalTo(s));
+        }
+    }
 }
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountTests.java
index 0da498c2865..394cc575110 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountTests.java
@@ -26,7 +26,6 @@ import com.carrotsearch.randomizedtesting.generators.RandomStrings;
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode;
@@ -108,7 +107,7 @@ public class MinDocCountTests extends AbstractTermsTests {
         YES {
             @Override
             TermsBuilder apply(TermsBuilder builder, String field) {
-                return builder.script("doc['" + field + "'].values");
+                return builder.script(new org.elasticsearch.script.Script("doc['" + field + "'].values"));
             }
         };
         abstract TermsBuilder apply(TermsBuilder builder, String field);
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java
index 2d414e400c5..c53b763a0a5 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeTests.java
@@ -20,6 +20,7 @@ package org.elasticsearch.search.aggregations.bucket;
 
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode;
 import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
 import org.elasticsearch.search.aggregations.bucket.range.Range;
@@ -196,14 +197,10 @@ public class RangeTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void singleValueField_WithFormat() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(range("range")
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .addUnboundedTo(3)
-                        .addRange(3, 6)
-                        .addUnboundedFrom(6)
-                        .format("#")
-                )
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        range("range").field(SINGLE_VALUED_FIELD_NAME).addUnboundedTo(3).addRange(3, 6).addUnboundedFrom(6).format("#"))
                 .execute().actionGet();
 
         assertSearchResponse(response);
@@ -426,18 +423,14 @@ public class RangeTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void singleValuedField_WithValueScript() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(range("range")
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .script("_value + 1")
-                        .addUnboundedTo(3)
-                        .addRange(3, 6)
-                        .addUnboundedFrom(6))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        range("range").field(SINGLE_VALUED_FIELD_NAME).script(new Script("_value + 1")).addUnboundedTo(3).addRange(3, 6)
+                                .addUnboundedFrom(6)).execute().actionGet();
 
         assertSearchResponse(response);
 
-
         Range range = response.getAggregations().get("range");
         assertThat(range, notNullValue());
         assertThat(range.getName(), equalTo("range"));
@@ -547,14 +540,11 @@ public class RangeTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void multiValuedField_WithValueScript() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(range("range")
-                        .field(MULTI_VALUED_FIELD_NAME)
-                        .script("_value + 1")
-                        .addUnboundedTo(3)
-                        .addRange(3, 6)
-                        .addUnboundedFrom(6))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        range("range").field(MULTI_VALUED_FIELD_NAME).script(new Script("_value + 1")).addUnboundedTo(3).addRange(3, 6)
+                                .addUnboundedFrom(6)).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -612,15 +602,11 @@ public class RangeTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void multiValuedField_WithValueScript_WithInheritedSubAggregator() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(range("range")
-                        .field(MULTI_VALUED_FIELD_NAME)
-                        .script("_value + 1")
-                        .addUnboundedTo(3)
-                        .addRange(3, 6)
-                        .addUnboundedFrom(6)
-                        .subAggregation(sum("sum")))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        range("range").field(MULTI_VALUED_FIELD_NAME).script(new Script("_value + 1")).addUnboundedTo(3).addRange(3, 6)
+                                .addUnboundedFrom(6).subAggregation(sum("sum"))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -677,13 +663,11 @@ public class RangeTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void script_SingleValue() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(range("range")
-                        .script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value")
-                        .addUnboundedTo(3)
-                        .addRange(3, 6)
-                        .addUnboundedFrom(6))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        range("range").script(new Script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value")).addUnboundedTo(3).addRange(3, 6)
+                                .addUnboundedFrom(6)).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -724,14 +708,11 @@ public class RangeTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void script_SingleValue_WithSubAggregator_Inherited() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(range("range")
-                        .script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value")
-                        .addUnboundedTo(3)
-                        .addRange(3, 6)
-                        .addUnboundedFrom(6)
-                        .subAggregation(avg("avg")))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        range("range").script(new Script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value")).addUnboundedTo(3).addRange(3, 6)
+                                .addUnboundedFrom(6).subAggregation(avg("avg"))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -822,13 +803,11 @@ public class RangeTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void script_MultiValued() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(range("range")
-                        .script("doc['" + MULTI_VALUED_FIELD_NAME + "'].values")
-                        .addUnboundedTo(3)
-                        .addRange(3, 6)
-                        .addUnboundedFrom(6))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        range("range").script(new Script("doc['" + MULTI_VALUED_FIELD_NAME + "'].values")).addUnboundedTo(3).addRange(3, 6)
+                                .addUnboundedFrom(6)).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -886,14 +865,11 @@ public class RangeTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void script_MultiValued_WithAggregatorInherited() throws Exception {
-        SearchResponse response = client().prepareSearch("idx")
-                .addAggregation(range("range")
-                        .script("doc['" + MULTI_VALUED_FIELD_NAME + "'].values")
-                        .addUnboundedTo("r1", 3)
-                        .addRange("r2", 3, 6)
-                        .addUnboundedFrom("r3", 6)
-                        .subAggregation(sum("sum")))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        range("range").script(new Script("doc['" + MULTI_VALUED_FIELD_NAME + "'].values")).addUnboundedTo("r1", 3)
+                                .addRange("r2", 3, 6).addUnboundedFrom("r3", 6).subAggregation(sum("sum"))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -1129,4 +1105,391 @@ public class RangeTests extends ElasticsearchIntegrationTest {
         assertThat(buckets.get(0).getDocCount(), equalTo(0l));
 
     }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void singleValuedField_WithValueScriptOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        range("range").field(SINGLE_VALUED_FIELD_NAME).script("_value + 1").addUnboundedTo(3).addRange(3, 6)
+                                .addUnboundedFrom(6)).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(range.getBuckets().size(), equalTo(3));
+
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-3.0"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(Double.NEGATIVE_INFINITY));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(3.0));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("3.0"));
+        assertThat(bucket.getDocCount(), equalTo(1l)); // 2
+
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("3.0-6.0"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(3.0));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(6.0));
+        assertThat(bucket.getFromAsString(), equalTo("3.0"));
+        assertThat(bucket.getToAsString(), equalTo("6.0"));
+        assertThat(bucket.getDocCount(), equalTo(3l)); // 3, 4, 5
+
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("6.0-*"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(6.0));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(Double.POSITIVE_INFINITY));
+        assertThat(bucket.getFromAsString(), equalTo("6.0"));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(numDocs - 4l));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void multiValuedField_WithValueScriptOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        range("range").field(MULTI_VALUED_FIELD_NAME).script("_value + 1").addUnboundedTo(3).addRange(3, 6)
+                                .addUnboundedFrom(6)).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(range.getBuckets().size(), equalTo(3));
+
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-3.0"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(Double.NEGATIVE_INFINITY));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(3.0));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("3.0"));
+        assertThat(bucket.getDocCount(), equalTo(1l));
+
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("3.0-6.0"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(3.0));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(6.0));
+        assertThat(bucket.getFromAsString(), equalTo("3.0"));
+        assertThat(bucket.getToAsString(), equalTo("6.0"));
+        assertThat(bucket.getDocCount(), equalTo(4l));
+
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("6.0-*"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(6.0));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(Double.POSITIVE_INFINITY));
+        assertThat(bucket.getFromAsString(), equalTo("6.0"));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(numDocs - 3l));
+    }
+
+    /*
+     * [2, 3] [3, 4] [4, 5] [5, 6] [6, 7] [7, 8j [8, 9] [9, 10] [10, 11] [11,
+     * 12]
+     * 
+     * r1: 2 r2: 3, 3, 4, 4, 5, 5 r3: 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12
+     */
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void multiValuedField_WithValueScript_WithInheritedSubAggregatorOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        range("range").field(MULTI_VALUED_FIELD_NAME).script("_value + 1").addUnboundedTo(3).addRange(3, 6)
+                                .addUnboundedFrom(6).subAggregation(sum("sum"))).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(range.getBuckets().size(), equalTo(3));
+
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-3.0"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(Double.NEGATIVE_INFINITY));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(3.0));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("3.0"));
+        assertThat(bucket.getDocCount(), equalTo(1l));
+        Sum sum = bucket.getAggregations().get("sum");
+        assertThat(sum, notNullValue());
+        assertThat(sum.getName(), equalTo("sum"));
+        assertThat(sum.getValue(), equalTo(2d + 3d));
+
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("3.0-6.0"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(3.0));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(6.0));
+        assertThat(bucket.getFromAsString(), equalTo("3.0"));
+        assertThat(bucket.getToAsString(), equalTo("6.0"));
+        assertThat(bucket.getDocCount(), equalTo(4l));
+        sum = bucket.getAggregations().get("sum");
+        assertThat(sum, notNullValue());
+        assertThat(sum.getName(), equalTo("sum"));
+        assertThat(sum.getValue(), equalTo((double) 2 + 3 + 3 + 4 + 4 + 5 + 5 + 6));
+
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("6.0-*"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(6.0));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(Double.POSITIVE_INFINITY));
+        assertThat(bucket.getFromAsString(), equalTo("6.0"));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(numDocs - 3L));
+        sum = bucket.getAggregations().get("sum");
+        assertThat(sum, notNullValue());
+        assertThat(sum.getName(), equalTo("sum"));
+        long total = 0;
+        for (int i = 3; i < numDocs; ++i) {
+            total += ((i + 1) + 1) + ((i + 1) + 2);
+        }
+        assertThat(sum.getValue(), equalTo((double) total));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_SingleValueOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        range("range").script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value").addUnboundedTo(3).addRange(3, 6)
+                                .addUnboundedFrom(6)).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(range.getBuckets().size(), equalTo(3));
+
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-3.0"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(Double.NEGATIVE_INFINITY));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(3.0));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("3.0"));
+        assertThat(bucket.getDocCount(), equalTo(2l));
+
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("3.0-6.0"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(3.0));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(6.0));
+        assertThat(bucket.getFromAsString(), equalTo("3.0"));
+        assertThat(bucket.getToAsString(), equalTo("6.0"));
+        assertThat(bucket.getDocCount(), equalTo(3l));
+
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("6.0-*"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(6.0));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(Double.POSITIVE_INFINITY));
+        assertThat(bucket.getFromAsString(), equalTo("6.0"));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(numDocs - 5l));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_SingleValue_WithSubAggregator_InheritedOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        range("range").script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value").addUnboundedTo(3).addRange(3, 6)
+                                .addUnboundedFrom(6).subAggregation(avg("avg"))).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(range.getBuckets().size(), equalTo(3));
+
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-3.0"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(Double.NEGATIVE_INFINITY));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(3.0));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("3.0"));
+        assertThat(bucket.getDocCount(), equalTo(2l));
+        Avg avg = bucket.getAggregations().get("avg");
+        assertThat(avg, notNullValue());
+        assertThat(avg.getValue(), equalTo(1.5)); // (1 + 2) / 2
+
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("3.0-6.0"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(3.0));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(6.0));
+        assertThat(bucket.getFromAsString(), equalTo("3.0"));
+        assertThat(bucket.getToAsString(), equalTo("6.0"));
+        assertThat(bucket.getDocCount(), equalTo(3l));
+        avg = bucket.getAggregations().get("avg");
+        assertThat(avg, notNullValue());
+        assertThat(avg.getValue(), equalTo(4.0)); // (3 + 4 + 5) / 3
+
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("6.0-*"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(6.0));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(Double.POSITIVE_INFINITY));
+        assertThat(bucket.getFromAsString(), equalTo("6.0"));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(numDocs - 5l));
+        avg = bucket.getAggregations().get("avg");
+        assertThat(avg, notNullValue());
+        long total = 0;
+        for (int i = 5; i < numDocs; ++i) {
+            total += i + 1;
+        }
+        assertThat(avg.getValue(), equalTo((double) total / (numDocs - 5))); // (6 + 7 + 8 + 9 + 10) / 5
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_MultiValuedOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        range("range").script("doc['" + MULTI_VALUED_FIELD_NAME + "'].values").addUnboundedTo(3).addRange(3, 6)
+                                .addUnboundedFrom(6)).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(range.getBuckets().size(), equalTo(3));
+
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("*-3.0"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(Double.NEGATIVE_INFINITY));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(3.0));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("3.0"));
+        assertThat(bucket.getDocCount(), equalTo(2l));
+
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("3.0-6.0"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(3.0));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(6.0));
+        assertThat(bucket.getFromAsString(), equalTo("3.0"));
+        assertThat(bucket.getToAsString(), equalTo("6.0"));
+        assertThat(bucket.getDocCount(), equalTo(4l));
+
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("6.0-*"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(6.0));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(Double.POSITIVE_INFINITY));
+        assertThat(bucket.getFromAsString(), equalTo("6.0"));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(numDocs - 4l));
+    }
+
+    /*
+     * [1, 2] [2, 3] [3, 4] [4, 5] [5, 6] [6, 7] [7, 8j [8, 9] [9, 10] [10, 11]
+     * 
+     * r1: 1, 2, 2 r2: 3, 3, 4, 4, 5, 5 r3: 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11
+     */
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_MultiValued_WithAggregatorInheritedOldScript() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .addAggregation(
+                        range("range").script("doc['" + MULTI_VALUED_FIELD_NAME + "'].values").addUnboundedTo("r1", 3).addRange("r2", 3, 6)
+                                .addUnboundedFrom("r3", 6).subAggregation(sum("sum"))).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Range range = response.getAggregations().get("range");
+        assertThat(range, notNullValue());
+        assertThat(range.getName(), equalTo("range"));
+        List<? extends Bucket> buckets = range.getBuckets();
+        assertThat(range.getBuckets().size(), equalTo(3));
+
+        Range.Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("r1"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(Double.NEGATIVE_INFINITY));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(3.0));
+        assertThat(bucket.getFromAsString(), nullValue());
+        assertThat(bucket.getToAsString(), equalTo("3.0"));
+        assertThat(bucket.getDocCount(), equalTo(2l));
+        Sum sum = bucket.getAggregations().get("sum");
+        assertThat(sum, notNullValue());
+        assertThat(sum.getName(), equalTo("sum"));
+        assertThat(sum.getValue(), equalTo((double) 1 + 2 + 2 + 3));
+
+        bucket = buckets.get(1);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("r2"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(3.0));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(6.0));
+        assertThat(bucket.getFromAsString(), equalTo("3.0"));
+        assertThat(bucket.getToAsString(), equalTo("6.0"));
+        assertThat(bucket.getDocCount(), equalTo(4l));
+        sum = bucket.getAggregations().get("sum");
+        assertThat(sum, notNullValue());
+        assertThat(sum.getName(), equalTo("sum"));
+        assertThat(sum.getValue(), equalTo((double) 2 + 3 + 3 + 4 + 4 + 5 + 5 + 6));
+
+        bucket = buckets.get(2);
+        assertThat(bucket, notNullValue());
+        assertThat((String) bucket.getKey(), equalTo("r3"));
+        assertThat(((Number) bucket.getFrom()).doubleValue(), equalTo(6.0));
+        assertThat(((Number) bucket.getTo()).doubleValue(), equalTo(Double.POSITIVE_INFINITY));
+        assertThat(bucket.getFromAsString(), equalTo("6.0"));
+        assertThat(bucket.getToAsString(), nullValue());
+        assertThat(bucket.getDocCount(), equalTo(numDocs - 4l));
+        sum = bucket.getAggregations().get("sum");
+        assertThat(sum, notNullValue());
+        assertThat(sum.getName(), equalTo("sum"));
+        long total = 0;
+        for (int i = 4; i < numDocs; ++i) {
+            total += (i + 1) + (i + 2);
+        }
+        assertThat(sum.getValue(), equalTo((double) total));
+    }
 }
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreTests.java
index 10dacac88e2..26d06dfb866 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreTests.java
@@ -30,8 +30,10 @@ import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.QueryParsingException;
 import org.elasticsearch.plugins.AbstractPlugin;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptModule;
 import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.filter.InternalFilter;
@@ -41,7 +43,16 @@ import org.elasticsearch.search.aggregations.bucket.significant.SignificantStrin
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTerms;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregatorFactory;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.heuristics.*;
+import org.elasticsearch.search.aggregations.bucket.significant.heuristics.ChiSquare;
+import org.elasticsearch.search.aggregations.bucket.significant.heuristics.GND;
+import org.elasticsearch.search.aggregations.bucket.significant.heuristics.MutualInformation;
+import org.elasticsearch.search.aggregations.bucket.significant.heuristics.ScriptHeuristic;
+import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristic;
+import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristicBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristicParser;
+import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristicStreams;
+import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificantTermsHeuristicModule;
+import org.elasticsearch.search.aggregations.bucket.significant.heuristics.TransportSignificantTermsHeuristicModule;
 import org.elasticsearch.search.aggregations.bucket.terms.StringTerms;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
@@ -49,7 +60,12 @@ import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.junit.Test;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
 import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_REPLICAS;
@@ -57,7 +73,10 @@ import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.closeTo;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.is;
 
 /**
  *
@@ -229,8 +248,9 @@ public class SignificantTermsSignificanceScoreTests extends ElasticsearchIntegra
         public static class SimpleHeuristicBuilder implements SignificanceHeuristicBuilder {
 
             @Override
-            public void toXContent(XContentBuilder builder) throws IOException {
+            public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
                 builder.startObject(STREAM.getName()).endObject();
+                return builder;
             }
         }
     }
@@ -488,6 +508,30 @@ public class SignificantTermsSignificanceScoreTests extends ElasticsearchIntegra
         }
     }
 
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testScriptScoreOldScriptAPI() throws ExecutionException, InterruptedException, IOException {
+        indexRandomFrequencies01(randomBoolean() ? "string" : "long");
+        ScriptHeuristic.ScriptHeuristicBuilder scriptHeuristicBuilder = getScriptSignificanceHeuristicBuilderOldScriptAPI();
+        ensureYellow();
+        SearchResponse response = client()
+                .prepareSearch(INDEX_NAME)
+                .addAggregation(
+                        new TermsBuilder("class").field(CLASS_FIELD).subAggregation(
+                                new SignificantTermsBuilder("mySignificantTerms").field(TEXT_FIELD).executionHint(randomExecutionHint())
+                                        .significanceHeuristic(scriptHeuristicBuilder).minDocCount(1).shardSize(2).size(2))).execute()
+                .actionGet();
+        assertSearchResponse(response);
+        for (Terms.Bucket classBucket : ((Terms) response.getAggregations().get("class")).getBuckets()) {
+            for (SignificantTerms.Bucket bucket : ((SignificantTerms) classBucket.getAggregations().get("mySignificantTerms")).getBuckets()) {
+                assertThat(bucket.getSignificanceScore(),
+                        is((double) bucket.getSubsetDf() + bucket.getSubsetSize() + bucket.getSupersetDf() + bucket.getSupersetSize()));
+            }
+        }
+    }
+
     @Test
     public void testNoNumberFormatExceptionWithDefaultScriptingEngine() throws ExecutionException, InterruptedException, IOException {
         assertAcked(client().admin().indices().prepareCreate("test").setSettings(Settings.builder().put("index.number_of_shards", 1)));
@@ -498,6 +542,41 @@ public class SignificantTermsSignificanceScoreTests extends ElasticsearchIntegra
         index("test", "doc", "3", "{\"field\":\"a b\"}");
         index("test", "doc", "33", "{\"field\":\"a b\"}");
         ScriptHeuristic.ScriptHeuristicBuilder scriptHeuristicBuilder = new ScriptHeuristic.ScriptHeuristicBuilder();
+        scriptHeuristicBuilder.setScript(new Script("_subset_freq/(_superset_freq - _subset_freq + 1)"));
+        ensureYellow();
+        refresh();
+        SearchResponse response = client()
+                .prepareSearch("test")
+                .addAggregation(
+                        new TermsBuilder("letters").field("field").subAggregation(
+                                new SignificantTermsBuilder("mySignificantTerms").field("field").executionHint(randomExecutionHint())
+                                        .significanceHeuristic(scriptHeuristicBuilder).minDocCount(1).shardSize(2).size(2))).execute()
+                .actionGet();
+        assertSearchResponse(response);
+        assertThat(((Terms) response.getAggregations().get("letters")).getBuckets().size(), equalTo(2));
+        for (Terms.Bucket classBucket : ((Terms) response.getAggregations().get("letters")).getBuckets()) {
+            assertThat(((SignificantStringTerms) classBucket.getAggregations().get("mySignificantTerms")).getBuckets().size(), equalTo(2));
+            for (SignificantTerms.Bucket bucket : ((SignificantTerms) classBucket.getAggregations().get("mySignificantTerms")).getBuckets()) {
+                assertThat(bucket.getSignificanceScore(),
+                        closeTo((double) bucket.getSubsetDf() / (bucket.getSupersetDf() - bucket.getSubsetDf() + 1), 1.e-6));
+            }
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testNoNumberFormatExceptionWithDefaultScriptingEngineOldScriptAPI() throws ExecutionException, InterruptedException,
+            IOException {
+        assertAcked(client().admin().indices().prepareCreate("test").setSettings(Settings.builder().put("index.number_of_shards", 1)));
+        index("test", "doc", "1", "{\"field\":\"a\"}");
+        index("test", "doc", "11", "{\"field\":\"a\"}");
+        index("test", "doc", "2", "{\"field\":\"b\"}");
+        index("test", "doc", "22", "{\"field\":\"b\"}");
+        index("test", "doc", "3", "{\"field\":\"a b\"}");
+        index("test", "doc", "33", "{\"field\":\"a b\"}");
+        ScriptHeuristic.ScriptHeuristicBuilder scriptHeuristicBuilder = new ScriptHeuristic.ScriptHeuristicBuilder();
         scriptHeuristicBuilder.setScript("_subset_freq/(_superset_freq - _subset_freq + 1)");
         ensureYellow();
         refresh();
@@ -520,6 +599,70 @@ public class SignificantTermsSignificanceScoreTests extends ElasticsearchIntegra
     }
 
     private ScriptHeuristic.ScriptHeuristicBuilder getScriptSignificanceHeuristicBuilder() throws IOException {
+        Map<String, Object> params = null;
+        Script script = null;
+        String lang = null;
+        if (randomBoolean()) {
+            params = new HashMap<>();
+            params.put("param", randomIntBetween(1, 100));
+        }
+        int randomScriptKind = randomIntBetween(0, 3);
+        if (randomBoolean()) {
+            lang = "groovy";
+        }
+        switch (randomScriptKind) {
+        case 0: {
+            if (params == null) {
+                script = new Script("return _subset_freq + _subset_size + _superset_freq + _superset_size");
+            } else {
+                script = new Script("return param*(_subset_freq + _subset_size + _superset_freq + _superset_size)/param",
+                        ScriptType.INLINE, lang, params);
+            }
+            break;
+        }
+        case 1: {
+            String scriptString;
+            if (params == null) {
+                scriptString = "return _subset_freq + _subset_size + _superset_freq + _superset_size";
+            } else {
+                scriptString = "return param*(_subset_freq + _subset_size + _superset_freq + _superset_size)/param";
+            }
+            client().prepareIndex().setIndex(ScriptService.SCRIPT_INDEX).setType(ScriptService.DEFAULT_LANG).setId("my_script")
+                    .setSource(XContentFactory.jsonBuilder().startObject().field("script", scriptString).endObject()).get();
+            refresh();
+            script = new Script("my_script", ScriptType.INDEXED, lang, params);
+            break;
+        }
+        case 2: {
+            if (params == null) {
+                script = new Script("significance_script_no_params", ScriptType.FILE, lang, null);
+            } else {
+                script = new Script("significance_script_with_params", ScriptType.FILE, lang, params);
+            }
+            break;
+        }
+        case 3: {
+            logger.info("NATIVE SCRIPT");
+            if (params == null) {
+                script = new Script("native_significance_score_script_no_params", ScriptType.INLINE, "native", null);
+            } else {
+                script = new Script("native_significance_score_script_with_params", ScriptType.INLINE, "native", params);
+            }
+            lang = "native";
+            if (randomBoolean()) {
+            }
+            break;
+        }
+        }
+        ScriptHeuristic.ScriptHeuristicBuilder builder = new ScriptHeuristic.ScriptHeuristicBuilder().setScript(script);
+
+        return builder;
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    private ScriptHeuristic.ScriptHeuristicBuilder getScriptSignificanceHeuristicBuilderOldScriptAPI() throws IOException {
         Map<String, Object> params = null;
         String script = null;
         String lang = null;
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsTests.java
index 12ac7575f13..7baf417c919 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsTests.java
@@ -26,6 +26,7 @@ import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.index.mapper.internal.FieldNamesFieldMapper;
 import org.elasticsearch.index.mapper.internal.IndexFieldMapper;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode;
 import org.elasticsearch.search.aggregations.bucket.filter.Filter;
 import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
@@ -82,31 +83,25 @@ public class StringTermsTests extends AbstractTermsTests {
         createIndex("idx");
         List<IndexRequestBuilder> builders = new ArrayList<>();
         for (int i = 0; i < 5; i++) {
-            builders.add(client().prepareIndex("idx", "type").setSource(jsonBuilder()
-                    .startObject()
-                    .field(SINGLE_VALUED_FIELD_NAME, "val" + i)
-                    .field("i", i)
-                    .field("tag", i < 5/2 + 1 ? "more" : "less")
-                    .startArray(MULTI_VALUED_FIELD_NAME).value("val" + i).value("val" + (i + 1)).endArray()
-                    .endObject()));
+            builders.add(client().prepareIndex("idx", "type").setSource(
+                    jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val" + i).field("i", i)
+                            .field("tag", i < 5 / 2 + 1 ? "more" : "less").startArray(MULTI_VALUED_FIELD_NAME).value("val" + i)
+                            .value("val" + (i + 1)).endArray().endObject()));
         }
 
         getMultiSortDocs(builders);
 
         for (int i = 0; i < 100; i++) {
-            builders.add(client().prepareIndex("idx", "high_card_type").setSource(jsonBuilder()
-                    .startObject()
-                    .field(SINGLE_VALUED_FIELD_NAME, "val" + Strings.padStart(i+"", 3, '0'))
-                    .startArray(MULTI_VALUED_FIELD_NAME).value("val" + Strings.padStart(i+"", 3, '0')).value("val" + Strings.padStart((i+1)+"", 3, '0')).endArray()
-                    .endObject()));
+            builders.add(client().prepareIndex("idx", "high_card_type").setSource(
+                    jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val" + Strings.padStart(i + "", 3, '0'))
+                            .startArray(MULTI_VALUED_FIELD_NAME).value("val" + Strings.padStart(i + "", 3, '0'))
+                            .value("val" + Strings.padStart((i + 1) + "", 3, '0')).endArray().endObject()));
         }
         prepareCreate("empty_bucket_idx").addMapping("type", SINGLE_VALUED_FIELD_NAME, "type=integer").execute().actionGet();
 
         for (int i = 0; i < 2; i++) {
-            builders.add(client().prepareIndex("empty_bucket_idx", "type", ""+i).setSource(jsonBuilder()
-                    .startObject()
-                    .field(SINGLE_VALUED_FIELD_NAME, i*2)
-                    .endObject()));
+            builders.add(client().prepareIndex("empty_bucket_idx", "type", "" + i).setSource(
+                    jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, i * 2).endObject()));
         }
         indexRandom(true, builders);
         createIndex("idx_unmapped");
@@ -160,67 +155,27 @@ public class StringTermsTests extends AbstractTermsTests {
 
         createIndex("sort_idx");
         for (int i = 1; i <= 3; i++) {
-            builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(jsonBuilder()
-                    .startObject()
-                    .field(SINGLE_VALUED_FIELD_NAME, "val1")
-                    .field("l", 1)
-                    .field("d", i)
-                    .endObject()));
-            builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(jsonBuilder()
-                    .startObject()
-                    .field(SINGLE_VALUED_FIELD_NAME, "val2")
-                    .field("l", 2)
-                    .field("d", i)
-                    .endObject()));
+            builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(
+                    jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val1").field("l", 1).field("d", i).endObject()));
+            builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(
+                    jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val2").field("l", 2).field("d", i).endObject()));
         }
-        builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(jsonBuilder()
-                .startObject()
-                .field(SINGLE_VALUED_FIELD_NAME, "val3")
-                .field("l", 3)
-                .field("d", 1)
-                .endObject()));
-        builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(jsonBuilder()
-                .startObject()
-                .field(SINGLE_VALUED_FIELD_NAME, "val3")
-                .field("l", 3)
-                .field("d", 2)
-                .endObject()));
-        builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(jsonBuilder()
-                .startObject()
-                .field(SINGLE_VALUED_FIELD_NAME, "val4")
-                .field("l", 3)
-                .field("d", 1)
-                .endObject()));
-        builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(jsonBuilder()
-                .startObject()
-                .field(SINGLE_VALUED_FIELD_NAME, "val4")
-                .field("l", 3)
-                .field("d", 3)
-                .endObject()));
-        builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(jsonBuilder()
-                .startObject()
-                .field(SINGLE_VALUED_FIELD_NAME, "val5")
-                .field("l", 5)
-                .field("d", 1)
-                .endObject()));
-        builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(jsonBuilder()
-                .startObject()
-                .field(SINGLE_VALUED_FIELD_NAME, "val5")
-                .field("l", 5)
-                .field("d", 2)
-                .endObject()));
-        builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(jsonBuilder()
-                .startObject()
-                .field(SINGLE_VALUED_FIELD_NAME, "val6")
-                .field("l", 5)
-                .field("d", 1)
-                .endObject()));
-        builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(jsonBuilder()
-                .startObject()
-                .field(SINGLE_VALUED_FIELD_NAME, "val7")
-                .field("l", 5)
-                .field("d", 1)
-                .endObject()));
+        builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(
+                jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val3").field("l", 3).field("d", 1).endObject()));
+        builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(
+                jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val3").field("l", 3).field("d", 2).endObject()));
+        builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(
+                jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val4").field("l", 3).field("d", 1).endObject()));
+        builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(
+                jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val4").field("l", 3).field("d", 3).endObject()));
+        builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(
+                jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val5").field("l", 5).field("d", 1).endObject()));
+        builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(
+                jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val5").field("l", 5).field("d", 2).endObject()));
+        builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(
+                jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val6").field("l", 5).field("d", 1).endObject()));
+        builders.add(client().prepareIndex("sort_idx", "multi_sort_type").setSource(
+                jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val7").field("l", 5).field("d", 1).endObject()));
     }
 
     private String key(Terms.Bucket bucket) {
@@ -231,14 +186,13 @@ public class StringTermsTests extends AbstractTermsTests {
     // the main purpose of this test is to make sure we're not allocating 2GB of memory per shard
     public void sizeIsZero() {
         final int minDocCount = randomInt(1);
-        SearchResponse response = client().prepareSearch("idx").setTypes("high_card_type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .minDocCount(minDocCount)
-                        .size(0))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("high_card_type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).minDocCount(minDocCount).size(0)).execute()
+                .actionGet();
 
         assertSearchResponse(response);
 
@@ -250,12 +204,12 @@ public class StringTermsTests extends AbstractTermsTests {
 
     @Test
     public void singleValueField() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values())))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values()))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -278,20 +232,17 @@ public class StringTermsTests extends AbstractTermsTests {
 
     @Test
     public void singleValueField_withGlobalOrdinals() throws Exception {
-        ExecutionMode[] executionModes = new ExecutionMode[] {
-                null,
-                ExecutionMode.GLOBAL_ORDINALS,
-                ExecutionMode.GLOBAL_ORDINALS_HASH,
-                ExecutionMode.GLOBAL_ORDINALS_LOW_CARDINALITY
-        };
+        ExecutionMode[] executionModes = new ExecutionMode[] { null, ExecutionMode.GLOBAL_ORDINALS, ExecutionMode.GLOBAL_ORDINALS_HASH,
+                ExecutionMode.GLOBAL_ORDINALS_LOW_CARDINALITY };
         for (ExecutionMode executionMode : executionModes) {
             logger.info("Execution mode:" + executionMode);
-            SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                    .addAggregation(terms("terms")
-                            .executionHint(executionMode == null ? null : executionMode.toString())
-                            .field(SINGLE_VALUED_FIELD_NAME)
-                            .collectMode(randomFrom(SubAggCollectionMode.values())))
-                    .execute().actionGet();
+            SearchResponse response = client()
+                    .prepareSearch("idx")
+                    .setTypes("type")
+                    .addAggregation(
+                            terms("terms").executionHint(executionMode == null ? null : executionMode.toString())
+                                    .field(SINGLE_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))).execute()
+                    .actionGet();
             assertSearchResponse(response);
 
             Terms terms = response.getAggregations().get("terms");
@@ -313,13 +264,12 @@ public class StringTermsTests extends AbstractTermsTests {
         // include without exclude
         // we should be left with: val000, val001, val002, val003, val004, val005, val006, val007, val008, val009
 
-        SearchResponse response = client().prepareSearch("idx").setTypes("high_card_type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .include("val00.+"))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("high_card_type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).include("val00.+")).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -338,12 +288,12 @@ public class StringTermsTests extends AbstractTermsTests {
         // include and exclude
         // we should be left with: val002, val003, val004, val005, val006, val007, val008, val009
 
-        response = client().prepareSearch("idx").setTypes("high_card_type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .include("val00.+").exclude("(val000|val001)"))
+        response = client()
+                .prepareSearch("idx")
+                .setTypes("high_card_type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).include("val00.+").exclude("(val000|val001)"))
                 .execute().actionGet();
 
         assertSearchResponse(response);
@@ -363,13 +313,12 @@ public class StringTermsTests extends AbstractTermsTests {
         // exclude without include
         // we should be left with: val000, val001, val002, val003, val004, val005, val006, val007, val008, val009
 
-        response = client().prepareSearch("idx").setTypes("high_card_type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .exclude("val0[1-9]+.+"))
-                .execute().actionGet();
+        response = client()
+                .prepareSearch("idx")
+                .setTypes("high_card_type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).exclude("val0[1-9]+.+")).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -390,13 +339,12 @@ public class StringTermsTests extends AbstractTermsTests {
     public void singleValueField_WithExactTermFiltering() throws Exception {
         // include without exclude
         String incVals[] = { "val000", "val001", "val002", "val003", "val004", "val005", "val006", "val007", "val008", "val009" };
-        SearchResponse response = client().prepareSearch("idx").setTypes("high_card_type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .include(incVals))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("high_card_type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).include(incVals)).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -409,7 +357,7 @@ public class StringTermsTests extends AbstractTermsTests {
             Terms.Bucket bucket = terms.getBucketByKey(incVal);
             assertThat(bucket, notNullValue());
             assertThat(key(bucket), equalTo(incVal));
-            assertThat(bucket.getDocCount(), equalTo(1l));            
+            assertThat(bucket.getDocCount(), equalTo(1l));
         }
 
         // include and exclude
@@ -418,14 +366,13 @@ public class StringTermsTests extends AbstractTermsTests {
         // we should be left with: val002, val003, val004, val005, val006, val007, val008, val009
         String excVals[] = { "val000", "val001" };
 
-        response = client().prepareSearch("idx").setTypes("high_card_type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .include(incVals)
-                        .exclude(excVals))
-                .execute().actionGet();
+        response = client()
+                .prepareSearch("idx")
+                .setTypes("high_card_type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).include(incVals).exclude(excVals)).execute()
+                .actionGet();
 
         assertSearchResponse(response);
 
@@ -440,15 +387,14 @@ public class StringTermsTests extends AbstractTermsTests {
             assertThat(key(bucket), equalTo("val00" + i));
             assertThat(bucket.getDocCount(), equalTo(1l));
         }
-        
+
         // Check case with only exact term exclude clauses 
-        response = client().prepareSearch("idx").setTypes("high_card_type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .exclude(excVals))
-                .execute().actionGet();
+        response = client()
+                .prepareSearch("idx")
+                .setTypes("high_card_type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).exclude(excVals)).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -460,7 +406,7 @@ public class StringTermsTests extends AbstractTermsTests {
             Terms.Bucket bucket = terms.getBucketByKey(key);
             assertThat(bucket, nullValue());
         }
-        NumberFormat nf=NumberFormat.getIntegerInstance(Locale.ENGLISH);
+        NumberFormat nf = NumberFormat.getIntegerInstance(Locale.ENGLISH);
         nf.setMinimumIntegerDigits(3);
         for (int i = 2; i < 12; i++) {
             Terms.Bucket bucket = terms.getBucketByKey("val" + nf.format(i));
@@ -468,21 +414,17 @@ public class StringTermsTests extends AbstractTermsTests {
             assertThat(key(bucket), equalTo("val" + nf.format(i)));
             assertThat(bucket.getDocCount(), equalTo(1l));
         }
-        
-        
-    }
-    
 
+    }
 
     @Test
     public void singleValueField_WithMaxSize() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("high_card_type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .size(20)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.term(true))) // we need to sort by terms cause we're checking the first 20 values
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("high_card_type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME).size(20)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.term(true))) // we need to sort by terms cause we're checking the first 20 values
                 .execute().actionGet();
 
         assertSearchResponse(response);
@@ -495,20 +437,20 @@ public class StringTermsTests extends AbstractTermsTests {
         for (int i = 0; i < 20; i++) {
             Terms.Bucket bucket = terms.getBucketByKey("val" + Strings.padStart(i + "", 3, '0'));
             assertThat(bucket, notNullValue());
-            assertThat(key(bucket), equalTo("val" + Strings.padStart(i+"", 3, '0')));
+            assertThat(key(bucket), equalTo("val" + Strings.padStart(i + "", 3, '0')));
             assertThat(bucket.getDocCount(), equalTo(1l));
         }
     }
 
     @Test
     public void singleValueField_OrderedByTermAsc() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.term(true)))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.term(true))).execute()
+                .actionGet();
 
         assertSearchResponse(response);
 
@@ -528,13 +470,13 @@ public class StringTermsTests extends AbstractTermsTests {
 
     @Test
     public void singleValueField_OrderedByTermDesc() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.term(false)))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.term(false))).execute()
+                .actionGet();
 
         assertSearchResponse(response);
 
@@ -554,13 +496,13 @@ public class StringTermsTests extends AbstractTermsTests {
 
     @Test
     public void singleValuedField_WithSubAggregation() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .subAggregation(count("count").field(MULTI_VALUED_FIELD_NAME)))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .subAggregation(count("count").field(MULTI_VALUED_FIELD_NAME))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -588,13 +530,13 @@ public class StringTermsTests extends AbstractTermsTests {
 
     @Test
     public void singleValuedField_WithSubAggregation_Inherited() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .subAggregation(count("count")))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).subAggregation(count("count"))).execute()
+                .actionGet();
 
         assertSearchResponse(response);
 
@@ -616,13 +558,13 @@ public class StringTermsTests extends AbstractTermsTests {
 
     @Test
     public void singleValuedField_WithValueScript() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("'foo_' + _value"))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).script(new Script("'foo_' + _value"))).execute()
+                .actionGet();
 
         assertSearchResponse(response);
 
@@ -641,12 +583,12 @@ public class StringTermsTests extends AbstractTermsTests {
 
     @Test
     public void multiValuedField_WithValueScript_NotUnique() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(MULTI_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("_value.substring(0,3)"))
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(MULTI_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).script(new Script("_value.substring(0,3)")))
                 .execute().actionGet();
 
         assertSearchResponse(response);
@@ -664,12 +606,12 @@ public class StringTermsTests extends AbstractTermsTests {
 
     @Test
     public void multiValuedField() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(MULTI_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values())))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(MULTI_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values()))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -692,12 +634,12 @@ public class StringTermsTests extends AbstractTermsTests {
 
     @Test
     public void multiValuedScript() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .script("doc['" + MULTI_VALUED_FIELD_NAME + "']")
-                        .collectMode(randomFrom(SubAggCollectionMode.values())))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).script(new Script("doc['" + MULTI_VALUED_FIELD_NAME + "']"))
+                                .collectMode(randomFrom(SubAggCollectionMode.values()))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -720,13 +662,13 @@ public class StringTermsTests extends AbstractTermsTests {
 
     @Test
     public void multiValuedField_WithValueScript() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(MULTI_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("'foo_' + _value"))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(MULTI_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).script(new Script("'foo_' + _value"))).execute()
+                .actionGet();
 
         assertSearchResponse(response);
 
@@ -748,33 +690,26 @@ public class StringTermsTests extends AbstractTermsTests {
     }
 
     /*
-
-    [foo_val0, foo_val1]
-    [foo_val1, foo_val2]
-    [foo_val2, foo_val3]
-    [foo_val3, foo_val4]
-    [foo_val4, foo_val5]
-
-
-    foo_val0 - doc_count: 1 - val_count: 2
-    foo_val1 - doc_count: 2 - val_count: 4
-    foo_val2 - doc_count: 2 - val_count: 4
-    foo_val3 - doc_count: 2 - val_count: 4
-    foo_val4 - doc_count: 2 - val_count: 4
-    foo_val5 - doc_count: 1 - val_count: 2
-
-    */
+     * 
+     * [foo_val0, foo_val1] [foo_val1, foo_val2] [foo_val2, foo_val3] [foo_val3,
+     * foo_val4] [foo_val4, foo_val5]
+     * 
+     * 
+     * foo_val0 - doc_count: 1 - val_count: 2 foo_val1 - doc_count: 2 -
+     * val_count: 4 foo_val2 - doc_count: 2 - val_count: 4 foo_val3 - doc_count:
+     * 2 - val_count: 4 foo_val4 - doc_count: 2 - val_count: 4 foo_val5 -
+     * doc_count: 1 - val_count: 2
+     */
 
     @Test
     public void multiValuedField_WithValueScript_WithInheritedSubAggregator() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(MULTI_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .script("'foo_' + _value")
-                        .subAggregation(count("count")))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(MULTI_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).script(new Script("'foo_' + _value"))
+                                .subAggregation(count("count"))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -803,12 +738,12 @@ public class StringTermsTests extends AbstractTermsTests {
 
     @Test
     public void script_SingleValue() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .executionHint(randomExecutionHint())
-                        .script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value"))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).executionHint(randomExecutionHint())
+                                .script(new Script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value"))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -827,12 +762,12 @@ public class StringTermsTests extends AbstractTermsTests {
 
     @Test
     public void script_SingleValue_ExplicitSingleValue() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .executionHint(randomExecutionHint())
-                        .script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value"))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).executionHint(randomExecutionHint())
+                                .script(new Script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value"))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -851,12 +786,12 @@ public class StringTermsTests extends AbstractTermsTests {
 
     @Test
     public void script_SingleValue_WithSubAggregator_Inherited() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .executionHint(randomExecutionHint())
-                        .script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value")
-                        .subAggregation(count("count")))
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).executionHint(randomExecutionHint())
+                                .script(new Script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value")).subAggregation(count("count")))
                 .execute().actionGet();
 
         assertSearchResponse(response);
@@ -879,12 +814,12 @@ public class StringTermsTests extends AbstractTermsTests {
 
     @Test
     public void script_MultiValued() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .executionHint(randomExecutionHint())
-                        .script("doc['" + MULTI_VALUED_FIELD_NAME + "']"))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).executionHint(randomExecutionHint())
+                                .script(new Script("doc['" + MULTI_VALUED_FIELD_NAME + "']"))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -907,13 +842,13 @@ public class StringTermsTests extends AbstractTermsTests {
 
     @Test
     public void script_MultiValued_WithAggregatorInherited() throws Exception {
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .executionHint(randomExecutionHint())
-                        .script("doc['" + MULTI_VALUED_FIELD_NAME + "']")
-                        .subAggregation(count("count")))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).executionHint(randomExecutionHint())
+                                .script(new Script("doc['" + MULTI_VALUED_FIELD_NAME + "']")).subAggregation(count("count"))).execute()
+                .actionGet();
 
         assertSearchResponse(response);
 
@@ -942,13 +877,12 @@ public class StringTermsTests extends AbstractTermsTests {
 
     @Test
     public void unmapped() throws Exception {
-        SearchResponse response = client().prepareSearch("idx_unmapped").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .size(randomInt(5))
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values())))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx_unmapped")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).size(randomInt(5)).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values()))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -960,12 +894,12 @@ public class StringTermsTests extends AbstractTermsTests {
 
     @Test
     public void partiallyUnmapped() throws Exception {
-        SearchResponse response = client().prepareSearch("idx", "idx_unmapped").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values())))
-                .execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx", "idx_unmapped")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values()))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -985,9 +919,12 @@ public class StringTermsTests extends AbstractTermsTests {
     @Test
     public void stringTermsNestedIntoPerBucketAggregator() throws Exception {
         // no execution hint so that the logic that decides whether or not to use ordinals is executed
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(filter("filter").filter(termQuery(MULTI_VALUED_FIELD_NAME, "val3")).subAggregation(terms("terms").field(MULTI_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))))
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        filter("filter").filter(termQuery(MULTI_VALUED_FIELD_NAME, "val3")).subAggregation(
+                                terms("terms").field(MULTI_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))))
                 .execute().actionGet();
 
         assertThat(response.getFailedShards(), equalTo(0));
@@ -1009,10 +946,11 @@ public class StringTermsTests extends AbstractTermsTests {
 
     @Test
     public void emptyAggregation() throws Exception {
-        SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx")
+        SearchResponse searchResponse = client()
+                .prepareSearch("empty_bucket_idx")
                 .setQuery(matchAllQuery())
-                .addAggregation(histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(1l).minDocCount(0)
-                        .subAggregation(terms("terms")))
+                .addAggregation(
+                        histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(1l).minDocCount(0).subAggregation(terms("terms")))
                 .execute().actionGet();
 
         assertThat(searchResponse.getHits().getTotalHits(), equalTo(2l));
@@ -1030,15 +968,13 @@ public class StringTermsTests extends AbstractTermsTests {
     @Test
     public void singleValuedField_OrderedBySingleValueSubAggregationAsc() throws Exception {
         boolean asc = true;
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.aggregation("avg_i", asc))
-                        .subAggregation(avg("avg_i").field("i"))
-                ).execute().actionGet();
-
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.aggregation("avg_i", asc))
+                                .subAggregation(avg("avg_i").field("i"))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -1062,15 +998,13 @@ public class StringTermsTests extends AbstractTermsTests {
     @Test
     public void singleValuedField_OrderedBySingleBucketSubAggregationAsc() throws Exception {
         boolean asc = randomBoolean();
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("tags")
-                        .executionHint(randomExecutionHint())
-                        .field("tag")
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.aggregation("filter", asc))
-                        .subAggregation(filter("filter").filter(QueryBuilders.matchAllQuery()))
-                ).execute().actionGet();
-
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("tags").executionHint(randomExecutionHint()).field("tag")
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.aggregation("filter", asc))
+                                .subAggregation(filter("filter").filter(QueryBuilders.matchAllQuery()))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -1101,17 +1035,19 @@ public class StringTermsTests extends AbstractTermsTests {
     @Test
     public void singleValuedField_OrderedBySubAggregationAsc_MultiHierarchyLevels() throws Exception {
         boolean asc = randomBoolean();
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("tags")
-                        .executionHint(randomExecutionHint())
-                        .field("tag")
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.aggregation("filter1>filter2>stats.max", asc))
-                        .subAggregation(filter("filter1").filter(QueryBuilders.matchAllQuery())
-                                .subAggregation(filter("filter2").filter(QueryBuilders.matchAllQuery())
-                                        .subAggregation(stats("stats").field("i"))))
-                ).execute().actionGet();
-
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("tags")
+                                .executionHint(randomExecutionHint())
+                                .field("tag")
+                                .collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .order(Terms.Order.aggregation("filter1>filter2>stats.max", asc))
+                                .subAggregation(
+                                        filter("filter1").filter(QueryBuilders.matchAllQuery()).subAggregation(
+                                                filter("filter2").filter(QueryBuilders.matchAllQuery()).subAggregation(
+                                                        stats("stats").field("i"))))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -1163,17 +1099,19 @@ public class StringTermsTests extends AbstractTermsTests {
         statsNameBuilder.append(randomAsciiOfLengthBetween(3, 10).replace("[", "").replace("]", "").replace(">", ""));
         String statsName = statsNameBuilder.toString();
         boolean asc = randomBoolean();
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("tags")
-                        .executionHint(randomExecutionHint())
-                        .field("tag")
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.aggregation("filter1>" + filter2Name + ">" + statsName + ".max", asc))
-                        .subAggregation(filter("filter1").filter(QueryBuilders.matchAllQuery())
-                                .subAggregation(filter(filter2Name).filter(QueryBuilders.matchAllQuery())
-                                        .subAggregation(stats(statsName).field("i"))))
-                ).execute().actionGet();
-
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("tags")
+                                .executionHint(randomExecutionHint())
+                                .field("tag")
+                                .collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .order(Terms.Order.aggregation("filter1>" + filter2Name + ">" + statsName + ".max", asc))
+                                .subAggregation(
+                                        filter("filter1").filter(QueryBuilders.matchAllQuery()).subAggregation(
+                                                filter(filter2Name).filter(QueryBuilders.matchAllQuery()).subAggregation(
+                                                        stats(statsName).field("i"))))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -1225,17 +1163,19 @@ public class StringTermsTests extends AbstractTermsTests {
         statsNameBuilder.append(randomAsciiOfLengthBetween(3, 10).replace("[", "").replace("]", "").replace(">", ""));
         String statsName = statsNameBuilder.toString();
         boolean asc = randomBoolean();
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("tags")
-                        .executionHint(randomExecutionHint())
-                        .field("tag")
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.aggregation("filter1>" + filter2Name + ">" + statsName + "[max]", asc))
-                        .subAggregation(filter("filter1").filter(QueryBuilders.matchAllQuery())
-                                .subAggregation(filter(filter2Name).filter(QueryBuilders.matchAllQuery())
-                                        .subAggregation(stats(statsName).field("i"))))
-                ).execute().actionGet();
-
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("tags")
+                                .executionHint(randomExecutionHint())
+                                .field("tag")
+                                .collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .order(Terms.Order.aggregation("filter1>" + filter2Name + ">" + statsName + "[max]", asc))
+                                .subAggregation(
+                                        filter("filter1").filter(QueryBuilders.matchAllQuery()).subAggregation(
+                                                filter(filter2Name).filter(QueryBuilders.matchAllQuery()).subAggregation(
+                                                        stats(statsName).field("i"))))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -1278,18 +1218,16 @@ public class StringTermsTests extends AbstractTermsTests {
         assertThat(stats.getMax(), equalTo(asc ? 4.0 : 2.0));
     }
 
-
     @Test
     public void singleValuedField_OrderedByMissingSubAggregation() throws Exception {
         for (String index : Arrays.asList("idx", "idx_unmapped")) {
             try {
-                client().prepareSearch(index).setTypes("type")
-                        .addAggregation(terms("terms")
-                                .executionHint(randomExecutionHint())
-                                .field(SINGLE_VALUED_FIELD_NAME)
-                                .collectMode(randomFrom(SubAggCollectionMode.values()))
-                                .order(Terms.Order.aggregation("avg_i", true))
-                        ).execute().actionGet();
+                client().prepareSearch(index)
+                        .setTypes("type")
+                        .addAggregation(
+                                terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                        .collectMode(randomFrom(SubAggCollectionMode.values()))
+                                        .order(Terms.Order.aggregation("avg_i", true))).execute().actionGet();
 
                 fail("Expected search to fail when trying to sort terms aggregation by sug-aggregation that doesn't exist");
 
@@ -1303,15 +1241,14 @@ public class StringTermsTests extends AbstractTermsTests {
     public void singleValuedField_OrderedByNonMetricsOrMultiBucketSubAggregation() throws Exception {
         for (String index : Arrays.asList("idx", "idx_unmapped")) {
             try {
-                client().prepareSearch(index).setTypes("type")
-                        .addAggregation(terms("terms")
-                                .executionHint(randomExecutionHint())
-                                .field(SINGLE_VALUED_FIELD_NAME)
-                                .collectMode(randomFrom(SubAggCollectionMode.values()))
-                                .order(Terms.Order.aggregation("values", true))
-                                .subAggregation(terms("values").field("i")
-                                        .collectMode(randomFrom(SubAggCollectionMode.values())))
-                        ).execute().actionGet();
+                client().prepareSearch(index)
+                        .setTypes("type")
+                        .addAggregation(
+                                terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                        .collectMode(randomFrom(SubAggCollectionMode.values()))
+                                        .order(Terms.Order.aggregation("values", true))
+                                        .subAggregation(terms("values").field("i").collectMode(randomFrom(SubAggCollectionMode.values()))))
+                        .execute().actionGet();
 
                 fail("Expected search to fail when trying to sort terms aggregation by sug-aggregation which is not of a metrics or single-bucket type");
 
@@ -1325,17 +1262,17 @@ public class StringTermsTests extends AbstractTermsTests {
     public void singleValuedField_OrderedByMultiValuedSubAggregation_WithUknownMetric() throws Exception {
         for (String index : Arrays.asList("idx", "idx_unmapped")) {
             try {
-                SearchResponse response = client().prepareSearch(index).setTypes("type")
-                        .addAggregation(terms("terms")
-                                .executionHint(randomExecutionHint())
-                                .field(SINGLE_VALUED_FIELD_NAME)
-                                .collectMode(randomFrom(SubAggCollectionMode.values()))
-                                .order(Terms.Order.aggregation("stats.foo", true))
-                                .subAggregation(stats("stats").field("i"))
-                        ).execute().actionGet();
-                fail("Expected search to fail when trying to sort terms aggregation by multi-valued sug-aggregation " +
-                        "with an unknown specified metric to order by. response had " + response.getFailedShards() + " failed shards.");
-    
+                SearchResponse response = client()
+                        .prepareSearch(index)
+                        .setTypes("type")
+                        .addAggregation(
+                                terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                        .collectMode(randomFrom(SubAggCollectionMode.values()))
+                                        .order(Terms.Order.aggregation("stats.foo", true)).subAggregation(stats("stats").field("i")))
+                        .execute().actionGet();
+                fail("Expected search to fail when trying to sort terms aggregation by multi-valued sug-aggregation "
+                        + "with an unknown specified metric to order by. response had " + response.getFailedShards() + " failed shards.");
+
             } catch (ElasticsearchException e) {
                 // expected
             }
@@ -1346,18 +1283,17 @@ public class StringTermsTests extends AbstractTermsTests {
     public void singleValuedField_OrderedByMultiValuedSubAggregation_WithoutMetric() throws Exception {
         for (String index : Arrays.asList("idx", "idx_unmapped")) {
             try {
-                client().prepareSearch(index).setTypes("type")
-                        .addAggregation(terms("terms")
-                                .executionHint(randomExecutionHint())
-                                .field(SINGLE_VALUED_FIELD_NAME)
-                                .collectMode(randomFrom(SubAggCollectionMode.values()))
-                                .order(Terms.Order.aggregation("stats", true))
-                                .subAggregation(stats("stats").field("i"))
-                        ).execute().actionGet();
-    
-                fail("Expected search to fail when trying to sort terms aggregation by multi-valued sug-aggregation " +
-                        "where the metric name is not specified");
-    
+                client().prepareSearch(index)
+                        .setTypes("type")
+                        .addAggregation(
+                                terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                        .collectMode(randomFrom(SubAggCollectionMode.values()))
+                                        .order(Terms.Order.aggregation("stats", true)).subAggregation(stats("stats").field("i"))).execute()
+                        .actionGet();
+
+                fail("Expected search to fail when trying to sort terms aggregation by multi-valued sug-aggregation "
+                        + "where the metric name is not specified");
+
             } catch (ElasticsearchException e) {
                 // expected
             }
@@ -1367,15 +1303,13 @@ public class StringTermsTests extends AbstractTermsTests {
     @Test
     public void singleValuedField_OrderedBySingleValueSubAggregationDesc() throws Exception {
         boolean asc = false;
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.aggregation("avg_i", asc))
-                        .subAggregation(avg("avg_i").field("i"))
-                ).execute().actionGet();
-
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.aggregation("avg_i", asc))
+                                .subAggregation(avg("avg_i").field("i"))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -1401,14 +1335,13 @@ public class StringTermsTests extends AbstractTermsTests {
     @Test
     public void singleValuedField_OrderedByMultiValueSubAggregationAsc() throws Exception {
         boolean asc = true;
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.aggregation("stats.avg", asc))
-                        .subAggregation(stats("stats").field("i"))
-                ).execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.aggregation("stats.avg", asc))
+                                .subAggregation(stats("stats").field("i"))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -1434,14 +1367,13 @@ public class StringTermsTests extends AbstractTermsTests {
     @Test
     public void singleValuedField_OrderedByMultiValueSubAggregationDesc() throws Exception {
         boolean asc = false;
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.aggregation("stats.avg", asc))
-                        .subAggregation(stats("stats").field("i"))
-                ).execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.aggregation("stats.avg", asc))
+                                .subAggregation(stats("stats").field("i"))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -1467,14 +1399,14 @@ public class StringTermsTests extends AbstractTermsTests {
     @Test
     public void singleValuedField_OrderedByMultiValueExtendedStatsAsc() throws Exception {
         boolean asc = true;
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.aggregation("stats.sum_of_squares", asc))
-                        .subAggregation(extendedStats("stats").field("i"))
-                ).execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .order(Terms.Order.aggregation("stats.sum_of_squares", asc))
+                                .subAggregation(extendedStats("stats").field("i"))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -1500,15 +1432,16 @@ public class StringTermsTests extends AbstractTermsTests {
     @Test
     public void singleValuedField_OrderedByStatsAggAscWithTermsSubAgg() throws Exception {
         boolean asc = true;
-        SearchResponse response = client().prepareSearch("idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.aggregation("stats.sum_of_squares", asc))
-                        .subAggregation(extendedStats("stats").field("i")).subAggregation(terms("subTerms").field("s_values")
-                                .collectMode(randomFrom(SubAggCollectionMode.values())))
-                ).execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values()))
+                                .order(Terms.Order.aggregation("stats.sum_of_squares", asc))
+                                .subAggregation(extendedStats("stats").field("i"))
+                                .subAggregation(terms("subTerms").field("s_values").collectMode(randomFrom(SubAggCollectionMode.values()))))
+                .execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -1575,7 +1508,8 @@ public class StringTermsTests extends AbstractTermsTests {
     @Test
     public void singleValuedField_OrderedByThreeCriteria() throws Exception {
         String[] expectedKeys = new String[] { "val2", "val1", "val4", "val5", "val3", "val6", "val7" };
-        assertMultiSortResponse(expectedKeys, Terms.Order.count(false), Terms.Order.aggregation("sum_d", false), Terms.Order.aggregation("avg_l", false));
+        assertMultiSortResponse(expectedKeys, Terms.Order.count(false), Terms.Order.aggregation("sum_d", false),
+                Terms.Order.aggregation("avg_l", false));
     }
 
     @Test
@@ -1585,15 +1519,13 @@ public class StringTermsTests extends AbstractTermsTests {
     }
 
     private void assertMultiSortResponse(String[] expectedKeys, Terms.Order... order) {
-        SearchResponse response = client().prepareSearch("sort_idx").setTypes("multi_sort_type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(SINGLE_VALUED_FIELD_NAME)
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .order(Terms.Order.compound(order))
-                        .subAggregation(avg("avg_l").field("l"))
-                        .subAggregation(sum("sum_d").field("d"))
-                ).execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("sort_idx")
+                .setTypes("multi_sort_type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).order(Terms.Order.compound(order))
+                                .subAggregation(avg("avg_l").field("l")).subAggregation(sum("sum_d").field("d"))).execute().actionGet();
 
         assertSearchResponse(response);
 
@@ -1617,15 +1549,14 @@ public class StringTermsTests extends AbstractTermsTests {
         }
     }
 
-
     @Test
     public void indexMetaField() throws Exception {
-        SearchResponse response = client().prepareSearch("idx", "empty_bucket_idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .collectMode(randomFrom(SubAggCollectionMode.values()))
-                        .executionHint(randomExecutionHint())
-                        .field(IndexFieldMapper.NAME)
-                ).execute().actionGet();
+        SearchResponse response = client()
+                .prepareSearch("idx", "empty_bucket_idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).executionHint(randomExecutionHint())
+                                .field(IndexFieldMapper.NAME)).execute().actionGet();
 
         assertSearchResponse(response);
         Terms terms = response.getAggregations().get("terms");
@@ -1642,10 +1573,8 @@ public class StringTermsTests extends AbstractTermsTests {
         }
 
         response = client().prepareSearch("idx", "empty_bucket_idx").setTypes("type")
-                .addAggregation(terms("terms")
-                        .executionHint(randomExecutionHint())
-                        .field(FieldNamesFieldMapper.NAME)
-                ).execute().actionGet();
+                .addAggregation(terms("terms").executionHint(randomExecutionHint()).field(FieldNamesFieldMapper.NAME)).execute()
+                .actionGet();
         assertSearchResponse(response);
         terms = response.getAggregations().get("terms");
         assertEquals(5L, terms.getBucketByKey("i").getDocCount());
@@ -1655,4 +1584,322 @@ public class StringTermsTests extends AbstractTermsTests {
     public void otherDocCount() {
         testOtherDocCount(SINGLE_VALUED_FIELD_NAME, MULTI_VALUED_FIELD_NAME);
     }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void singleValuedField_WithValueScriptOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(SINGLE_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).script("'foo_' + _value")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(5));
+
+        for (int i = 0; i < 5; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("foo_val" + i);
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("foo_val" + i));
+            assertThat(bucket.getDocCount(), equalTo(1l));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void multiValuedField_WithValueScript_NotUniqueOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(MULTI_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).script("_value.substring(0,3)")).execute()
+                .actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(1));
+
+        Terms.Bucket bucket = terms.getBucketByKey("val");
+        assertThat(bucket, notNullValue());
+        assertThat(key(bucket), equalTo("val"));
+        assertThat(bucket.getDocCount(), equalTo(5l));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void multiValuedScriptOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).script("doc['" + MULTI_VALUED_FIELD_NAME + "']")
+                                .collectMode(randomFrom(SubAggCollectionMode.values()))).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(6));
+
+        for (int i = 0; i < 6; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("val" + i);
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("val" + i));
+            if (i == 0 || i == 5) {
+                assertThat(bucket.getDocCount(), equalTo(1l));
+            } else {
+                assertThat(bucket.getDocCount(), equalTo(2l));
+            }
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void multiValuedField_WithValueScriptOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(MULTI_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).script("'foo_' + _value")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(6));
+
+        for (int i = 0; i < 6; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("foo_val" + i);
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("foo_val" + i));
+            if (i == 0 || i == 5) {
+                assertThat(bucket.getDocCount(), equalTo(1l));
+            } else {
+                assertThat(bucket.getDocCount(), equalTo(2l));
+            }
+        }
+    }
+
+    /*
+     * 
+     * [foo_val0, foo_val1] [foo_val1, foo_val2] [foo_val2, foo_val3] [foo_val3,
+     * foo_val4] [foo_val4, foo_val5]
+     * 
+     * 
+     * foo_val0 - doc_count: 1 - val_count: 2 foo_val1 - doc_count: 2 -
+     * val_count: 4 foo_val2 - doc_count: 2 - val_count: 4 foo_val3 - doc_count:
+     * 2 - val_count: 4 foo_val4 - doc_count: 2 - val_count: 4 foo_val5 -
+     * doc_count: 1 - val_count: 2
+     */
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void multiValuedField_WithValueScript_WithInheritedSubAggregatorOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").executionHint(randomExecutionHint()).field(MULTI_VALUED_FIELD_NAME)
+                                .collectMode(randomFrom(SubAggCollectionMode.values())).script("'foo_' + _value")
+                                .subAggregation(count("count"))).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(6));
+
+        for (int i = 0; i < 6; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("foo_val" + i);
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("foo_val" + i));
+            if (i == 0 | i == 5) {
+                assertThat(bucket.getDocCount(), equalTo(1l));
+                ValueCount valueCount = bucket.getAggregations().get("count");
+                assertThat(valueCount, notNullValue());
+                assertThat(valueCount.getValue(), equalTo(2l));
+            } else {
+                assertThat(bucket.getDocCount(), equalTo(2l));
+                ValueCount valueCount = bucket.getAggregations().get("count");
+                assertThat(valueCount, notNullValue());
+                assertThat("term[" + key(bucket) + "]", valueCount.getValue(), equalTo(4l));
+            }
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_SingleValueOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).executionHint(randomExecutionHint())
+                                .script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(5));
+
+        for (int i = 0; i < 5; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("val" + i);
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("val" + i));
+            assertThat(bucket.getDocCount(), equalTo(1l));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_SingleValue_ExplicitSingleValueOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).executionHint(randomExecutionHint())
+                                .script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(5));
+
+        for (int i = 0; i < 5; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("val" + i);
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("val" + i));
+            assertThat(bucket.getDocCount(), equalTo(1l));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_SingleValue_WithSubAggregator_InheritedOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).executionHint(randomExecutionHint())
+                                .script("doc['" + SINGLE_VALUED_FIELD_NAME + "'].value").subAggregation(count("count"))).execute()
+                .actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(5));
+
+        for (int i = 0; i < 5; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("val" + i);
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("val" + i));
+            assertThat(bucket.getDocCount(), equalTo(1l));
+            ValueCount valueCount = bucket.getAggregations().get("count");
+            assertThat(valueCount, notNullValue());
+            assertThat(valueCount.getValue(), equalTo(1l));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_MultiValuedOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).executionHint(randomExecutionHint())
+                                .script("doc['" + MULTI_VALUED_FIELD_NAME + "']")).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(6));
+
+        for (int i = 0; i < 6; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("val" + i);
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("val" + i));
+            if (i == 0 || i == 5) {
+                assertThat(bucket.getDocCount(), equalTo(1l));
+            } else {
+                assertThat(bucket.getDocCount(), equalTo(2l));
+            }
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void script_MultiValued_WithAggregatorInheritedOldScriptAPI() throws Exception {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .addAggregation(
+                        terms("terms").collectMode(randomFrom(SubAggCollectionMode.values())).executionHint(randomExecutionHint())
+                                .script("doc['" + MULTI_VALUED_FIELD_NAME + "']").subAggregation(count("count"))).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(6));
+
+        for (int i = 0; i < 6; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("val" + i);
+            assertThat(bucket, notNullValue());
+            assertThat(key(bucket), equalTo("val" + i));
+            if (i == 0 | i == 5) {
+                assertThat(bucket.getDocCount(), equalTo(1l));
+                ValueCount valueCount = bucket.getAggregations().get("count");
+                assertThat(valueCount, notNullValue());
+                assertThat(valueCount.getValue(), equalTo(2l));
+            } else {
+                assertThat(bucket.getDocCount(), equalTo(2l));
+                ValueCount valueCount = bucket.getAggregations().get("count");
+                assertThat(valueCount, notNullValue());
+                assertThat(valueCount.getValue(), equalTo(4l));
+            }
+        }
+    }
 }
diff --git a/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsTests.java b/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsTests.java
index a592ec18b95..d5292e6786c 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsTests.java
@@ -25,6 +25,7 @@ import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHitField;
 import org.elasticsearch.search.SearchHits;
@@ -533,7 +534,7 @@ public class TopHitsTests extends ElasticsearchIntegrationTest {
                                             .addHighlightedField("text")
                                             .setExplain(true)
                                             .addFieldDataField("field1")
-                                            .addScriptField("script", "doc['field1'].value")
+                                                .addScriptField("script", new Script("doc['field1'].value"))
                                             .setFetchSource("text", null)
                                             .setVersion(true)
                                 )
@@ -847,23 +848,15 @@ public class TopHitsTests extends ElasticsearchIntegrationTest {
                 .forceSource(randomBoolean()) // randomly from stored field or _source
                 .highlighterType(hlType);
 
-        SearchResponse searchResponse = client().prepareSearch("articles")
+        SearchResponse searchResponse = client()
+                .prepareSearch("articles")
                 .setQuery(nestedQuery("comments", matchQuery("comments.message", "comment").queryName("test")))
                 .addAggregation(
-                        nested("to-comments")
-                                .path("comments")
-                                .subAggregation(
-                                        topHits("top-comments").setSize(1)
-                                                .addHighlightedField(hlField)
-                                                .setExplain(true)
+                        nested("to-comments").path("comments").subAggregation(
+                                topHits("top-comments").setSize(1).addHighlightedField(hlField).setExplain(true)
                                                 .addFieldDataField("comments.user")
-                                                .addScriptField("script", "doc['comments.user'].value")
-                                                .setFetchSource("message", null)
-                                                .setVersion(true)
-                                                .addSort("comments.date", SortOrder.ASC)
-                                )
-                )
-                .get();
+                                        .addScriptField("script", new Script("doc['comments.user'].value")).setFetchSource("message", null)
+                                        .setVersion(true).addSort("comments.date", SortOrder.ASC))).get();
         assertHitCount(searchResponse, 2);
         Nested nested = searchResponse.getAggregations().get("to-comments");
         assertThat(nested.getDocCount(), equalTo(4l));
@@ -943,4 +936,113 @@ public class TopHitsTests extends ElasticsearchIntegrationTest {
         }
     }
 
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testFetchFeaturesOldScriptAPI() {
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setTypes("type")
+                .setQuery(matchQuery("text", "text").queryName("test"))
+                .addAggregation(
+                        terms("terms")
+                                .executionHint(randomExecutionHint())
+                                .field(TERMS_AGGS_FIELD)
+                                .subAggregation(
+                                        topHits("hits").setSize(1).addHighlightedField("text").setExplain(true).addFieldDataField("field1")
+                                                .addScriptField("script", "doc['field1'].value").setFetchSource("text", null)
+                                                .setVersion(true))).get();
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(5));
+
+        for (Terms.Bucket bucket : terms.getBuckets()) {
+            TopHits topHits = bucket.getAggregations().get("hits");
+            SearchHits hits = topHits.getHits();
+            assertThat(hits.totalHits(), equalTo(10l));
+            assertThat(hits.getHits().length, equalTo(1));
+
+            SearchHit hit = hits.getAt(0);
+            HighlightField highlightField = hit.getHighlightFields().get("text");
+            assertThat(highlightField.getFragments().length, equalTo(1));
+            assertThat(highlightField.getFragments()[0].string(), equalTo("some <em>text</em> to entertain"));
+
+            Explanation explanation = hit.explanation();
+            assertThat(explanation.toString(), containsString("text:text"));
+
+            long version = hit.version();
+            assertThat(version, equalTo(1l));
+
+            assertThat(hit.matchedQueries()[0], equalTo("test"));
+
+            SearchHitField field = hit.field("field1");
+            assertThat(field.getValue().toString(), equalTo("5"));
+
+            field = hit.field("script");
+            assertThat(field.getValue().toString(), equalTo("5"));
+
+            assertThat(hit.sourceAsMap().size(), equalTo(1));
+            assertThat(hit.sourceAsMap().get("text").toString(), equalTo("some text to entertain"));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testNestedFetchFeaturesOldScriptAPI() {
+        String hlType = randomFrom("plain", "fvh", "postings");
+        HighlightBuilder.Field hlField = new HighlightBuilder.Field("comments.message")
+                .highlightQuery(matchQuery("comments.message", "comment")).forceSource(randomBoolean()) // randomly from stored field or _source
+                .highlighterType(hlType);
+
+        SearchResponse searchResponse = client()
+                .prepareSearch("articles")
+                .setQuery(nestedQuery("comments", matchQuery("comments.message", "comment").queryName("test")))
+                .addAggregation(
+                        nested("to-comments").path("comments").subAggregation(
+                                topHits("top-comments").setSize(1).addHighlightedField(hlField).setExplain(true)
+                                        .addFieldDataField("comments.user").addScriptField("script", "doc['comments.user'].value")
+                                        .setFetchSource("message", null).setVersion(true).addSort("comments.date", SortOrder.ASC))).get();
+        assertHitCount(searchResponse, 2);
+        Nested nested = searchResponse.getAggregations().get("to-comments");
+        assertThat(nested.getDocCount(), equalTo(4l));
+
+        SearchHits hits = ((TopHits) nested.getAggregations().get("top-comments")).getHits();
+        assertThat(hits.totalHits(), equalTo(4l));
+        SearchHit searchHit = hits.getAt(0);
+        assertThat(searchHit.getId(), equalTo("1"));
+        assertThat(searchHit.getNestedIdentity().getField().string(), equalTo("comments"));
+        assertThat(searchHit.getNestedIdentity().getOffset(), equalTo(0));
+
+        HighlightField highlightField = searchHit.getHighlightFields().get("comments.message");
+        assertThat(highlightField.getFragments().length, equalTo(1));
+        assertThat(highlightField.getFragments()[0].string(), equalTo("some <em>comment</em>"));
+
+        // Can't explain nested hit with the main query, since both are in a different scopes, also the nested doc may not even have matched with the main query
+        // If top_hits would have a query option then we can explain that query
+        Explanation explanation = searchHit.explanation();
+        assertFalse(explanation.isMatch());
+
+        // Returns the version of the root document. Nested docs don't have a separate version
+        long version = searchHit.version();
+        assertThat(version, equalTo(1l));
+
+        // Can't use named queries for the same reason explain doesn't work:
+        assertThat(searchHit.matchedQueries(), arrayContaining("test"));
+
+        SearchHitField field = searchHit.field("comments.user");
+        assertThat(field.getValue().toString(), equalTo("a"));
+
+        field = searchHit.field("script");
+        assertThat(field.getValue().toString(), equalTo("a"));
+
+        assertThat(searchHit.sourceAsMap().size(), equalTo(1));
+        assertThat(searchHit.sourceAsMap().get("message").toString(), equalTo("some comment"));
+    }
+
 }
diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java b/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java
index ce1a4b50fac..2fced92d8eb 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricTests.java
@@ -23,6 +23,8 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptResponse;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.script.groovy.GroovyScriptEngineService;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.Aggregations;
@@ -122,7 +124,7 @@ public class ScriptedMetricTests extends ElasticsearchIntegrationTest {
     @Test
     public void testMap() {
         SearchResponse response = client().prepareSearch("idx").setQuery(matchAllQuery())
-                .addAggregation(scriptedMetric("scripted").mapScript("_agg['count'] = 1")).execute().actionGet();
+                .addAggregation(scriptedMetric("scripted").mapScript(new Script("_agg['count'] = 1"))).execute().actionGet();
         assertSearchResponse(response);
         assertThat(response.getHits().getTotalHits(), equalTo(numDocs));
 
@@ -159,7 +161,7 @@ public class ScriptedMetricTests extends ElasticsearchIntegrationTest {
         params.put("_agg", new ArrayList<>());
 
         SearchResponse response = client().prepareSearch("idx").setQuery(matchAllQuery())
-                .addAggregation(scriptedMetric("scripted").params(params).mapScript("_agg.add(1)")).execute().actionGet();
+                .addAggregation(scriptedMetric("scripted").params(params).mapScript(new Script("_agg.add(1)"))).execute().actionGet();
         assertSearchResponse(response);
         assertThat(response.getHits().getTotalHits(), equalTo(numDocs));
 
@@ -200,8 +202,8 @@ public class ScriptedMetricTests extends ElasticsearchIntegrationTest {
                 .prepareSearch("idx")
                 .setQuery(matchAllQuery())
                 .addAggregation(
-                        scriptedMetric("scripted").params(params).initScript("vars.multiplier = 3")
-                                .mapScript("_agg.add(vars.multiplier)")).execute().actionGet();
+                        scriptedMetric("scripted").params(params).initScript(new Script("vars.multiplier = 3"))
+                                .mapScript(new Script("_agg.add(vars.multiplier)"))).execute().actionGet();
         assertSearchResponse(response);
         assertThat(response.getHits().getTotalHits(), equalTo(numDocs));
 
@@ -238,6 +240,647 @@ public class ScriptedMetricTests extends ElasticsearchIntegrationTest {
         params.put("_agg", new ArrayList<>());
         params.put("vars", varsMap);
 
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setQuery(matchAllQuery())
+                .addAggregation(
+                        scriptedMetric("scripted")
+                                .params(params)
+                                .mapScript(new Script("_agg.add(1)"))
+                                .combineScript(
+                                        new Script(
+                                                "newaggregation = []; sum = 0;for (a in _agg) { sum += a}; newaggregation.add(sum); return newaggregation")))
+                .execute().actionGet();
+        assertSearchResponse(response);
+        assertThat(response.getHits().getTotalHits(), equalTo(numDocs));
+
+        Aggregation aggregation = response.getAggregations().get("scripted");
+        assertThat(aggregation, notNullValue());
+        assertThat(aggregation, instanceOf(ScriptedMetric.class));
+        ScriptedMetric scriptedMetricAggregation = (ScriptedMetric) aggregation;
+        assertThat(scriptedMetricAggregation.getName(), equalTo("scripted"));
+        assertThat(scriptedMetricAggregation.aggregation(), notNullValue());
+        assertThat(scriptedMetricAggregation.aggregation(), instanceOf(ArrayList.class));
+        List<?> aggregationList = (List<?>) scriptedMetricAggregation.aggregation();
+        assertThat(aggregationList.size(), equalTo(getNumShards("idx").numPrimaries));
+        long totalCount = 0;
+        for (Object object : aggregationList) {
+            assertThat(object, notNullValue());
+            assertThat(object, instanceOf(List.class));
+            List<?> list = (List<?>) object;
+            for (Object o : list) {
+                assertThat(o, notNullValue());
+                assertThat(o, instanceOf(Number.class));
+                Number numberValue = (Number) o;
+                // A particular shard may not have any documents stored on it so
+                // we have to assume the lower bound may be 0. The check at the
+                // bottom of the test method will make sure the count is correct
+                assertThat(numberValue.longValue(), allOf(greaterThanOrEqualTo(0l), lessThanOrEqualTo(numDocs)));
+                totalCount += numberValue.longValue();
+            }
+        }
+        assertThat(totalCount, equalTo(numDocs));
+    }
+
+    @Test
+    public void testInitMapCombine_withParams() {
+        Map<String, Object> varsMap = new HashMap<>();
+        varsMap.put("multiplier", 1);
+        Map<String, Object> params = new HashMap<>();
+        params.put("_agg", new ArrayList<>());
+        params.put("vars", varsMap);
+
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setQuery(matchAllQuery())
+                .addAggregation(
+                        scriptedMetric("scripted")
+                                .params(params)
+                                .initScript(new Script("vars.multiplier = 3"))
+                                .mapScript(new Script("_agg.add(vars.multiplier)"))
+                                .combineScript(
+                                        new Script(
+                                                "newaggregation = []; sum = 0;for (a in _agg) { sum += a}; newaggregation.add(sum); return newaggregation")))
+                .execute().actionGet();
+        assertSearchResponse(response);
+        assertThat(response.getHits().getTotalHits(), equalTo(numDocs));
+
+        Aggregation aggregation = response.getAggregations().get("scripted");
+        assertThat(aggregation, notNullValue());
+        assertThat(aggregation, instanceOf(ScriptedMetric.class));
+        ScriptedMetric scriptedMetricAggregation = (ScriptedMetric) aggregation;
+        assertThat(scriptedMetricAggregation.getName(), equalTo("scripted"));
+        assertThat(scriptedMetricAggregation.aggregation(), notNullValue());
+        assertThat(scriptedMetricAggregation.aggregation(), instanceOf(ArrayList.class));
+        List<?> aggregationList = (List<?>) scriptedMetricAggregation.aggregation();
+        assertThat(aggregationList.size(), equalTo(getNumShards("idx").numPrimaries));
+        long totalCount = 0;
+        for (Object object : aggregationList) {
+            assertThat(object, notNullValue());
+            assertThat(object, instanceOf(List.class));
+            List<?> list = (List<?>) object;
+            for (Object o : list) {
+                assertThat(o, notNullValue());
+                assertThat(o, instanceOf(Number.class));
+                Number numberValue = (Number) o;
+                // A particular shard may not have any documents stored on it so
+                // we have to assume the lower bound may be 0. The check at the
+                // bottom of the test method will make sure the count is correct
+                assertThat(numberValue.longValue(), allOf(greaterThanOrEqualTo(0l), lessThanOrEqualTo(numDocs * 3)));
+                totalCount += numberValue.longValue();
+            }
+        }
+        assertThat(totalCount, equalTo(numDocs * 3));
+    }
+
+    @Test
+    public void testInitMapCombineReduce_withParams() {
+        Map<String, Object> varsMap = new HashMap<>();
+        varsMap.put("multiplier", 1);
+        Map<String, Object> params = new HashMap<>();
+        params.put("_agg", new ArrayList<>());
+        params.put("vars", varsMap);
+
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setQuery(matchAllQuery())
+                .addAggregation(
+                        scriptedMetric("scripted")
+                                .params(params)
+                                .initScript(new Script("vars.multiplier = 3"))
+                                .mapScript(new Script("_agg.add(vars.multiplier)"))
+                                .combineScript(
+                                        new Script(
+                                                "newaggregation = []; sum = 0;for (a in _agg) { sum += a}; newaggregation.add(sum); return newaggregation"))
+                                .reduceScript(
+                                        new Script(
+                                                "newaggregation = []; sum = 0;for (aggregation in _aggs) { for (a in aggregation) { sum += a} }; newaggregation.add(sum); return newaggregation")))
+                .execute().actionGet();
+        assertSearchResponse(response);
+        assertThat(response.getHits().getTotalHits(), equalTo(numDocs));
+
+        Aggregation aggregation = response.getAggregations().get("scripted");
+        assertThat(aggregation, notNullValue());
+        assertThat(aggregation, instanceOf(ScriptedMetric.class));
+        ScriptedMetric scriptedMetricAggregation = (ScriptedMetric) aggregation;
+        assertThat(scriptedMetricAggregation.getName(), equalTo("scripted"));
+        assertThat(scriptedMetricAggregation.aggregation(), notNullValue());
+        assertThat(scriptedMetricAggregation.aggregation(), instanceOf(ArrayList.class));
+        List<?> aggregationList = (List<?>) scriptedMetricAggregation.aggregation();
+        assertThat(aggregationList.size(), equalTo(1));
+        Object object = aggregationList.get(0);
+        assertThat(object, notNullValue());
+        assertThat(object, instanceOf(Number.class));
+        assertThat(((Number) object).longValue(), equalTo(numDocs * 3));
+    }
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @Test
+    public void testInitMapCombineReduce_getProperty() throws Exception {
+        Map<String, Object> varsMap = new HashMap<>();
+        varsMap.put("multiplier", 1);
+        Map<String, Object> params = new HashMap<>();
+        params.put("_agg", new ArrayList<>());
+        params.put("vars", varsMap);
+        SearchResponse searchResponse = client()
+                .prepareSearch("idx")
+                .setQuery(matchAllQuery())
+                .addAggregation(
+                        global("global")
+                                .subAggregation(
+                                        scriptedMetric("scripted")
+                                                .params(params)
+                                                .initScript(new Script("vars.multiplier = 3"))
+                                                .mapScript(new Script("_agg.add(vars.multiplier)"))
+                                                .combineScript(
+                                                        new Script(
+                                                                "newaggregation = []; sum = 0;for (a in _agg) { sum += a}; newaggregation.add(sum); return newaggregation"))
+                                                .reduceScript(
+                                                        new Script(
+                                                                "newaggregation = []; sum = 0;for (aggregation in _aggs) { for (a in aggregation) { sum += a} }; newaggregation.add(sum); return newaggregation"))))
+                .execute().actionGet();
+
+        assertSearchResponse(searchResponse);
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(numDocs));
+
+        Global global = searchResponse.getAggregations().get("global");
+        assertThat(global, notNullValue());
+        assertThat(global.getName(), equalTo("global"));
+        assertThat(global.getDocCount(), equalTo(numDocs));
+        assertThat(global.getAggregations(), notNullValue());
+        assertThat(global.getAggregations().asMap().size(), equalTo(1));
+
+        ScriptedMetric scriptedMetricAggregation = global.getAggregations().get("scripted");
+        assertThat(scriptedMetricAggregation, notNullValue());
+        assertThat(scriptedMetricAggregation.getName(), equalTo("scripted"));
+        assertThat(scriptedMetricAggregation.aggregation(), notNullValue());
+        assertThat(scriptedMetricAggregation.aggregation(), instanceOf(ArrayList.class));
+        List<?> aggregationList = (List<?>) scriptedMetricAggregation.aggregation();
+        assertThat(aggregationList.size(), equalTo(1));
+        Object object = aggregationList.get(0);
+        assertThat(object, notNullValue());
+        assertThat(object, instanceOf(Number.class));
+        assertThat(((Number) object).longValue(), equalTo(numDocs * 3));
+        assertThat((ScriptedMetric) global.getProperty("scripted"), sameInstance(scriptedMetricAggregation));
+        assertThat((List) global.getProperty("scripted.value"), sameInstance((List) aggregationList));
+        assertThat((List) scriptedMetricAggregation.getProperty("value"), sameInstance((List) aggregationList));
+
+    }
+
+    @Test
+    public void testMapCombineReduce_withParams() {
+        Map<String, Object> varsMap = new HashMap<>();
+        varsMap.put("multiplier", 1);
+        Map<String, Object> params = new HashMap<>();
+        params.put("_agg", new ArrayList<>());
+        params.put("vars", varsMap);
+
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setQuery(matchAllQuery())
+                .addAggregation(
+                        scriptedMetric("scripted")
+                                .params(params)
+                                .mapScript(new Script("_agg.add(vars.multiplier)"))
+                                .combineScript(
+                                        new Script(
+                                                "newaggregation = []; sum = 0;for (a in _agg) { sum += a}; newaggregation.add(sum); return newaggregation"))
+                                .reduceScript(
+                                        new Script(
+                                                "newaggregation = []; sum = 0;for (aggregation in _aggs) { for (a in aggregation) { sum += a} }; newaggregation.add(sum); return newaggregation")))
+                .execute().actionGet();
+        assertSearchResponse(response);
+        assertThat(response.getHits().getTotalHits(), equalTo(numDocs));
+
+        Aggregation aggregation = response.getAggregations().get("scripted");
+        assertThat(aggregation, notNullValue());
+        assertThat(aggregation, instanceOf(ScriptedMetric.class));
+        ScriptedMetric scriptedMetricAggregation = (ScriptedMetric) aggregation;
+        assertThat(scriptedMetricAggregation.getName(), equalTo("scripted"));
+        assertThat(scriptedMetricAggregation.aggregation(), notNullValue());
+        assertThat(scriptedMetricAggregation.aggregation(), instanceOf(ArrayList.class));
+        List<?> aggregationList = (List<?>) scriptedMetricAggregation.aggregation();
+        assertThat(aggregationList.size(), equalTo(1));
+        Object object = aggregationList.get(0);
+        assertThat(object, notNullValue());
+        assertThat(object, instanceOf(Number.class));
+        assertThat(((Number) object).longValue(), equalTo(numDocs));
+    }
+
+    @Test
+    public void testInitMapReduce_withParams() {
+        Map<String, Object> varsMap = new HashMap<>();
+        varsMap.put("multiplier", 1);
+        Map<String, Object> params = new HashMap<>();
+        params.put("_agg", new ArrayList<>());
+        params.put("vars", varsMap);
+
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setQuery(matchAllQuery())
+                .addAggregation(
+                        scriptedMetric("scripted")
+                                .params(params)
+                                .initScript(new Script("vars.multiplier = 3"))
+                                .mapScript(new Script("_agg.add(vars.multiplier)"))
+                                .reduceScript(
+                                        new Script(
+                                                "newaggregation = []; sum = 0;for (aggregation in _aggs) { for (a in aggregation) { sum += a} }; newaggregation.add(sum); return newaggregation")))
+                .execute().actionGet();
+        assertSearchResponse(response);
+        assertThat(response.getHits().getTotalHits(), equalTo(numDocs));
+
+        Aggregation aggregation = response.getAggregations().get("scripted");
+        assertThat(aggregation, notNullValue());
+        assertThat(aggregation, instanceOf(ScriptedMetric.class));
+        ScriptedMetric scriptedMetricAggregation = (ScriptedMetric) aggregation;
+        assertThat(scriptedMetricAggregation.getName(), equalTo("scripted"));
+        assertThat(scriptedMetricAggregation.aggregation(), notNullValue());
+        assertThat(scriptedMetricAggregation.aggregation(), instanceOf(ArrayList.class));
+        List<?> aggregationList = (List<?>) scriptedMetricAggregation.aggregation();
+        assertThat(aggregationList.size(), equalTo(1));
+        Object object = aggregationList.get(0);
+        assertThat(object, notNullValue());
+        assertThat(object, instanceOf(Number.class));
+        assertThat(((Number) object).longValue(), equalTo(numDocs * 3));
+    }
+
+    @Test
+    public void testMapReduce_withParams() {
+        Map<String, Object> varsMap = new HashMap<>();
+        varsMap.put("multiplier", 1);
+        Map<String, Object> params = new HashMap<>();
+        params.put("_agg", new ArrayList<>());
+        params.put("vars", varsMap);
+
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setQuery(matchAllQuery())
+                .addAggregation(
+                        scriptedMetric("scripted")
+                                .params(params)
+                                .mapScript(new Script("_agg.add(vars.multiplier)"))
+                                .reduceScript(
+                                        new Script(
+                                                "newaggregation = []; sum = 0;for (aggregation in _aggs) { for (a in aggregation) { sum += a} }; newaggregation.add(sum); return newaggregation")))
+                .execute().actionGet();
+        assertSearchResponse(response);
+        assertThat(response.getHits().getTotalHits(), equalTo(numDocs));
+
+        Aggregation aggregation = response.getAggregations().get("scripted");
+        assertThat(aggregation, notNullValue());
+        assertThat(aggregation, instanceOf(ScriptedMetric.class));
+        ScriptedMetric scriptedMetricAggregation = (ScriptedMetric) aggregation;
+        assertThat(scriptedMetricAggregation.getName(), equalTo("scripted"));
+        assertThat(scriptedMetricAggregation.aggregation(), notNullValue());
+        assertThat(scriptedMetricAggregation.aggregation(), instanceOf(ArrayList.class));
+        List<?> aggregationList = (List<?>) scriptedMetricAggregation.aggregation();
+        assertThat(aggregationList.size(), equalTo(1));
+        Object object = aggregationList.get(0);
+        assertThat(object, notNullValue());
+        assertThat(object, instanceOf(Number.class));
+        assertThat(((Number) object).longValue(), equalTo(numDocs));
+    }
+
+    @Test
+    public void testInitMapCombineReduce_withParamsAndReduceParams() {
+        Map<String, Object> varsMap = new HashMap<>();
+        varsMap.put("multiplier", 1);
+        Map<String, Object> params = new HashMap<>();
+        params.put("_agg", new ArrayList<>());
+        params.put("vars", varsMap);
+        Map<String, Object> reduceParams = new HashMap<>();
+        reduceParams.put("multiplier", 4);
+
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setQuery(matchAllQuery())
+                .addAggregation(
+                        scriptedMetric("scripted")
+                                .params(params)
+                                .initScript(new Script("vars.multiplier = 3"))
+                                .mapScript(new Script("_agg.add(vars.multiplier)"))
+                                .combineScript(
+                                        new Script(
+                                                "newaggregation = []; sum = 0;for (a in _agg) { sum += a}; newaggregation.add(sum); return newaggregation"))
+                                .reduceScript(
+                                        new Script(
+                                                "newaggregation = []; sum = 0;for (aggregation in _aggs) { for (a in aggregation) { sum += a} }; newaggregation.add(sum * multiplier); return newaggregation",
+                                                ScriptType.INLINE, null, reduceParams)))
+                .execute().actionGet();
+        assertSearchResponse(response);
+        assertThat(response.getHits().getTotalHits(), equalTo(numDocs));
+
+        Aggregation aggregation = response.getAggregations().get("scripted");
+        assertThat(aggregation, notNullValue());
+        assertThat(aggregation, instanceOf(ScriptedMetric.class));
+        ScriptedMetric scriptedMetricAggregation = (ScriptedMetric) aggregation;
+        assertThat(scriptedMetricAggregation.getName(), equalTo("scripted"));
+        assertThat(scriptedMetricAggregation.aggregation(), notNullValue());
+        assertThat(scriptedMetricAggregation.aggregation(), instanceOf(ArrayList.class));
+        List<?> aggregationList = (List<?>) scriptedMetricAggregation.aggregation();
+        assertThat(aggregationList.size(), equalTo(1));
+        Object object = aggregationList.get(0);
+        assertThat(object, notNullValue());
+        assertThat(object, instanceOf(Number.class));
+        assertThat(((Number) object).longValue(), equalTo(numDocs * 12));
+    }
+
+    @Test
+    public void testInitMapCombineReduce_withParams_Indexed() {
+        Map<String, Object> varsMap = new HashMap<>();
+        varsMap.put("multiplier", 1);
+        Map<String, Object> params = new HashMap<>();
+        params.put("_agg", new ArrayList<>());
+        params.put("vars", varsMap);
+
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setQuery(matchAllQuery())
+                .addAggregation(
+                        scriptedMetric("scripted").params(params)
+                                .initScript(new Script("initScript_indexed", ScriptType.INDEXED, null, null))
+                                .mapScript(new Script("mapScript_indexed", ScriptType.INDEXED, null, null))
+                                .combineScript(new Script("combineScript_indexed", ScriptType.INDEXED, null, null))
+                                .reduceScript(new Script("reduceScript_indexed", ScriptType.INDEXED, null, null))).execute().actionGet();
+        assertSearchResponse(response);
+        assertThat(response.getHits().getTotalHits(), equalTo(numDocs));
+
+        Aggregation aggregation = response.getAggregations().get("scripted");
+        assertThat(aggregation, notNullValue());
+        assertThat(aggregation, instanceOf(ScriptedMetric.class));
+        ScriptedMetric scriptedMetricAggregation = (ScriptedMetric) aggregation;
+        assertThat(scriptedMetricAggregation.getName(), equalTo("scripted"));
+        assertThat(scriptedMetricAggregation.aggregation(), notNullValue());
+        assertThat(scriptedMetricAggregation.aggregation(), instanceOf(ArrayList.class));
+        List<?> aggregationList = (List<?>) scriptedMetricAggregation.aggregation();
+        assertThat(aggregationList.size(), equalTo(1));
+        Object object = aggregationList.get(0);
+        assertThat(object, notNullValue());
+        assertThat(object, instanceOf(Number.class));
+        assertThat(((Number) object).longValue(), equalTo(numDocs * 3));
+    }
+
+    @Test
+    public void testInitMapCombineReduce_withParams_File() {
+
+        Map<String, Object> varsMap = new HashMap<>();
+        varsMap.put("multiplier", 1);
+        Map<String, Object> params = new HashMap<>();
+        params.put("_agg", new ArrayList<>());
+        params.put("vars", varsMap);
+
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setQuery(matchAllQuery())
+                .addAggregation(
+                        scriptedMetric("scripted").params(params).initScript(new Script("init_script", ScriptType.FILE, null, null))
+                                .mapScript(new Script("map_script", ScriptType.FILE, null, null))
+                                .combineScript(new Script("combine_script", ScriptType.FILE, null, null))
+                                .reduceScript(new Script("reduce_script", ScriptType.FILE, null, null))).execute().actionGet();
+        assertSearchResponse(response);
+        assertThat(response.getHits().getTotalHits(), equalTo(numDocs));
+
+        Aggregation aggregation = response.getAggregations().get("scripted");
+        assertThat(aggregation, notNullValue());
+        assertThat(aggregation, instanceOf(ScriptedMetric.class));
+        ScriptedMetric scriptedMetricAggregation = (ScriptedMetric) aggregation;
+        assertThat(scriptedMetricAggregation.getName(), equalTo("scripted"));
+        assertThat(scriptedMetricAggregation.aggregation(), notNullValue());
+        assertThat(scriptedMetricAggregation.aggregation(), instanceOf(ArrayList.class));
+        List<?> aggregationList = (List<?>) scriptedMetricAggregation.aggregation();
+        assertThat(aggregationList.size(), equalTo(1));
+        Object object = aggregationList.get(0);
+        assertThat(object, notNullValue());
+        assertThat(object, instanceOf(Number.class));
+        assertThat(((Number) object).longValue(), equalTo(numDocs * 3));
+    }
+
+    @Test
+    public void testInitMapCombineReduce_withParams_asSubAgg() {
+        Map<String, Object> varsMap = new HashMap<>();
+        varsMap.put("multiplier", 1);
+        Map<String, Object> params = new HashMap<>();
+        params.put("_agg", new ArrayList<>());
+        params.put("vars", varsMap);
+
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setQuery(matchAllQuery()).setSize(1000)
+                .addAggregation(
+                        histogram("histo")
+                                .field("l_value")
+                                .interval(1)
+                                .subAggregation(
+                                        scriptedMetric("scripted")
+                                                .params(params)
+                                                .initScript(new Script("vars.multiplier = 3"))
+                                                .mapScript(new Script("_agg.add(vars.multiplier)"))
+                                                .combineScript(
+                                                        new Script(
+                                                                "newaggregation = []; sum = 0;for (a in _agg) { sum += a}; newaggregation.add(sum); return newaggregation"))
+                                                .reduceScript(
+                                                        new Script(
+                                                                "newaggregation = []; sum = 0;for (aggregation in _aggs) { for (a in aggregation) { sum += a} }; newaggregation.add(sum); return newaggregation"))))
+                .execute().actionGet();
+        assertSearchResponse(response);
+        assertThat(response.getHits().getTotalHits(), equalTo(numDocs));
+        Aggregation aggregation = response.getAggregations().get("histo");
+        assertThat(aggregation, notNullValue());
+        assertThat(aggregation, instanceOf(Histogram.class));
+        Histogram histoAgg = (Histogram) aggregation;
+        assertThat(histoAgg.getName(), equalTo("histo"));
+        List<? extends Bucket> buckets = histoAgg.getBuckets();
+        assertThat(buckets, notNullValue());
+        for (Bucket b : buckets) {
+            assertThat(b, notNullValue());
+            assertThat(b.getDocCount(), equalTo(1l));
+            Aggregations subAggs = b.getAggregations();
+            assertThat(subAggs, notNullValue());
+            assertThat(subAggs.asList().size(), equalTo(1));
+            Aggregation subAgg = subAggs.get("scripted");
+            assertThat(subAgg, notNullValue());
+            assertThat(subAgg, instanceOf(ScriptedMetric.class));
+            ScriptedMetric scriptedMetricAggregation = (ScriptedMetric) subAgg;
+            assertThat(scriptedMetricAggregation.getName(), equalTo("scripted"));
+            assertThat(scriptedMetricAggregation.aggregation(), notNullValue());
+            assertThat(scriptedMetricAggregation.aggregation(), instanceOf(ArrayList.class));
+            List<?> aggregationList = (List<?>) scriptedMetricAggregation.aggregation();
+            assertThat(aggregationList.size(), equalTo(1));
+            Object object = aggregationList.get(0);
+            assertThat(object, notNullValue());
+            assertThat(object, instanceOf(Number.class));
+            assertThat(((Number) object).longValue(), equalTo(3l));
+        }
+    }
+
+    @Test
+    public void testEmptyAggregation() throws Exception {
+        Map<String, Object> varsMap = new HashMap<>();
+        varsMap.put("multiplier", 1);
+        Map<String, Object> params = new HashMap<>();
+        params.put("_agg", new ArrayList<>());
+        params.put("vars", varsMap);
+
+        SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx")
+                .setQuery(matchAllQuery())
+                .addAggregation(histogram("histo").field("value").interval(1l).minDocCount(0)
+                        .subAggregation(
+                        scriptedMetric("scripted")
+                                .params(params)
+                                                .initScript(new Script("vars.multiplier = 3"))
+                                                .mapScript(new Script("_agg.add(vars.multiplier)"))
+                                                .combineScript(
+                                                        new Script(
+                                                                "newaggregation = []; sum = 0;for (a in _agg) { sum += a}; newaggregation.add(sum); return newaggregation"))
+                                                .reduceScript(
+                                                        new Script(
+                                                                "newaggregation = []; sum = 0;for (aggregation in _aggs) { for (a in aggregation) { sum += a} }; newaggregation.add(sum); return newaggregation"))))
+                .execute().actionGet();
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(2l));
+        Histogram histo = searchResponse.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        Histogram.Bucket bucket = histo.getBuckets().get(1);
+        assertThat(bucket, notNullValue());
+
+        ScriptedMetric scriptedMetric = bucket.getAggregations().get("scripted");
+        assertThat(scriptedMetric, notNullValue());
+        assertThat(scriptedMetric.getName(), equalTo("scripted"));
+        assertThat(scriptedMetric.aggregation(), nullValue());
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testMapOldScriptAPI() {
+        SearchResponse response = client().prepareSearch("idx").setQuery(matchAllQuery())
+                .addAggregation(scriptedMetric("scripted").mapScript("_agg['count'] = 1")).execute().actionGet();
+        assertSearchResponse(response);
+        assertThat(response.getHits().getTotalHits(), equalTo(numDocs));
+
+        Aggregation aggregation = response.getAggregations().get("scripted");
+        assertThat(aggregation, notNullValue());
+        assertThat(aggregation, instanceOf(ScriptedMetric.class));
+        ScriptedMetric scriptedMetricAggregation = (ScriptedMetric) aggregation;
+        assertThat(scriptedMetricAggregation.getName(), equalTo("scripted"));
+        assertThat(scriptedMetricAggregation.aggregation(), notNullValue());
+        assertThat(scriptedMetricAggregation.aggregation(), instanceOf(ArrayList.class));
+        List<?> aggregationList = (List<?>) scriptedMetricAggregation.aggregation();
+        assertThat(aggregationList.size(), equalTo(getNumShards("idx").numPrimaries));
+        int numShardsRun = 0;
+        for (Object object : aggregationList) {
+            assertThat(object, notNullValue());
+            assertThat(object, instanceOf(Map.class));
+            Map<String, Object> map = (Map<String, Object>) object;
+            assertThat(map.size(), lessThanOrEqualTo(1));
+            if (map.size() == 1) {
+                assertThat(map.get("count"), notNullValue());
+                assertThat(map.get("count"), instanceOf(Number.class));
+                assertThat((Number) map.get("count"), equalTo((Number) 1));
+                numShardsRun++;
+            }
+        }
+        // We don't know how many shards will have documents but we need to make
+        // sure that at least one shard ran the map script
+        assertThat(numShardsRun, greaterThan(0));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testMap_withParamsOldScriptAPI() {
+        Map<String, Object> params = new HashMap<>();
+        params.put("_agg", new ArrayList<>());
+
+        SearchResponse response = client().prepareSearch("idx").setQuery(matchAllQuery())
+                .addAggregation(scriptedMetric("scripted").params(params).mapScript("_agg.add(1)")).execute().actionGet();
+        assertSearchResponse(response);
+        assertThat(response.getHits().getTotalHits(), equalTo(numDocs));
+
+        Aggregation aggregation = response.getAggregations().get("scripted");
+        assertThat(aggregation, notNullValue());
+        assertThat(aggregation, instanceOf(ScriptedMetric.class));
+        ScriptedMetric scriptedMetricAggregation = (ScriptedMetric) aggregation;
+        assertThat(scriptedMetricAggregation.getName(), equalTo("scripted"));
+        assertThat(scriptedMetricAggregation.aggregation(), notNullValue());
+        assertThat(scriptedMetricAggregation.aggregation(), instanceOf(ArrayList.class));
+        List<?> aggregationList = (List<?>) scriptedMetricAggregation.aggregation();
+        assertThat(aggregationList.size(), equalTo(getNumShards("idx").numPrimaries));
+        long totalCount = 0;
+        for (Object object : aggregationList) {
+            assertThat(object, notNullValue());
+            assertThat(object, instanceOf(List.class));
+            List<?> list = (List<?>) object;
+            for (Object o : list) {
+                assertThat(o, notNullValue());
+                assertThat(o, instanceOf(Number.class));
+                Number numberValue = (Number) o;
+                assertThat(numberValue, equalTo((Number) 1));
+                totalCount += numberValue.longValue();
+            }
+        }
+        assertThat(totalCount, equalTo(numDocs));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testInitMap_withParamsOldScriptAPI() {
+        Map<String, Object> varsMap = new HashMap<>();
+        varsMap.put("multiplier", 1);
+        Map<String, Object> params = new HashMap<>();
+        params.put("_agg", new ArrayList<>());
+        params.put("vars", varsMap);
+
+        SearchResponse response = client()
+                .prepareSearch("idx")
+                .setQuery(matchAllQuery())
+                .addAggregation(
+                        scriptedMetric("scripted").params(params).initScript("vars.multiplier = 3").mapScript("_agg.add(vars.multiplier)"))
+                .execute().actionGet();
+        assertSearchResponse(response);
+        assertThat(response.getHits().getTotalHits(), equalTo(numDocs));
+
+        Aggregation aggregation = response.getAggregations().get("scripted");
+        assertThat(aggregation, notNullValue());
+        assertThat(aggregation, instanceOf(ScriptedMetric.class));
+        ScriptedMetric scriptedMetricAggregation = (ScriptedMetric) aggregation;
+        assertThat(scriptedMetricAggregation.getName(), equalTo("scripted"));
+        assertThat(scriptedMetricAggregation.aggregation(), notNullValue());
+        assertThat(scriptedMetricAggregation.aggregation(), instanceOf(ArrayList.class));
+        List<?> aggregationList = (List<?>) scriptedMetricAggregation.aggregation();
+        assertThat(aggregationList.size(), equalTo(getNumShards("idx").numPrimaries));
+        long totalCount = 0;
+        for (Object object : aggregationList) {
+            assertThat(object, notNullValue());
+            assertThat(object, instanceOf(List.class));
+            List<?> list = (List<?>) object;
+            for (Object o : list) {
+                assertThat(o, notNullValue());
+                assertThat(o, instanceOf(Number.class));
+                Number numberValue = (Number) o;
+                assertThat(numberValue, equalTo((Number) 3));
+                totalCount += numberValue.longValue();
+            }
+        }
+        assertThat(totalCount, equalTo(numDocs * 3));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testMapCombine_withParamsOldScriptAPI() {
+        Map<String, Object> varsMap = new HashMap<>();
+        varsMap.put("multiplier", 1);
+        Map<String, Object> params = new HashMap<>();
+        params.put("_agg", new ArrayList<>());
+        params.put("vars", varsMap);
+
         SearchResponse response = client()
                 .prepareSearch("idx")
                 .setQuery(matchAllQuery())
@@ -279,8 +922,11 @@ public class ScriptedMetricTests extends ElasticsearchIntegrationTest {
         assertThat(totalCount, equalTo(numDocs));
     }
 
+    /*
+     * TODO Remove in 2.0
+     */
     @Test
-    public void testInitMapCombine_withParams() {
+    public void testInitMapCombine_withParamsOldScriptAPI() {
         Map<String, Object> varsMap = new HashMap<>();
         varsMap.put("multiplier", 1);
         Map<String, Object> params = new HashMap<>();
@@ -329,8 +975,11 @@ public class ScriptedMetricTests extends ElasticsearchIntegrationTest {
         assertThat(totalCount, equalTo(numDocs * 3));
     }
 
+    /*
+     * TODO Remove in 2.0
+     */
     @Test
-    public void testInitMapCombineReduce_withParams() {
+    public void testInitMapCombineReduce_withParamsOldScriptAPI() {
         Map<String, Object> varsMap = new HashMap<>();
         varsMap.put("multiplier", 1);
         Map<String, Object> params = new HashMap<>();
@@ -368,9 +1017,12 @@ public class ScriptedMetricTests extends ElasticsearchIntegrationTest {
         assertThat(((Number) object).longValue(), equalTo(numDocs * 3));
     }
 
+    /*
+     * TODO Remove in 2.0
+     */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @Test
-    public void testInitMapCombineReduce_getProperty() throws Exception {
+    public void testInitMapCombineReduce_getPropertyOldScriptAPI() throws Exception {
         Map<String, Object> varsMap = new HashMap<>();
         varsMap.put("multiplier", 1);
         Map<String, Object> params = new HashMap<>();
@@ -419,8 +1071,11 @@ public class ScriptedMetricTests extends ElasticsearchIntegrationTest {
 
     }
 
+    /*
+     * TODO Remove in 2.0
+     */
     @Test
-    public void testMapCombineReduce_withParams() {
+    public void testMapCombineReduce_withParamsOldScriptAPI() {
         Map<String, Object> varsMap = new HashMap<>();
         varsMap.put("multiplier", 1);
         Map<String, Object> params = new HashMap<>();
@@ -457,8 +1112,11 @@ public class ScriptedMetricTests extends ElasticsearchIntegrationTest {
         assertThat(((Number) object).longValue(), equalTo(numDocs));
     }
 
+    /*
+     * TODO Remove in 2.0
+     */
     @Test
-    public void testInitMapReduce_withParams() {
+    public void testInitMapReduce_withParamsOldScriptAPI() {
         Map<String, Object> varsMap = new HashMap<>();
         varsMap.put("multiplier", 1);
         Map<String, Object> params = new HashMap<>();
@@ -494,8 +1152,11 @@ public class ScriptedMetricTests extends ElasticsearchIntegrationTest {
         assertThat(((Number) object).longValue(), equalTo(numDocs * 3));
     }
 
+    /*
+     * TODO Remove in 2.0
+     */
     @Test
-    public void testMapReduce_withParams() {
+    public void testMapReduce_withParamsOldScriptAPI() {
         Map<String, Object> varsMap = new HashMap<>();
         varsMap.put("multiplier", 1);
         Map<String, Object> params = new HashMap<>();
@@ -530,8 +1191,11 @@ public class ScriptedMetricTests extends ElasticsearchIntegrationTest {
         assertThat(((Number) object).longValue(), equalTo(numDocs));
     }
 
+    /*
+     * TODO Remove in 2.0
+     */
     @Test
-    public void testInitMapCombineReduce_withParamsAndReduceParams() {
+    public void testInitMapCombineReduce_withParamsAndReduceParamsOldScriptAPI() {
         Map<String, Object> varsMap = new HashMap<>();
         varsMap.put("multiplier", 1);
         Map<String, Object> params = new HashMap<>();
@@ -572,8 +1236,11 @@ public class ScriptedMetricTests extends ElasticsearchIntegrationTest {
         assertThat(((Number) object).longValue(), equalTo(numDocs * 12));
     }
 
+    /*
+     * TODO Remove in 2.0
+     */
     @Test
-    public void testInitMapCombineReduce_withParams_Indexed() {
+    public void testInitMapCombineReduce_withParams_IndexedOldScriptAPI() {
         Map<String, Object> varsMap = new HashMap<>();
         varsMap.put("multiplier", 1);
         Map<String, Object> params = new HashMap<>();
@@ -584,9 +1251,8 @@ public class ScriptedMetricTests extends ElasticsearchIntegrationTest {
                 .prepareSearch("idx")
                 .setQuery(matchAllQuery())
                 .addAggregation(
-                        scriptedMetric("scripted").params(params).initScriptId("initScript_indexed")
-                                .mapScriptId("mapScript_indexed").combineScriptId("combineScript_indexed").reduceScriptId("reduceScript_indexed"))
-                .execute().actionGet();
+                        scriptedMetric("scripted").params(params).initScriptId("initScript_indexed").mapScriptId("mapScript_indexed")
+                                .combineScriptId("combineScript_indexed").reduceScriptId("reduceScript_indexed")).execute().actionGet();
         assertSearchResponse(response);
         assertThat(response.getHits().getTotalHits(), equalTo(numDocs));
 
@@ -605,8 +1271,11 @@ public class ScriptedMetricTests extends ElasticsearchIntegrationTest {
         assertThat(((Number) object).longValue(), equalTo(numDocs * 3));
     }
 
+    /*
+     * TODO Remove in 2.0
+     */
     @Test
-    public void testInitMapCombineReduce_withParams_File() {
+    public void testInitMapCombineReduce_withParams_FileOldScriptAPI() {
 
         Map<String, Object> varsMap = new HashMap<>();
         varsMap.put("multiplier", 1);
@@ -638,8 +1307,11 @@ public class ScriptedMetricTests extends ElasticsearchIntegrationTest {
         assertThat(((Number) object).longValue(), equalTo(numDocs * 3));
     }
 
+    /*
+     * TODO Remove in 2.0
+     */
     @Test
-    public void testInitMapCombineReduce_withParams_asSubAgg() {
+    public void testInitMapCombineReduce_withParams_asSubAggOldScriptAPI() {
         Map<String, Object> varsMap = new HashMap<>();
         varsMap.put("multiplier", 1);
         Map<String, Object> params = new HashMap<>();
@@ -648,7 +1320,8 @@ public class ScriptedMetricTests extends ElasticsearchIntegrationTest {
 
         SearchResponse response = client()
                 .prepareSearch("idx")
-                .setQuery(matchAllQuery()).setSize(1000)
+                .setQuery(matchAllQuery())
+                .setSize(1000)
                 .addAggregation(
                         histogram("histo")
                                 .field("l_value")
@@ -694,26 +1367,34 @@ public class ScriptedMetricTests extends ElasticsearchIntegrationTest {
         }
     }
 
+    /*
+     * TODO Remove in 2.0
+     */
     @Test
-    public void testEmptyAggregation() throws Exception {
+    public void testEmptyAggregationOldScriptAPI() throws Exception {
         Map<String, Object> varsMap = new HashMap<>();
         varsMap.put("multiplier", 1);
         Map<String, Object> params = new HashMap<>();
         params.put("_agg", new ArrayList<>());
         params.put("vars", varsMap);
 
-        SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx")
+        SearchResponse searchResponse = client()
+                .prepareSearch("empty_bucket_idx")
                 .setQuery(matchAllQuery())
-                .addAggregation(histogram("histo").field("value").interval(1l).minDocCount(0)
-                        .subAggregation(
-                        scriptedMetric("scripted")
-                                .params(params)
-                                .initScript("vars.multiplier = 3")
-                                .mapScript("_agg.add(vars.multiplier)")
-                                .combineScript(
-                                        "newaggregation = []; sum = 0;for (a in _agg) { sum += a}; newaggregation.add(sum); return newaggregation")
-                                .reduceScript(
-                                        "newaggregation = []; sum = 0;for (aggregation in _aggs) { for (a in aggregation) { sum += a} }; newaggregation.add(sum); return newaggregation")))
+                .addAggregation(
+                        histogram("histo")
+                                .field("value")
+                                .interval(1l)
+                                .minDocCount(0)
+                                .subAggregation(
+                                        scriptedMetric("scripted")
+                                                .params(params)
+                                                .initScript("vars.multiplier = 3")
+                                                .mapScript("_agg.add(vars.multiplier)")
+                                                .combineScript(
+                                                        "newaggregation = []; sum = 0;for (a in _agg) { sum += a}; newaggregation.add(sum); return newaggregation")
+                                                .reduceScript(
+                                                        "newaggregation = []; sum = 0;for (aggregation in _aggs) { for (a in aggregation) { sum += a} }; newaggregation.add(sum); return newaggregation")))
                 .execute().actionGet();
 
         assertThat(searchResponse.getHits().getTotalHits(), equalTo(2l));
diff --git a/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java b/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java
index 0d4329d5bb7..a7720c15bdc 100644
--- a/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java
+++ b/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java
@@ -44,6 +44,7 @@ import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.search.child.ScoreType;
 import org.elasticsearch.rest.RestStatus;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.bucket.filter.Filter;
 import org.elasticsearch.search.aggregations.bucket.global.Global;
@@ -771,7 +772,8 @@ public class SimpleChildQuerySearchTests extends ElasticsearchIntegrationTest {
                 .setQuery(
                         QueryBuilders.hasChildQuery(
                                 "child",
-                                QueryBuilders.functionScoreQuery(matchQuery("c_field2", 0), scriptFunction("doc['c_field1'].value"))
+                                QueryBuilders.functionScoreQuery(matchQuery("c_field2", 0),
+                                        scriptFunction(new Script("doc['c_field1'].value")))
                                         .boostMode(CombineFunction.REPLACE.getName())).scoreType("sum")).get();
 
         assertThat(response.getHits().totalHits(), equalTo(3l));
@@ -787,7 +789,8 @@ public class SimpleChildQuerySearchTests extends ElasticsearchIntegrationTest {
                 .setQuery(
                         QueryBuilders.hasChildQuery(
                                 "child",
-                                QueryBuilders.functionScoreQuery(matchQuery("c_field2", 0), scriptFunction("doc['c_field1'].value"))
+                                QueryBuilders.functionScoreQuery(matchQuery("c_field2", 0),
+                                        scriptFunction(new Script("doc['c_field1'].value")))
                                         .boostMode(CombineFunction.REPLACE.getName())).scoreType("max")).get();
 
         assertThat(response.getHits().totalHits(), equalTo(3l));
@@ -803,7 +806,8 @@ public class SimpleChildQuerySearchTests extends ElasticsearchIntegrationTest {
                 .setQuery(
                         QueryBuilders.hasChildQuery(
                                 "child",
-                                QueryBuilders.functionScoreQuery(matchQuery("c_field2", 0), scriptFunction("doc['c_field1'].value"))
+                                QueryBuilders.functionScoreQuery(matchQuery("c_field2", 0),
+                                        scriptFunction(new Script("doc['c_field1'].value")))
                                         .boostMode(CombineFunction.REPLACE.getName())).scoreType("avg")).get();
 
         assertThat(response.getHits().totalHits(), equalTo(3l));
@@ -819,7 +823,8 @@ public class SimpleChildQuerySearchTests extends ElasticsearchIntegrationTest {
                 .setQuery(
                         QueryBuilders.hasParentQuery(
                                 "parent",
-                                QueryBuilders.functionScoreQuery(matchQuery("p_field1", "p_value3"), scriptFunction("doc['p_field2'].value"))
+                                QueryBuilders.functionScoreQuery(matchQuery("p_field1", "p_value3"),
+                                        scriptFunction(new Script("doc['p_field2'].value")))
                                         .boostMode(CombineFunction.REPLACE.getName())).scoreType("score"))
                 .addSort(SortBuilders.fieldSort("c_field3")).addSort(SortBuilders.scoreSort()).get();
 
diff --git a/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java b/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java
index a7110a7745b..f9c02f52299 100644
--- a/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java
+++ b/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java
@@ -33,6 +33,8 @@ import org.elasticsearch.common.joda.Joda;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.rest.RestStatus;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHitField;
 import org.elasticsearch.search.sort.SortOrder;
@@ -155,9 +157,9 @@ public class SearchFieldsTests extends ElasticsearchIntegrationTest {
         SearchResponse response = client().prepareSearch()
                 .setQuery(matchAllQuery())
                 .addSort("num1", SortOrder.ASC)
-                .addScriptField("sNum1", "doc['num1'].value")
-                .addScriptField("sNum1_field", "_fields['num1'].value")
-                .addScriptField("date1", "doc['date'].date.millis")
+                .addScriptField("sNum1", new Script("doc['num1'].value"))
+                .addScriptField("sNum1_field", new Script("_fields['num1'].value"))
+                .addScriptField("date1", new Script("doc['date'].date.millis"))
                 .execute().actionGet();
 
         assertNoFailures(response);
@@ -185,7 +187,7 @@ public class SearchFieldsTests extends ElasticsearchIntegrationTest {
         response = client().prepareSearch()
                 .setQuery(matchAllQuery())
                 .addSort("num1", SortOrder.ASC)
-                .addScriptField("sNum1", "doc['num1'].value * factor", params)
+                .addScriptField("sNum1", new Script("doc['num1'].value * factor", ScriptType.INLINE, null, params))
                 .execute().actionGet();
 
         assertThat(response.getHits().totalHits(), equalTo(3l));
@@ -215,7 +217,7 @@ public class SearchFieldsTests extends ElasticsearchIntegrationTest {
 
         SearchResponse response = client().prepareSearch()
                 .setQuery(matchAllQuery()).addSort("num1", SortOrder.ASC).setSize(numDocs)
-                .addScriptField("uid", "_fields._uid.value").get();
+                .addScriptField("uid", new Script("_fields._uid.value")).get();
 
         assertNoFailures(response);
 
@@ -228,7 +230,7 @@ public class SearchFieldsTests extends ElasticsearchIntegrationTest {
 
         response = client().prepareSearch()
                 .setQuery(matchAllQuery()).addSort("num1", SortOrder.ASC).setSize(numDocs)
-                .addScriptField("id", "_fields._id.value").get();
+                .addScriptField("id", new Script("_fields._id.value")).get();
 
         assertNoFailures(response);
 
@@ -241,7 +243,7 @@ public class SearchFieldsTests extends ElasticsearchIntegrationTest {
 
         response = client().prepareSearch()
                 .setQuery(matchAllQuery()).addSort("num1", SortOrder.ASC).setSize(numDocs)
-                .addScriptField("type", "_fields._type.value").get();
+                .addScriptField("type", new Script("_fields._type.value")).get();
 
         assertNoFailures(response);
 
@@ -254,9 +256,8 @@ public class SearchFieldsTests extends ElasticsearchIntegrationTest {
 
         response = client().prepareSearch()
                 .setQuery(matchAllQuery()).addSort("num1", SortOrder.ASC).setSize(numDocs)
-                .addScriptField("id", "_fields._id.value")
-                .addScriptField("uid", "_fields._uid.value")
-                .addScriptField("type", "_fields._type.value").get();
+                .addScriptField("id", new Script("_fields._id.value")).addScriptField("uid", new Script("_fields._uid.value"))
+                .addScriptField("type", new Script("_fields._type.value")).get();
 
         assertNoFailures(response);
 
@@ -286,11 +287,9 @@ public class SearchFieldsTests extends ElasticsearchIntegrationTest {
 
         SearchResponse response = client().prepareSearch()
                 .setQuery(matchAllQuery())
-                .addScriptField("s_obj1", "_source.obj1")
-                .addScriptField("s_obj1_test", "_source.obj1.test")
-                .addScriptField("s_obj2", "_source.obj2")
-                .addScriptField("s_obj2_arr2", "_source.obj2.arr2")
-                .addScriptField("s_arr3", "_source.arr3")
+.addScriptField("s_obj1", new Script("_source.obj1"))
+                .addScriptField("s_obj1_test", new Script("_source.obj1.test")).addScriptField("s_obj2", new Script("_source.obj2"))
+                .addScriptField("s_obj2_arr2", new Script("_source.obj2.arr2")).addScriptField("s_arr3", new Script("_source.arr3"))
                 .execute().actionGet();
 
         assertThat("Failures " + Arrays.toString(response.getShardFailures()), response.getShardFailures().length, equalTo(0));
@@ -595,6 +594,221 @@ public class SearchFieldsTests extends ElasticsearchIntegrationTest {
         indexRandom(true, reqs);
         ensureSearchable();
         SearchRequestBuilder req = client().prepareSearch("index");
+        for (String field : Arrays.asList("s", "ms", "l", "ml", "d", "md")) {
+            req.addScriptField(field, new Script("doc['" + field + "'].values"));
+        }
+        SearchResponse resp = req.get();
+        assertSearchResponse(resp);
+        for (SearchHit hit : resp.getHits().getHits()) {
+            final int id = Integer.parseInt(hit.getId());
+            Map<String, SearchHitField> fields = hit.getFields();
+            assertThat(fields.get("s").getValues(), equalTo(Collections.<Object> singletonList(Integer.toString(id))));
+            assertThat(fields.get("l").getValues(), equalTo(Collections.<Object> singletonList((long) id)));
+            assertThat(fields.get("d").getValues(), equalTo(Collections.<Object> singletonList((double) id)));
+            assertThat(fields.get("ms").getValues(), equalTo(Arrays.<Object> asList(Integer.toString(id), Integer.toString(id + 1))));
+            assertThat(fields.get("ml").getValues(), equalTo(Arrays.<Object> asList((long) id, id + 1L)));
+            assertThat(fields.get("md").getValues(), equalTo(Arrays.<Object> asList((double) id, id + 1d)));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testScriptDocAndFieldsOldScriptAPI() throws Exception {
+        createIndex("test");
+        client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet();
+
+        String mapping = XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("properties").startObject("num1")
+                .field("type", "double").field("store", "yes").endObject().endObject().endObject().endObject().string();
+
+        client().admin().indices().preparePutMapping().setType("type1").setSource(mapping).execute().actionGet();
+
+        client().prepareIndex("test", "type1", "1")
+                .setSource(
+                        jsonBuilder().startObject().field("test", "value beck").field("num1", 1.0f).field("date", "1970-01-01T00:00:00")
+                                .endObject()).execute().actionGet();
+        client().admin().indices().prepareFlush().execute().actionGet();
+        client().prepareIndex("test", "type1", "2")
+                .setSource(
+                        jsonBuilder().startObject().field("test", "value beck").field("num1", 2.0f).field("date", "1970-01-01T00:00:25")
+                                .endObject()).execute().actionGet();
+        client().admin().indices().prepareFlush().execute().actionGet();
+        client().prepareIndex("test", "type1", "3")
+                .setSource(
+                        jsonBuilder().startObject().field("test", "value beck").field("num1", 3.0f).field("date", "1970-01-01T00:02:00")
+                                .endObject()).execute().actionGet();
+        client().admin().indices().refresh(refreshRequest()).actionGet();
+
+        logger.info("running doc['num1'].value");
+        SearchResponse response = client().prepareSearch().setQuery(matchAllQuery()).addSort("num1", SortOrder.ASC)
+                .addScriptField("sNum1", "doc['num1'].value").addScriptField("sNum1_field", "_fields['num1'].value")
+                .addScriptField("date1", "doc['date'].date.millis").execute().actionGet();
+
+        assertNoFailures(response);
+
+        assertThat(response.getHits().totalHits(), equalTo(3l));
+        assertThat(response.getHits().getAt(0).isSourceEmpty(), equalTo(true));
+        assertThat(response.getHits().getAt(0).id(), equalTo("1"));
+        assertThat(response.getHits().getAt(0).fields().size(), equalTo(3));
+        assertThat((Double) response.getHits().getAt(0).fields().get("sNum1").values().get(0), equalTo(1.0));
+        assertThat((Double) response.getHits().getAt(0).fields().get("sNum1_field").values().get(0), equalTo(1.0));
+        assertThat((Long) response.getHits().getAt(0).fields().get("date1").values().get(0), equalTo(0l));
+        assertThat(response.getHits().getAt(1).id(), equalTo("2"));
+        assertThat(response.getHits().getAt(1).fields().size(), equalTo(3));
+        assertThat((Double) response.getHits().getAt(1).fields().get("sNum1").values().get(0), equalTo(2.0));
+        assertThat((Double) response.getHits().getAt(1).fields().get("sNum1_field").values().get(0), equalTo(2.0));
+        assertThat((Long) response.getHits().getAt(1).fields().get("date1").values().get(0), equalTo(25000l));
+        assertThat(response.getHits().getAt(2).id(), equalTo("3"));
+        assertThat(response.getHits().getAt(2).fields().size(), equalTo(3));
+        assertThat((Double) response.getHits().getAt(2).fields().get("sNum1").values().get(0), equalTo(3.0));
+        assertThat((Double) response.getHits().getAt(2).fields().get("sNum1_field").values().get(0), equalTo(3.0));
+        assertThat((Long) response.getHits().getAt(2).fields().get("date1").values().get(0), equalTo(120000l));
+
+        logger.info("running doc['num1'].value * factor");
+        Map<String, Object> params = MapBuilder.<String, Object> newMapBuilder().put("factor", 2.0).map();
+        response = client().prepareSearch().setQuery(matchAllQuery()).addSort("num1", SortOrder.ASC)
+                .addScriptField("sNum1", "doc['num1'].value * factor", params).execute().actionGet();
+
+        assertThat(response.getHits().totalHits(), equalTo(3l));
+        assertThat(response.getHits().getAt(0).id(), equalTo("1"));
+        assertThat(response.getHits().getAt(0).fields().size(), equalTo(1));
+        assertThat((Double) response.getHits().getAt(0).fields().get("sNum1").values().get(0), equalTo(2.0));
+        assertThat(response.getHits().getAt(1).id(), equalTo("2"));
+        assertThat(response.getHits().getAt(1).fields().size(), equalTo(1));
+        assertThat((Double) response.getHits().getAt(1).fields().get("sNum1").values().get(0), equalTo(4.0));
+        assertThat(response.getHits().getAt(2).id(), equalTo("3"));
+        assertThat(response.getHits().getAt(2).fields().size(), equalTo(1));
+        assertThat((Double) response.getHits().getAt(2).fields().get("sNum1").values().get(0), equalTo(6.0));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testUidBasedScriptFieldsOldScriptAPI() throws Exception {
+        prepareCreate("test").addMapping("type1", "num1", "type=long").execute().actionGet();
+        ensureYellow();
+
+        int numDocs = randomIntBetween(1, 30);
+        IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[numDocs];
+        for (int i = 0; i < numDocs; i++) {
+            indexRequestBuilders[i] = client().prepareIndex("test", "type1", Integer.toString(i)).setSource(
+                    jsonBuilder().startObject().field("num1", i).endObject());
+        }
+        indexRandom(true, indexRequestBuilders);
+
+        SearchResponse response = client().prepareSearch().setQuery(matchAllQuery()).addSort("num1", SortOrder.ASC).setSize(numDocs)
+                .addScriptField("uid", "_fields._uid.value").get();
+
+        assertNoFailures(response);
+
+        assertThat(response.getHits().totalHits(), equalTo((long) numDocs));
+        for (int i = 0; i < numDocs; i++) {
+            assertThat(response.getHits().getAt(i).id(), equalTo(Integer.toString(i)));
+            assertThat(response.getHits().getAt(i).fields().size(), equalTo(1));
+            assertThat((String) response.getHits().getAt(i).fields().get("uid").value(), equalTo("type1#" + Integer.toString(i)));
+        }
+
+        response = client().prepareSearch().setQuery(matchAllQuery()).addSort("num1", SortOrder.ASC).setSize(numDocs)
+                .addScriptField("id", "_fields._id.value").get();
+
+        assertNoFailures(response);
+
+        assertThat(response.getHits().totalHits(), equalTo((long) numDocs));
+        for (int i = 0; i < numDocs; i++) {
+            assertThat(response.getHits().getAt(i).id(), equalTo(Integer.toString(i)));
+            assertThat(response.getHits().getAt(i).fields().size(), equalTo(1));
+            assertThat((String) response.getHits().getAt(i).fields().get("id").value(), equalTo(Integer.toString(i)));
+        }
+
+        response = client().prepareSearch().setQuery(matchAllQuery()).addSort("num1", SortOrder.ASC).setSize(numDocs)
+                .addScriptField("type", "_fields._type.value").get();
+
+        assertNoFailures(response);
+
+        assertThat(response.getHits().totalHits(), equalTo((long) numDocs));
+        for (int i = 0; i < numDocs; i++) {
+            assertThat(response.getHits().getAt(i).id(), equalTo(Integer.toString(i)));
+            assertThat(response.getHits().getAt(i).fields().size(), equalTo(1));
+            assertThat((String) response.getHits().getAt(i).fields().get("type").value(), equalTo("type1"));
+        }
+
+        response = client().prepareSearch().setQuery(matchAllQuery()).addSort("num1", SortOrder.ASC).setSize(numDocs)
+                .addScriptField("id", "_fields._id.value").addScriptField("uid", "_fields._uid.value")
+                .addScriptField("type", "_fields._type.value").get();
+
+        assertNoFailures(response);
+
+        assertThat(response.getHits().totalHits(), equalTo((long) numDocs));
+        for (int i = 0; i < numDocs; i++) {
+            assertThat(response.getHits().getAt(i).id(), equalTo(Integer.toString(i)));
+            assertThat(response.getHits().getAt(i).fields().size(), equalTo(3));
+            assertThat((String) response.getHits().getAt(i).fields().get("uid").value(), equalTo("type1#" + Integer.toString(i)));
+            assertThat((String) response.getHits().getAt(i).fields().get("type").value(), equalTo("type1"));
+            assertThat((String) response.getHits().getAt(i).fields().get("id").value(), equalTo(Integer.toString(i)));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testScriptFieldUsingSourceOldScriptAPI() throws Exception {
+        createIndex("test");
+        client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().execute().actionGet();
+
+        client().prepareIndex("test", "type1", "1")
+                .setSource(
+                        jsonBuilder().startObject().startObject("obj1").field("test", "something").endObject().startObject("obj2")
+                                .startArray("arr2").value("arr_value1").value("arr_value2").endArray().endObject().startArray("arr3")
+                                .startObject().field("arr3_field1", "arr3_value1").endObject().endArray().endObject()).execute()
+                .actionGet();
+        client().admin().indices().refresh(refreshRequest()).actionGet();
+
+        SearchResponse response = client().prepareSearch().setQuery(matchAllQuery()).addScriptField("s_obj1", "_source.obj1")
+                .addScriptField("s_obj1_test", "_source.obj1.test").addScriptField("s_obj2", "_source.obj2")
+                .addScriptField("s_obj2_arr2", "_source.obj2.arr2").addScriptField("s_arr3", "_source.arr3").execute().actionGet();
+
+        assertThat("Failures " + Arrays.toString(response.getShardFailures()), response.getShardFailures().length, equalTo(0));
+
+        assertThat(response.getHits().getAt(0).field("s_obj1_test").value().toString(), equalTo("something"));
+
+        Map<String, Object> sObj1 = response.getHits().getAt(0).field("s_obj1").value();
+        assertThat(sObj1.get("test").toString(), equalTo("something"));
+        assertThat(response.getHits().getAt(0).field("s_obj1_test").value().toString(), equalTo("something"));
+
+        Map<String, Object> sObj2 = response.getHits().getAt(0).field("s_obj2").value();
+        List sObj2Arr2 = (List) sObj2.get("arr2");
+        assertThat(sObj2Arr2.size(), equalTo(2));
+        assertThat(sObj2Arr2.get(0).toString(), equalTo("arr_value1"));
+        assertThat(sObj2Arr2.get(1).toString(), equalTo("arr_value2"));
+
+        sObj2Arr2 = response.getHits().getAt(0).field("s_obj2_arr2").values();
+        assertThat(sObj2Arr2.size(), equalTo(2));
+        assertThat(sObj2Arr2.get(0).toString(), equalTo("arr_value1"));
+        assertThat(sObj2Arr2.get(1).toString(), equalTo("arr_value2"));
+
+        List sObj2Arr3 = response.getHits().getAt(0).field("s_arr3").values();
+        assertThat(((Map) sObj2Arr3.get(0)).get("arr3_field1").toString(), equalTo("arr3_value1"));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    public void testScriptFieldsOldScriptAPI() throws Exception {
+        assertAcked(prepareCreate("index").addMapping("type", "s", "type=string,index=not_analyzed", "l", "type=long", "d", "type=double",
+                "ms", "type=string,index=not_analyzed", "ml", "type=long", "md", "type=double").get());
+        final int numDocs = randomIntBetween(3, 8);
+        List<IndexRequestBuilder> reqs = new ArrayList<>();
+        for (int i = 0; i < numDocs; ++i) {
+            reqs.add(client().prepareIndex("index", "type", Integer.toString(i)).setSource("s", Integer.toString(i), "ms",
+                    new String[] { Integer.toString(i), Integer.toString(i + 1) }, "l", i, "ml", new long[] { i, i + 1 }, "d", i, "md",
+                    new double[] { i, i + 1 }));
+        }
+        indexRandom(true, reqs);
+        ensureSearchable();
+        SearchRequestBuilder req = client().prepareSearch("index");
         for (String field : Arrays.asList("s", "ms", "l", "ml", "d", "md")) {
             req.addScriptField(field, "doc['" + field + "'].values");
         }
@@ -603,12 +817,12 @@ public class SearchFieldsTests extends ElasticsearchIntegrationTest {
         for (SearchHit hit : resp.getHits().getHits()) {
             final int id = Integer.parseInt(hit.getId());
             Map<String, SearchHitField> fields = hit.getFields();
-            assertThat(fields.get("s").getValues(), equalTo(Collections.<Object>singletonList(Integer.toString(id))));
-            assertThat(fields.get("l").getValues(), equalTo(Collections.<Object>singletonList((long) id)));
-            assertThat(fields.get("d").getValues(), equalTo(Collections.<Object>singletonList((double) id)));
-            assertThat(fields.get("ms").getValues(), equalTo(Arrays.<Object>asList(Integer.toString(id), Integer.toString(id + 1))));
-            assertThat(fields.get("ml").getValues(), equalTo(Arrays.<Object>asList((long) id, id+1L)));
-            assertThat(fields.get("md").getValues(), equalTo(Arrays.<Object>asList((double) id, id+1d)));
+            assertThat(fields.get("s").getValues(), equalTo(Collections.<Object> singletonList(Integer.toString(id))));
+            assertThat(fields.get("l").getValues(), equalTo(Collections.<Object> singletonList((long) id)));
+            assertThat(fields.get("d").getValues(), equalTo(Collections.<Object> singletonList((double) id)));
+            assertThat(fields.get("ms").getValues(), equalTo(Arrays.<Object> asList(Integer.toString(id), Integer.toString(id + 1))));
+            assertThat(fields.get("ml").getValues(), equalTo(Arrays.<Object> asList((long) id, id + 1L)));
+            assertThat(fields.get("md").getValues(), equalTo(Arrays.<Object> asList((double) id, id + 1d)));
         }
     }
 }
diff --git a/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptTests.java b/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptTests.java
index 82567eeb5c8..3f10ce389af 100644
--- a/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptTests.java
+++ b/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptTests.java
@@ -30,9 +30,13 @@ import org.elasticsearch.script.AbstractDoubleSearchScript;
 import org.elasticsearch.script.ExecutableScript;
 import org.elasticsearch.script.ExplainableSearchScript;
 import org.elasticsearch.script.NativeScriptFactory;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
+import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
+import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
 import org.elasticsearch.test.hamcrest.ElasticsearchAssertions;
 import org.junit.Test;
 
@@ -49,8 +53,6 @@ import static org.elasticsearch.index.query.QueryBuilders.functionScoreQuery;
 import static org.elasticsearch.index.query.QueryBuilders.termQuery;
 import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.scriptFunction;
 import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource;
-import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
-import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -77,7 +79,10 @@ public class ExplainableScriptTests extends ElasticsearchIntegrationTest {
         client().admin().indices().prepareRefresh().execute().actionGet();
         ensureYellow();
         SearchResponse response = client().search(searchRequest().searchType(SearchType.QUERY_THEN_FETCH).source(
-                searchSource().explain(true).query(functionScoreQuery(termQuery("text", "text")).add(scriptFunction("native_explainable_script", "native")).boostMode("replace")))).actionGet();
+                        searchSource().explain(true).query(
+                                functionScoreQuery(termQuery("text", "text")).add(
+                                        scriptFunction(new Script("native_explainable_script", ScriptType.INLINE, "native", null)))
+                                        .boostMode("replace")))).actionGet();
 
         ElasticsearchAssertions.assertNoFailures(response);
         SearchHits hits = response.getHits();
diff --git a/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreTests.java b/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreTests.java
index 45b7e384a6d..0ff64ad876b 100644
--- a/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreTests.java
+++ b/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreTests.java
@@ -30,6 +30,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
 import org.elasticsearch.index.query.functionscore.weight.WeightBuilder;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.junit.Test;
@@ -174,21 +175,20 @@ public class FunctionScoreTests extends ElasticsearchIntegrationTest {
                                 functionScoreQuery(constantScoreQuery(termQuery(TEXT_FIELD, "value")))
                                         .add(gaussDecayFunction(GEO_POINT_FIELD, new GeoPoint(10, 20), "1000km"))
                                         .add(fieldValueFactorFunction(DOUBLE_FIELD).modifier(FieldValueFactorFunction.Modifier.LN).setWeight(2))
-                                        .add(scriptFunction("_index['" + TEXT_FIELD + "']['value'].tf()").setWeight(3))
-                        ).explain(true))).actionGet();
+                                        .add(scriptFunction(new Script("_index['" + TEXT_FIELD + "']['value'].tf()")).setWeight(3)))
+                                .explain(true))).actionGet();
 
-        assertThat(responseWithWeights.getHits().getAt(0).getExplanation().toString(),
-                equalTo("6.0 = function score, product of:\n  1.0 = ConstantScore(text_field:value), product of:\n    1.0 = boost\n    1.0 = queryNorm\n  6.0 = min of:\n    6.0 = function score, score mode [multiply]\n      1.0 = function score, product of:\n        1.0 = match filter: *:*\n        1.0 = Function for field geo_point_field:\n          1.0 = exp(-0.5*pow(MIN of: [Math.max(arcDistance([10.0, 20.0](=doc value),[10.0, 20.0](=origin)) - 0.0(=offset), 0)],2.0)/7.213475204444817E11)\n      2.0 = function score, product of:\n        1.0 = match filter: *:*\n        2.0 = product of:\n          1.0 = field value function: ln(doc['double_field'].value * factor=1.0)\n          2.0 = weight\n      3.0 = function score, product of:\n        1.0 = match filter: *:*\n        3.0 = product of:\n          1.0 = script score function, computed with script:\"_index['text_field']['value'].tf()\n            1.0 = _score: \n              1.0 = ConstantScore(text_field:value), product of:\n                1.0 = boost\n                1.0 = queryNorm\n          3.0 = weight\n    3.4028235E38 = maxBoost\n  1.0 = queryBoost\n")
-        );
+        assertThat(
+                responseWithWeights.getHits().getAt(0).getExplanation().toString(),
+                equalTo("6.0 = function score, product of:\n  1.0 = ConstantScore(text_field:value), product of:\n    1.0 = boost\n    1.0 = queryNorm\n  6.0 = min of:\n    6.0 = function score, score mode [multiply]\n      1.0 = function score, product of:\n        1.0 = match filter: *:*\n        1.0 = Function for field geo_point_field:\n          1.0 = exp(-0.5*pow(MIN of: [Math.max(arcDistance([10.0, 20.0](=doc value),[10.0, 20.0](=origin)) - 0.0(=offset), 0)],2.0)/7.213475204444817E11)\n      2.0 = function score, product of:\n        1.0 = match filter: *:*\n        2.0 = product of:\n          1.0 = field value function: ln(doc['double_field'].value * factor=1.0)\n          2.0 = weight\n      3.0 = function score, product of:\n        1.0 = match filter: *:*\n        3.0 = product of:\n          1.0 = script score function, computed with script:\"[script: _index['text_field']['value'].tf(), type: inline, lang: null, params: {}]\" and parameters: \n{}\n            1.0 = _score: \n              1.0 = ConstantScore(text_field:value), product of:\n                1.0 = boost\n                1.0 = queryNorm\n          3.0 = weight\n    3.4028235E38 = maxBoost\n  1.0 = queryBoost\n"));
         responseWithWeights = client().search(
                 searchRequest().source(
                         searchSource().query(
-                                functionScoreQuery(constantScoreQuery(termQuery(TEXT_FIELD, "value")))
-                                        .add(weightFactorFunction(4.0f))
-                        ).explain(true))).actionGet();
-        assertThat(responseWithWeights.getHits().getAt(0).getExplanation().toString(),
-                equalTo("4.0 = function score, product of:\n  1.0 = ConstantScore(text_field:value), product of:\n    1.0 = boost\n    1.0 = queryNorm\n  4.0 = min of:\n    4.0 = product of:\n      1.0 = constant score 1.0 - no function provided\n      4.0 = weight\n    3.4028235E38 = maxBoost\n  1.0 = queryBoost\n")
-        );
+                                functionScoreQuery(constantScoreQuery(termQuery(TEXT_FIELD, "value"))).add(weightFactorFunction(4.0f)))
+                                .explain(true))).actionGet();
+        assertThat(
+                responseWithWeights.getHits().getAt(0).getExplanation().toString(),
+                equalTo("4.0 = function score, product of:\n  1.0 = ConstantScore(text_field:value), product of:\n    1.0 = boost\n    1.0 = queryNorm\n  4.0 = min of:\n    4.0 = product of:\n      1.0 = constant score 1.0 - no function provided\n      4.0 = weight\n    3.4028235E38 = maxBoost\n  1.0 = queryBoost\n"));
 
     }
 
@@ -207,16 +207,16 @@ public class FunctionScoreTests extends ElasticsearchIntegrationTest {
                                 functionScoreQuery(constantScoreQuery(termQuery(TEXT_FIELD, "value")))
                                         .add(gaussDecayFunction(GEO_POINT_FIELD, new GeoPoint(10, 20), "1000km"))
                                         .add(fieldValueFactorFunction(DOUBLE_FIELD).modifier(FieldValueFactorFunction.Modifier.LN))
-                                        .add(scriptFunction("_index['" + TEXT_FIELD + "']['value'].tf()"))
-                        ))).actionGet();
+                                        .add(scriptFunction(new Script("_index['" + TEXT_FIELD + "']['value'].tf()")))))).actionGet();
         SearchResponse responseWithWeights = client().search(
                 searchRequest().source(
                         searchSource().query(
                                 functionScoreQuery(constantScoreQuery(termQuery(TEXT_FIELD, "value")))
                                         .add(gaussDecayFunction(GEO_POINT_FIELD, new GeoPoint(10, 20), "1000km").setWeight(2))
-                                        .add(fieldValueFactorFunction(DOUBLE_FIELD).modifier(FieldValueFactorFunction.Modifier.LN).setWeight(2))
-                                        .add(scriptFunction("_index['" + TEXT_FIELD + "']['value'].tf()").setWeight(2))
-                        ))).actionGet();
+                                        .add(fieldValueFactorFunction(DOUBLE_FIELD).modifier(FieldValueFactorFunction.Modifier.LN)
+                                                .setWeight(2))
+                                        .add(scriptFunction(new Script("_index['" + TEXT_FIELD + "']['value'].tf()")).setWeight(2)))))
+                .actionGet();
 
         assertSearchResponse(response);
         assertThat(response.getHits().getAt(0).getScore(), is(1.0f));
@@ -355,7 +355,7 @@ public class FunctionScoreTests extends ElasticsearchIntegrationTest {
         builders[0] = gaussDecayFunction(GEO_POINT_FIELD, new GeoPoint(10, 20), "1000km");
         builders[1] = randomFunction(10);
         builders[2] = fieldValueFactorFunction(DOUBLE_FIELD).modifier(FieldValueFactorFunction.Modifier.LN);
-        builders[3] = scriptFunction("_index['" + TEXT_FIELD + "']['value'].tf()");
+        builders[3] = scriptFunction(new Script("_index['" + TEXT_FIELD + "']['value'].tf()"));
         return builders;
     }
 
@@ -420,9 +420,9 @@ public class FunctionScoreTests extends ElasticsearchIntegrationTest {
                         searchSource().query(
                                 functionScoreQuery(
                                         functionScoreQuery(
-                                                functionScoreQuery().add(scriptFunction("1")))
-                                                .add(scriptFunction("_score.doubleValue()")))
-                                        .add(scriptFunction("_score.doubleValue()")
+functionScoreQuery().add(scriptFunction(new Script("1")))).add(
+                                                scriptFunction(new Script("_score.doubleValue()")))).add(
+                                        scriptFunction(new Script("_score.doubleValue()"))
                                         )
                         )
                 )
@@ -439,11 +439,8 @@ public class FunctionScoreTests extends ElasticsearchIntegrationTest {
         refresh();
         SearchResponse response = client().search(
                 searchRequest().source(
-                        searchSource().query(
-                                functionScoreQuery()
-                                        .add(scriptFunction("_score.doubleValue()")
-                                        )
-                        ).aggregation(terms("score_agg").script("_score.doubleValue()"))
+                        searchSource().query(functionScoreQuery().add(scriptFunction(new Script("_score.doubleValue()")))).aggregation(
+                                terms("score_agg").script(new Script("_score.doubleValue()")))
                 )
         ).actionGet();
         assertSearchResponse(response);
@@ -459,7 +456,9 @@ public class FunctionScoreTests extends ElasticsearchIntegrationTest {
         float score = randomFloat();
         float minScore = randomFloat();
         SearchResponse searchResponse = client().search(
-                searchRequest().source(searchSource().query(functionScoreQuery().add(scriptFunction(Float.toString(score))).setMinScore(minScore)))
+                searchRequest().source(
+                        searchSource().query(
+                                functionScoreQuery().add(scriptFunction(new Script(Float.toString(score)))).setMinScore(minScore)))
         ).actionGet();
         if (score < minScore) {
             assertThat(searchResponse.getHits().getTotalHits(), is(0l));
@@ -469,8 +468,8 @@ public class FunctionScoreTests extends ElasticsearchIntegrationTest {
 
         searchResponse = client().search(
                 searchRequest().source(searchSource().query(functionScoreQuery()
-                        .add(scriptFunction(Float.toString(score)))
-                        .add(scriptFunction(Float.toString(score)))
+.add(scriptFunction(new Script(Float.toString(score))))
+                                        .add(scriptFunction(new Script(Float.toString(score))))
                         .scoreMode("avg").setMinScore(minScore)))
         ).actionGet();
         if (score < minScore) {
@@ -491,7 +490,7 @@ public class FunctionScoreTests extends ElasticsearchIntegrationTest {
         }
         indexRandom(true, docs);
         ensureYellow();
-        String script = "return (doc['num'].value)";
+        Script script = new Script("return (doc['num'].value)");
         int numMatchingDocs = numDocs + scoreOffset - minScore;
         if (numMatchingDocs < 0) {
             numMatchingDocs = 0;
@@ -558,5 +557,245 @@ public class FunctionScoreTests extends ElasticsearchIntegrationTest {
         assertSearchResponse(response);
         assertThat(response.getHits().totalHits(), equalTo(0l));
     }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testExplainOldScriptAPI() throws IOException, ExecutionException, InterruptedException {
+        assertAcked(prepareCreate(INDEX).addMapping(TYPE, MAPPING_WITH_DOUBLE_AND_GEO_POINT_AND_TEXT_FIELD));
+        ensureYellow();
+
+        index(INDEX, TYPE, "1", SIMPLE_DOC);
+        refresh();
+
+        SearchResponse responseWithWeights = client().search(
+                searchRequest().source(
+                        searchSource().query(
+                                functionScoreQuery(constantScoreQuery(termQuery(TEXT_FIELD, "value")))
+                                        .add(gaussDecayFunction(GEO_POINT_FIELD, new GeoPoint(10, 20), "1000km"))
+                                        .add(fieldValueFactorFunction(DOUBLE_FIELD).modifier(FieldValueFactorFunction.Modifier.LN)
+                                                .setWeight(2))
+                                        .add(scriptFunction("_index['" + TEXT_FIELD + "']['value'].tf()").setWeight(3))).explain(true)))
+                .actionGet();
+
+        assertThat(
+                responseWithWeights.getHits().getAt(0).getExplanation().toString(),
+                equalTo("6.0 = function score, product of:\n  1.0 = ConstantScore(text_field:value), product of:\n    1.0 = boost\n    1.0 = queryNorm\n  6.0 = min of:\n    6.0 = function score, score mode [multiply]\n      1.0 = function score, product of:\n        1.0 = match filter: *:*\n        1.0 = Function for field geo_point_field:\n          1.0 = exp(-0.5*pow(MIN of: [Math.max(arcDistance([10.0, 20.0](=doc value),[10.0, 20.0](=origin)) - 0.0(=offset), 0)],2.0)/7.213475204444817E11)\n      2.0 = function score, product of:\n        1.0 = match filter: *:*\n        2.0 = product of:\n          1.0 = field value function: ln(doc['double_field'].value * factor=1.0)\n          2.0 = weight\n      3.0 = function score, product of:\n        1.0 = match filter: *:*\n        3.0 = product of:\n          1.0 = script score function, computed with script:\"[script: _index['text_field']['value'].tf(), type: inline, lang: null, params: {}]\" and parameters: \n{}\n            1.0 = _score: \n              1.0 = ConstantScore(text_field:value), product of:\n                1.0 = boost\n                1.0 = queryNorm\n          3.0 = weight\n    3.4028235E38 = maxBoost\n  1.0 = queryBoost\n"));
+        responseWithWeights = client().search(
+                searchRequest().source(
+                        searchSource().query(
+                                functionScoreQuery(constantScoreQuery(termQuery(TEXT_FIELD, "value"))).add(weightFactorFunction(4.0f)))
+                                .explain(true))).actionGet();
+        assertThat(
+                responseWithWeights.getHits().getAt(0).getExplanation().toString(),
+                equalTo("4.0 = function score, product of:\n  1.0 = ConstantScore(text_field:value), product of:\n    1.0 = boost\n    1.0 = queryNorm\n  4.0 = min of:\n    4.0 = product of:\n      1.0 = constant score 1.0 - no function provided\n      4.0 = weight\n    3.4028235E38 = maxBoost\n  1.0 = queryBoost\n"));
+
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void simpleWeightedFunctionsTestOldScriptAPI() throws IOException, ExecutionException, InterruptedException {
+        assertAcked(prepareCreate(INDEX).addMapping(TYPE, MAPPING_WITH_DOUBLE_AND_GEO_POINT_AND_TEXT_FIELD));
+        ensureYellow();
+
+        index(INDEX, TYPE, "1", SIMPLE_DOC);
+        refresh();
+        SearchResponse response = client().search(
+                searchRequest().source(
+                        searchSource().query(
+                                functionScoreQuery(constantScoreQuery(termQuery(TEXT_FIELD, "value")))
+                                        .add(gaussDecayFunction(GEO_POINT_FIELD, new GeoPoint(10, 20), "1000km"))
+                                        .add(fieldValueFactorFunction(DOUBLE_FIELD).modifier(FieldValueFactorFunction.Modifier.LN))
+                                        .add(scriptFunction("_index['" + TEXT_FIELD + "']['value'].tf()"))))).actionGet();
+        SearchResponse responseWithWeights = client().search(
+                searchRequest().source(
+                        searchSource().query(
+                                functionScoreQuery(constantScoreQuery(termQuery(TEXT_FIELD, "value")))
+                                        .add(gaussDecayFunction(GEO_POINT_FIELD, new GeoPoint(10, 20), "1000km").setWeight(2))
+                                        .add(fieldValueFactorFunction(DOUBLE_FIELD).modifier(FieldValueFactorFunction.Modifier.LN)
+                                                .setWeight(2))
+                                        .add(scriptFunction("_index['" + TEXT_FIELD + "']['value'].tf()").setWeight(2))))).actionGet();
+
+        assertSearchResponse(response);
+        assertThat(response.getHits().getAt(0).getScore(), is(1.0f));
+        assertThat(responseWithWeights.getHits().getAt(0).getScore(), is(8.0f));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void simpleWeightedFunctionsTestWithRandomWeightsAndRandomCombineModeOldScriptAPI() throws IOException, ExecutionException,
+            InterruptedException {
+        assertAcked(prepareCreate(INDEX).addMapping(TYPE, MAPPING_WITH_DOUBLE_AND_GEO_POINT_AND_TEXT_FIELD));
+        ensureYellow();
+
+        XContentBuilder doc = SIMPLE_DOC;
+        index(INDEX, TYPE, "1", doc);
+        refresh();
+        ScoreFunctionBuilder[] scoreFunctionBuilders = getScoreFunctionBuildersOldScriptAPI();
+        float[] weights = createRandomWeights(scoreFunctionBuilders.length);
+        float[] scores = getScores(scoreFunctionBuilders);
+
+        String scoreMode = getRandomScoreMode();
+        FunctionScoreQueryBuilder withWeights = functionScoreQuery(constantScoreQuery(termQuery(TEXT_FIELD, "value"))).scoreMode(scoreMode);
+        int weightscounter = 0;
+        for (ScoreFunctionBuilder builder : scoreFunctionBuilders) {
+            withWeights.add(builder.setWeight(weights[weightscounter]));
+            weightscounter++;
+        }
+        SearchResponse responseWithWeights = client().search(searchRequest().source(searchSource().query(withWeights))).actionGet();
+
+        double expectedScore = computeExpectedScore(weights, scores, scoreMode);
+        assertThat((float) expectedScore / responseWithWeights.getHits().getAt(0).getScore(), is(1.0f));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void simpleWeightedFunctionsTestSingleFunctionOldScriptAPI() throws IOException, ExecutionException, InterruptedException {
+        assertAcked(prepareCreate(INDEX).addMapping(TYPE, MAPPING_WITH_DOUBLE_AND_GEO_POINT_AND_TEXT_FIELD));
+        ensureYellow();
+
+        XContentBuilder doc = jsonBuilder().startObject().field(TEXT_FIELD, "value").startObject(GEO_POINT_FIELD).field("lat", 12)
+                .field("lon", 21).endObject().field(DOUBLE_FIELD, 10).endObject();
+        index(INDEX, TYPE, "1", doc);
+        refresh();
+        ScoreFunctionBuilder[] scoreFunctionBuilders = getScoreFunctionBuildersOldScriptAPI();
+        ScoreFunctionBuilder scoreFunctionBuilder = scoreFunctionBuilders[randomInt(3)];
+        float[] weights = createRandomWeights(1);
+        float[] scores = getScores(scoreFunctionBuilder);
+        FunctionScoreQueryBuilder withWeights = functionScoreQuery(constantScoreQuery(termQuery(TEXT_FIELD, "value")));
+        withWeights.add(scoreFunctionBuilder.setWeight(weights[0]));
+
+        SearchResponse responseWithWeights = client().search(searchRequest().source(searchSource().query(withWeights))).actionGet();
+
+        assertThat((double) scores[0] * weights[0] / responseWithWeights.getHits().getAt(0).getScore(), closeTo(1.0, 1.e-6));
+
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    public ScoreFunctionBuilder[] getScoreFunctionBuildersOldScriptAPI() {
+        ScoreFunctionBuilder[] builders = new ScoreFunctionBuilder[4];
+        builders[0] = gaussDecayFunction(GEO_POINT_FIELD, new GeoPoint(10, 20), "1000km");
+        builders[1] = randomFunction(10);
+        builders[2] = fieldValueFactorFunction(DOUBLE_FIELD).modifier(FieldValueFactorFunction.Modifier.LN);
+        builders[3] = scriptFunction("_index['" + TEXT_FIELD + "']['value'].tf()");
+        return builders;
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testScriptScoresNestedOldScriptAPI() throws IOException {
+        createIndex(INDEX);
+        ensureYellow();
+        index(INDEX, TYPE, "1", jsonBuilder().startObject().field("dummy_field", 1).endObject());
+        refresh();
+        SearchResponse response = client().search(
+                searchRequest().source(
+                        searchSource().query(
+                                functionScoreQuery(
+                                        functionScoreQuery(functionScoreQuery().add(scriptFunction("1"))).add(
+                                                scriptFunction("_score.doubleValue()"))).add(scriptFunction("_score.doubleValue()")))))
+                .actionGet();
+        assertSearchResponse(response);
+        assertThat(response.getHits().getAt(0).score(), equalTo(1.0f));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testScriptScoresWithAggOldScriptAPI() throws IOException {
+        createIndex(INDEX);
+        ensureYellow();
+        index(INDEX, TYPE, "1", jsonBuilder().startObject().field("dummy_field", 1).endObject());
+        refresh();
+        SearchResponse response = client().search(
+                searchRequest().source(
+                        searchSource().query(functionScoreQuery().add(scriptFunction("_score.doubleValue()"))).aggregation(
+                                terms("score_agg").script("_score.doubleValue()")))).actionGet();
+        assertSearchResponse(response);
+        assertThat(response.getHits().getAt(0).score(), equalTo(1.0f));
+        assertThat(((Terms) response.getAggregations().asMap().get("score_agg")).getBuckets().get(0).getKeyAsString(), equalTo("1.0"));
+        assertThat(((Terms) response.getAggregations().asMap().get("score_agg")).getBuckets().get(0).getDocCount(), is(1l));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    public void testMinScoreFunctionScoreBasicOldScriptAPI() throws IOException {
+        index(INDEX, TYPE, jsonBuilder().startObject().field("num", 2).endObject());
+        refresh();
+        ensureYellow();
+        float score = randomFloat();
+        float minScore = randomFloat();
+        SearchResponse searchResponse = client().search(
+                searchRequest().source(
+                        searchSource().query(functionScoreQuery().add(scriptFunction(Float.toString(score))).setMinScore(minScore))))
+                .actionGet();
+        if (score < minScore) {
+            assertThat(searchResponse.getHits().getTotalHits(), is(0l));
+        } else {
+            assertThat(searchResponse.getHits().getTotalHits(), is(1l));
+        }
+
+        searchResponse = client().search(
+                searchRequest().source(
+                        searchSource().query(
+                                functionScoreQuery().add(scriptFunction(Float.toString(score))).add(scriptFunction(Float.toString(score)))
+                                        .scoreMode("avg").setMinScore(minScore)))).actionGet();
+        if (score < minScore) {
+            assertThat(searchResponse.getHits().getTotalHits(), is(0l));
+        } else {
+            assertThat(searchResponse.getHits().getTotalHits(), is(1l));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testMinScoreFunctionScoreManyDocsAndRandomMinScoreOldScriptAPI() throws IOException, ExecutionException,
+            InterruptedException {
+        List<IndexRequestBuilder> docs = new ArrayList<>();
+        int numDocs = randomIntBetween(1, 100);
+        int scoreOffset = randomIntBetween(-2 * numDocs, 2 * numDocs);
+        int minScore = randomIntBetween(-2 * numDocs, 2 * numDocs);
+        for (int i = 0; i < numDocs; i++) {
+            docs.add(client().prepareIndex(INDEX, TYPE, Integer.toString(i)).setSource("num", i + scoreOffset));
+        }
+        indexRandom(true, docs);
+        ensureYellow();
+        String script = "return (doc['num'].value)";
+        int numMatchingDocs = numDocs + scoreOffset - minScore;
+        if (numMatchingDocs < 0) {
+            numMatchingDocs = 0;
+        }
+        if (numMatchingDocs > numDocs) {
+            numMatchingDocs = numDocs;
+        }
+
+        SearchResponse searchResponse = client().search(
+                searchRequest().source(
+                        searchSource().query(functionScoreQuery().add(scriptFunction(script)).setMinScore(minScore)).size(numDocs)))
+                .actionGet();
+        assertMinScoreSearchResponses(numDocs, searchResponse, numMatchingDocs);
+
+        searchResponse = client().search(
+                searchRequest().source(
+                        searchSource().query(
+                                functionScoreQuery().add(scriptFunction(script)).add(scriptFunction(script)).scoreMode("avg")
+                                        .setMinScore(minScore)).size(numDocs))).actionGet();
+        assertMinScoreSearchResponses(numDocs, searchResponse, numMatchingDocs);
+    }
 }
 
diff --git a/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java b/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java
index 4ad41d9f44e..566c1887886 100644
--- a/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java
+++ b/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java
@@ -21,6 +21,8 @@ package org.elasticsearch.search.functionscore;
 import org.apache.lucene.util.ArrayUtil;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.index.query.functionscore.random.RandomScoreFunctionBuilder;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.hamcrest.CoreMatchers;
@@ -28,14 +30,26 @@ import org.junit.Ignore;
 
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
 
 import static com.google.common.collect.Lists.newArrayList;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.index.query.QueryBuilders.*;
-import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.*;
+import static org.elasticsearch.index.query.QueryBuilders.functionScoreQuery;
+import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
+import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
+import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.fieldValueFactorFunction;
+import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.randomFunction;
+import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.scriptFunction;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
+import static org.hamcrest.Matchers.nullValue;
 
 public class RandomScoreFunctionTests extends ElasticsearchIntegrationTest {
 
@@ -101,7 +115,10 @@ public class RandomScoreFunctionTests extends ElasticsearchIntegrationTest {
         }
     }
 
-    public void testScoreAccessWithinScript() throws Exception {
+    /*
+     * TODO Remove in 2.0
+     */
+    public void testScoreAccessWithinScriptOldScriptAPI() throws Exception {
         assertAcked(prepareCreate("test")
                 .addMapping("type", "body", "type=string", "index", "type=" + randomFrom(new String[]{"short", "float", "long", "integer", "double"})));
         ensureYellow();
@@ -167,6 +184,76 @@ public class RandomScoreFunctionTests extends ElasticsearchIntegrationTest {
         assertThat(firstHit.getScore(), greaterThan(1f));
     }
 
+    public void testScoreAccessWithinScript() throws Exception {
+        assertAcked(prepareCreate("test").addMapping("type", "body", "type=string", "index",
+                "type=" + randomFrom(new String[] { "short", "float", "long", "integer", "double" })));
+        ensureYellow();
+
+        int docCount = randomIntBetween(100, 200);
+        for (int i = 0; i < docCount; i++) {
+            client().prepareIndex("test", "type", "" + i).setSource("body", randomFrom(newArrayList("foo", "bar", "baz")), "index", i)
+                    .get();
+        }
+        refresh();
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("factor", randomIntBetween(2, 4));
+        // Test for accessing _score
+        SearchResponse resp = client()
+                .prepareSearch("test")
+                .setQuery(
+                        functionScoreQuery(matchQuery("body", "foo")).add(fieldValueFactorFunction("index").factor(2)).add(
+                                scriptFunction(new Script("log(doc['index'].value + (factor * _score))", ScriptType.INLINE, null, params))))
+                .get();
+        assertNoFailures(resp);
+        SearchHit firstHit = resp.getHits().getAt(0);
+        assertThat(firstHit.getScore(), greaterThan(1f));
+
+        // Test for accessing _score.intValue()
+        resp = client()
+                .prepareSearch("test")
+                .setQuery(
+                        functionScoreQuery(matchQuery("body", "foo")).add(fieldValueFactorFunction("index").factor(2)).add(
+                                scriptFunction(new Script("log(doc['index'].value + (factor * _score.intValue()))", ScriptType.INLINE,
+                                        null, params)))).get();
+        assertNoFailures(resp);
+        firstHit = resp.getHits().getAt(0);
+        assertThat(firstHit.getScore(), greaterThan(1f));
+
+        // Test for accessing _score.longValue()
+        resp = client()
+                .prepareSearch("test")
+                .setQuery(
+                        functionScoreQuery(matchQuery("body", "foo")).add(fieldValueFactorFunction("index").factor(2)).add(
+                                scriptFunction(new Script("log(doc['index'].value + (factor * _score.longValue()))", ScriptType.INLINE,
+                                        null, params)))).get();
+        assertNoFailures(resp);
+        firstHit = resp.getHits().getAt(0);
+        assertThat(firstHit.getScore(), greaterThan(1f));
+
+        // Test for accessing _score.floatValue()
+        resp = client()
+                .prepareSearch("test")
+                .setQuery(
+                        functionScoreQuery(matchQuery("body", "foo")).add(fieldValueFactorFunction("index").factor(2)).add(
+                                scriptFunction(new Script("log(doc['index'].value + (factor * _score.floatValue()))", ScriptType.INLINE,
+                                        null, params)))).get();
+        assertNoFailures(resp);
+        firstHit = resp.getHits().getAt(0);
+        assertThat(firstHit.getScore(), greaterThan(1f));
+
+        // Test for accessing _score.doubleValue()
+        resp = client()
+                .prepareSearch("test")
+                .setQuery(
+                        functionScoreQuery(matchQuery("body", "foo")).add(fieldValueFactorFunction("index").factor(2)).add(
+                                scriptFunction(new Script("log(doc['index'].value + (factor * _score.doubleValue()))", ScriptType.INLINE,
+                                        null, params)))).get();
+        assertNoFailures(resp);
+        firstHit = resp.getHits().getAt(0);
+        assertThat(firstHit.getScore(), greaterThan(1f));
+    }
+
     public void testSeedReportedInExplain() throws Exception {
         createIndex("test");
         ensureGreen();
diff --git a/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java b/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java
index 0d602dfe92f..8ecde929122 100644
--- a/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java
+++ b/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java
@@ -29,6 +29,7 @@ import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.json.JsonXContent;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.rest.RestStatus;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.sort.SortBuilders;
 import org.elasticsearch.search.sort.SortOrder;
@@ -408,37 +409,141 @@ public class GeoDistanceTests extends ElasticsearchIntegrationTest {
 
         refresh();
 
-        SearchResponse searchResponse1 = client().prepareSearch().addField("_source").addScriptField("distance", "doc['location'].arcDistance(" + target_lat + "," + target_long + ")").execute().actionGet();
+        SearchResponse searchResponse1 = client().prepareSearch().addField("_source")
+                .addScriptField("distance", new Script("doc['location'].arcDistance(" + target_lat + "," + target_long + ")")).execute()
+                .actionGet();
         Double resultDistance1 = searchResponse1.getHits().getHits()[0].getFields().get("distance").getValue();
-        assertThat(resultDistance1, closeTo(GeoDistance.ARC.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.DEFAULT), 0.0001d));
+        assertThat(resultDistance1,
+                closeTo(GeoDistance.ARC.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.DEFAULT), 0.0001d));
 
-        SearchResponse searchResponse2 = client().prepareSearch().addField("_source").addScriptField("distance", "doc['location'].distance(" + target_lat + "," + target_long + ")").execute().actionGet();
+        SearchResponse searchResponse2 = client().prepareSearch().addField("_source")
+                .addScriptField("distance", new Script("doc['location'].distance(" + target_lat + "," + target_long + ")")).execute()
+                .actionGet();
         Double resultDistance2 = searchResponse2.getHits().getHits()[0].getFields().get("distance").getValue();
-        assertThat(resultDistance2, closeTo(GeoDistance.PLANE.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.DEFAULT), 0.0001d));
+        assertThat(resultDistance2,
+                closeTo(GeoDistance.PLANE.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.DEFAULT), 0.0001d));
 
-        SearchResponse searchResponse3 = client().prepareSearch().addField("_source").addScriptField("distance", "doc['location'].arcDistanceInKm(" + target_lat + "," + target_long + ")").execute().actionGet();
+        SearchResponse searchResponse3 = client().prepareSearch().addField("_source")
+                .addScriptField("distance", new Script("doc['location'].arcDistanceInKm(" + target_lat + "," + target_long + ")"))
+                .execute().actionGet();
         Double resultArcDistance3 = searchResponse3.getHits().getHits()[0].getFields().get("distance").getValue();
-        assertThat(resultArcDistance3, closeTo(GeoDistance.ARC.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.KILOMETERS), 0.0001d));
+        assertThat(resultArcDistance3,
+                closeTo(GeoDistance.ARC.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.KILOMETERS), 0.0001d));
 
-        SearchResponse searchResponse4 = client().prepareSearch().addField("_source").addScriptField("distance", "doc['location'].distanceInKm(" + target_lat + "," + target_long + ")").execute().actionGet();
+        SearchResponse searchResponse4 = client().prepareSearch().addField("_source")
+                .addScriptField("distance", new Script("doc['location'].distanceInKm(" + target_lat + "," + target_long + ")")).execute()
+                .actionGet();
         Double resultDistance4 = searchResponse4.getHits().getHits()[0].getFields().get("distance").getValue();
-        assertThat(resultDistance4, closeTo(GeoDistance.PLANE.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.KILOMETERS), 0.0001d));
+        assertThat(resultDistance4,
+                closeTo(GeoDistance.PLANE.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.KILOMETERS), 0.0001d));
 
-        SearchResponse searchResponse5 = client().prepareSearch().addField("_source").addScriptField("distance", "doc['location'].arcDistanceInKm(" + (target_lat) + "," + (target_long + 360) + ")").execute().actionGet();
+        SearchResponse searchResponse5 = client()
+                .prepareSearch()
+                .addField("_source")
+                .addScriptField("distance", new Script("doc['location'].arcDistanceInKm(" + (target_lat) + "," + (target_long + 360) + ")"))
+                .execute().actionGet();
         Double resultArcDistance5 = searchResponse5.getHits().getHits()[0].getFields().get("distance").getValue();
-        assertThat(resultArcDistance5, closeTo(GeoDistance.ARC.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.KILOMETERS), 0.0001d));
+        assertThat(resultArcDistance5,
+                closeTo(GeoDistance.ARC.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.KILOMETERS), 0.0001d));
 
-        SearchResponse searchResponse6 = client().prepareSearch().addField("_source").addScriptField("distance", "doc['location'].arcDistanceInKm(" + (target_lat + 360) + "," + (target_long) + ")").execute().actionGet();
+        SearchResponse searchResponse6 = client()
+                .prepareSearch()
+                .addField("_source")
+                .addScriptField("distance", new Script("doc['location'].arcDistanceInKm(" + (target_lat + 360) + "," + (target_long) + ")"))
+                .execute().actionGet();
         Double resultArcDistance6 = searchResponse6.getHits().getHits()[0].getFields().get("distance").getValue();
-        assertThat(resultArcDistance6, closeTo(GeoDistance.ARC.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.KILOMETERS), 0.0001d));
+        assertThat(resultArcDistance6,
+                closeTo(GeoDistance.ARC.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.KILOMETERS), 0.0001d));
 
-        SearchResponse searchResponse7 = client().prepareSearch().addField("_source").addScriptField("distance", "doc['location'].arcDistanceInMiles(" + target_lat + "," + target_long + ")").execute().actionGet();
+        SearchResponse searchResponse7 = client().prepareSearch().addField("_source")
+                .addScriptField("distance", new Script("doc['location'].arcDistanceInMiles(" + target_lat + "," + target_long + ")"))
+                .execute().actionGet();
         Double resultDistance7 = searchResponse7.getHits().getHits()[0].getFields().get("distance").getValue();
-        assertThat(resultDistance7, closeTo(GeoDistance.ARC.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.MILES), 0.0001d));
+        assertThat(resultDistance7,
+                closeTo(GeoDistance.ARC.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.MILES), 0.0001d));
 
-        SearchResponse searchResponse8 = client().prepareSearch().addField("_source").addScriptField("distance", "doc['location'].distanceInMiles(" + target_lat + "," + target_long + ")").execute().actionGet();
+        SearchResponse searchResponse8 = client().prepareSearch().addField("_source")
+                .addScriptField("distance", new Script("doc['location'].distanceInMiles(" + target_lat + "," + target_long + ")"))
+                .execute().actionGet();
         Double resultDistance8 = searchResponse8.getHits().getHits()[0].getFields().get("distance").getValue();
-        assertThat(resultDistance8, closeTo(GeoDistance.PLANE.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.MILES), 0.0001d));
+        assertThat(resultDistance8,
+                closeTo(GeoDistance.PLANE.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.MILES), 0.0001d));
+    }
+
+    /*
+     * Remove in 2.0
+     */
+    @Test
+    public void distanceScriptTestsOldScriptAPI() throws Exception {
+        double source_lat = 32.798;
+        double source_long = -117.151;
+        double target_lat = 32.81;
+        double target_long = -117.21;
+
+        XContentBuilder xContentBuilder = XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("properties")
+                .startObject("location").field("type", "geo_point").field("lat_lon", true).endObject().endObject().endObject().endObject();
+        assertAcked(prepareCreate("test").addMapping("type1", xContentBuilder));
+        ensureGreen();
+
+        client().prepareIndex("test", "type1", "1")
+                .setSource(
+                        jsonBuilder().startObject().field("name", "TestPosition").startObject("location").field("lat", source_lat)
+                                .field("lon", source_long).endObject().endObject()).execute().actionGet();
+
+        refresh();
+
+        SearchResponse searchResponse1 = client().prepareSearch().addField("_source")
+                .addScriptField("distance", "doc['location'].arcDistance(" + target_lat + "," + target_long + ")").execute().actionGet();
+        Double resultDistance1 = searchResponse1.getHits().getHits()[0].getFields().get("distance").getValue();
+        assertThat(resultDistance1,
+                closeTo(GeoDistance.ARC.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.DEFAULT), 0.0001d));
+
+        SearchResponse searchResponse2 = client().prepareSearch().addField("_source")
+                .addScriptField("distance", "doc['location'].distance(" + target_lat + "," + target_long + ")").execute().actionGet();
+        Double resultDistance2 = searchResponse2.getHits().getHits()[0].getFields().get("distance").getValue();
+        assertThat(resultDistance2,
+                closeTo(GeoDistance.PLANE.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.DEFAULT), 0.0001d));
+
+        SearchResponse searchResponse3 = client().prepareSearch().addField("_source")
+                .addScriptField("distance", "doc['location'].arcDistanceInKm(" + target_lat + "," + target_long + ")").execute()
+                .actionGet();
+        Double resultArcDistance3 = searchResponse3.getHits().getHits()[0].getFields().get("distance").getValue();
+        assertThat(resultArcDistance3,
+                closeTo(GeoDistance.ARC.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.KILOMETERS), 0.0001d));
+
+        SearchResponse searchResponse4 = client().prepareSearch().addField("_source")
+                .addScriptField("distance", "doc['location'].distanceInKm(" + target_lat + "," + target_long + ")").execute().actionGet();
+        Double resultDistance4 = searchResponse4.getHits().getHits()[0].getFields().get("distance").getValue();
+        assertThat(resultDistance4,
+                closeTo(GeoDistance.PLANE.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.KILOMETERS), 0.0001d));
+
+        SearchResponse searchResponse5 = client().prepareSearch().addField("_source")
+                .addScriptField("distance", "doc['location'].arcDistanceInKm(" + (target_lat) + "," + (target_long + 360) + ")").execute()
+                .actionGet();
+        Double resultArcDistance5 = searchResponse5.getHits().getHits()[0].getFields().get("distance").getValue();
+        assertThat(resultArcDistance5,
+                closeTo(GeoDistance.ARC.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.KILOMETERS), 0.0001d));
+
+        SearchResponse searchResponse6 = client().prepareSearch().addField("_source")
+                .addScriptField("distance", "doc['location'].arcDistanceInKm(" + (target_lat + 360) + "," + (target_long) + ")").execute()
+                .actionGet();
+        Double resultArcDistance6 = searchResponse6.getHits().getHits()[0].getFields().get("distance").getValue();
+        assertThat(resultArcDistance6,
+                closeTo(GeoDistance.ARC.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.KILOMETERS), 0.0001d));
+
+        SearchResponse searchResponse7 = client().prepareSearch().addField("_source")
+                .addScriptField("distance", "doc['location'].arcDistanceInMiles(" + target_lat + "," + target_long + ")").execute()
+                .actionGet();
+        Double resultDistance7 = searchResponse7.getHits().getHits()[0].getFields().get("distance").getValue();
+        assertThat(resultDistance7,
+                closeTo(GeoDistance.ARC.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.MILES), 0.0001d));
+
+        SearchResponse searchResponse8 = client().prepareSearch().addField("_source")
+                .addScriptField("distance", "doc['location'].distanceInMiles(" + target_lat + "," + target_long + ")").execute()
+                .actionGet();
+        Double resultDistance8 = searchResponse8.getHits().getHits()[0].getFields().get("distance").getValue();
+        assertThat(resultDistance8,
+                closeTo(GeoDistance.PLANE.calculate(source_lat, source_long, target_lat, target_long, DistanceUnit.MILES), 0.0001d));
     }
 
     @Test
diff --git a/src/test/java/org/elasticsearch/search/innerhits/InnerHitsTests.java b/src/test/java/org/elasticsearch/search/innerhits/InnerHitsTests.java
index e2da5cf1333..8d64ef26602 100644
--- a/src/test/java/org/elasticsearch/search/innerhits/InnerHitsTests.java
+++ b/src/test/java/org/elasticsearch/search/innerhits/InnerHitsTests.java
@@ -28,6 +28,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.support.QueryInnerHitBuilder;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.fetch.innerhits.InnerHitsBuilder;
@@ -41,11 +42,21 @@ import java.util.List;
 import java.util.Locale;
 
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
+import static org.elasticsearch.index.query.QueryBuilders.constantScoreQuery;
 import static org.elasticsearch.index.query.QueryBuilders.hasChildQuery;
+import static org.elasticsearch.index.query.QueryBuilders.hasParentQuery;
+import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
+import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
 import static org.elasticsearch.index.query.QueryBuilders.nestedQuery;
-import static org.elasticsearch.index.query.QueryBuilders.*;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
-import static org.hamcrest.Matchers.*;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHit;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasId;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.nullValue;
 
 /**
  */
@@ -146,14 +157,14 @@ public class InnerHitsTests extends ElasticsearchIntegrationTest {
                                 .addHighlightedField("comments.message")
                                 .setExplain(true)
                                 .addFieldDataField("comments.message")
-                                .addScriptField("script", "doc['comments.message'].value")
+                                        .addScriptField("script", new Script("doc['comments.message'].value"))
                                 .setSize(1)).request(),
                 client().prepareSearch("articles")
                         .setQuery(nestedQuery("comments", matchQuery("comments.message", "fox")).innerHit(new QueryInnerHitBuilder()
                                 .addHighlightedField("comments.message")
                                 .setExplain(true)
                                 .addFieldDataField("comments.message")
-                                .addScriptField("script", "doc['comments.message'].value")
+                                                .addScriptField("script", new Script("doc['comments.message'].value"))
                                 .setSize(1))).request()
         };
 
@@ -322,18 +333,15 @@ public class InnerHitsTests extends ElasticsearchIntegrationTest {
                                         .addHighlightedField("message")
                                         .setExplain(true)
                                         .addFieldDataField("message")
-                                        .addScriptField("script", "doc['message'].value")
+                                        .addScriptField("script", new Script("doc['message'].value"))
                                         .setSize(1)
                         ).request(),
                 client().prepareSearch("articles")
-                        .setQuery(hasChildQuery("comment", matchQuery("message", "fox")).innerHit(new QueryInnerHitBuilder()
-                                        .addHighlightedField("message")
-                                        .setExplain(true)
-                                        .addFieldDataField("message")
-                                        .addScriptField("script", "doc['message'].value")
-                                        .setSize(1))
-                        ).request()
-        };
+                        .setQuery(
+                                hasChildQuery("comment", matchQuery("message", "fox")).innerHit(
+                                        new QueryInnerHitBuilder().addHighlightedField("message").setExplain(true)
+                                                .addFieldDataField("message").addScriptField("script", new Script("doc['message'].value"))
+                                                .setSize(1))).request() };
 
         for (SearchRequest searchRequest : searchRequests) {
             SearchResponse response = client().search(searchRequest).actionGet();
@@ -923,6 +931,216 @@ public class InnerHitsTests extends ElasticsearchIntegrationTest {
         assertThat(response.getHits().getAt(0).getInnerHits().get("comments.messages").getAt(0).getNestedIdentity().getChild(), nullValue());
     }
 
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testSimpleNestedOldScriptAPI() throws Exception {
+        assertAcked(prepareCreate("articles").addMapping(
+                "article",
+                jsonBuilder().startObject().startObject("article").startObject("properties").startObject("comments")
+                        .field("type", "nested").startObject("properties").startObject("message").field("type", "string").endObject()
+                        .endObject().endObject().startObject("title").field("type", "string").endObject().endObject().endObject()
+                        .endObject()));
+
+        List<IndexRequestBuilder> requests = new ArrayList<>();
+        requests.add(client().prepareIndex("articles", "article", "1").setSource(
+                jsonBuilder().startObject().field("title", "quick brown fox").startArray("comments").startObject()
+                        .field("message", "fox eat quick").endObject().startObject().field("message", "fox ate rabbit x y z").endObject()
+                        .startObject().field("message", "rabbit got away").endObject().endArray().endObject()));
+        requests.add(client().prepareIndex("articles", "article", "2").setSource(
+                jsonBuilder().startObject().field("title", "big gray elephant").startArray("comments").startObject()
+                        .field("message", "elephant captured").endObject().startObject().field("message", "mice squashed by elephant x")
+                        .endObject().startObject().field("message", "elephant scared by mice x y").endObject().endArray().endObject()));
+        indexRandom(true, requests);
+
+        // Inner hits can be defined in two ways: 1) with the query 2) as seperate inner_hit definition
+        SearchRequest[] searchRequests = new SearchRequest[] {
+                client().prepareSearch("articles")
+                        .setQuery(
+                                nestedQuery("comments", matchQuery("comments.message", "fox")).innerHit(
+                                        new QueryInnerHitBuilder().setName("comment"))).request(),
+                client().prepareSearch("articles")
+                        .setQuery(nestedQuery("comments", matchQuery("comments.message", "fox")))
+                        .addInnerHit("comment",
+                                new InnerHitsBuilder.InnerHit().setPath("comments").setQuery(matchQuery("comments.message", "fox")))
+                        .request() };
+        for (SearchRequest searchRequest : searchRequests) {
+            SearchResponse response = client().search(searchRequest).actionGet();
+            assertNoFailures(response);
+            assertHitCount(response, 1);
+            assertSearchHit(response, 1, hasId("1"));
+            assertThat(response.getHits().getAt(0).getInnerHits().size(), equalTo(1));
+            SearchHits innerHits = response.getHits().getAt(0).getInnerHits().get("comment");
+            assertThat(innerHits.totalHits(), equalTo(2l));
+            assertThat(innerHits.getHits().length, equalTo(2));
+            assertThat(innerHits.getAt(0).getId(), equalTo("1"));
+            assertThat(innerHits.getAt(0).getNestedIdentity().getField().string(), equalTo("comments"));
+            assertThat(innerHits.getAt(0).getNestedIdentity().getOffset(), equalTo(0));
+            assertThat(innerHits.getAt(1).getId(), equalTo("1"));
+            assertThat(innerHits.getAt(1).getNestedIdentity().getField().string(), equalTo("comments"));
+            assertThat(innerHits.getAt(1).getNestedIdentity().getOffset(), equalTo(1));
+        }
+
+        searchRequests = new SearchRequest[] {
+                client().prepareSearch("articles")
+                        .setQuery(nestedQuery("comments", matchQuery("comments.message", "elephant")))
+                        .addInnerHit("comment",
+                                new InnerHitsBuilder.InnerHit().setPath("comments").setQuery(matchQuery("comments.message", "elephant")))
+                        .request(),
+                client().prepareSearch("articles")
+                        .setQuery(
+                                nestedQuery("comments", matchQuery("comments.message", "elephant")).innerHit(
+                                        new QueryInnerHitBuilder().setName("comment"))).request(),
+                client().prepareSearch("articles")
+                        .setQuery(
+                                nestedQuery("comments", matchQuery("comments.message", "elephant")).innerHit(
+                                        new QueryInnerHitBuilder().setName("comment").addSort("_doc", SortOrder.DESC))).request() };
+        for (SearchRequest searchRequest : searchRequests) {
+            SearchResponse response = client().search(searchRequest).actionGet();
+            assertNoFailures(response);
+            assertHitCount(response, 1);
+            assertSearchHit(response, 1, hasId("2"));
+            assertThat(response.getHits().getAt(0).getInnerHits().size(), equalTo(1));
+            SearchHits innerHits = response.getHits().getAt(0).getInnerHits().get("comment");
+            assertThat(innerHits.totalHits(), equalTo(3l));
+            assertThat(innerHits.getHits().length, equalTo(3));
+            assertThat(innerHits.getAt(0).getId(), equalTo("2"));
+            assertThat(innerHits.getAt(0).getNestedIdentity().getField().string(), equalTo("comments"));
+            assertThat(innerHits.getAt(0).getNestedIdentity().getOffset(), equalTo(0));
+            assertThat(innerHits.getAt(1).getId(), equalTo("2"));
+            assertThat(innerHits.getAt(1).getNestedIdentity().getField().string(), equalTo("comments"));
+            assertThat(innerHits.getAt(1).getNestedIdentity().getOffset(), equalTo(1));
+            assertThat(innerHits.getAt(2).getId(), equalTo("2"));
+            assertThat(innerHits.getAt(2).getNestedIdentity().getField().string(), equalTo("comments"));
+            assertThat(innerHits.getAt(2).getNestedIdentity().getOffset(), equalTo(2));
+        }
+
+        searchRequests = new SearchRequest[] {
+                client().prepareSearch("articles")
+                        .setQuery(nestedQuery("comments", matchQuery("comments.message", "fox")))
+                        .addInnerHit(
+                                "comments",
+                                new InnerHitsBuilder.InnerHit().setPath("comments").setQuery(matchQuery("comments.message", "fox"))
+                                        .addHighlightedField("comments.message").setExplain(true).addFieldDataField("comments.message")
+                                        .addScriptField("script", "doc['comments.message'].value").setSize(1)).request(),
+                client().prepareSearch("articles")
+                        .setQuery(
+                                nestedQuery("comments", matchQuery("comments.message", "fox")).innerHit(
+                                        new QueryInnerHitBuilder().addHighlightedField("comments.message").setExplain(true)
+                                                .addFieldDataField("comments.message")
+                                                .addScriptField("script", "doc['comments.message'].value").setSize(1))).request() };
+
+        for (SearchRequest searchRequest : searchRequests) {
+            SearchResponse response = client().search(searchRequest).actionGet();
+            assertNoFailures(response);
+            SearchHits innerHits = response.getHits().getAt(0).getInnerHits().get("comments");
+            assertThat(innerHits.getTotalHits(), equalTo(2l));
+            assertThat(innerHits.getHits().length, equalTo(1));
+            assertThat(innerHits.getAt(0).getHighlightFields().get("comments.message").getFragments()[0].string(),
+                    equalTo("<em>fox</em> eat quick"));
+            assertThat(innerHits.getAt(0).explanation().toString(), containsString("weight(comments.message:fox in"));
+            assertThat(innerHits.getAt(0).getFields().get("comments.message").getValue().toString(), equalTo("eat"));
+            assertThat(innerHits.getAt(0).getFields().get("script").getValue().toString(), equalTo("eat"));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testSimpleParentChildOldScriptAPI() throws Exception {
+        assertAcked(prepareCreate("articles").addMapping("article", "title", "type=string").addMapping("comment", "_parent",
+                "type=article", "message", "type=string"));
+
+        List<IndexRequestBuilder> requests = new ArrayList<>();
+        requests.add(client().prepareIndex("articles", "article", "1").setSource("title", "quick brown fox"));
+        requests.add(client().prepareIndex("articles", "comment", "1").setParent("1").setSource("message", "fox eat quick"));
+        requests.add(client().prepareIndex("articles", "comment", "2").setParent("1").setSource("message", "fox ate rabbit x y z"));
+        requests.add(client().prepareIndex("articles", "comment", "3").setParent("1").setSource("message", "rabbit got away"));
+        requests.add(client().prepareIndex("articles", "article", "2").setSource("title", "big gray elephant"));
+        requests.add(client().prepareIndex("articles", "comment", "4").setParent("2").setSource("message", "elephant captured"));
+        requests.add(client().prepareIndex("articles", "comment", "5").setParent("2").setSource("message", "mice squashed by elephant x"));
+        requests.add(client().prepareIndex("articles", "comment", "6").setParent("2").setSource("message", "elephant scared by mice x y"));
+        indexRandom(true, requests);
+
+        SearchRequest[] searchRequests = new SearchRequest[] {
+                client().prepareSearch("articles").setQuery(hasChildQuery("comment", matchQuery("message", "fox")))
+                        .addInnerHit("comment", new InnerHitsBuilder.InnerHit().setType("comment").setQuery(matchQuery("message", "fox")))
+                        .request(),
+                client().prepareSearch("articles")
+                        .setQuery(
+                                hasChildQuery("comment", matchQuery("message", "fox")).innerHit(
+                                        new QueryInnerHitBuilder().setName("comment"))).request() };
+        for (SearchRequest searchRequest : searchRequests) {
+            SearchResponse response = client().search(searchRequest).actionGet();
+            assertNoFailures(response);
+            assertHitCount(response, 1);
+            assertSearchHit(response, 1, hasId("1"));
+
+            assertThat(response.getHits().getAt(0).getInnerHits().size(), equalTo(1));
+            SearchHits innerHits = response.getHits().getAt(0).getInnerHits().get("comment");
+            assertThat(innerHits.totalHits(), equalTo(2l));
+
+            assertThat(innerHits.getAt(0).getId(), equalTo("1"));
+            assertThat(innerHits.getAt(0).type(), equalTo("comment"));
+            assertThat(innerHits.getAt(1).getId(), equalTo("2"));
+            assertThat(innerHits.getAt(1).type(), equalTo("comment"));
+        }
+
+        searchRequests = new SearchRequest[] {
+                client().prepareSearch("articles")
+                        .setQuery(hasChildQuery("comment", matchQuery("message", "elephant")))
+                        .addInnerHit("comment",
+                                new InnerHitsBuilder.InnerHit().setType("comment").setQuery(matchQuery("message", "elephant"))).request(),
+                client().prepareSearch("articles")
+                        .setQuery(hasChildQuery("comment", matchQuery("message", "elephant")).innerHit(new QueryInnerHitBuilder()))
+                        .request() };
+        for (SearchRequest searchRequest : searchRequests) {
+            SearchResponse response = client().search(searchRequest).actionGet();
+            assertNoFailures(response);
+            assertHitCount(response, 1);
+            assertSearchHit(response, 1, hasId("2"));
+
+            assertThat(response.getHits().getAt(0).getInnerHits().size(), equalTo(1));
+            SearchHits innerHits = response.getHits().getAt(0).getInnerHits().get("comment");
+            assertThat(innerHits.totalHits(), equalTo(3l));
+
+            assertThat(innerHits.getAt(0).getId(), equalTo("4"));
+            assertThat(innerHits.getAt(0).type(), equalTo("comment"));
+            assertThat(innerHits.getAt(1).getId(), equalTo("5"));
+            assertThat(innerHits.getAt(1).type(), equalTo("comment"));
+            assertThat(innerHits.getAt(2).getId(), equalTo("6"));
+            assertThat(innerHits.getAt(2).type(), equalTo("comment"));
+        }
+
+        searchRequests = new SearchRequest[] {
+                client().prepareSearch("articles")
+                        .setQuery(hasChildQuery("comment", matchQuery("message", "fox")))
+                        .addInnerHit(
+                                "comment",
+                                new InnerHitsBuilder.InnerHit().setType("comment").setQuery(matchQuery("message", "fox"))
+                                        .addHighlightedField("message").setExplain(true).addFieldDataField("message")
+                                        .addScriptField("script", "doc['message'].value").setSize(1)).request(),
+                client().prepareSearch("articles")
+                        .setQuery(
+                                hasChildQuery("comment", matchQuery("message", "fox")).innerHit(
+                                        new QueryInnerHitBuilder().addHighlightedField("message").setExplain(true)
+                                                .addFieldDataField("message").addScriptField("script", "doc['message'].value").setSize(1)))
+                        .request() };
+
+        for (SearchRequest searchRequest : searchRequests) {
+            SearchResponse response = client().search(searchRequest).actionGet();
+            assertNoFailures(response);
+            SearchHits innerHits = response.getHits().getAt(0).getInnerHits().get("comment");
+            assertThat(innerHits.getHits().length, equalTo(1));
+            assertThat(innerHits.getAt(0).getHighlightFields().get("message").getFragments()[0].string(), equalTo("<em>fox</em> eat quick"));
+            assertThat(innerHits.getAt(0).explanation().toString(), containsString("weight(message:fox"));
+            assertThat(innerHits.getAt(0).getFields().get("message").getValue().toString(), equalTo("eat"));
+            assertThat(innerHits.getAt(0).getFields().get("script").getValue().toString(), equalTo("eat"));
+        }
+    }
+
     @Test
     public void testRoyals() throws Exception {
         assertAcked(
diff --git a/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java b/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java
index 895fb8f27ef..61cbcec2aea 100644
--- a/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java
+++ b/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java
@@ -33,10 +33,17 @@ import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.mapper.MapperParsingException;
-import org.elasticsearch.index.query.*;
+import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder.Operator;
+import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder.Type;
+import org.elasticsearch.index.query.MultiMatchQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.index.query.QueryStringQueryBuilder;
+import org.elasticsearch.index.query.TermQueryBuilder;
+import org.elasticsearch.index.query.WrapperQueryBuilder;
 import org.elasticsearch.rest.RestStatus;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
@@ -55,11 +62,58 @@ import java.util.concurrent.ExecutionException;
 import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.index.query.QueryBuilders.*;
+import static org.elasticsearch.index.query.QueryBuilders.andQuery;
+import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
+import static org.elasticsearch.index.query.QueryBuilders.commonTermsQuery;
+import static org.elasticsearch.index.query.QueryBuilders.constantScoreQuery;
+import static org.elasticsearch.index.query.QueryBuilders.existsQuery;
+import static org.elasticsearch.index.query.QueryBuilders.filteredQuery;
+import static org.elasticsearch.index.query.QueryBuilders.functionScoreQuery;
+import static org.elasticsearch.index.query.QueryBuilders.fuzzyQuery;
+import static org.elasticsearch.index.query.QueryBuilders.hasChildQuery;
+import static org.elasticsearch.index.query.QueryBuilders.idsQuery;
+import static org.elasticsearch.index.query.QueryBuilders.indicesQuery;
+import static org.elasticsearch.index.query.QueryBuilders.limitQuery;
+import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
+import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
+import static org.elasticsearch.index.query.QueryBuilders.missingQuery;
+import static org.elasticsearch.index.query.QueryBuilders.multiMatchQuery;
+import static org.elasticsearch.index.query.QueryBuilders.notQuery;
+import static org.elasticsearch.index.query.QueryBuilders.prefixQuery;
+import static org.elasticsearch.index.query.QueryBuilders.queryStringQuery;
+import static org.elasticsearch.index.query.QueryBuilders.rangeQuery;
+import static org.elasticsearch.index.query.QueryBuilders.regexpQuery;
+import static org.elasticsearch.index.query.QueryBuilders.spanMultiTermQueryBuilder;
+import static org.elasticsearch.index.query.QueryBuilders.spanNearQuery;
+import static org.elasticsearch.index.query.QueryBuilders.spanNotQuery;
+import static org.elasticsearch.index.query.QueryBuilders.spanOrQuery;
+import static org.elasticsearch.index.query.QueryBuilders.spanTermQuery;
+import static org.elasticsearch.index.query.QueryBuilders.termQuery;
+import static org.elasticsearch.index.query.QueryBuilders.termsLookupQuery;
+import static org.elasticsearch.index.query.QueryBuilders.termsQuery;
+import static org.elasticsearch.index.query.QueryBuilders.typeQuery;
+import static org.elasticsearch.index.query.QueryBuilders.wildcardQuery;
+import static org.elasticsearch.index.query.QueryBuilders.wrapperQuery;
 import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.scriptFunction;
 import static org.elasticsearch.test.VersionUtils.randomVersion;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
-import static org.hamcrest.Matchers.*;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFailures;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFirstHit;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHit;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSecondHit;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThirdHit;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasId;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasScore;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.closeTo;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.is;
 
 @Slow
 public class SearchQueryTests extends ElasticsearchIntegrationTest {
@@ -2105,7 +2159,7 @@ public class SearchQueryTests extends ElasticsearchIntegrationTest {
                 client().prepareIndex("test", "test", "4").setSource("score", 0.5));
 
         SearchResponse searchResponse = client().prepareSearch("test").setQuery(
-                functionScoreQuery(scriptFunction("_doc['score'].value"))).setMinScore(1.5f).get();
+functionScoreQuery(scriptFunction(new Script("_doc['score'].value")))).setMinScore(1.5f).get();
         assertHitCount(searchResponse, 2);
         assertFirstHit(searchResponse, hasId("3"));
         assertSecondHit(searchResponse, hasId("1"));
diff --git a/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java b/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java
index d1cbdc86525..8bcf5f4477a 100644
--- a/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java
+++ b/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java
@@ -35,6 +35,7 @@ import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.rescore.RescoreBuilder.QueryRescorer;
@@ -47,8 +48,19 @@ import java.util.Comparator;
 import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
 import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_REPLICAS;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
-import static org.hamcrest.Matchers.*;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFirstHit;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFourthHit;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSecondHit;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThirdHit;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasId;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasScore;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
+import static org.hamcrest.Matchers.notNullValue;
 
 /**
  *
@@ -586,9 +598,15 @@ public class QueryRescorerTests extends ElasticsearchIntegrationTest {
                         .queryRescorer(
                                 QueryBuilders.boolQuery()
                                         .disableCoord(true)
-                                        .should(QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("field1", intToEnglish[0])).boostMode(CombineFunction.REPLACE).add(ScoreFunctionBuilders.scriptFunction("5.0f")))
-                                    .should(QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("field1", intToEnglish[1])).boostMode(CombineFunction.REPLACE).add(ScoreFunctionBuilders.scriptFunction("7.0f")))
-                                    .should(QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("field1", intToEnglish[3])).boostMode(CombineFunction.REPLACE).add(ScoreFunctionBuilders.scriptFunction("0.0f"))))
+                                        .should(QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("field1", intToEnglish[0]))
+                                                .boostMode(CombineFunction.REPLACE)
+                                                .add(ScoreFunctionBuilders.scriptFunction(new Script("5.0f"))))
+                                        .should(QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("field1", intToEnglish[1]))
+                                                .boostMode(CombineFunction.REPLACE)
+                                                .add(ScoreFunctionBuilders.scriptFunction(new Script("7.0f"))))
+                                        .should(QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("field1", intToEnglish[3]))
+                                                .boostMode(CombineFunction.REPLACE)
+                                                .add(ScoreFunctionBuilders.scriptFunction(new Script("0.0f")))))
                         .setQueryWeight(primaryWeight)
                         .setRescoreQueryWeight(secondaryWeight);
 
@@ -601,10 +619,18 @@ public class QueryRescorerTests extends ElasticsearchIntegrationTest {
                         .setPreference("test") // ensure we hit the same shards for tie-breaking
                         .setQuery(QueryBuilders.boolQuery()
                                 .disableCoord(true)
-                                .should(QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("field1", intToEnglish[0])).boostMode(CombineFunction.REPLACE).add(ScoreFunctionBuilders.scriptFunction("2.0f")))
-                                .should(QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("field1", intToEnglish[1])).boostMode(CombineFunction.REPLACE).add(ScoreFunctionBuilders.scriptFunction("3.0f")))
-                                .should(QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("field1", intToEnglish[2])).boostMode(CombineFunction.REPLACE).add(ScoreFunctionBuilders.scriptFunction("5.0f")))
-                                .should(QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("field1", intToEnglish[3])).boostMode(CombineFunction.REPLACE).add(ScoreFunctionBuilders.scriptFunction("0.2f"))))
+                                        .should(QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("field1", intToEnglish[0]))
+                                                .boostMode(CombineFunction.REPLACE)
+                                                .add(ScoreFunctionBuilders.scriptFunction(new Script("2.0f"))))
+                                        .should(QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("field1", intToEnglish[1]))
+                                                .boostMode(CombineFunction.REPLACE)
+                                                .add(ScoreFunctionBuilders.scriptFunction(new Script("3.0f"))))
+                                        .should(QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("field1", intToEnglish[2]))
+                                                .boostMode(CombineFunction.REPLACE)
+                                                .add(ScoreFunctionBuilders.scriptFunction(new Script("5.0f"))))
+                                        .should(QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("field1", intToEnglish[3]))
+                                                .boostMode(CombineFunction.REPLACE)
+                                                .add(ScoreFunctionBuilders.scriptFunction(new Script("0.2f")))))
                         .setFrom(0)
                         .setSize(10)
                         .setRescorer(rescoreQuery)
@@ -662,10 +688,12 @@ public class QueryRescorerTests extends ElasticsearchIntegrationTest {
         int numDocs = indexRandomNumbers("keyword", 1, true);
         QueryRescorer eightIsGreat = RescoreBuilder.queryRescorer(
                 QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("field1", English.intToEnglish(8))).boostMode(CombineFunction.REPLACE)
-                .add(ScoreFunctionBuilders.scriptFunction("1000.0f"))).setScoreMode("total");
+.add(ScoreFunctionBuilders.scriptFunction(new Script("1000.0f")))).setScoreMode(
+                "total");
         QueryRescorer sevenIsBetter = RescoreBuilder.queryRescorer(
                 QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("field1", English.intToEnglish(7))).boostMode(CombineFunction.REPLACE)
-                .add(ScoreFunctionBuilders.scriptFunction("10000.0f"))).setScoreMode("total");
+.add(ScoreFunctionBuilders.scriptFunction(new Script("10000.0f"))))
+                .setScoreMode("total");
 
         // First set the rescore window large enough that both rescores take effect
         SearchRequestBuilder request = client().prepareSearch().setRescoreWindow(numDocs);
@@ -682,10 +710,10 @@ public class QueryRescorerTests extends ElasticsearchIntegrationTest {
         // Now use one rescore to drag the number we're looking for into the window of another
         QueryRescorer ninetyIsGood = RescoreBuilder.queryRescorer(
                 QueryBuilders.functionScoreQuery(QueryBuilders.queryStringQuery("*ninety*")).boostMode(CombineFunction.REPLACE)
-                .add(ScoreFunctionBuilders.scriptFunction("1000.0f"))).setScoreMode("total");
+                        .add(ScoreFunctionBuilders.scriptFunction(new Script("1000.0f")))).setScoreMode("total");
         QueryRescorer oneToo = RescoreBuilder.queryRescorer(
                 QueryBuilders.functionScoreQuery(QueryBuilders.queryStringQuery("*one*")).boostMode(CombineFunction.REPLACE)
-                .add(ScoreFunctionBuilders.scriptFunction("1000.0f"))).setScoreMode("total");
+                        .add(ScoreFunctionBuilders.scriptFunction(new Script("1000.0f")))).setScoreMode("total");
         request.clearRescorers().addRescorer(ninetyIsGood).addRescorer(oneToo, 10);
         response = request.setSize(2).get();
         assertFirstHit(response, hasId("91"));
diff --git a/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchTests.java b/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchTests.java
index 430b86a6cb5..a37bc269ae6 100644
--- a/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchTests.java
+++ b/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchTests.java
@@ -24,16 +24,20 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.cache.filter.FilterCacheModule;
 import org.elasticsearch.index.cache.filter.FilterCacheModule.FilterCacheSettings;
 import org.elasticsearch.index.cache.filter.index.IndexFilterCache;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.ScriptService.ScriptType;
 import org.elasticsearch.search.sort.SortOrder;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.junit.Test;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.index.query.QueryBuilders.scriptQuery;
 import static org.elasticsearch.index.query.QueryBuilders.filteredQuery;
 import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
+import static org.elasticsearch.index.query.QueryBuilders.scriptQuery;
 import static org.hamcrest.Matchers.equalTo;
 
 /**
@@ -69,10 +73,68 @@ public class ScriptQuerySearchTests extends ElasticsearchIntegrationTest {
 
         logger.info("running doc['num1'].value > 1");
         SearchResponse response = client().prepareSearch()
-                .setQuery(filteredQuery(matchAllQuery(), scriptQuery("doc['num1'].value > 1")))
-                .addSort("num1", SortOrder.ASC)
-                .addScriptField("sNum1", "doc['num1'].value")
-                .execute().actionGet();
+                .setQuery(filteredQuery(matchAllQuery(), scriptQuery(new Script("doc['num1'].value > 1")))).addSort("num1", SortOrder.ASC)
+                .addScriptField("sNum1", new Script("doc['num1'].value")).execute().actionGet();
+
+        assertThat(response.getHits().totalHits(), equalTo(2l));
+        assertThat(response.getHits().getAt(0).id(), equalTo("2"));
+        assertThat((Double) response.getHits().getAt(0).fields().get("sNum1").values().get(0), equalTo(2.0));
+        assertThat(response.getHits().getAt(1).id(), equalTo("3"));
+        assertThat((Double) response.getHits().getAt(1).fields().get("sNum1").values().get(0), equalTo(3.0));
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("param1", 2);
+
+        logger.info("running doc['num1'].value > param1");
+        response = client()
+                .prepareSearch()
+                .setQuery(
+                        filteredQuery(matchAllQuery(),
+                                scriptQuery(new Script("doc['num1'].value > param1", ScriptType.INLINE, null, params))))
+                .addSort("num1", SortOrder.ASC).addScriptField("sNum1", new Script("doc['num1'].value")).execute().actionGet();
+
+        assertThat(response.getHits().totalHits(), equalTo(1l));
+        assertThat(response.getHits().getAt(0).id(), equalTo("3"));
+        assertThat((Double) response.getHits().getAt(0).fields().get("sNum1").values().get(0), equalTo(3.0));
+
+        params = new HashMap<>();
+        params.put("param1", -1);
+        logger.info("running doc['num1'].value > param1");
+        response = client()
+                .prepareSearch()
+                .setQuery(
+                        filteredQuery(matchAllQuery(),
+                                scriptQuery(new Script("doc['num1'].value > param1", ScriptType.INLINE, null, params))))
+                .addSort("num1", SortOrder.ASC).addScriptField("sNum1", new Script("doc['num1'].value")).execute().actionGet();
+
+        assertThat(response.getHits().totalHits(), equalTo(3l));
+        assertThat(response.getHits().getAt(0).id(), equalTo("1"));
+        assertThat((Double) response.getHits().getAt(0).fields().get("sNum1").values().get(0), equalTo(1.0));
+        assertThat(response.getHits().getAt(1).id(), equalTo("2"));
+        assertThat((Double) response.getHits().getAt(1).fields().get("sNum1").values().get(0), equalTo(2.0));
+        assertThat(response.getHits().getAt(2).id(), equalTo("3"));
+        assertThat((Double) response.getHits().getAt(2).fields().get("sNum1").values().get(0), equalTo(3.0));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testCustomScriptBoostOldScriptAPI() throws Exception {
+        createIndex("test");
+        client().prepareIndex("test", "type1", "1")
+                .setSource(jsonBuilder().startObject().field("test", "value beck").field("num1", 1.0f).endObject()).execute().actionGet();
+        flush();
+        client().prepareIndex("test", "type1", "2")
+                .setSource(jsonBuilder().startObject().field("test", "value beck").field("num1", 2.0f).endObject()).execute().actionGet();
+        flush();
+        client().prepareIndex("test", "type1", "3")
+                .setSource(jsonBuilder().startObject().field("test", "value beck").field("num1", 3.0f).endObject()).execute().actionGet();
+        refresh();
+
+        logger.info("running doc['num1'].value > 1");
+        SearchResponse response = client().prepareSearch().setQuery(filteredQuery(matchAllQuery(), scriptQuery("doc['num1'].value > 1")))
+                .addSort("num1", SortOrder.ASC).addScriptField("sNum1", "doc['num1'].value").execute().actionGet();
 
         assertThat(response.getHits().totalHits(), equalTo(2l));
         assertThat(response.getHits().getAt(0).id(), equalTo("2"));
@@ -83,9 +145,7 @@ public class ScriptQuerySearchTests extends ElasticsearchIntegrationTest {
         logger.info("running doc['num1'].value > param1");
         response = client().prepareSearch()
                 .setQuery(filteredQuery(matchAllQuery(), scriptQuery("doc['num1'].value > param1").addParam("param1", 2)))
-                .addSort("num1", SortOrder.ASC)
-                .addScriptField("sNum1", "doc['num1'].value")
-                .execute().actionGet();
+                .addSort("num1", SortOrder.ASC).addScriptField("sNum1", "doc['num1'].value").execute().actionGet();
 
         assertThat(response.getHits().totalHits(), equalTo(1l));
         assertThat(response.getHits().getAt(0).id(), equalTo("3"));
@@ -94,9 +154,7 @@ public class ScriptQuerySearchTests extends ElasticsearchIntegrationTest {
         logger.info("running doc['num1'].value > param1");
         response = client().prepareSearch()
                 .setQuery(filteredQuery(matchAllQuery(), scriptQuery("doc['num1'].value > param1").addParam("param1", -1)))
-                .addSort("num1", SortOrder.ASC)
-                .addScriptField("sNum1", "doc['num1'].value")
-                .execute().actionGet();
+                .addSort("num1", SortOrder.ASC).addScriptField("sNum1", "doc['num1'].value").execute().actionGet();
 
         assertThat(response.getHits().totalHits(), equalTo(3l));
         assertThat(response.getHits().getAt(0).id(), equalTo("1"));
diff --git a/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java b/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java
index fb3c9ec4858..8a369d8f5f9 100644
--- a/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java
+++ b/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java
@@ -41,6 +41,7 @@ import org.elasticsearch.index.fielddata.IndexFieldData;
 import org.elasticsearch.index.mapper.Uid;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHitField;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
@@ -374,21 +375,33 @@ public class SimpleSortTests extends ElasticsearchIntegrationTest {
 
         refresh();
 
-        SearchResponse searchResponse = client().prepareSearch("test").setQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), ScoreFunctionBuilders.scriptFunction("_source.field"))).execute().actionGet();
+        SearchResponse searchResponse = client()
+                .prepareSearch("test")
+                .setQuery(
+                        QueryBuilders.functionScoreQuery(matchAllQuery(), ScoreFunctionBuilders.scriptFunction(new Script("_source.field"))))
+                .execute().actionGet();
         assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("1"));
         assertThat(searchResponse.getHits().getAt(1).score(), Matchers.lessThan(searchResponse.getHits().getAt(0).score()));
         assertThat(searchResponse.getHits().getAt(1).getId(), equalTo("2"));
         assertThat(searchResponse.getHits().getAt(2).score(), Matchers.lessThan(searchResponse.getHits().getAt(1).score()));
         assertThat(searchResponse.getHits().getAt(2).getId(), equalTo("3"));
 
-        searchResponse = client().prepareSearch("test").setQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), ScoreFunctionBuilders.scriptFunction("_source.field"))).addSort("_score", SortOrder.DESC).execute().actionGet();
+        searchResponse = client()
+                .prepareSearch("test")
+                .setQuery(
+                        QueryBuilders.functionScoreQuery(matchAllQuery(), ScoreFunctionBuilders.scriptFunction(new Script("_source.field"))))
+                .addSort("_score", SortOrder.DESC).execute().actionGet();
         assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("1"));
         assertThat(searchResponse.getHits().getAt(1).score(), Matchers.lessThan(searchResponse.getHits().getAt(0).score()));
         assertThat(searchResponse.getHits().getAt(1).getId(), equalTo("2"));
         assertThat(searchResponse.getHits().getAt(2).score(), Matchers.lessThan(searchResponse.getHits().getAt(1).score()));
         assertThat(searchResponse.getHits().getAt(2).getId(), equalTo("3"));
 
-        searchResponse = client().prepareSearch("test").setQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), ScoreFunctionBuilders.scriptFunction("_source.field"))).addSort("_score", SortOrder.DESC).execute().actionGet();
+        searchResponse = client()
+                .prepareSearch("test")
+                .setQuery(
+                        QueryBuilders.functionScoreQuery(matchAllQuery(), ScoreFunctionBuilders.scriptFunction(new Script("_source.field"))))
+                .addSort("_score", SortOrder.DESC).execute().actionGet();
         assertThat(searchResponse.getHits().getAt(2).getId(), equalTo("3"));
         assertThat(searchResponse.getHits().getAt(1).getId(), equalTo("2"));
         assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("1"));
@@ -406,21 +419,26 @@ public class SimpleSortTests extends ElasticsearchIntegrationTest {
 
         refresh();
 
-        SearchResponse searchResponse = client().prepareSearch("test").setQuery(functionScoreQuery(matchAllQuery(), scriptFunction("_source.field"))).execute().actionGet();
+        SearchResponse searchResponse = client().prepareSearch("test")
+                .setQuery(functionScoreQuery(matchAllQuery(), scriptFunction(new Script("_source.field")))).execute().actionGet();
         assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("1"));
         assertThat(searchResponse.getHits().getAt(1).score(), Matchers.lessThan(searchResponse.getHits().getAt(0).score()));
         assertThat(searchResponse.getHits().getAt(1).getId(), equalTo("2"));
         assertThat(searchResponse.getHits().getAt(2).score(), Matchers.lessThan(searchResponse.getHits().getAt(1).score()));
         assertThat(searchResponse.getHits().getAt(2).getId(), equalTo("3"));
 
-        searchResponse = client().prepareSearch("test").setQuery(functionScoreQuery(matchAllQuery(), scriptFunction("_source.field"))).addSort("_score", SortOrder.DESC).execute().actionGet();
+        searchResponse = client().prepareSearch("test")
+                .setQuery(functionScoreQuery(matchAllQuery(), scriptFunction(new Script("_source.field"))))
+                .addSort("_score", SortOrder.DESC).execute().actionGet();
         assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("1"));
         assertThat(searchResponse.getHits().getAt(1).score(), Matchers.lessThan(searchResponse.getHits().getAt(0).score()));
         assertThat(searchResponse.getHits().getAt(1).getId(), equalTo("2"));
         assertThat(searchResponse.getHits().getAt(2).score(), Matchers.lessThan(searchResponse.getHits().getAt(1).score()));
         assertThat(searchResponse.getHits().getAt(2).getId(), equalTo("3"));
 
-        searchResponse = client().prepareSearch("test").setQuery(functionScoreQuery(matchAllQuery(), scriptFunction("_source.field"))).addSort("_score", SortOrder.DESC).execute().actionGet();
+        searchResponse = client().prepareSearch("test")
+                .setQuery(functionScoreQuery(matchAllQuery(), scriptFunction(new Script("_source.field"))))
+                .addSort("_score", SortOrder.DESC).execute().actionGet();
         assertThat(searchResponse.getHits().getAt(2).getId(), equalTo("3"));
         assertThat(searchResponse.getHits().getAt(1).getId(), equalTo("2"));
         assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("1"));
@@ -557,6 +575,272 @@ public class SimpleSortTests extends ElasticsearchIntegrationTest {
         searchResponse = client().prepareSearch()
                 .setQuery(matchAllQuery())
                 .setSize(size)
+                .addSort(new ScriptSortBuilder(new Script("doc['str_value'].value"), "string")).execute().actionGet();
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(10l));
+        assertThat(searchResponse.getHits().hits().length, equalTo(size));
+        for (int i = 0; i < size; i++) {
+            assertThat(searchResponse.getHits().getAt(i).id(), equalTo(Integer.toString(i)));
+            assertThat(searchResponse.getHits().getAt(i).sortValues()[0].toString(), equalTo(new String(new char[] { (char) (97 + i),
+                    (char) (97 + i) })));
+        }
+        size = 1 + random.nextInt(10);
+        searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("str_value", SortOrder.DESC).execute()
+                .actionGet();
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(10l));
+        assertThat(searchResponse.getHits().hits().length, equalTo(size));
+        for (int i = 0; i < size; i++) {
+            assertThat(searchResponse.getHits().getAt(i).id(), equalTo(Integer.toString(9 - i)));
+            assertThat(searchResponse.getHits().getAt(i).sortValues()[0].toString(), equalTo(new String(new char[] { (char) (97 + (9 - i)),
+                    (char) (97 + (9 - i)) })));
+        }
+
+        assertThat(searchResponse.toString(), not(containsString("error")));
+
+        // BYTE
+        size = 1 + random.nextInt(10);
+        searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("byte_value", SortOrder.ASC).execute()
+                .actionGet();
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(10l));
+        assertThat(searchResponse.getHits().hits().length, equalTo(size));
+        for (int i = 0; i < size; i++) {
+            assertThat(searchResponse.getHits().getAt(i).id(), equalTo(Integer.toString(i)));
+            assertThat(((Number) searchResponse.getHits().getAt(i).sortValues()[0]).byteValue(), equalTo((byte) i));
+        }
+        size = 1 + random.nextInt(10);
+        searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("byte_value", SortOrder.DESC).execute()
+                .actionGet();
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(10l));
+        assertThat(searchResponse.getHits().hits().length, equalTo(size));
+        for (int i = 0; i < size; i++) {
+            assertThat(searchResponse.getHits().getAt(i).id(), equalTo(Integer.toString(9 - i)));
+            assertThat(((Number) searchResponse.getHits().getAt(i).sortValues()[0]).byteValue(), equalTo((byte) (9 - i)));
+        }
+
+        assertThat(searchResponse.toString(), not(containsString("error")));
+
+        // SHORT
+        size = 1 + random.nextInt(10);
+        searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("short_value", SortOrder.ASC).execute()
+                .actionGet();
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(10l));
+        assertThat(searchResponse.getHits().hits().length, equalTo(size));
+        for (int i = 0; i < size; i++) {
+            assertThat(searchResponse.getHits().getAt(i).id(), equalTo(Integer.toString(i)));
+            assertThat(((Number) searchResponse.getHits().getAt(i).sortValues()[0]).shortValue(), equalTo((short) i));
+        }
+        size = 1 + random.nextInt(10);
+        searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("short_value", SortOrder.DESC).execute()
+                .actionGet();
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(10l));
+        assertThat(searchResponse.getHits().hits().length, equalTo(size));
+        for (int i = 0; i < size; i++) {
+            assertThat(searchResponse.getHits().getAt(i).id(), equalTo(Integer.toString(9 - i)));
+            assertThat(((Number) searchResponse.getHits().getAt(i).sortValues()[0]).shortValue(), equalTo((short) (9 - i)));
+        }
+
+        assertThat(searchResponse.toString(), not(containsString("error")));
+
+        // INTEGER
+        size = 1 + random.nextInt(10);
+        searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("integer_value", SortOrder.ASC).execute()
+                .actionGet();
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(10l));
+        assertThat(searchResponse.getHits().hits().length, equalTo(size));
+        for (int i = 0; i < size; i++) {
+            assertThat(searchResponse.getHits().getAt(i).id(), equalTo(Integer.toString(i)));
+            assertThat(((Number) searchResponse.getHits().getAt(i).sortValues()[0]).intValue(), equalTo(i));
+        }
+
+        assertThat(searchResponse.toString(), not(containsString("error")));
+        size = 1 + random.nextInt(10);
+        searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("integer_value", SortOrder.DESC)
+                .execute().actionGet();
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(10l));
+        assertThat(searchResponse.getHits().hits().length, equalTo(size));
+        for (int i = 0; i < size; i++) {
+            assertThat(searchResponse.getHits().getAt(i).id(), equalTo(Integer.toString(9 - i)));
+            assertThat(((Number) searchResponse.getHits().getAt(i).sortValues()[0]).intValue(), equalTo((9 - i)));
+        }
+
+        assertThat(searchResponse.toString(), not(containsString("error")));
+
+        // LONG
+        size = 1 + random.nextInt(10);
+        searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("long_value", SortOrder.ASC).execute()
+                .actionGet();
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(10l));
+        assertThat(searchResponse.getHits().hits().length, equalTo(size));
+        for (int i = 0; i < size; i++) {
+            assertThat(searchResponse.getHits().getAt(i).id(), equalTo(Integer.toString(i)));
+            assertThat(((Number) searchResponse.getHits().getAt(i).sortValues()[0]).longValue(), equalTo((long) i));
+        }
+
+        assertThat(searchResponse.toString(), not(containsString("error")));
+        size = 1 + random.nextInt(10);
+        searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("long_value", SortOrder.DESC).execute()
+                .actionGet();
+        assertHitCount(searchResponse, 10l);
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(10l));
+        assertThat(searchResponse.getHits().hits().length, equalTo(size));
+        for (int i = 0; i < size; i++) {
+            assertThat(searchResponse.getHits().getAt(i).id(), equalTo(Integer.toString(9 - i)));
+            assertThat(((Number) searchResponse.getHits().getAt(i).sortValues()[0]).longValue(), equalTo((long) (9 - i)));
+        }
+
+        assertThat(searchResponse.toString(), not(containsString("error")));
+
+        // FLOAT
+        size = 1 + random.nextInt(10);
+        searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("float_value", SortOrder.ASC).execute()
+                .actionGet();
+
+        assertHitCount(searchResponse, 10l);
+        assertThat(searchResponse.getHits().hits().length, equalTo(size));
+        for (int i = 0; i < size; i++) {
+            assertThat(searchResponse.getHits().getAt(i).id(), equalTo(Integer.toString(i)));
+            assertThat(((Number) searchResponse.getHits().getAt(i).sortValues()[0]).doubleValue(), closeTo(0.1d * i, 0.000001d));
+        }
+
+        assertThat(searchResponse.toString(), not(containsString("error")));
+        size = 1 + random.nextInt(10);
+        searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("float_value", SortOrder.DESC).execute()
+                .actionGet();
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(10l));
+        assertThat(searchResponse.getHits().hits().length, equalTo(size));
+        for (int i = 0; i < size; i++) {
+            assertThat(searchResponse.getHits().getAt(i).id(), equalTo(Integer.toString(9 - i)));
+            assertThat(((Number) searchResponse.getHits().getAt(i).sortValues()[0]).doubleValue(), closeTo(0.1d * (9 - i), 0.000001d));
+        }
+
+        assertThat(searchResponse.toString(), not(containsString("error")));
+
+        // DOUBLE
+        size = 1 + random.nextInt(10);
+        searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("double_value", SortOrder.ASC).execute()
+                .actionGet();
+
+        assertHitCount(searchResponse, 10l);
+        assertThat(searchResponse.getHits().hits().length, equalTo(size));
+        for (int i = 0; i < size; i++) {
+            assertThat(searchResponse.getHits().getAt(i).id(), equalTo(Integer.toString(i)));
+            assertThat(((Number) searchResponse.getHits().getAt(i).sortValues()[0]).doubleValue(), closeTo(0.1d * i, 0.000001d));
+        }
+
+        assertThat(searchResponse.toString(), not(containsString("error")));
+        size = 1 + random.nextInt(10);
+        searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("double_value", SortOrder.DESC).execute()
+                .actionGet();
+
+        assertHitCount(searchResponse, 10l);
+        assertThat(searchResponse.getHits().hits().length, equalTo(size));
+        for (int i = 0; i < size; i++) {
+            assertThat(searchResponse.getHits().getAt(i).id(), equalTo(Integer.toString(9 - i)));
+            assertThat(((Number) searchResponse.getHits().getAt(i).sortValues()[0]).doubleValue(), closeTo(0.1d * (9 - i), 0.000001d));
+        }
+
+        assertNoFailures(searchResponse);
+    }
+
+    @Test
+    public void test2920() throws IOException {
+        assertAcked(prepareCreate("test").addMapping(
+                "test",
+                jsonBuilder().startObject().startObject("test").startObject("properties").startObject("value").field("type", "string")
+                        .endObject().endObject().endObject().endObject()));
+        ensureGreen();
+        for (int i = 0; i < 10; i++) {
+            client().prepareIndex("test", "test", Integer.toString(i))
+                    .setSource(jsonBuilder().startObject().field("value", "" + i).endObject()).execute().actionGet();
+        }
+        refresh();
+        SearchResponse searchResponse = client().prepareSearch().setQuery(matchAllQuery())
+                .addSort(SortBuilders.scriptSort(new Script("\u0027\u0027"), "string")).setSize(10).execute().actionGet();
+        assertNoFailures(searchResponse);
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testSimpleSortsOldScriptAPI() throws Exception {
+        Random random = getRandom();
+        assertAcked(prepareCreate("test").addMapping(
+                "type1",
+                XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("properties").startObject("str_value")
+                        .field("type", "string").field("index", "not_analyzed").startObject("fielddata")
+                        .field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject().startObject("boolean_value")
+                        .field("type", "boolean").endObject().startObject("byte_value").field("type", "byte").startObject("fielddata")
+                        .field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject().startObject("short_value")
+                        .field("type", "short").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null)
+                        .endObject().endObject().startObject("integer_value").field("type", "integer").startObject("fielddata")
+                        .field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject().startObject("long_value")
+                        .field("type", "long").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null)
+                        .endObject().endObject().startObject("float_value").field("type", "float").startObject("fielddata")
+                        .field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject().startObject("double_value")
+                        .field("type", "double").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null)
+                        .endObject().endObject().endObject().endObject().endObject()));
+        ensureGreen();
+        List<IndexRequestBuilder> builders = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            IndexRequestBuilder builder = client().prepareIndex("test", "type1", Integer.toString(i)).setSource(
+                    jsonBuilder().startObject().field("str_value", new String(new char[] { (char) (97 + i), (char) (97 + i) }))
+                            .field("boolean_value", true).field("byte_value", i).field("short_value", i).field("integer_value", i)
+                            .field("long_value", i).field("float_value", 0.1 * i).field("double_value", 0.1 * i).endObject());
+            builders.add(builder);
+        }
+        Collections.shuffle(builders, random);
+        for (IndexRequestBuilder builder : builders) {
+            builder.execute().actionGet();
+            if (random.nextBoolean()) {
+                if (random.nextInt(5) != 0) {
+                    refresh();
+                } else {
+                    client().admin().indices().prepareFlush().execute().actionGet();
+                }
+            }
+
+        }
+        refresh();
+
+        // STRING
+        int size = 1 + random.nextInt(10);
+
+        SearchResponse searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size)
+                .addSort("str_value", SortOrder.ASC).execute().actionGet();
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(10l));
+        assertThat(searchResponse.getHits().hits().length, equalTo(size));
+        for (int i = 0; i < size; i++) {
+            assertThat(searchResponse.getHits().getAt(i).id(), equalTo(Integer.toString(i)));
+            assertThat(searchResponse.getHits().getAt(i).sortValues()[0].toString(), equalTo(new String(new char[] { (char) (97 + i),
+                    (char) (97 + i) })));
+        }
+        size = 1 + random.nextInt(10);
+        searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("str_value", SortOrder.DESC).execute()
+                .actionGet();
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(10l));
+        assertThat(searchResponse.getHits().hits().length, equalTo(size));
+        for (int i = 0; i < size; i++) {
+            assertThat(searchResponse.getHits().getAt(i).id(), equalTo(Integer.toString(9 - i)));
+            assertThat(searchResponse.getHits().getAt(i).sortValues()[0].toString(), equalTo(new String(new char[] { (char) (97 + (9 - i)),
+                    (char) (97 + (9 - i)) })));
+        }
+
+        assertThat(searchResponse.toString(), not(containsString("error")));
+
+        // STRING script
+        size = 1 + random.nextInt(10);
+
+        searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size)
                 .addSort(new ScriptSortBuilder("doc['str_value'].value", "string"))
                 .execute().actionGet();
         assertThat(searchResponse.getHits().getTotalHits(), equalTo(10l));
@@ -770,8 +1054,11 @@ public class SimpleSortTests extends ElasticsearchIntegrationTest {
         assertNoFailures(searchResponse);
     }
 
+    /*
+     * TODO Remove in 2.0
+     */
     @Test
-    public void test2920() throws IOException {
+    public void test2920OldScriptAPI() throws IOException {
         assertAcked(prepareCreate("test").addMapping("test",
                 jsonBuilder().startObject().startObject("test").startObject("properties")
                         .startObject("value").field("type", "string").endObject()
@@ -824,7 +1111,7 @@ public class SimpleSortTests extends ElasticsearchIntegrationTest {
         // test the long values
         SearchResponse searchResponse = client().prepareSearch()
                 .setQuery(matchAllQuery())
-                .addScriptField("min", "retval = Long.MAX_VALUE; for (v in doc['lvalue'].values){ retval = min(v, retval) }; retval")
+                .addScriptField("min", new Script("retval = Long.MAX_VALUE; for (v in doc['lvalue'].values){ retval = min(v, retval) }; retval"))
                 .addSort(SortBuilders.fieldSort("ord").order(SortOrder.ASC).unmappedType("long")).setSize(10)
                 .execute().actionGet();
 
@@ -837,7 +1124,7 @@ public class SimpleSortTests extends ElasticsearchIntegrationTest {
         // test the double values
         searchResponse = client().prepareSearch()
                 .setQuery(matchAllQuery())
-                .addScriptField("min", "retval = Double.MAX_VALUE; for (v in doc['dvalue'].values){ retval = min(v, retval) }; retval")
+                .addScriptField("min", new Script("retval = Double.MAX_VALUE; for (v in doc['dvalue'].values){ retval = min(v, retval) }; retval"))
                 .addSort(SortBuilders.fieldSort("ord").order(SortOrder.ASC).unmappedType("long")).setSize(10)
                 .execute().actionGet();
 
@@ -851,7 +1138,7 @@ public class SimpleSortTests extends ElasticsearchIntegrationTest {
         // test the string values
         searchResponse = client().prepareSearch()
                 .setQuery(matchAllQuery())
-                .addScriptField("min", "retval = Integer.MAX_VALUE; for (v in doc['svalue'].values){ retval = min(Integer.parseInt(v), retval) }; retval")
+                .addScriptField("min", new Script("retval = Integer.MAX_VALUE; for (v in doc['svalue'].values){ retval = min(Integer.parseInt(v), retval) }; retval"))
                 .addSort(SortBuilders.fieldSort("ord").order(SortOrder.ASC).unmappedType("long")).setSize(10)
                 .execute().actionGet();
 
@@ -865,7 +1152,7 @@ public class SimpleSortTests extends ElasticsearchIntegrationTest {
         // test the geopoint values
         searchResponse = client().prepareSearch()
                 .setQuery(matchAllQuery())
-                .addScriptField("min", "retval = Double.MAX_VALUE; for (v in doc['gvalue'].values){ retval = min(v.lon, retval) }; retval")
+                .addScriptField("min", new Script("retval = Double.MAX_VALUE; for (v in doc['gvalue'].values){ retval = min(v.lon, retval) }; retval"))
                 .addSort(SortBuilders.fieldSort("ord").order(SortOrder.ASC).unmappedType("long")).setSize(10)
                 .execute().actionGet();
 
@@ -904,6 +1191,184 @@ public class SimpleSortTests extends ElasticsearchIntegrationTest {
                 .endObject()).execute().actionGet();
 
 
+        flush();
+        refresh();
+
+        SearchResponse searchResponse = client().prepareSearch()
+                .setQuery(matchAllQuery())
+                .addScriptField("id", new Script("doc['id'].value"))
+                .addSort("svalue", SortOrder.ASC)
+                .execute().actionGet();
+
+        assertNoFailures(searchResponse);
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(3l));
+        assertThat((String) searchResponse.getHits().getAt(0).field("id").value(), equalTo("1"));
+        assertThat((String) searchResponse.getHits().getAt(1).field("id").value(), equalTo("3"));
+        assertThat((String) searchResponse.getHits().getAt(2).field("id").value(), equalTo("2"));
+
+        searchResponse = client().prepareSearch()
+                .setQuery(matchAllQuery())
+                .addScriptField("id", new Script("doc['id'].values[0]"))
+                .addSort("svalue", SortOrder.ASC)
+                .execute().actionGet();
+
+        assertNoFailures(searchResponse);
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(3l));
+        assertThat((String) searchResponse.getHits().getAt(0).field("id").value(), equalTo("1"));
+        assertThat((String) searchResponse.getHits().getAt(1).field("id").value(), equalTo("3"));
+        assertThat((String) searchResponse.getHits().getAt(2).field("id").value(), equalTo("2"));
+
+        searchResponse = client().prepareSearch()
+                .setQuery(matchAllQuery())
+                .addScriptField("id", new Script("doc['id'].value"))
+                .addSort("svalue", SortOrder.DESC)
+                .execute().actionGet();
+
+        if (searchResponse.getFailedShards() > 0) {
+            logger.warn("Failed shards:");
+            for (ShardSearchFailure shardSearchFailure : searchResponse.getShardFailures()) {
+                logger.warn("-> {}", shardSearchFailure);
+            }
+        }
+        assertThat(searchResponse.getFailedShards(), equalTo(0));
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(3l));
+        assertThat((String) searchResponse.getHits().getAt(0).field("id").value(), equalTo("3"));
+        assertThat((String) searchResponse.getHits().getAt(1).field("id").value(), equalTo("1"));
+        assertThat((String) searchResponse.getHits().getAt(2).field("id").value(), equalTo("2"));
+
+        // a query with docs just with null values
+        searchResponse = client().prepareSearch()
+                .setQuery(termQuery("id", "2"))
+                .addScriptField("id", new Script("doc['id'].value"))
+                .addSort("svalue", SortOrder.DESC)
+                .execute().actionGet();
+
+        if (searchResponse.getFailedShards() > 0) {
+            logger.warn("Failed shards:");
+            for (ShardSearchFailure shardSearchFailure : searchResponse.getShardFailures()) {
+                logger.warn("-> {}", shardSearchFailure);
+            }
+        }
+        assertThat(searchResponse.getFailedShards(), equalTo(0));
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(1l));
+        assertThat((String) searchResponse.getHits().getAt(0).field("id").value(), equalTo("2"));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testSortMinValueScriptOldScriptAPI() throws IOException {
+        String mapping = jsonBuilder().startObject().startObject("type1").startObject("properties").startObject("lvalue")
+                .field("type", "long").endObject().startObject("dvalue").field("type", "double").endObject().startObject("svalue")
+                .field("type", "string").endObject().startObject("gvalue").field("type", "geo_point").endObject().endObject().endObject()
+                .endObject().string();
+        assertAcked(prepareCreate("test").addMapping("type1", mapping));
+        ensureGreen();
+
+        for (int i = 0; i < 10; i++) {
+            IndexRequestBuilder req = client().prepareIndex("test", "type1", "" + i).setSource(
+                    jsonBuilder().startObject().field("ord", i).field("svalue", new String[] { "" + i, "" + (i + 1), "" + (i + 2) })
+                            .field("lvalue", new long[] { i, i + 1, i + 2 }).field("dvalue", new double[] { i, i + 1, i + 2 })
+                            .startObject("gvalue").field("lat", (double) i + 1).field("lon", (double) i).endObject().endObject());
+            req.execute().actionGet();
+        }
+
+        for (int i = 10; i < 20; i++) { // add some docs that don't have values in those fields
+            client().prepareIndex("test", "type1", "" + i).setSource(jsonBuilder().startObject().field("ord", i).endObject()).execute()
+                    .actionGet();
+        }
+        client().admin().indices().prepareRefresh("test").execute().actionGet();
+
+        // test the long values
+        SearchResponse searchResponse = client().prepareSearch().setQuery(matchAllQuery())
+                .addScriptField("min", "retval = Long.MAX_VALUE; for (v in doc['lvalue'].values){ retval = min(v, retval) }; retval")
+                .addSort(SortBuilders.fieldSort("ord").order(SortOrder.ASC).unmappedType("long")).setSize(10).execute().actionGet();
+
+        assertNoFailures(searchResponse);
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(20l));
+        for (int i = 0; i < 10; i++) {
+            assertThat("res: " + i + " id: " + searchResponse.getHits().getAt(i).getId(),
+                    (Long) searchResponse.getHits().getAt(i).field("min").value(), equalTo((long) i));
+        }
+        // test the double values
+        searchResponse = client().prepareSearch().setQuery(matchAllQuery())
+                .addScriptField("min", "retval = Double.MAX_VALUE; for (v in doc['dvalue'].values){ retval = min(v, retval) }; retval")
+                .addSort(SortBuilders.fieldSort("ord").order(SortOrder.ASC).unmappedType("long")).setSize(10).execute().actionGet();
+
+        assertNoFailures(searchResponse);
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(20l));
+        for (int i = 0; i < 10; i++) {
+            assertThat("res: " + i + " id: " + searchResponse.getHits().getAt(i).getId(),
+                    (Double) searchResponse.getHits().getAt(i).field("min").value(), equalTo((double) i));
+        }
+
+        // test the string values
+        searchResponse = client()
+                .prepareSearch()
+                .setQuery(matchAllQuery())
+                .addScriptField("min",
+                        "retval = Integer.MAX_VALUE; for (v in doc['svalue'].values){ retval = min(Integer.parseInt(v), retval) }; retval")
+                .addSort(SortBuilders.fieldSort("ord").order(SortOrder.ASC).unmappedType("long")).setSize(10).execute().actionGet();
+
+        assertNoFailures(searchResponse);
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(20l));
+        for (int i = 0; i < 10; i++) {
+            assertThat("res: " + i + " id: " + searchResponse.getHits().getAt(i).getId(), (Integer) searchResponse.getHits().getAt(i)
+                    .field("min").value(), equalTo(i));
+        }
+
+        // test the geopoint values
+        searchResponse = client().prepareSearch().setQuery(matchAllQuery())
+                .addScriptField("min", "retval = Double.MAX_VALUE; for (v in doc['gvalue'].values){ retval = min(v.lon, retval) }; retval")
+                .addSort(SortBuilders.fieldSort("ord").order(SortOrder.ASC).unmappedType("long")).setSize(10).execute().actionGet();
+
+        assertNoFailures(searchResponse);
+
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(20l));
+        for (int i = 0; i < 10; i++) {
+            assertThat("res: " + i + " id: " + searchResponse.getHits().getAt(i).getId(),
+                    (Double) searchResponse.getHits().getAt(i).field("min").value(), equalTo((double) i));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testDocumentsWithNullValueOldScriptAPI() throws Exception {
+        // TODO: sort shouldn't fail when sort field is mapped dynamically
+        // We have to specify mapping explicitly because by the time search is performed dynamic mapping might not
+        // be propagated to all nodes yet and sort operation fail when the sort field is not defined
+        String mapping = jsonBuilder().startObject().startObject("type1").startObject("properties")
+                .startObject("svalue").field("type", "string").field("index", "not_analyzed").startObject("fielddata").field("format", random().nextBoolean() ? "doc_values" : null).endObject().endObject()
+                .endObject().endObject().endObject().string();
+        assertAcked(prepareCreate("test").addMapping("type1", mapping));
+        ensureGreen();
+
+        client().prepareIndex("test", "type1").setSource(jsonBuilder().startObject()
+                .field("id", "1")
+                .field("svalue", "aaa")
+                .endObject()).execute().actionGet();
+
+        client().prepareIndex("test", "type1").setSource(jsonBuilder().startObject()
+                .field("id", "2")
+                .nullField("svalue")
+                .endObject()).execute().actionGet();
+
+        client().prepareIndex("test", "type1").setSource(jsonBuilder().startObject()
+                .field("id", "3")
+                .field("svalue", "bbb")
+                .endObject()).execute().actionGet();
+
+
         flush();
         refresh();
 
diff --git a/src/test/java/org/elasticsearch/search/stats/SearchStatsTests.java b/src/test/java/org/elasticsearch/search/stats/SearchStatsTests.java
index 3422a7394ae..a4d17090ed7 100644
--- a/src/test/java/org/elasticsearch/search/stats/SearchStatsTests.java
+++ b/src/test/java/org/elasticsearch/search/stats/SearchStatsTests.java
@@ -32,6 +32,7 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.search.stats.SearchStats.Stats;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.junit.Test;
 
@@ -41,8 +42,16 @@ import java.util.Set;
 import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_REPLICAS;
 import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
 import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
-import static org.hamcrest.Matchers.*;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAllSuccessful;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
 
 /**
  */
@@ -93,7 +102,7 @@ public class SearchStatsTests extends ElasticsearchIntegrationTest {
             SearchResponse searchResponse = internalCluster().clientNodeClient().prepareSearch()
                     .setQuery(QueryBuilders.termQuery("field", "value")).setStats("group1", "group2")
                     .addHighlightedField("field")
-                    .addScriptField("scrip1", "_source.field")
+                    .addScriptField("scrip1", new Script("_source.field"))
                     .setSize(100)
                     .execute().actionGet();
             assertHitCount(searchResponse, docsTest1 + docsTest2);
diff --git a/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutTests.java b/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutTests.java
index 48bfa9069b0..3025752f468 100644
--- a/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutTests.java
+++ b/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutTests.java
@@ -21,12 +21,13 @@ package org.elasticsearch.search.timeout;
 
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.junit.Test;
 
-import static org.elasticsearch.index.query.QueryBuilders.scriptQuery;
 import static org.elasticsearch.index.query.QueryBuilders.filteredQuery;
 import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
+import static org.elasticsearch.index.query.QueryBuilders.scriptQuery;
 import static org.hamcrest.Matchers.equalTo;
 
 /**
@@ -45,7 +46,7 @@ public class SearchTimeoutTests extends ElasticsearchIntegrationTest {
 
         SearchResponse searchResponse = client().prepareSearch("test")
                 .setTimeout("10ms")
-                .setQuery(filteredQuery(matchAllQuery(), scriptQuery("Thread.sleep(500); return true;")))
+                .setQuery(filteredQuery(matchAllQuery(), scriptQuery(new Script("Thread.sleep(500); return true;"))))
                 .execute().actionGet();
         assertThat(searchResponse.isTimedOut(), equalTo(true));
     }
diff --git a/src/test/java/org/elasticsearch/update/UpdateByNativeScriptTests.java b/src/test/java/org/elasticsearch/update/UpdateByNativeScriptTests.java
index 444e4591a04..71b4cb803d9 100644
--- a/src/test/java/org/elasticsearch/update/UpdateByNativeScriptTests.java
+++ b/src/test/java/org/elasticsearch/update/UpdateByNativeScriptTests.java
@@ -19,16 +19,22 @@
 package org.elasticsearch.update;
 
 import com.google.common.collect.Maps;
+
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.script.*;
+import org.elasticsearch.script.AbstractExecutableScript;
+import org.elasticsearch.script.ExecutableScript;
+import org.elasticsearch.script.NativeScriptEngineService;
+import org.elasticsearch.script.NativeScriptFactory;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
+import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
 import org.junit.Test;
 
 import java.util.Map;
 
-import static org.elasticsearch.test.ElasticsearchIntegrationTest.*;
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.is;
 
@@ -53,6 +59,26 @@ public class UpdateByNativeScriptTests extends ElasticsearchIntegrationTest {
 
         index("test", "type", "1", "text", "value");
 
+        Map<String, Object> params = Maps.newHashMap();
+        params.put("foo", "SETVALUE");
+        client().prepareUpdate("test", "type", "1")
+                .setScript(new Script("custom", ScriptService.ScriptType.INLINE, NativeScriptEngineService.NAME, params)).get();
+
+        Map<String, Object> data = client().prepareGet("test", "type", "1").get().getSource();
+        assertThat(data, hasKey("foo"));
+        assertThat(data.get("foo").toString(), is("SETVALUE"));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testThatUpdateUsingNativeScriptWorksOldScriptAPI() throws Exception {
+        createIndex("test");
+        ensureYellow();
+
+        index("test", "type", "1", "text", "value");
+
         Map<String, Object> params = Maps.newHashMap();
         params.put("foo", "SETVALUE");
         client().prepareUpdate("test", "type", "1")
diff --git a/src/test/java/org/elasticsearch/update/UpdateTests.java b/src/test/java/org/elasticsearch/update/UpdateTests.java
index 78ceb19ff94..6d9184b788b 100644
--- a/src/test/java/org/elasticsearch/update/UpdateTests.java
+++ b/src/test/java/org/elasticsearch/update/UpdateTests.java
@@ -37,6 +37,7 @@ import org.elasticsearch.index.VersionType;
 import org.elasticsearch.index.engine.DocumentMissingException;
 import org.elasticsearch.index.engine.VersionConflictEngineException;
 import org.elasticsearch.index.merge.policy.MergePolicyModule;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.elasticsearch.test.index.merge.NoMergePolicyProvider;
@@ -54,7 +55,12 @@ import java.util.concurrent.TimeUnit;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
 
 public class UpdateTests extends ElasticsearchIntegrationTest {
 
@@ -78,7 +84,7 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
 
         UpdateResponse updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
                 .setUpsert(XContentFactory.jsonBuilder().startObject().field("field", 1).endObject())
-                .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE)
+                .setScript(new Script("ctx._source.field += 1", ScriptService.ScriptType.INLINE, null, null))
                 .execute().actionGet();
         assertTrue(updateResponse.isCreated());
         assertThat(updateResponse.getIndex(), equalTo("test"));
@@ -90,7 +96,7 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
 
         updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
                 .setUpsert(XContentFactory.jsonBuilder().startObject().field("field", 1).endObject())
-                .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE)
+                .setScript(new Script("ctx._source.field += 1", ScriptService.ScriptType.INLINE, null, null))
                 .execute().actionGet();
         assertFalse(updateResponse.isCreated());
         assertThat(updateResponse.getIndex(), equalTo("test"));
@@ -100,7 +106,7 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
             assertThat(getResponse.getSourceAsMap().get("field").toString(), equalTo("2"));
         }
     }
-    
+
     @Test
     public void testScriptedUpsert() throws Exception {
         createTestIndex();
@@ -115,13 +121,15 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
                       "ctx._source.balance=oldBalance-deduction;";
         int openingBalance=10;
 
+        Map<String, Object> params = new HashMap<>();
+        params.put("payment", 2);
+
         // Pay money from what will be a new account and opening balance comes from upsert doc
         // provided by client
         UpdateResponse updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
                 .setUpsert(XContentFactory.jsonBuilder().startObject().field("balance", openingBalance).endObject())
                 .setScriptedUpsert(true)
-                .addScriptParam("payment", 2)
-                .setScript(script, ScriptService.ScriptType.INLINE)
+.setScript(new Script(script, ScriptService.ScriptType.INLINE, null, params))
                 .execute().actionGet();
         assertTrue(updateResponse.isCreated());
         assertThat(updateResponse.getIndex(), equalTo("test"));
@@ -135,8 +143,7 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
         updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
                 .setUpsert(XContentFactory.jsonBuilder().startObject().field("balance", openingBalance).endObject())
                 .setScriptedUpsert(true)
-                .addScriptParam("payment", 2)
-                .setScript(script, ScriptService.ScriptType.INLINE)
+.setScript(new Script(script, ScriptService.ScriptType.INLINE, null, params))
                 .execute().actionGet();
         assertFalse(updateResponse.isCreated());
         assertThat(updateResponse.getIndex(), equalTo("test"));
@@ -145,8 +152,8 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
             GetResponse getResponse = client().prepareGet("test", "type1", "1").execute().actionGet();
             assertThat(getResponse.getSourceAsMap().get("balance").toString(), equalTo("7"));
         }
-    }    
- 
+    }
+
     @Test
     public void testUpsertDoc() throws Exception {
         createTestIndex();
@@ -183,7 +190,7 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
 
         UpdateResponse updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
                 .setUpsert(XContentFactory.jsonBuilder().startObject().field("bar", "baz").endObject())
-                .setScript("ctx._source.extra = \"foo\"", ScriptService.ScriptType.INLINE)
+                .setScript(new Script("ctx._source.extra = \"foo\"", ScriptService.ScriptType.INLINE, null, null))
                 .setFields("_source")
                 .execute().actionGet();
 
@@ -195,7 +202,7 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
 
         updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
                 .setUpsert(XContentFactory.jsonBuilder().startObject().field("bar", "baz").endObject())
-                .setScript("ctx._source.extra = \"foo\"", ScriptService.ScriptType.INLINE)
+                .setScript(new Script("ctx._source.extra = \"foo\"", ScriptService.ScriptType.INLINE, null, null))
                 .setFields("_source")
                 .execute().actionGet();
 
@@ -214,44 +221,48 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
         index("test", "type", "1", "text", "value"); // version is now 1
 
         assertThrows(client().prepareUpdate(indexOrAlias(), "type", "1")
-                        .setScript("ctx._source.text = 'v2'", ScriptService.ScriptType.INLINE).setVersion(2).execute(),
+                        .setScript(new Script("ctx._source.text = 'v2'", ScriptService.ScriptType.INLINE, null, null)).setVersion(2)
+                        .execute(),
                 VersionConflictEngineException.class);
 
         client().prepareUpdate(indexOrAlias(), "type", "1")
-                .setScript("ctx._source.text = 'v2'", ScriptService.ScriptType.INLINE).setVersion(1).get();
+                .setScript(new Script("ctx._source.text = 'v2'", ScriptService.ScriptType.INLINE, null, null)).setVersion(1).get();
         assertThat(client().prepareGet("test", "type", "1").get().getVersion(), equalTo(2l));
 
         // and again with a higher version..
         client().prepareUpdate(indexOrAlias(), "type", "1")
-                .setScript("ctx._source.text = 'v3'", ScriptService.ScriptType.INLINE).setVersion(2).get();
+                .setScript(new Script("ctx._source.text = 'v3'", ScriptService.ScriptType.INLINE, null, null)).setVersion(2).get();
 
         assertThat(client().prepareGet("test", "type", "1").get().getVersion(), equalTo(3l));
 
         // after delete
         client().prepareDelete("test", "type", "1").get();
         assertThrows(client().prepareUpdate("test", "type", "1")
-                        .setScript("ctx._source.text = 'v2'", ScriptService.ScriptType.INLINE).setVersion(3).execute(),
+                        .setScript(new Script("ctx._source.text = 'v2'", ScriptService.ScriptType.INLINE, null, null)).setVersion(3)
+                        .execute(),
                 DocumentMissingException.class);
 
         // external versioning
         client().prepareIndex("test", "type", "2").setSource("text", "value").setVersion(10).setVersionType(VersionType.EXTERNAL).get();
 
         assertThrows(client().prepareUpdate(indexOrAlias(), "type", "2")
-                        .setScript("ctx._source.text = 'v2'", ScriptService.ScriptType.INLINE).setVersion(2)
+                        .setScript(new Script("ctx._source.text = 'v2'", ScriptService.ScriptType.INLINE, null, null)).setVersion(2)
                         .setVersionType(VersionType.EXTERNAL).execute(),
                 ActionRequestValidationException.class);
 
         // upserts - the combination with versions is a bit weird. Test are here to ensure we do not change our behavior unintentionally
 
         // With internal versions, tt means "if object is there with version X, update it or explode. If it is not there, index.
-        client().prepareUpdate(indexOrAlias(), "type", "3").setScript("ctx._source.text = 'v2'", ScriptService.ScriptType.INLINE)
+        client().prepareUpdate(indexOrAlias(), "type", "3")
+                .setScript(new Script("ctx._source.text = 'v2'", ScriptService.ScriptType.INLINE, null, null))
                 .setVersion(10).setUpsert("{ \"text\": \"v0\" }").get();
         GetResponse get = get("test", "type", "3");
         assertThat(get.getVersion(), equalTo(1l));
         assertThat((String) get.getSource().get("text"), equalTo("v0"));
 
         // With force version
-        client().prepareUpdate(indexOrAlias(), "type", "4").setScript("ctx._source.text = 'v2'", ScriptService.ScriptType.INLINE)
+        client().prepareUpdate(indexOrAlias(), "type", "4")
+                .setScript(new Script("ctx._source.text = 'v2'", ScriptService.ScriptType.INLINE, null, null))
                 .setVersion(10).setVersionType(VersionType.FORCE).setUpsert("{ \"text\": \"v0\" }").get();
 
         get = get("test", "type", "4");
@@ -267,7 +278,7 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
     public void testIndexAutoCreation() throws Exception {
         UpdateResponse updateResponse = client().prepareUpdate("test", "type1", "1")
                 .setUpsert(XContentFactory.jsonBuilder().startObject().field("bar", "baz").endObject())
-                .setScript("ctx._source.extra = \"foo\"", ScriptService.ScriptType.INLINE)
+                .setScript(new Script("ctx._source.extra = \"foo\"", ScriptService.ScriptType.INLINE, null, null))
                 .setFields("_source")
                 .execute().actionGet();
 
@@ -285,7 +296,7 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
 
         try {
             client().prepareUpdate(indexOrAlias(), "type1", "1")
-                    .setScript("ctx._source.field++", ScriptService.ScriptType.INLINE).execute().actionGet();
+                    .setScript(new Script("ctx._source.field++", ScriptService.ScriptType.INLINE, null, null)).execute().actionGet();
             fail();
         } catch (DocumentMissingException e) {
             // all is well
@@ -294,7 +305,7 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
         client().prepareIndex("test", "type1", "1").setSource("field", 1).execute().actionGet();
 
         UpdateResponse updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
-                .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE).execute().actionGet();
+                .setScript(new Script("ctx._source.field += 1", ScriptService.ScriptType.INLINE, null, null)).execute().actionGet();
         assertThat(updateResponse.getVersion(), equalTo(2L));
         assertFalse(updateResponse.isCreated());
         assertThat(updateResponse.getIndex(), equalTo("test"));
@@ -304,9 +315,10 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
             assertThat(getResponse.getSourceAsMap().get("field").toString(), equalTo("2"));
         }
 
+        Map<String, Object> params = new HashMap<>();
+        params.put("count", 3);
         updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
-                .setScript("ctx._source.field += count", ScriptService.ScriptType.INLINE)
-                .addScriptParam("count", 3).execute().actionGet();
+                .setScript(new Script("ctx._source.field += count", ScriptService.ScriptType.INLINE, null, params)).execute().actionGet();
         assertThat(updateResponse.getVersion(), equalTo(3L));
         assertFalse(updateResponse.isCreated());
         assertThat(updateResponse.getIndex(), equalTo("test"));
@@ -318,7 +330,7 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
 
         // check noop
         updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
-                .setScript("ctx.op = 'none'", ScriptService.ScriptType.INLINE).execute().actionGet();
+                .setScript(new Script("ctx.op = 'none'", ScriptService.ScriptType.INLINE, null, null)).execute().actionGet();
         assertThat(updateResponse.getVersion(), equalTo(3L));
         assertFalse(updateResponse.isCreated());
         assertThat(updateResponse.getIndex(), equalTo("test"));
@@ -330,7 +342,7 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
 
         // check delete
         updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
-                .setScript("ctx.op = 'delete'", ScriptService.ScriptType.INLINE).execute().actionGet();
+                .setScript(new Script("ctx.op = 'delete'", ScriptService.ScriptType.INLINE, null, null)).execute().actionGet();
         assertThat(updateResponse.getVersion(), equalTo(4L));
         assertFalse(updateResponse.isCreated());
         assertThat(updateResponse.getIndex(), equalTo("test"));
@@ -345,13 +357,15 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
         GetResponse getResponse = client().prepareGet("test", "type1", "2").setFields("_ttl").execute().actionGet();
         long ttl = ((Number) getResponse.getField("_ttl").getValue()).longValue();
         assertThat(ttl, greaterThan(0L));
-        client().prepareUpdate(indexOrAlias(), "type1", "2").setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE).execute().actionGet();
+        client().prepareUpdate(indexOrAlias(), "type1", "2")
+                .setScript(new Script("ctx._source.field += 1", ScriptService.ScriptType.INLINE, null, null)).execute().actionGet();
         getResponse = client().prepareGet("test", "type1", "2").setFields("_ttl").execute().actionGet();
         ttl = ((Number) getResponse.getField("_ttl").getValue()).longValue();
         assertThat(ttl, greaterThan(0L));
 
         // check TTL update
-        client().prepareUpdate(indexOrAlias(), "type1", "2").setScript("ctx._ttl = 3600000", ScriptService.ScriptType.INLINE).execute().actionGet();
+        client().prepareUpdate(indexOrAlias(), "type1", "2")
+                .setScript(new Script("ctx._ttl = 3600000", ScriptService.ScriptType.INLINE, null, null)).execute().actionGet();
         getResponse = client().prepareGet("test", "type1", "2").setFields("_ttl").execute().actionGet();
         ttl = ((Number) getResponse.getField("_ttl").getValue()).longValue();
         assertThat(ttl, greaterThan(0L));
@@ -360,7 +374,8 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
         // check timestamp update
         client().prepareIndex("test", "type1", "3").setSource("field", 1).setRefresh(true).execute().actionGet();
         client().prepareUpdate(indexOrAlias(), "type1", "3")
-                .setScript("ctx._timestamp = \"2009-11-15T14:12:12\"", ScriptService.ScriptType.INLINE).execute().actionGet();
+                .setScript(new Script("ctx._timestamp = \"2009-11-15T14:12:12\"", ScriptService.ScriptType.INLINE, null, null)).execute()
+                .actionGet();
         getResponse = client().prepareGet("test", "type1", "3").setFields("_timestamp").execute().actionGet();
         long timestamp = ((Number) getResponse.getField("_timestamp").getValue()).longValue();
         assertThat(timestamp, equalTo(1258294332000L));
@@ -368,7 +383,8 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
         // check fields parameter
         client().prepareIndex("test", "type1", "1").setSource("field", 1).execute().actionGet();
         updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
-                .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE).setFields("_source", "field").execute().actionGet();
+                .setScript(new Script("ctx._source.field += 1", ScriptService.ScriptType.INLINE, null, null)).setFields("_source", "field")
+                .execute().actionGet();
         assertThat(updateResponse.getIndex(), equalTo("test"));
         assertThat(updateResponse.getGetResult(), notNullValue());
         assertThat(updateResponse.getGetResult().getIndex(), equalTo("test"));
@@ -428,7 +444,7 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
         try {
             client().prepareUpdate(indexOrAlias(), "type1", "1")
                     .setDoc(XContentFactory.jsonBuilder().startObject().field("field", 1).endObject())
-                    .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE)
+                    .setScript(new Script("ctx._source.field += 1", ScriptService.ScriptType.INLINE, null, null))
                     .execute().actionGet();
             fail("Should have thrown ActionRequestValidationException");
         } catch (ActionRequestValidationException e) {
@@ -444,7 +460,7 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
         ensureGreen();
         try {
             client().prepareUpdate(indexOrAlias(), "type1", "1")
-                    .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE)
+                    .setScript(new Script("ctx._source.field += 1", ScriptService.ScriptType.INLINE, null, null))
                     .setDocAsUpsert(true)
                     .execute().actionGet();
             fail("Should have thrown ActionRequestValidationException");
@@ -500,7 +516,9 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
         scriptParams.put("delim", "_");
         UpdateResponse updateResponse = client().prepareUpdate("test", "subtype1", "id1")
                 .setRouting("routing1")
-                .setScript("assert ctx._index == \"test\" : \"index should be \\\"test\\\"\"\n" +
+                .setScript(
+                        new Script("assert ctx._index == \"test\" : \"index should be \\\"test\\\"\"\n"
+                                +
                                 "assert ctx._type == \"subtype1\" : \"type should be \\\"subtype1\\\"\"\n" +
                                 "assert ctx._id == \"id1\" : \"id should be \\\"id1\\\"\"\n" +
                                 "assert ctx._version == 1 : \"version should be 1\"\n" +
@@ -512,8 +530,7 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
                                 "assert ctx._ttl >= " + (ttl-3000) + " : \"ttl should be <= " + (ttl-3000) + " but was \" + ctx._ttl\n" +
                                 "ctx._source.content = ctx._source.content + delim + ctx._source.content;\n" +
                                 "ctx._source.field1 += 1;\n",
-                        ScriptService.ScriptType.INLINE)
-                .setScriptParams(scriptParams)
+ ScriptService.ScriptType.INLINE, null, scriptParams))
                 .execute().actionGet();
 
         assertEquals(2, updateResponse.getVersion());
@@ -527,6 +544,7 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
         scriptParams.put("delim", "_");
         updateResponse = client().prepareUpdate("test", "type1", "parentId1")
                 .setScript(
+                        new Script(
                         "assert ctx._index == \"test\" : \"index should be \\\"test\\\"\"\n" +
                         "assert ctx._type == \"type1\" : \"type should be \\\"type1\\\"\"\n" +
                         "assert ctx._id == \"parentId1\" : \"id should be \\\"parentId1\\\"\"\n" +
@@ -537,8 +555,7 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
                         "assert ctx._ttl == null : \"ttl should be null\"\n" +
                         "ctx._source.content = ctx._source.content + delim + ctx._source.content;\n" +
                         "ctx._source.field1 += 1;\n",
-                        ScriptService.ScriptType.INLINE)
-                .setScriptParams(scriptParams)
+ ScriptService.ScriptType.INLINE, null, scriptParams))
                 .execute().actionGet();
 
         assertEquals(2, updateResponse.getVersion());
@@ -570,13 +587,13 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
                         for (int i = 0; i < numberOfUpdatesPerThread; i++) {
                             if (useBulkApi) {
                                 UpdateRequestBuilder updateRequestBuilder = client().prepareUpdate(indexOrAlias(), "type1", Integer.toString(i))
-                                        .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE)
+                                        .setScript(new Script("ctx._source.field += 1", ScriptService.ScriptType.INLINE, null, null))
                                         .setRetryOnConflict(Integer.MAX_VALUE)
                                         .setUpsert(jsonBuilder().startObject().field("field", 1).endObject());
                                 client().prepareBulk().add(updateRequestBuilder).execute().actionGet();
                             } else {
                                 client().prepareUpdate(indexOrAlias(), "type1", Integer.toString(i))
-                                        .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE)
+                                        .setScript(new Script("ctx._source.field += 1", ScriptService.ScriptType.INLINE, null, null))
                                         .setRetryOnConflict(Integer.MAX_VALUE)
                                         .setUpsert(jsonBuilder().startObject().field("field", 1).endObject())
                                         .execute().actionGet();
@@ -607,7 +624,6 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
         }
     }
 
-
     @Test
     @Slow
     public void stressUpdateDeleteConcurrency() throws Exception {
@@ -698,7 +714,7 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
                             updateRequestsOutstanding.acquire();
                             try {
                                 UpdateRequest ur = client().prepareUpdate("test", "type1", Integer.toString(j))
-                                        .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE)
+                                        .setScript(new Script("ctx._source.field += 1", ScriptService.ScriptType.INLINE, null, null))
                                         .setRetryOnConflict(retryOnConflict)
                                         .setUpsert(jsonBuilder().startObject().field("field", 1).endObject())
                                         .request();
@@ -798,7 +814,7 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
         //All the previous operations should be complete or failed at this point
         for (int i = 0; i < numberOfIdsPerThread; ++i) {
             UpdateResponse ur = client().prepareUpdate("test", "type1", Integer.toString(i))
-                .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE)
+                    .setScript(new Script("ctx._source.field += 1", ScriptService.ScriptType.INLINE, null, null))
                 .setRetryOnConflict(Integer.MAX_VALUE)
                 .setUpsert(jsonBuilder().startObject().field("field", 1).endObject())
                 .execute().actionGet();
@@ -828,6 +844,732 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
         }
     }
 
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testUpsertOldScriptAPI() throws Exception {
+        createTestIndex();
+        ensureGreen();
+
+        UpdateResponse updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
+                .setUpsert(XContentFactory.jsonBuilder().startObject().field("field", 1).endObject())
+                .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE).execute().actionGet();
+        assertTrue(updateResponse.isCreated());
+        assertThat(updateResponse.getIndex(), equalTo("test"));
+
+        for (int i = 0; i < 5; i++) {
+            GetResponse getResponse = client().prepareGet("test", "type1", "1").execute().actionGet();
+            assertThat(getResponse.getSourceAsMap().get("field").toString(), equalTo("1"));
+        }
+
+        updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
+                .setUpsert(XContentFactory.jsonBuilder().startObject().field("field", 1).endObject())
+                .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE).execute().actionGet();
+        assertFalse(updateResponse.isCreated());
+        assertThat(updateResponse.getIndex(), equalTo("test"));
+
+        for (int i = 0; i < 5; i++) {
+            GetResponse getResponse = client().prepareGet("test", "type1", "1").execute().actionGet();
+            assertThat(getResponse.getSourceAsMap().get("field").toString(), equalTo("2"));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testScriptedUpsertOldScriptAPI() throws Exception {
+        createTestIndex();
+        ensureGreen();
+
+        // Script logic is 
+        // 1) New accounts take balance from "balance" in upsert doc and first payment is charged at 50%
+        // 2) Existing accounts subtract full payment from balance stored in elasticsearch
+
+        String script = "int oldBalance=ctx._source.balance;" + "int deduction=ctx.op == \"create\" ? (payment/2) :  payment;"
+                + "ctx._source.balance=oldBalance-deduction;";
+        int openingBalance = 10;
+
+        // Pay money from what will be a new account and opening balance comes from upsert doc
+        // provided by client
+        UpdateResponse updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
+                .setUpsert(XContentFactory.jsonBuilder().startObject().field("balance", openingBalance).endObject())
+                .setScriptedUpsert(true).addScriptParam("payment", 2).setScript(script, ScriptService.ScriptType.INLINE).execute()
+                .actionGet();
+        assertTrue(updateResponse.isCreated());
+        assertThat(updateResponse.getIndex(), equalTo("test"));
+
+        for (int i = 0; i < 5; i++) {
+            GetResponse getResponse = client().prepareGet("test", "type1", "1").execute().actionGet();
+            assertThat(getResponse.getSourceAsMap().get("balance").toString(), equalTo("9"));
+        }
+
+        // Now pay money for an existing account where balance is stored in es 
+        updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
+                .setUpsert(XContentFactory.jsonBuilder().startObject().field("balance", openingBalance).endObject())
+                .setScriptedUpsert(true).addScriptParam("payment", 2).setScript(script, ScriptService.ScriptType.INLINE).execute()
+                .actionGet();
+        assertFalse(updateResponse.isCreated());
+        assertThat(updateResponse.getIndex(), equalTo("test"));
+
+        for (int i = 0; i < 5; i++) {
+            GetResponse getResponse = client().prepareGet("test", "type1", "1").execute().actionGet();
+            assertThat(getResponse.getSourceAsMap().get("balance").toString(), equalTo("7"));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testUpsertFieldsOldScriptAPI() throws Exception {
+        createTestIndex();
+        ensureGreen();
+
+        UpdateResponse updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
+                .setUpsert(XContentFactory.jsonBuilder().startObject().field("bar", "baz").endObject())
+                .setScript("ctx._source.extra = \"foo\"", ScriptService.ScriptType.INLINE).setFields("_source").execute().actionGet();
+
+        assertThat(updateResponse.getIndex(), equalTo("test"));
+        assertThat(updateResponse.getGetResult(), notNullValue());
+        assertThat(updateResponse.getGetResult().getIndex(), equalTo("test"));
+        assertThat(updateResponse.getGetResult().sourceAsMap().get("bar").toString(), equalTo("baz"));
+        assertThat(updateResponse.getGetResult().sourceAsMap().get("extra"), nullValue());
+
+        updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
+                .setUpsert(XContentFactory.jsonBuilder().startObject().field("bar", "baz").endObject())
+                .setScript("ctx._source.extra = \"foo\"", ScriptService.ScriptType.INLINE).setFields("_source").execute().actionGet();
+
+        assertThat(updateResponse.getIndex(), equalTo("test"));
+        assertThat(updateResponse.getGetResult(), notNullValue());
+        assertThat(updateResponse.getGetResult().getIndex(), equalTo("test"));
+        assertThat(updateResponse.getGetResult().sourceAsMap().get("bar").toString(), equalTo("baz"));
+        assertThat(updateResponse.getGetResult().sourceAsMap().get("extra").toString(), equalTo("foo"));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testVersionedUpdateOldScriptAPI() throws Exception {
+        assertAcked(prepareCreate("test").addAlias(new Alias("alias")));
+        ensureGreen();
+
+        index("test", "type", "1", "text", "value"); // version is now 1
+
+        assertThrows(
+                client().prepareUpdate(indexOrAlias(), "type", "1").setScript("ctx._source.text = 'v2'", ScriptService.ScriptType.INLINE)
+                        .setVersion(2).execute(), VersionConflictEngineException.class);
+
+        client().prepareUpdate(indexOrAlias(), "type", "1").setScript("ctx._source.text = 'v2'", ScriptService.ScriptType.INLINE)
+                .setVersion(1).get();
+        assertThat(client().prepareGet("test", "type", "1").get().getVersion(), equalTo(2l));
+
+        // and again with a higher version..
+        client().prepareUpdate(indexOrAlias(), "type", "1").setScript("ctx._source.text = 'v3'", ScriptService.ScriptType.INLINE)
+                .setVersion(2).get();
+
+        assertThat(client().prepareGet("test", "type", "1").get().getVersion(), equalTo(3l));
+
+        // after delete
+        client().prepareDelete("test", "type", "1").get();
+        assertThrows(client().prepareUpdate("test", "type", "1").setScript("ctx._source.text = 'v2'", ScriptService.ScriptType.INLINE)
+                .setVersion(3).execute(), DocumentMissingException.class);
+
+        // external versioning
+        client().prepareIndex("test", "type", "2").setSource("text", "value").setVersion(10).setVersionType(VersionType.EXTERNAL).get();
+
+        assertThrows(
+                client().prepareUpdate(indexOrAlias(), "type", "2").setScript("ctx._source.text = 'v2'", ScriptService.ScriptType.INLINE)
+                        .setVersion(2).setVersionType(VersionType.EXTERNAL).execute(), ActionRequestValidationException.class);
+
+        // upserts - the combination with versions is a bit weird. Test are here to ensure we do not change our behavior unintentionally
+
+        // With internal versions, tt means "if object is there with version X, update it or explode. If it is not there, index.
+        client().prepareUpdate(indexOrAlias(), "type", "3").setScript("ctx._source.text = 'v2'", ScriptService.ScriptType.INLINE)
+                .setVersion(10).setUpsert("{ \"text\": \"v0\" }").get();
+        GetResponse get = get("test", "type", "3");
+        assertThat(get.getVersion(), equalTo(1l));
+        assertThat((String) get.getSource().get("text"), equalTo("v0"));
+
+        // With force version
+        client().prepareUpdate(indexOrAlias(), "type", "4").setScript("ctx._source.text = 'v2'", ScriptService.ScriptType.INLINE)
+                .setVersion(10).setVersionType(VersionType.FORCE).setUpsert("{ \"text\": \"v0\" }").get();
+
+        get = get("test", "type", "4");
+        assertThat(get.getVersion(), equalTo(10l));
+        assertThat((String) get.getSource().get("text"), equalTo("v0"));
+
+        // retry on conflict is rejected:
+        assertThrows(client().prepareUpdate(indexOrAlias(), "type", "1").setVersion(10).setRetryOnConflict(5),
+                ActionRequestValidationException.class);
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testIndexAutoCreationOldScriptAPI() throws Exception {
+        UpdateResponse updateResponse = client().prepareUpdate("test", "type1", "1")
+                .setUpsert(XContentFactory.jsonBuilder().startObject().field("bar", "baz").endObject())
+                .setScript("ctx._source.extra = \"foo\"", ScriptService.ScriptType.INLINE).setFields("_source").execute().actionGet();
+
+        assertThat(updateResponse.getIndex(), equalTo("test"));
+        assertThat(updateResponse.getGetResult(), notNullValue());
+        assertThat(updateResponse.getGetResult().getIndex(), equalTo("test"));
+        assertThat(updateResponse.getGetResult().sourceAsMap().get("bar").toString(), equalTo("baz"));
+        assertThat(updateResponse.getGetResult().sourceAsMap().get("extra"), nullValue());
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testUpdateOldScriptAPI() throws Exception {
+        createTestIndex();
+        ensureGreen();
+
+        try {
+            client().prepareUpdate(indexOrAlias(), "type1", "1").setScript("ctx._source.field++", ScriptService.ScriptType.INLINE)
+                    .execute().actionGet();
+            fail();
+        } catch (DocumentMissingException e) {
+            // all is well
+        }
+
+        client().prepareIndex("test", "type1", "1").setSource("field", 1).execute().actionGet();
+
+        UpdateResponse updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
+                .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE).execute().actionGet();
+        assertThat(updateResponse.getVersion(), equalTo(2L));
+        assertFalse(updateResponse.isCreated());
+        assertThat(updateResponse.getIndex(), equalTo("test"));
+
+        for (int i = 0; i < 5; i++) {
+            GetResponse getResponse = client().prepareGet("test", "type1", "1").execute().actionGet();
+            assertThat(getResponse.getSourceAsMap().get("field").toString(), equalTo("2"));
+        }
+
+        updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
+                .setScript("ctx._source.field += count", ScriptService.ScriptType.INLINE).addScriptParam("count", 3).execute().actionGet();
+        assertThat(updateResponse.getVersion(), equalTo(3L));
+        assertFalse(updateResponse.isCreated());
+        assertThat(updateResponse.getIndex(), equalTo("test"));
+
+        for (int i = 0; i < 5; i++) {
+            GetResponse getResponse = client().prepareGet("test", "type1", "1").execute().actionGet();
+            assertThat(getResponse.getSourceAsMap().get("field").toString(), equalTo("5"));
+        }
+
+        // check noop
+        updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1").setScript("ctx.op = 'none'", ScriptService.ScriptType.INLINE)
+                .execute().actionGet();
+        assertThat(updateResponse.getVersion(), equalTo(3L));
+        assertFalse(updateResponse.isCreated());
+        assertThat(updateResponse.getIndex(), equalTo("test"));
+
+        for (int i = 0; i < 5; i++) {
+            GetResponse getResponse = client().prepareGet("test", "type1", "1").execute().actionGet();
+            assertThat(getResponse.getSourceAsMap().get("field").toString(), equalTo("5"));
+        }
+
+        // check delete
+        updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
+                .setScript("ctx.op = 'delete'", ScriptService.ScriptType.INLINE).execute().actionGet();
+        assertThat(updateResponse.getVersion(), equalTo(4L));
+        assertFalse(updateResponse.isCreated());
+        assertThat(updateResponse.getIndex(), equalTo("test"));
+
+        for (int i = 0; i < 5; i++) {
+            GetResponse getResponse = client().prepareGet("test", "type1", "1").execute().actionGet();
+            assertThat(getResponse.isExists(), equalTo(false));
+        }
+
+        // check TTL is kept after an update without TTL
+        client().prepareIndex("test", "type1", "2").setSource("field", 1).setTTL(86400000L).setRefresh(true).execute().actionGet();
+        GetResponse getResponse = client().prepareGet("test", "type1", "2").setFields("_ttl").execute().actionGet();
+        long ttl = ((Number) getResponse.getField("_ttl").getValue()).longValue();
+        assertThat(ttl, greaterThan(0L));
+        client().prepareUpdate(indexOrAlias(), "type1", "2").setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE).execute()
+                .actionGet();
+        getResponse = client().prepareGet("test", "type1", "2").setFields("_ttl").execute().actionGet();
+        ttl = ((Number) getResponse.getField("_ttl").getValue()).longValue();
+        assertThat(ttl, greaterThan(0L));
+
+        // check TTL update
+        client().prepareUpdate(indexOrAlias(), "type1", "2").setScript("ctx._ttl = 3600000", ScriptService.ScriptType.INLINE).execute()
+                .actionGet();
+        getResponse = client().prepareGet("test", "type1", "2").setFields("_ttl").execute().actionGet();
+        ttl = ((Number) getResponse.getField("_ttl").getValue()).longValue();
+        assertThat(ttl, greaterThan(0L));
+        assertThat(ttl, lessThanOrEqualTo(3600000L));
+
+        // check timestamp update
+        client().prepareIndex("test", "type1", "3").setSource("field", 1).setRefresh(true).execute().actionGet();
+        client().prepareUpdate(indexOrAlias(), "type1", "3")
+                .setScript("ctx._timestamp = \"2009-11-15T14:12:12\"", ScriptService.ScriptType.INLINE).execute().actionGet();
+        getResponse = client().prepareGet("test", "type1", "3").setFields("_timestamp").execute().actionGet();
+        long timestamp = ((Number) getResponse.getField("_timestamp").getValue()).longValue();
+        assertThat(timestamp, equalTo(1258294332000L));
+
+        // check fields parameter
+        client().prepareIndex("test", "type1", "1").setSource("field", 1).execute().actionGet();
+        updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
+                .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE).setFields("_source", "field").execute().actionGet();
+        assertThat(updateResponse.getIndex(), equalTo("test"));
+        assertThat(updateResponse.getGetResult(), notNullValue());
+        assertThat(updateResponse.getGetResult().getIndex(), equalTo("test"));
+        assertThat(updateResponse.getGetResult().sourceRef(), notNullValue());
+        assertThat(updateResponse.getGetResult().field("field").getValue(), notNullValue());
+
+        // check updates without script
+        // add new field
+        client().prepareIndex("test", "type1", "1").setSource("field", 1).execute().actionGet();
+        updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
+                .setDoc(XContentFactory.jsonBuilder().startObject().field("field2", 2).endObject()).execute().actionGet();
+        for (int i = 0; i < 5; i++) {
+            getResponse = client().prepareGet("test", "type1", "1").execute().actionGet();
+            assertThat(getResponse.getSourceAsMap().get("field").toString(), equalTo("1"));
+            assertThat(getResponse.getSourceAsMap().get("field2").toString(), equalTo("2"));
+        }
+
+        // change existing field
+        updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
+                .setDoc(XContentFactory.jsonBuilder().startObject().field("field", 3).endObject()).execute().actionGet();
+        for (int i = 0; i < 5; i++) {
+            getResponse = client().prepareGet("test", "type1", "1").execute().actionGet();
+            assertThat(getResponse.getSourceAsMap().get("field").toString(), equalTo("3"));
+            assertThat(getResponse.getSourceAsMap().get("field2").toString(), equalTo("2"));
+        }
+
+        // recursive map
+        Map<String, Object> testMap = new HashMap<>();
+        Map<String, Object> testMap2 = new HashMap<>();
+        Map<String, Object> testMap3 = new HashMap<>();
+        testMap3.put("commonkey", testMap);
+        testMap3.put("map3", 5);
+        testMap2.put("map2", 6);
+        testMap.put("commonkey", testMap2);
+        testMap.put("map1", 8);
+
+        client().prepareIndex("test", "type1", "1").setSource("map", testMap).execute().actionGet();
+        updateResponse = client().prepareUpdate(indexOrAlias(), "type1", "1")
+                .setDoc(XContentFactory.jsonBuilder().startObject().field("map", testMap3).endObject()).execute().actionGet();
+        for (int i = 0; i < 5; i++) {
+            getResponse = client().prepareGet("test", "type1", "1").execute().actionGet();
+            Map map1 = (Map) getResponse.getSourceAsMap().get("map");
+            assertThat(map1.size(), equalTo(3));
+            assertThat(map1.containsKey("map1"), equalTo(true));
+            assertThat(map1.containsKey("map3"), equalTo(true));
+            assertThat(map1.containsKey("commonkey"), equalTo(true));
+            Map map2 = (Map) map1.get("commonkey");
+            assertThat(map2.size(), equalTo(3));
+            assertThat(map2.containsKey("map1"), equalTo(true));
+            assertThat(map2.containsKey("map2"), equalTo(true));
+            assertThat(map2.containsKey("commonkey"), equalTo(true));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testUpdateRequestWithBothScriptAndDocOldScriptAPI() throws Exception {
+        createTestIndex();
+        ensureGreen();
+
+        try {
+            client().prepareUpdate(indexOrAlias(), "type1", "1")
+                    .setDoc(XContentFactory.jsonBuilder().startObject().field("field", 1).endObject())
+                    .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE).execute().actionGet();
+            fail("Should have thrown ActionRequestValidationException");
+        } catch (ActionRequestValidationException e) {
+            assertThat(e.validationErrors().size(), equalTo(1));
+            assertThat(e.validationErrors().get(0), containsString("can't provide both script and doc"));
+            assertThat(e.getMessage(), containsString("can't provide both script and doc"));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testUpdateRequestWithScriptAndShouldUpsertDocOldScriptAPI() throws Exception {
+        createTestIndex();
+        ensureGreen();
+        try {
+            client().prepareUpdate(indexOrAlias(), "type1", "1")
+                    .setScript(new Script("ctx._source.field += 1", ScriptService.ScriptType.INLINE, null, null)).setDocAsUpsert(true)
+                    .execute().actionGet();
+            fail("Should have thrown ActionRequestValidationException");
+        } catch (ActionRequestValidationException e) {
+            assertThat(e.validationErrors().size(), equalTo(1));
+            assertThat(e.validationErrors().get(0), containsString("doc must be specified if doc_as_upsert is enabled"));
+            assertThat(e.getMessage(), containsString("doc must be specified if doc_as_upsert is enabled"));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    public void testContextVariablesOldScriptAPI() throws Exception {
+        createTestIndex();
+
+        // Add child type for testing the _parent context variable
+        client().admin()
+                .indices()
+                .preparePutMapping("test")
+                .setType("subtype1")
+                .setSource(
+                        XContentFactory.jsonBuilder().startObject().startObject("subtype1").startObject("_parent").field("type", "type1")
+                                .endObject().startObject("_timestamp").field("enabled", true).field("store", "yes").endObject()
+                                .startObject("_ttl").field("enabled", true).endObject().endObject().endObject()).execute().actionGet();
+        ensureGreen();
+
+        // Index some documents
+        long timestamp = System.currentTimeMillis();
+        client().prepareIndex().setIndex("test").setType("type1").setId("parentId1").setTimestamp(String.valueOf(timestamp - 1))
+                .setSource("field1", 0, "content", "bar").execute().actionGet();
+
+        long ttl = 10000;
+        client().prepareIndex().setIndex("test").setType("subtype1").setId("id1").setParent("parentId1").setRouting("routing1")
+                .setTimestamp(String.valueOf(timestamp)).setTTL(ttl).setSource("field1", 1, "content", "foo").execute().actionGet();
+
+        // Update the first object and note context variables values
+        Map<String, Object> scriptParams = new HashMap<>();
+        scriptParams.put("delim", "_");
+        UpdateResponse updateResponse = client()
+                .prepareUpdate("test", "subtype1", "id1")
+                .setRouting("routing1")
+                .setScript(
+                        "assert ctx._index == \"test\" : \"index should be \\\"test\\\"\"\n"
+                                + "assert ctx._type == \"subtype1\" : \"type should be \\\"subtype1\\\"\"\n"
+                                + "assert ctx._id == \"id1\" : \"id should be \\\"id1\\\"\"\n"
+                                + "assert ctx._version == 1 : \"version should be 1\"\n"
+                                + "assert ctx._parent == \"parentId1\" : \"parent should be \\\"parentId1\\\"\"\n"
+                                + "assert ctx._routing == \"routing1\" : \"routing should be \\\"routing1\\\"\"\n"
+                                + "assert ctx._timestamp == " + timestamp + " : \"timestamp should be "
+                                + timestamp
+                                + "\"\n"
+                                +
+                                // ttl has a 3-second leeway, because it's always counting down
+                                "assert ctx._ttl <= " + ttl + " : \"ttl should be <= " + ttl + " but was \" + ctx._ttl\n"
+                                + "assert ctx._ttl >= " + (ttl - 3000) + " : \"ttl should be <= " + (ttl - 3000)
+                                + " but was \" + ctx._ttl\n" + "ctx._source.content = ctx._source.content + delim + ctx._source.content;\n"
+                                + "ctx._source.field1 += 1;\n", ScriptService.ScriptType.INLINE).setScriptParams(scriptParams).execute()
+                .actionGet();
+
+        assertEquals(2, updateResponse.getVersion());
+
+        GetResponse getResponse = client().prepareGet("test", "subtype1", "id1").setRouting("routing1").execute().actionGet();
+        assertEquals(2, getResponse.getSourceAsMap().get("field1"));
+        assertEquals("foo_foo", getResponse.getSourceAsMap().get("content"));
+
+        // Idem with the second object
+        scriptParams = new HashMap<>();
+        scriptParams.put("delim", "_");
+        updateResponse = client()
+                .prepareUpdate("test", "type1", "parentId1")
+                .setScript(
+                        "assert ctx._index == \"test\" : \"index should be \\\"test\\\"\"\n"
+                                + "assert ctx._type == \"type1\" : \"type should be \\\"type1\\\"\"\n"
+                                + "assert ctx._id == \"parentId1\" : \"id should be \\\"parentId1\\\"\"\n"
+                                + "assert ctx._version == 1 : \"version should be 1\"\n"
+                                + "assert ctx._parent == null : \"parent should be null\"\n"
+                                + "assert ctx._routing == null : \"routing should be null\"\n" + "assert ctx._timestamp == "
+                                + (timestamp - 1) + " : \"timestamp should be " + (timestamp - 1) + "\"\n"
+                                + "assert ctx._ttl == null : \"ttl should be null\"\n"
+                                + "ctx._source.content = ctx._source.content + delim + ctx._source.content;\n"
+                                + "ctx._source.field1 += 1;\n", ScriptService.ScriptType.INLINE).setScriptParams(scriptParams).execute()
+                .actionGet();
+
+        assertEquals(2, updateResponse.getVersion());
+
+        getResponse = client().prepareGet("test", "type1", "parentId1").execute().actionGet();
+        assertEquals(1, getResponse.getSourceAsMap().get("field1"));
+        assertEquals("bar_bar", getResponse.getSourceAsMap().get("content"));
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    @Slow
+    public void testConcurrentUpdateWithRetryOnConflictOldScriptAPI() throws Exception {
+        final boolean useBulkApi = randomBoolean();
+        createTestIndex();
+        ensureGreen();
+
+        int numberOfThreads = scaledRandomIntBetween(2, 5);
+        final CountDownLatch latch = new CountDownLatch(numberOfThreads);
+        final CountDownLatch startLatch = new CountDownLatch(1);
+        final int numberOfUpdatesPerThread = scaledRandomIntBetween(100, 10000);
+        final List<Throwable> failures = new CopyOnWriteArrayList<>();
+        for (int i = 0; i < numberOfThreads; i++) {
+            Runnable r = new Runnable() {
+
+                @Override
+                public void run() {
+                    try {
+                        startLatch.await();
+                        for (int i = 0; i < numberOfUpdatesPerThread; i++) {
+                            if (useBulkApi) {
+                                UpdateRequestBuilder updateRequestBuilder = client()
+                                        .prepareUpdate(indexOrAlias(), "type1", Integer.toString(i))
+                                        .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE)
+                                        .setRetryOnConflict(Integer.MAX_VALUE)
+                                        .setUpsert(jsonBuilder().startObject().field("field", 1).endObject());
+                                client().prepareBulk().add(updateRequestBuilder).execute().actionGet();
+                            } else {
+                                client().prepareUpdate(indexOrAlias(), "type1", Integer.toString(i))
+                                        .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE)
+                                        .setRetryOnConflict(Integer.MAX_VALUE)
+                                        .setUpsert(jsonBuilder().startObject().field("field", 1).endObject()).execute().actionGet();
+                            }
+                        }
+                    } catch (Throwable e) {
+                        failures.add(e);
+                    } finally {
+                        latch.countDown();
+                    }
+                }
+
+            };
+            new Thread(r).start();
+        }
+        startLatch.countDown();
+        latch.await();
+        for (Throwable throwable : failures) {
+            logger.info("Captured failure on concurrent update:", throwable);
+        }
+        assertThat(failures.size(), equalTo(0));
+        for (int i = 0; i < numberOfUpdatesPerThread; i++) {
+            GetResponse response = client().prepareGet("test", "type1", Integer.toString(i)).execute().actionGet();
+            assertThat(response.getId(), equalTo(Integer.toString(i)));
+            assertThat(response.isExists(), equalTo(true));
+            assertThat(response.getVersion(), equalTo((long) numberOfThreads));
+            assertThat((Integer) response.getSource().get("field"), equalTo(numberOfThreads));
+        }
+    }
+
+    /*
+     * TODO Remove in 2.0
+     */
+    @Test
+    @Slow
+    public void stressUpdateDeleteConcurrencyOldScriptAPI() throws Exception {
+        //We create an index with merging disabled so that deletes don't get merged away
+        assertAcked(prepareCreate("test").addMapping(
+                "type1",
+                XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("_timestamp").field("enabled", true)
+                        .field("store", "yes").endObject().startObject("_ttl").field("enabled", true).endObject().endObject().endObject())
+                .setSettings(Settings.builder().put(MergePolicyModule.MERGE_POLICY_TYPE_KEY, NoMergePolicyProvider.class)));
+        ensureGreen();
+
+        final int numberOfThreads = scaledRandomIntBetween(3, 5);
+        final int numberOfIdsPerThread = scaledRandomIntBetween(3, 10);
+        final int numberOfUpdatesPerId = scaledRandomIntBetween(10, 100);
+        final int retryOnConflict = randomIntBetween(0, 1);
+        final CountDownLatch latch = new CountDownLatch(numberOfThreads);
+        final CountDownLatch startLatch = new CountDownLatch(1);
+        final List<Throwable> failures = new CopyOnWriteArrayList<>();
+
+        final class UpdateThread extends Thread {
+            final Map<Integer, Integer> failedMap = new HashMap<>();
+            final int numberOfIds;
+            final int updatesPerId;
+            final int maxUpdateRequests = numberOfIdsPerThread * numberOfUpdatesPerId;
+            final int maxDeleteRequests = numberOfIdsPerThread * numberOfUpdatesPerId;
+            private final Semaphore updateRequestsOutstanding = new Semaphore(maxUpdateRequests);
+            private final Semaphore deleteRequestsOutstanding = new Semaphore(maxDeleteRequests);
+
+            public UpdateThread(int numberOfIds, int updatesPerId) {
+                this.numberOfIds = numberOfIds;
+                this.updatesPerId = updatesPerId;
+            }
+
+            final class UpdateListener implements ActionListener<UpdateResponse> {
+                int id;
+
+                public UpdateListener(int id) {
+                    this.id = id;
+                }
+
+                @Override
+                public void onResponse(UpdateResponse updateResponse) {
+                    updateRequestsOutstanding.release(1);
+                }
+
+                @Override
+                public void onFailure(Throwable e) {
+                    synchronized (failedMap) {
+                        incrementMapValue(id, failedMap);
+                    }
+                    updateRequestsOutstanding.release(1);
+                }
+
+            }
+
+            final class DeleteListener implements ActionListener<DeleteResponse> {
+                int id;
+
+                public DeleteListener(int id) {
+                    this.id = id;
+                }
+
+                @Override
+                public void onResponse(DeleteResponse deleteResponse) {
+                    deleteRequestsOutstanding.release(1);
+                }
+
+                @Override
+                public void onFailure(Throwable e) {
+                    synchronized (failedMap) {
+                        incrementMapValue(id, failedMap);
+                    }
+                    deleteRequestsOutstanding.release(1);
+                }
+            }
+
+            @Override
+            public void run() {
+                try {
+                    startLatch.await();
+                    boolean hasWaitedForNoNode = false;
+                    for (int j = 0; j < numberOfIds; j++) {
+                        for (int k = 0; k < numberOfUpdatesPerId; ++k) {
+                            updateRequestsOutstanding.acquire();
+                            try {
+                                UpdateRequest ur = client().prepareUpdate("test", "type1", Integer.toString(j))
+                                        .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE)
+                                        .setRetryOnConflict(retryOnConflict)
+                                        .setUpsert(jsonBuilder().startObject().field("field", 1).endObject()).request();
+                                client().update(ur, new UpdateListener(j));
+                            } catch (NoNodeAvailableException nne) {
+                                updateRequestsOutstanding.release();
+                                synchronized (failedMap) {
+                                    incrementMapValue(j, failedMap);
+                                }
+                                if (hasWaitedForNoNode) {
+                                    throw nne;
+                                }
+                                logger.warn("Got NoNodeException waiting for 1 second for things to recover.");
+                                hasWaitedForNoNode = true;
+                                Thread.sleep(1000);
+                            }
+
+                            try {
+                                deleteRequestsOutstanding.acquire();
+                                DeleteRequest dr = client().prepareDelete("test", "type1", Integer.toString(j)).request();
+                                client().delete(dr, new DeleteListener(j));
+                            } catch (NoNodeAvailableException nne) {
+                                deleteRequestsOutstanding.release();
+                                synchronized (failedMap) {
+                                    incrementMapValue(j, failedMap);
+                                }
+                                if (hasWaitedForNoNode) {
+                                    throw nne;
+                                }
+                                logger.warn("Got NoNodeException waiting for 1 second for things to recover.");
+                                hasWaitedForNoNode = true;
+                                Thread.sleep(1000); //Wait for no-node to clear
+                            }
+                        }
+                    }
+                } catch (Throwable e) {
+                    logger.error("Something went wrong", e);
+                    failures.add(e);
+                } finally {
+                    try {
+                        waitForOutstandingRequests(TimeValue.timeValueSeconds(60), updateRequestsOutstanding, maxUpdateRequests, "Update");
+                        waitForOutstandingRequests(TimeValue.timeValueSeconds(60), deleteRequestsOutstanding, maxDeleteRequests, "Delete");
+                    } catch (ElasticsearchTimeoutException ete) {
+                        failures.add(ete);
+                    }
+                    latch.countDown();
+                }
+            }
+
+            private void incrementMapValue(int j, Map<Integer, Integer> map) {
+                if (!map.containsKey(j)) {
+                    map.put(j, 0);
+                }
+                map.put(j, map.get(j) + 1);
+            }
+
+            private void waitForOutstandingRequests(TimeValue timeOut, Semaphore requestsOutstanding, int maxRequests, String name) {
+                long start = System.currentTimeMillis();
+                do {
+                    long msRemaining = timeOut.getMillis() - (System.currentTimeMillis() - start);
+                    logger.info("[{}] going to try and acquire [{}] in [{}]ms [{}] available to acquire right now", name, maxRequests,
+                            msRemaining, requestsOutstanding.availablePermits());
+                    try {
+                        requestsOutstanding.tryAcquire(maxRequests, msRemaining, TimeUnit.MILLISECONDS);
+                        return;
+                    } catch (InterruptedException ie) {
+                        //Just keep swimming
+                    }
+                } while ((System.currentTimeMillis() - start) < timeOut.getMillis());
+                throw new ElasticsearchTimeoutException("Requests were still outstanding after the timeout [" + timeOut + "] for type ["
+                        + name + "]");
+            }
+        }
+        final List<UpdateThread> threads = new ArrayList<>();
+
+        for (int i = 0; i < numberOfThreads; i++) {
+            UpdateThread ut = new UpdateThread(numberOfIdsPerThread, numberOfUpdatesPerId);
+            ut.start();
+            threads.add(ut);
+        }
+
+        startLatch.countDown();
+        latch.await();
+
+        for (UpdateThread ut : threads) {
+            ut.join(); //Threads should have finished because of the latch.await
+        }
+
+        //If are no errors every request received a response otherwise the test would have timedout
+        //aquiring the request outstanding semaphores.
+        for (Throwable throwable : failures) {
+            logger.info("Captured failure on concurrent update:", throwable);
+        }
+
+        assertThat(failures.size(), equalTo(0));
+
+        //Upsert all the ids one last time to make sure they are available at get time
+        //This means that we add 1 to the expected versions and attempts
+        //All the previous operations should be complete or failed at this point
+        for (int i = 0; i < numberOfIdsPerThread; ++i) {
+            UpdateResponse ur = client().prepareUpdate("test", "type1", Integer.toString(i))
+                    .setScript("ctx._source.field += 1", ScriptService.ScriptType.INLINE).setRetryOnConflict(Integer.MAX_VALUE)
+                    .setUpsert(jsonBuilder().startObject().field("field", 1).endObject()).execute().actionGet();
+        }
+
+        refresh();
+
+        for (int i = 0; i < numberOfIdsPerThread; ++i) {
+            int totalFailures = 0;
+            GetResponse response = client().prepareGet("test", "type1", Integer.toString(i)).execute().actionGet();
+            if (response.isExists()) {
+                assertThat(response.getId(), equalTo(Integer.toString(i)));
+                int expectedVersion = (numberOfThreads * numberOfUpdatesPerId * 2) + 1;
+                for (UpdateThread ut : threads) {
+                    if (ut.failedMap.containsKey(i)) {
+                        totalFailures += ut.failedMap.get(i);
+                    }
+                }
+                expectedVersion -= totalFailures;
+                logger.error("Actual version [{}] Expected version [{}] Total failures [{}]", response.getVersion(), expectedVersion,
+                        totalFailures);
+                assertThat(response.getVersion(), equalTo((long) expectedVersion));
+                assertThat(response.getVersion() + totalFailures, equalTo((long) ((numberOfUpdatesPerId * numberOfThreads * 2) + 1)));
+            }
+        }
+    }
+
     private static String indexOrAlias() {
         return randomBoolean() ? "test" : "alias";
     }

From fb8cd53582fe6b91ab4f5a395034cfa7ab2c29fa Mon Sep 17 00:00:00 2001
From: Areek Zillur <areek.zillur@elasticsearch.com>
Date: Fri, 15 May 2015 16:17:47 -0400
Subject: [PATCH 073/123] This commit removes the ability to use `filter` for
 PhraseSuggester collate. Only `query` can be used for collation.

Internally, a collate query is executed as an exists query. So specifying a
filter does not have any benefits.
---
 .../search/suggesters/phrase-suggest.asciidoc | 12 ++---
 .../suggest/phrase/PhraseSuggestParser.java   | 13 ++---
 .../suggest/phrase/PhraseSuggester.java       | 18 +------
 .../phrase/PhraseSuggestionBuilder.java       | 30 +-----------
 .../phrase/PhraseSuggestionContext.java       |  8 ---
 .../search/suggest/SuggestSearchTests.java    | 49 +++++--------------
 6 files changed, 24 insertions(+), 106 deletions(-)

diff --git a/docs/reference/search/suggesters/phrase-suggest.asciidoc b/docs/reference/search/suggesters/phrase-suggest.asciidoc
index 07332568685..9710b6a3f48 100644
--- a/docs/reference/search/suggesters/phrase-suggest.asciidoc
+++ b/docs/reference/search/suggesters/phrase-suggest.asciidoc
@@ -162,13 +162,13 @@ can contain misspellings (See parameter descriptions below).
     is wrapped rather than each token.
 
 `collate`::
-    Checks each suggestion against the specified `query` or `filter` to
-    prune suggestions for which no matching docs exist in the index.
-    The collate query for a suggestion is run only on the local shard from which
-    the suggestion has been generated from. Either a `query` or a `filter` must
-    be specified, and it is run as a <<query-dsl-template-query,`template` query>>.
+    Checks each suggestion against the specified `query` to prune suggestions
+    for which no matching docs exist in the index. The collate query for a
+    suggestion is run only on the local shard from which the suggestion has
+    been generated from. The `query` must be specified, and it is run as
+    a <<query-dsl-template-query,`template` query>>.
     The current suggestion is automatically made available as the `{{suggestion}}`
-    variable, which should be used in your query/filter.  You can still specify
+    variable, which should be used in your query.  You can still specify
     your own template `params` -- the `suggestion` value will be added to the
     variables you specify. Additionally, you can specify a `prune` to control
     if all phrase suggestions will be returned, when set to `true` the suggestions
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java
index 4bb59952336..a5bc2d530bf 100644
--- a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java
+++ b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestParser.java
@@ -134,20 +134,13 @@ public final class PhraseSuggestParser implements SuggestContextParser {
                     while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
                         if (token == XContentParser.Token.FIELD_NAME) {
                             fieldName = parser.currentName();
-                        } else if ("query".equals(fieldName) || "filter".equals(fieldName)) {
-                            Template template = Template.parse(parser);
-                            if (suggestion.getCollateFilterScript() != null) {
-                                throw new IllegalArgumentException("suggester[phrase][collate] filter already set, doesn't support additional [" + fieldName + "]");
-                            }
+                        } else if ("query".equals(fieldName)) {
                             if (suggestion.getCollateQueryScript() != null) {
                                 throw new IllegalArgumentException("suggester[phrase][collate] query already set, doesn't support additional [" + fieldName + "]");
                             }
+                            Template template = Template.parse(parser);
                             CompiledScript compiledScript = suggester.scriptService().compile(template, ScriptContext.Standard.SEARCH);
-                            if ("query".equals(fieldName)) {
-                                suggestion.setCollateQueryScript(compiledScript);
-                            } else {
-                                suggestion.setCollateFilterScript(compiledScript);
-                            }
+                            suggestion.setCollateQueryScript(compiledScript);
                         } else if ("params".equals(fieldName)) {
                             suggestion.setCollateScriptParams(parser.map());
                         } else if ("prune".equals(fieldName)) {
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java
index 37ab17fffed..30c1b63de21 100644
--- a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java
+++ b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggester.java
@@ -34,7 +34,6 @@ import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.lucene.Lucene.EarlyTerminatingCollector;
 import org.elasticsearch.common.text.StringText;
 import org.elasticsearch.common.text.Text;
-import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.ParsedQuery;
 import org.elasticsearch.script.CompiledScript;
 import org.elasticsearch.script.ExecutableScript;
@@ -105,14 +104,7 @@ public final class PhraseSuggester extends Suggester<PhraseSuggestionContext> {
 
             final BytesRefBuilder byteSpare = new BytesRefBuilder();
             final EarlyTerminatingCollector collector = Lucene.createExistsCollector();
-            final CompiledScript collateScript;
-            if (suggestion.getCollateQueryScript() != null) {
-                collateScript = suggestion.getCollateQueryScript();
-            } else if (suggestion.getCollateFilterScript() != null) {
-                collateScript = suggestion.getCollateFilterScript();
-            } else {
-                collateScript = null;
-            }
+            final CompiledScript collateScript = suggestion.getCollateQueryScript();
             final boolean collatePrune = (collateScript != null) && suggestion.collatePrune();
             for (int i = 0; i < checkerResult.corrections.length; i++) {
                 Correction correction = checkerResult.corrections[i];
@@ -125,13 +117,7 @@ public final class PhraseSuggester extends Suggester<PhraseSuggestionContext> {
                     vars.put(SUGGESTION_TEMPLATE_VAR_NAME, spare.toString());
                     final ExecutableScript executable = scriptService.executable(collateScript, vars);
                     final BytesReference querySource = (BytesReference) executable.run();
-                    final ParsedQuery parsedQuery;
-                    if (suggestion.getCollateFilterScript() != null) {
-                        parsedQuery = suggestion.getQueryParserService().parse(
-                                QueryBuilders.constantScoreQuery(QueryBuilders.wrapperQuery(querySource)));
-                    } else {
-                        parsedQuery = suggestion.getQueryParserService().parse(querySource);
-                    }
+                    final ParsedQuery parsedQuery = suggestion.getQueryParserService().parse(querySource);
                     collateMatch = Lucene.exists(searcher, parsedQuery.query(), collector);
                 }
                 if (!collateMatch && !collatePrune) {
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java
index ef320eb60e5..ac990deffb7 100644
--- a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java
+++ b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java
@@ -42,8 +42,6 @@ public final class PhraseSuggestionBuilder extends SuggestionBuilder<PhraseSugge
     private String preTag;
     private String postTag;
     private String collateQuery;
-    private String collateFilter;
-    private String collatePreference;
     private Map<String, Object> collateParams;
     private Boolean collatePrune;
 
@@ -178,22 +176,6 @@ public final class PhraseSuggestionBuilder extends SuggestionBuilder<PhraseSugge
         return this;
     }
 
-    /**
-     * Sets a filter used for filtering out suggested phrases (collation).
-     */
-    public PhraseSuggestionBuilder collateFilter(String collateFilter) {
-        this.collateFilter = collateFilter;
-        return this;
-    }
-
-    /**
-     * Sets routing preferences for executing filter query (collation).
-     */
-    public PhraseSuggestionBuilder collatePreference(String collatePreference) {
-        this.collatePreference = collatePreference;
-        return this;
-    }
-
     /**
      * Sets additional params for collate script
      */
@@ -254,17 +236,9 @@ public final class PhraseSuggestionBuilder extends SuggestionBuilder<PhraseSugge
             builder.field("post_tag", postTag);
             builder.endObject();
         }
-        if (collateQuery != null || collateFilter != null) {
+        if (collateQuery != null) {
             builder.startObject("collate");
-            if (collateQuery != null) {
-                builder.field("query", collateQuery);
-            }
-            if (collateFilter != null) {
-                builder.field("filter", collateFilter);
-            }
-            if (collatePreference != null) {
-                builder.field("preference", collatePreference);
-            }
+            builder.field("query", collateQuery);
             if (collateParams != null) {
                 builder.field("params", collateParams);
             }
diff --git a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java
index b38dd95053a..14ecb887582 100644
--- a/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java
+++ b/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java
@@ -204,14 +204,6 @@ class PhraseSuggestionContext extends SuggestionContext {
         this.collateQueryScript = collateQueryScript;
     }
 
-    CompiledScript getCollateFilterScript() {
-        return collateFilterScript;
-    }
-
-    void setCollateFilterScript(CompiledScript collateFilterScript) {
-        this.collateFilterScript = collateFilterScript;
-    }
-
     Map<String, Object> getCollateScriptParams() {
         return collateScriptParams;
     }
diff --git a/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java b/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java
index 06d0c86b89a..b5c114ab380 100644
--- a/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java
+++ b/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java
@@ -1129,7 +1129,7 @@ public class SuggestSearchTests extends ElasticsearchIntegrationTest {
         }
         indexRandom(true, builders);
 
-        // suggest without filtering
+        // suggest without collate
         PhraseSuggestionBuilder suggest = phraseSuggestion("title")
                 .field("title")
                 .addCandidateGenerator(PhraseSuggestionBuilder.candidateGenerator("title")
@@ -1145,7 +1145,7 @@ public class SuggestSearchTests extends ElasticsearchIntegrationTest {
         Suggest searchSuggest = searchSuggest("united states house of representatives elections in washington 2006", suggest);
         assertSuggestionSize(searchSuggest, 0, 10, "title");
 
-        // suggest with filtering
+        // suggest with collate
         String filterString = XContentFactory.jsonBuilder()
                     .startObject()
                         .startObject("match_phrase")
@@ -1157,13 +1157,13 @@ public class SuggestSearchTests extends ElasticsearchIntegrationTest {
         searchSuggest = searchSuggest("united states house of representatives elections in washington 2006", filteredQuerySuggest);
         assertSuggestionSize(searchSuggest, 0, 2, "title");
 
-        // filtered suggest with no result (boundary case)
+        // collate suggest with no result (boundary case)
         searchSuggest = searchSuggest("Elections of Representatives Parliament", filteredQuerySuggest);
         assertSuggestionSize(searchSuggest, 0, 0, "title");
 
         NumShards numShards = getNumShards("test");
 
-        // filtered suggest with bad query
+        // collate suggest with bad query
         String incorrectFilterString = XContentFactory.jsonBuilder()
                 .startObject()
                     .startObject("test")
@@ -1179,7 +1179,7 @@ public class SuggestSearchTests extends ElasticsearchIntegrationTest {
             // expected
         }
 
-        // suggest with filter collation
+        // suggest with collation
         String filterStringAsFilter = XContentFactory.jsonBuilder()
                 .startObject()
                 .startObject("query")
@@ -1190,11 +1190,11 @@ public class SuggestSearchTests extends ElasticsearchIntegrationTest {
                 .endObject()
                 .string();
 
-        PhraseSuggestionBuilder filteredFilterSuggest = suggest.collateQuery(null).collateFilter(filterStringAsFilter);
+        PhraseSuggestionBuilder filteredFilterSuggest = suggest.collateQuery(filterStringAsFilter);
         searchSuggest = searchSuggest("united states house of representatives elections in washington 2006", filteredFilterSuggest);
         assertSuggestionSize(searchSuggest, 0, 2, "title");
 
-        // filtered suggest with bad filter
+        // collate suggest with bad query
         String filterStr = XContentFactory.jsonBuilder()
                 .startObject()
                 .startObject("pprefix")
@@ -1203,7 +1203,7 @@ public class SuggestSearchTests extends ElasticsearchIntegrationTest {
                 .endObject()
                 .string();
 
-        PhraseSuggestionBuilder in = suggest.collateQuery(null).collateFilter(filterStr);
+        PhraseSuggestionBuilder in = suggest.collateQuery(filterStr);
         try {
             searchSuggest("united states house of representatives elections in washington 2006", numShards.numPrimaries, in);
             fail("Post filter error has been swallowed");
@@ -1221,7 +1221,7 @@ public class SuggestSearchTests extends ElasticsearchIntegrationTest {
                 .string();
 
 
-        PhraseSuggestionBuilder phraseSuggestWithNoParams = suggest.collateFilter(null).collateQuery(collateWithParams);
+        PhraseSuggestionBuilder phraseSuggestWithNoParams = suggest.collateQuery(collateWithParams);
         try {
             searchSuggest("united states house of representatives elections in washington 2006", numShards.numPrimaries, phraseSuggestWithNoParams);
             fail("Malformed query (lack of additional params) should fail");
@@ -1234,39 +1234,12 @@ public class SuggestSearchTests extends ElasticsearchIntegrationTest {
         params.put("query_type", "match_phrase");
         params.put("query_field", "title");
 
-        PhraseSuggestionBuilder phraseSuggestWithParams = suggest.collateFilter(null).collateQuery(collateWithParams).collateParams(params);
+        PhraseSuggestionBuilder phraseSuggestWithParams = suggest.collateQuery(collateWithParams).collateParams(params);
         searchSuggest = searchSuggest("united states house of representatives elections in washington 2006", phraseSuggestWithParams);
         assertSuggestionSize(searchSuggest, 0, 2, "title");
 
-        //collate request defining both query/filter should fail
-        PhraseSuggestionBuilder phraseSuggestWithFilterAndQuery = suggest.collateFilter(filterStringAsFilter).collateQuery(filterString);
-        try {
-            searchSuggest("united states house of representatives elections in washington 2006", numShards.numPrimaries, phraseSuggestWithFilterAndQuery);
-            fail("expected parse failure, as both filter and query are set in collate");
-        } catch (ElasticsearchException e) {
-            // expected
-        }
-
         // collate query request with prune set to true
-        PhraseSuggestionBuilder phraseSuggestWithParamsAndReturn = suggest.collateFilter(null).collateQuery(collateWithParams).collateParams(params).collatePrune(true);
-        searchSuggest = searchSuggest("united states house of representatives elections in washington 2006", phraseSuggestWithParamsAndReturn);
-        assertSuggestionSize(searchSuggest, 0, 10, "title");
-        assertSuggestionPhraseCollateMatchExists(searchSuggest, "title", 2);
-
-        collateWithParams = XContentFactory.jsonBuilder()
-                .startObject()
-                .startObject("query")
-                .startObject("{{query_type}}")
-                .field("{{query_field}}", "{{suggestion}}")
-                .endObject()
-                .endObject()
-                .endObject().string();
-
-        params.clear();
-        params.put("query_type", "match_phrase");
-        params.put("query_field", "title");
-        // collate filter request with prune set to true
-        phraseSuggestWithParamsAndReturn = suggest.collateFilter(collateWithParams).collateQuery(null).collateParams(params).collatePrune(true);
+        PhraseSuggestionBuilder phraseSuggestWithParamsAndReturn = suggest.collateQuery(collateWithParams).collateParams(params).collatePrune(true);
         searchSuggest = searchSuggest("united states house of representatives elections in washington 2006", phraseSuggestWithParamsAndReturn);
         assertSuggestionSize(searchSuggest, 0, 10, "title");
         assertSuggestionPhraseCollateMatchExists(searchSuggest, "title", 2);

From a9ee78dd08a65edf1f3f9985d88147a0377dddff Mon Sep 17 00:00:00 2001
From: Colin Goodheart-Smithe <colings86@users.noreply.github.com>
Date: Fri, 29 May 2015 18:52:29 +0100
Subject: [PATCH 074/123] [TEST] muted ElasticsearchRestTestCase

This is because commit 35a58d874ef56be50a0ad1d7bfb13edb4204d0a3 causes the following REST tests to fail and reverting the commit causes conflicts:

update/15_script/Script
script/10_basic/Indexed script
---
 .../test/rest/ElasticsearchRestTestCase.java  | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java b/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java
index ee217ae1e8f..e8066a5c939 100644
--- a/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java
+++ b/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java
@@ -24,10 +24,11 @@ import com.carrotsearch.randomizedtesting.annotations.TestGroup;
 import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
 import com.google.common.collect.Lists;
 
+import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.LuceneTestCase.AwaitsFix;
 import org.apache.lucene.util.LuceneTestCase.Slow;
 import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
 import org.apache.lucene.util.LuceneTestCase.SuppressFsync;
-import org.apache.lucene.util.IOUtils;
 import org.apache.lucene.util.TimeUnits;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.SuppressForbidden;
@@ -40,7 +41,11 @@ import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
 import org.elasticsearch.test.rest.client.RestException;
 import org.elasticsearch.test.rest.parser.RestTestParseException;
 import org.elasticsearch.test.rest.parser.RestTestSuiteParser;
-import org.elasticsearch.test.rest.section.*;
+import org.elasticsearch.test.rest.section.DoSection;
+import org.elasticsearch.test.rest.section.ExecutableSection;
+import org.elasticsearch.test.rest.section.RestTestSuite;
+import org.elasticsearch.test.rest.section.SkipSection;
+import org.elasticsearch.test.rest.section.TestSection;
 import org.elasticsearch.test.rest.spec.RestApi;
 import org.elasticsearch.test.rest.spec.RestSpec;
 import org.elasticsearch.test.rest.support.FileUtils;
@@ -51,7 +56,11 @@ import org.junit.Test;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -61,7 +70,11 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.PathMatcher;
 import java.nio.file.StandardCopyOption;
-import java.util.*;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Runs the clients test suite against an elasticsearch cluster.
@@ -72,6 +85,7 @@ import java.util.*;
 @SuppressCodecs("*") // requires custom completion postings format
 @ClusterScope(randomDynamicTemplates = false)
 @TimeoutSuite(millis = 40 * TimeUnits.MINUTE) // timeout the suite after 40min and fail the test.
+@AwaitsFix(bugUrl = "script/10_basic/Indexed script and update/15_script/Script fail due to commit 35a58d874ef56be50a0ad1d7bfb13edb4204d0a3")
 public abstract class ElasticsearchRestTestCase extends ElasticsearchIntegrationTest {
 
     /**

From bd381b86ca1dcebeb0c8b91e2a033e7e866eeb16 Mon Sep 17 00:00:00 2001
From: Clinton Gormley <clint@traveljury.com>
Date: Fri, 29 May 2015 21:02:31 +0200
Subject: [PATCH 075/123] Release notes: Add HTML header with UTF-8 encoding

---
 dev-tools/es_release_notes.pl | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dev-tools/es_release_notes.pl b/dev-tools/es_release_notes.pl
index b07a973d832..7e65731a411 100644
--- a/dev-tools/es_release_notes.pl
+++ b/dev-tools/es_release_notes.pl
@@ -33,6 +33,7 @@ my @Groups = qw(
 );
 my %Group_Labels = (
     breaking    => 'Breaking changes',
+    build       => 'Build',
     deprecation => 'Deprecations',
     doc         => 'Docs',
     feature     => 'New features',
@@ -70,6 +71,14 @@ sub dump_issues {
     $month++;
     $year += 1900;
 
+    print <<"HTML";
+<html>
+<head>
+  <meta charset="UTF-8">
+</head>
+<body>
+HTML
+
     for my $group ( @Groups, 'other' ) {
         my $group_issues = $issues->{$group} or next;
         print "<h2>$Group_Labels{$group}</h2>\n\n<ul>\n";
@@ -115,6 +124,7 @@ sub dump_issues {
         print "</ul>";
         print "\n\n";
     }
+    print "</body></html>\n";
 }
 
 #===================================

From 1cfb6a79f1e130dc73ac62a51be7420564a95c82 Mon Sep 17 00:00:00 2001
From: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date: Wed, 25 Mar 2015 10:42:49 +0100
Subject: [PATCH 076/123] Parent/child: refactored _parent field mapper and
 parent/child queries

* Cut the `has_child` and `has_parent` queries over to use Lucene's query time global ordinal join. The main benefit of this change is that parent/child queries can now efficiently execute if parent/child queries are wrapped in a bigger boolean query. If the rest of the query only hit a few documents both has_child and has_parent queries don't need to evaluate all parent or child documents any more.
* Cut the `_parent` field over to use doc values. This significantly reduces the on heap memory footprint of parent/child, because the parent id values are never loaded into memory.

Breaking changes:
* The `type` option on the `_parent` field can only point to a parent type that doesn't exist yet, so this means that an existing type/mapping can't become a parent type any longer.
* The `has_child` and `has_parent` queries can no longer be use in alias filters.

All these changes, improvements and breaks in compatibility only apply for indices created with ES version 2.0 or higher. For indices creates with ES <= 2.0 the older implementation is used.

It is highly recommended to re-index all your indices with parent and child documents to benefit from all the improvements that come with this refactoring. The easiest way to achieve this is by using the scan and bulk apis using a simple script.

Closes #6107
Closes #8134
---
 .../mapping/fields/parent-field.asciidoc      |  37 ++-
 docs/reference/migration/migrate_2_0.asciidoc |  16 ++
 .../query-dsl/has-child-query.asciidoc        |  18 --
 .../query-dsl/has-parent-query.asciidoc       |  20 --
 .../metadata/MetaDataMappingService.java      |  15 +
 .../index/AbstractIndexComponent.java         |   4 +
 .../plain/ParentChildIndexFieldData.java      | 118 +++++---
 .../index/mapper/DocumentMapper.java          |   4 +
 .../index/mapper/MapperService.java           |  21 +-
 .../mapper/internal/ParentFieldMapper.java    |  41 ++-
 .../index/query/HasChildQueryParser.java      |  80 ++++--
 .../index/query/HasParentQueryParser.java     |  17 +-
 .../index/query/QueryParseContext.java        |   9 +
 .../bucket/children/ChildrenParser.java       |   2 +-
 .../aliases/IndexAliasesTests.java            |  52 ++--
 .../search/child/ChildSearchBenchmark.java    |  43 ++-
 .../fielddata/ParentChildFieldDataTests.java  |  25 +-
 .../query/SimpleIndexQueryParserTests.java    |  85 +-----
 ...-query-with-empty-clauses-for-parsing.json |   4 +-
 .../search/child/AbstractChildTests.java      |  19 +-
 .../child/ChildQuerySearchBwcTests.java       | 219 ++++++++++++++
 ...hTests.java => ChildQuerySearchTests.java} | 190 ++-----------
 .../child/ParentFieldLoadingBwcTest.java      | 269 ++++++++++++++++++
 .../search/child/ParentFieldLoadingTest.java  |  12 +-
 .../org/elasticsearch/update/UpdateTests.java |  59 ++--
 25 files changed, 944 insertions(+), 435 deletions(-)
 create mode 100644 src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcTests.java
 rename src/test/java/org/elasticsearch/search/child/{SimpleChildQuerySearchTests.java => ChildQuerySearchTests.java} (92%)
 create mode 100644 src/test/java/org/elasticsearch/search/child/ParentFieldLoadingBwcTest.java

diff --git a/docs/reference/mapping/fields/parent-field.asciidoc b/docs/reference/mapping/fields/parent-field.asciidoc
index 260ab57af98..8c919b8373e 100644
--- a/docs/reference/mapping/fields/parent-field.asciidoc
+++ b/docs/reference/mapping/fields/parent-field.asciidoc
@@ -1,6 +1,9 @@
 [[mapping-parent-field]]
 === `_parent`
 
+TIP: It is highly recommend to reindex all indices with `_parent` field created before version 2.x.
+     The reason for this is to gain from all the optimizations added with the 2.0 release.
+
 The parent field mapping is defined on a child mapping, and points to
 the parent type this child relates to. For example, in case of a `blog`
 type and a `blog_tag` type child document, the mapping for `blog_tag`
@@ -20,8 +23,34 @@ should be:
 The mapping is automatically stored and indexed (meaning it can be
 searched on using the `_parent` field notation).
 
-==== Field data loading
+==== Limitations
 
-Contrary to other fields the fielddata loading is not `lazy`, but `eager`. The reason for this is that when this
-field has been enabled it is going to be used in parent/child queries, which heavily relies on field data to perform
-efficiently. This can already be observed during indexing after refresh either automatically or manually has been executed.
+The `_parent.type` setting can only point to a type that doesn't exist yet.
+This means that a type can't become a parent type after is has been created.
+
+The `parent.type` setting can't point to itself. This means self referential
+parent/child isn't supported.
+
+Parent/child queries (`has_child` & `has_parent`) can't be used in index aliases.
+
+==== Global ordinals
+
+Parent-child uses <<index-modules-fielddata-global-ordinals,global ordinals>> to speed up joins and global ordinals need to be rebuilt after any change to a shard.
+The more parent id values are stored in a shard, the longer it takes to rebuild global ordinals for the `_parent` field.
+
+Global ordinals, by default, are built lazily: the first parent-child query or aggregation after a refresh will trigger building of global ordinals.
+This can introduce a significant latency spike for your users. You can use <<index-modules-fielddata-fielddata-loading,eager_global_ordinals>> to shift the cost of building global ordinals
+from query time to refresh time, by mapping the _parent field as follows:
+
+==== Memory usage
+
+The only on heap memory used by parent/child is the global ordinals for the `_parent` field.
+
+How much memory is used for the global ordianls for the `_parent` field in the fielddata cache
+can be checked via the <<indices-stats,indices stats>> or <<cluster-nodes-stats,nodes stats>>
+APIS, eg:
+
+[source,js]
+--------------------------------------------------
+curl -XGET "http://localhost:9200/_stats/fielddata?pretty&human&fielddata_fields=_parent"
+--------------------------------------------------
diff --git a/docs/reference/migration/migrate_2_0.asciidoc b/docs/reference/migration/migrate_2_0.asciidoc
index 34b022b95d2..d45242b573f 100644
--- a/docs/reference/migration/migrate_2_0.asciidoc
+++ b/docs/reference/migration/migrate_2_0.asciidoc
@@ -626,3 +626,19 @@ anymore, it will only highlight fields that were queried.
 The `match` query with type set to `match_phrase_prefix` is not supported by the
 postings highlighter. No highlighted snippets will be returned.
 
+[float]
+=== Parent/child
+
+Parent/child has been rewritten completely to reduce memory usage and to execute
+`has_child` and `has_parent` queries faster and more efficient. The `_parent` field
+uses doc values by default. The refactored and improved implementation is only active
+for indices created on or after version 2.0.
+
+In order to benefit for all performance and memory improvements we recommend to reindex all
+indices that have the `_parent` field created before was upgraded to 2.0.
+
+The following breaks in backwards compatability have been made on indices with the `_parent` field
+created on or after clusters with version 2.0:
+* The `type` option on the `_parent` field can only point to a parent type that doesn't exist yet,
+  so this means that an existing type/mapping can no longer become a parent type.
+* The `has_child` and `has_parent` queries can no longer be use in alias filters.
\ No newline at end of file
diff --git a/docs/reference/query-dsl/has-child-query.asciidoc b/docs/reference/query-dsl/has-child-query.asciidoc
index e974f58001e..606c6a58459 100644
--- a/docs/reference/query-dsl/has-child-query.asciidoc
+++ b/docs/reference/query-dsl/has-child-query.asciidoc
@@ -72,21 +72,3 @@ a match:
 
 The  `min_children` and `max_children` parameters can be combined with
 the `score_mode` parameter.
-
-[float]
-=== Memory Considerations
-
-In order to support parent-child joins, all of the (string) parent IDs
-must be resident in memory (in the <<index-modules-fielddata,field data cache>>.
-Additionally, every child document is mapped to its parent using a long
-value (approximately). It is advisable to keep the string parent ID short
-in order to reduce memory usage.
-
-You can check how much memory is being used by the `_parent` field in the fielddata cache
-using the <<indices-stats,indices stats>> or <<cluster-nodes-stats,nodes stats>>
-APIS, eg:
-
-[source,js]
---------------------------------------------------
-curl -XGET "http://localhost:9200/_stats/fielddata?pretty&human&fielddata_fields=_parent"
---------------------------------------------------
diff --git a/docs/reference/query-dsl/has-parent-query.asciidoc b/docs/reference/query-dsl/has-parent-query.asciidoc
index f0ab59a1b1e..cbd4fb9358e 100644
--- a/docs/reference/query-dsl/has-parent-query.asciidoc
+++ b/docs/reference/query-dsl/has-parent-query.asciidoc
@@ -47,23 +47,3 @@ matching parent document. The score type can be specified with the
     }
 }
 --------------------------------------------------
-
-[float]
-=== Memory Considerations
-
-In order to support parent-child joins, all of the (string) parent IDs 
-must be resident in memory (in the <<index-modules-fielddata,field data cache>>. 
-Additionally, every child document is mapped to its parent using a long
-value (approximately). It is advisable to keep the string parent ID short
-in order to reduce memory usage.
-
-You can check how much memory is being used by the `_parent` field in the fielddata cache
-using the <<indices-stats,indices stats>> or <<cluster-nodes-stats,nodes stats>>
-APIS, eg:
-
-[source,js]
---------------------------------------------------
-curl -XGET "http://localhost:9200/_stats/fielddata?pretty&human&fielddata_fields=_parent"
---------------------------------------------------
-
-
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
index 4406decfe0c..3c2e77316ed 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
@@ -22,6 +22,7 @@ package org.elasticsearch.cluster.metadata;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingClusterStateUpdateRequest;
 import org.elasticsearch.cluster.AckedClusterStateUpdateTask;
@@ -386,9 +387,23 @@ public class MetaDataMappingService extends AbstractComponent {
                                 if (mergeResult.hasConflicts()) {
                                     throw new MergeMappingException(mergeResult.buildConflicts());
                                 }
+                            } else {
+                                // TODO: can we find a better place for this validation?
+                                // The reason this validation is here is that the mapper service doesn't learn about
+                                // new types all at once , which can create a false error.
+
+                                // For example in MapperService we can't distinguish between a create index api call
+                                // and a put mapping api call, so we don't which type did exist before.
+                                // Also the order of the mappings may be backwards.
+                                if (Version.indexCreated(indexService.getIndexSettings()).onOrAfter(Version.V_2_0_0) && newMapper.parentFieldMapper().active()) {
+                                    if (indexService.mapperService().types().contains(newMapper.parentFieldMapper().type())) {
+                                        throw new IllegalArgumentException("can't add a _parent field that points to an already existing type");
+                                    }
+                                }
                             }
                         }
 
+
                         newMappers.put(index, newMapper);
                         if (existingMapper != null) {
                             existingMappers.put(index, existingMapper);
diff --git a/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java b/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java
index 3cfecc4cf07..b229b365665 100644
--- a/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java
+++ b/src/main/java/org/elasticsearch/index/AbstractIndexComponent.java
@@ -53,6 +53,10 @@ public abstract class AbstractIndexComponent implements IndexComponent {
         return this.index;
     }
 
+    public Settings indexSettings() {
+        return indexSettings;
+    }
+
     public String nodeName() {
         return indexSettings.get("name", "");
     }
diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java
index e748805e329..6f78ec5fd53 100644
--- a/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java
+++ b/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java
@@ -21,16 +21,10 @@ package org.elasticsearch.index.fielddata.plain;
 
 import com.carrotsearch.hppc.ObjectObjectHashMap;
 import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
-
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.LeafReader;
-import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.index.*;
 import org.apache.lucene.index.MultiDocValues.OrdinalMap;
-import org.apache.lucene.index.PostingsEnum;
-import org.apache.lucene.index.SortedDocValues;
-import org.apache.lucene.index.Terms;
-import org.apache.lucene.index.TermsEnum;
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.util.Accountable;
 import org.apache.lucene.util.BytesRef;
@@ -39,6 +33,7 @@ import org.apache.lucene.util.PagedBytes;
 import org.apache.lucene.util.packed.PackedInts;
 import org.apache.lucene.util.packed.PackedLongValues;
 import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.Version;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.breaker.CircuitBreaker;
 import org.elasticsearch.common.collect.ImmutableOpenMap;
@@ -47,14 +42,8 @@ import org.elasticsearch.common.lease.Releasables;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.index.Index;
-import org.elasticsearch.index.fielddata.AtomicOrdinalsFieldData;
-import org.elasticsearch.index.fielddata.AtomicParentChildFieldData;
-import org.elasticsearch.index.fielddata.FieldDataType;
-import org.elasticsearch.index.fielddata.IndexFieldData;
+import org.elasticsearch.index.fielddata.*;
 import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
-import org.elasticsearch.index.fielddata.IndexFieldDataCache;
-import org.elasticsearch.index.fielddata.IndexParentChildFieldData;
-import org.elasticsearch.index.fielddata.RamAccountingTermsEnum;
 import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource;
 import org.elasticsearch.index.fielddata.ordinals.Ordinals;
 import org.elasticsearch.index.fielddata.ordinals.OrdinalsBuilder;
@@ -70,17 +59,7 @@ import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import org.elasticsearch.search.MultiValueMode;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableSet;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -89,7 +68,7 @@ import java.util.concurrent.TimeUnit;
  */
 public class ParentChildIndexFieldData extends AbstractIndexFieldData<AtomicParentChildFieldData> implements IndexParentChildFieldData, DocumentTypeListener {
 
-    private final NavigableSet<BytesRef> parentTypes;
+    private final NavigableSet<String> parentTypes;
     private final CircuitBreakerService breakerService;
 
     // If child type (a type with _parent field) is added or removed, we want to make sure modifications don't happen
@@ -100,7 +79,7 @@ public class ParentChildIndexFieldData extends AbstractIndexFieldData<AtomicPare
                                      FieldDataType fieldDataType, IndexFieldDataCache cache, MapperService mapperService,
                                      CircuitBreakerService breakerService) {
         super(index, indexSettings, fieldNames, fieldDataType, cache);
-        parentTypes = new TreeSet<>(BytesRef.getUTF8SortedAsUnicodeComparator());
+        parentTypes = new TreeSet<>();
         this.breakerService = breakerService;
         for (DocumentMapper documentMapper : mapperService.docMappers(false)) {
             beforeCreate(documentMapper);
@@ -114,15 +93,60 @@ public class ParentChildIndexFieldData extends AbstractIndexFieldData<AtomicPare
     }
 
     @Override
-    public ParentChildAtomicFieldData loadDirect(LeafReaderContext context) throws Exception {
+    public AtomicParentChildFieldData load(LeafReaderContext context) {
+        if (Version.indexCreated(indexSettings).onOrAfter(Version.V_2_0_0)) {
+            final LeafReader reader = context.reader();
+            final NavigableSet<String> parentTypes;
+            synchronized (lock) {
+                parentTypes = ImmutableSortedSet.copyOf(this.parentTypes);
+            }
+            return new AbstractAtomicParentChildFieldData() {
+
+                public Set<String> types() {
+                    return parentTypes;
+                }
+
+                @Override
+                public SortedDocValues getOrdinalsValues(String type) {
+                    try {
+                        return DocValues.getSorted(reader, ParentFieldMapper.joinField(type));
+                    } catch (IOException e) {
+                        throw new IllegalStateException("cannot load join doc values field for type [" + type + "]", e);
+                    }
+                }
+
+                @Override
+                public long ramBytesUsed() {
+                    // unknown
+                    return 0;
+                }
+
+                @Override
+                public Collection<Accountable> getChildResources() {
+                    return Collections.emptyList();
+                }
+
+                @Override
+                public void close() throws ElasticsearchException {
+                }
+            };
+        } else {
+            return super.load(context);
+        }
+    }
+
+    @Override
+    public AbstractAtomicParentChildFieldData loadDirect(LeafReaderContext context) throws Exception {
         LeafReader reader = context.reader();
         final float acceptableTransientOverheadRatio = fieldDataType.getSettings().getAsFloat(
                 "acceptable_transient_overhead_ratio", OrdinalsBuilder.DEFAULT_ACCEPTABLE_OVERHEAD_RATIO
         );
 
-        final NavigableSet<BytesRef> parentTypes;
+        final NavigableSet<BytesRef> parentTypes = new TreeSet<>();
         synchronized (lock) {
-            parentTypes = ImmutableSortedSet.copyOf(BytesRef.getUTF8SortedAsUnicodeComparator(), this.parentTypes);
+            for (String parentType : this.parentTypes) {
+                parentTypes.add(new BytesRef(parentType));
+            }
         }
         boolean success = false;
         ParentChildAtomicFieldData data = null;
@@ -192,7 +216,7 @@ public class ParentChildIndexFieldData extends AbstractIndexFieldData<AtomicPare
             if (parentFieldMapper.active()) {
                 // A _parent field can never be added to an existing mapping, so a _parent field either exists on
                 // a new created or doesn't exists. This is why we can update the known parent types via DocumentTypeListener
-                if (parentTypes.add(new BytesRef(parentFieldMapper.type()))) {
+                if (parentTypes.add(parentFieldMapper.type())) {
                     clear();
                 }
             }
@@ -320,11 +344,9 @@ public class ParentChildIndexFieldData extends AbstractIndexFieldData<AtomicPare
     @Override
     public IndexParentChildFieldData localGlobalDirect(IndexReader indexReader) throws Exception {
         final long startTime = System.nanoTime();
-        final Set<String> parentTypes = new HashSet<>();
+        final Set<String> parentTypes;
         synchronized (lock) {
-            for (BytesRef type : this.parentTypes) {
-                parentTypes.add(type.utf8ToString());
-            }
+            parentTypes = ImmutableSet.copyOf(this.parentTypes);
         }
 
         long ramBytesUsed = 0;
@@ -352,7 +374,7 @@ public class ParentChildIndexFieldData extends AbstractIndexFieldData<AtomicPare
             );
         }
 
-        return new GlobalFieldData(indexReader, fielddata, ramBytesUsed);
+        return new GlobalFieldData(indexReader, fielddata, ramBytesUsed, perType);
     }
 
     private static class GlobalAtomicFieldData extends AbstractAtomicParentChildFieldData {
@@ -436,16 +458,18 @@ public class ParentChildIndexFieldData extends AbstractIndexFieldData<AtomicPare
 
     }
 
-    private class GlobalFieldData implements IndexParentChildFieldData, Accountable {
+    public class GlobalFieldData implements IndexParentChildFieldData, Accountable {
 
         private final AtomicParentChildFieldData[] fielddata;
         private final IndexReader reader;
         private final long ramBytesUsed;
+        private final Map<String, OrdinalMapAndAtomicFieldData> ordinalMapPerType;
 
-        GlobalFieldData(IndexReader reader, AtomicParentChildFieldData[] fielddata, long ramBytesUsed) {
+        GlobalFieldData(IndexReader reader, AtomicParentChildFieldData[] fielddata, long ramBytesUsed, Map<String, OrdinalMapAndAtomicFieldData> ordinalMapPerType) {
             this.reader = reader;
             this.ramBytesUsed = ramBytesUsed;
             this.fielddata = fielddata;
+            this.ordinalMapPerType = ordinalMapPerType;
         }
 
         @Override
@@ -514,4 +538,20 @@ public class ParentChildIndexFieldData extends AbstractIndexFieldData<AtomicPare
 
     }
 
+    /**
+     * Returns the global ordinal map for the specified type
+     */
+    // TODO: OrdinalMap isn't expose in the field data framework, because it is an implementation detail.
+    // However the JoinUtil works directly with OrdinalMap, so this is a hack to get access to OrdinalMap
+    // I don't think we should expose OrdinalMap in IndexFieldData, because only parent/child relies on it and for the
+    // rest of the code OrdinalMap is an implementation detail, but maybe we can expose it in IndexParentChildFieldData interface?
+    public static MultiDocValues.OrdinalMap getOrdinalMap(IndexParentChildFieldData indexParentChildFieldData, String type) {
+        if (indexParentChildFieldData instanceof ParentChildIndexFieldData.GlobalFieldData) {
+            return ((GlobalFieldData) indexParentChildFieldData).ordinalMapPerType.get(type).ordMap;
+        } else {
+            // one segment, local ordinals are global
+            return null;
+        }
+    }
+
 }
diff --git a/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java b/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
index b306396700a..17ceba1712b 100644
--- a/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
@@ -402,6 +402,10 @@ public class DocumentMapper implements ToXContent {
         mapperService.addFieldMappers(fieldMappers);
     }
 
+    public boolean isParent(String type) {
+        return mapperService.getParentTypes().contains(type);
+    }
+
     private void addObjectMappers(Collection<ObjectMapper> objectMappers) {
         assert mappingLock.isWriteLockedByCurrentThread();
             MapBuilder<String, ObjectMapper> builder = MapBuilder.newMapBuilder(this.objectMappers);
diff --git a/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/src/main/java/org/elasticsearch/index/mapper/MapperService.java
index 8847550c6c9..d592231d20e 100755
--- a/src/main/java/org/elasticsearch/index/mapper/MapperService.java
+++ b/src/main/java/org/elasticsearch/index/mapper/MapperService.java
@@ -21,10 +21,7 @@ package org.elasticsearch.index.mapper;
 
 import com.carrotsearch.hppc.ObjectHashSet;
 import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.Lists;
+import com.google.common.collect.*;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.DelegatingAnalyzerWrapper;
@@ -40,6 +37,7 @@ import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.ElasticsearchGenerationException;
 import org.elasticsearch.cluster.metadata.MetaData;
+import org.elasticsearch.Version;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.collect.ImmutableOpenMap;
 import org.elasticsearch.common.collect.Tuple;
@@ -117,6 +115,8 @@ public class MapperService extends AbstractIndexComponent  {
 
     private volatile ImmutableMap<String, FieldMapper> unmappedFieldMappers = ImmutableMap.of();
 
+    private volatile ImmutableSet<String> parentTypes = ImmutableSet.of();
+
     @Inject
     public MapperService(Index index, @IndexSettings Settings indexSettings, AnalysisService analysisService, IndexFieldDataService fieldDataService,
                          SimilarityLookupService similarityLookupService,
@@ -250,6 +250,9 @@ public class MapperService extends AbstractIndexComponent  {
             if (mapper.type().contains(",")) {
                 throw new InvalidTypeNameException("mapping type name [" + mapper.type() + "] should not include ',' in it");
             }
+            if (Version.indexCreated(indexSettings).onOrAfter(Version.V_2_0_0) && mapper.type().equals(mapper.parentFieldMapper().type())) {
+                throw new IllegalArgumentException("The [_parent.type] option can't point to the same type");
+            }
             if (mapper.type().contains(".") && !PercolatorService.TYPE_NAME.equals(mapper.type())) {
                 logger.warn("Type [{}] contains a '.', it is recommended not to include it within a type name", mapper.type());
             }
@@ -285,6 +288,12 @@ public class MapperService extends AbstractIndexComponent  {
                     typeListener.beforeCreate(mapper);
                 }
                 mappers = newMapBuilder(mappers).put(mapper.type(), mapper).map();
+                if (mapper.parentFieldMapper().active()) {
+                    ImmutableSet.Builder<String> parentTypesCopy = ImmutableSet.builder();
+                    parentTypesCopy.addAll(parentTypes);
+                    parentTypesCopy.add(mapper.parentFieldMapper().type());
+                    parentTypes = parentTypesCopy.build();
+                }
                 assert assertSerialization(mapper);
                 return mapper;
             }
@@ -645,6 +654,10 @@ public class MapperService extends AbstractIndexComponent  {
         return null;
     }
 
+    public ImmutableSet<String> getParentTypes() {
+        return parentTypes;
+    }
+
     /**
      * @return Whether a field is a metadata field.
      */
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java
index 7aca0b17ea6..70109a08074 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java
@@ -21,6 +21,7 @@ package org.elasticsearch.index.mapper.internal;
 import com.google.common.base.Objects;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.SortedDocValuesField;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.queries.TermsQuery;
 import org.apache.lucene.search.Query;
@@ -33,9 +34,11 @@ import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.loader.SettingsLoader;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.support.XContentMapValues;
 import org.elasticsearch.index.fielddata.FieldDataType;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.Mapper;
+import org.elasticsearch.index.mapper.MapperBuilders;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MergeMappingException;
 import org.elasticsearch.index.mapper.MergeResult;
@@ -55,7 +58,6 @@ import java.util.Map;
 import static org.elasticsearch.common.settings.Settings.builder;
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeMapValue;
-import static org.elasticsearch.index.mapper.MapperBuilders.parent;
 
 /**
  *
@@ -107,7 +109,7 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
         @Override
         public ParentFieldMapper build(BuilderContext context) {
             if (type == null) {
-                throw new MapperParsingException("Parent mapping must contain the parent type");
+                throw new MapperParsingException("[_parent] field mapping must contain the [type] option");
             }
             return new ParentFieldMapper(name, indexName, type, fieldDataSettings, context.indexSettings());
         }
@@ -116,7 +118,7 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
     public static class TypeParser implements Mapper.TypeParser {
         @Override
         public Mapper.Builder parse(String name, Map<String, Object> node, ParserContext parserContext) throws MapperParsingException {
-            ParentFieldMapper.Builder builder = parent();
+            ParentFieldMapper.Builder builder = MapperBuilders.parent();
             for (Iterator<Map.Entry<String, Object>> iterator = node.entrySet().iterator(); iterator.hasNext();) {
                 Map.Entry<String, Object> entry = iterator.next();
                 String fieldName = Strings.toUnderscoreCase(entry.getKey());
@@ -145,8 +147,9 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
     private final BytesRef typeAsBytes;
 
     protected ParentFieldMapper(String name, String indexName, String type, @Nullable Settings fieldDataSettings, Settings indexSettings) {
-        super(new Names(name, indexName, indexName, name), Defaults.BOOST, new FieldType(Defaults.FIELD_TYPE), false,
-                Lucene.KEYWORD_ANALYZER, Lucene.KEYWORD_ANALYZER, null, null, fieldDataSettings, indexSettings);
+        super(new Names(name, indexName, indexName, name), Defaults.BOOST, new FieldType(Defaults.FIELD_TYPE),
+                Version.indexCreated(indexSettings).onOrAfter(Version.V_2_0_0), Lucene.KEYWORD_ANALYZER, Lucene.KEYWORD_ANALYZER,
+                null, null, fieldDataSettings, indexSettings);
         this.type = type;
         this.typeAsBytes = type == null ? null : new BytesRef(type);
     }
@@ -181,6 +184,11 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
 
     @Override
     protected void parseCreateField(ParseContext context, List<Field> fields) throws IOException {
+        boolean parent = context.docMapper().isParent(context.type());
+        if (parent && hasDocValues()) {
+            fields.add(createJoinField(context.type(), context.id()));
+        }
+
         if (!active()) {
             return;
         }
@@ -190,6 +198,9 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
             String parentId = context.parser().text();
             context.sourceToParse().parent(parentId);
             fields.add(new Field(names.indexName(), Uid.createUid(context.stringBuilder(), type, parentId), fieldType));
+            if (hasDocValues()) {
+                fields.add(createJoinField(type, parentId));
+            }
         } else {
             // otherwise, we are running it post processing of the xcontent
             String parsedParentId = context.doc().get(Defaults.NAME);
@@ -201,6 +212,9 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
                     }
                     // we did not add it in the parsing phase, add it now
                     fields.add(new Field(names.indexName(), Uid.createUid(context.stringBuilder(), type, parentId), fieldType));
+                    if (hasDocValues()) {
+                        fields.add(createJoinField(type, parentId));
+                    }
                 } else if (parentId != null && !parsedParentId.equals(Uid.createUid(context.stringBuilder(), type, parentId))) {
                     throw new MapperParsingException("Parent id mismatch, document value is [" + Uid.createUid(parsedParentId).id() + "], while external value is [" + parentId + "]");
                 }
@@ -209,6 +223,15 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
         // we have parent mapping, yet no value was set, ignore it...
     }
 
+    private SortedDocValuesField createJoinField(String parentType, String id) {
+        String joinField = joinField(parentType);
+        return new SortedDocValuesField(joinField, new BytesRef(id));
+    }
+
+    public static String joinField(String parentType) {
+        return ParentFieldMapper.NAME + "#" + parentType;
+    }
+
     @Override
     public Uid value(Object value) {
         if (value == null) {
@@ -303,7 +326,9 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
         boolean includeDefaults = params.paramAsBoolean("include_defaults", false);
 
         builder.startObject(CONTENT_TYPE);
-        builder.field("type", type);
+        if (type != null) {
+            builder.field("type", type);
+        }
         if (customFieldDataSettings != null) {
             builder.field("fielddata", (Map) customFieldDataSettings.getAsMap());
         } else if (includeDefaults) {
@@ -316,7 +341,7 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
     @Override
     public void merge(Mapper mergeWith, MergeResult mergeResult) throws MergeMappingException {
         ParentFieldMapper other = (ParentFieldMapper) mergeWith;
-        if (!Objects.equal(type, other.type)) {
+        if (Objects.equal(type, other.type) == false) {
             mergeResult.addConflict("The _parent field's type option can't be changed: [" + type + "]->[" + other.type + "]");
         }
 
@@ -334,7 +359,7 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
     }
 
     /**
-     * @return Whether the _parent field is actually used.
+     * @return Whether the _parent field is actually configured.
      */
     public boolean active() {
         return type != null;
diff --git a/src/main/java/org/elasticsearch/index/query/HasChildQueryParser.java b/src/main/java/org/elasticsearch/index/query/HasChildQueryParser.java
index 52af7afe580..e8556773e52 100644
--- a/src/main/java/org/elasticsearch/index/query/HasChildQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/HasChildQueryParser.java
@@ -19,16 +19,23 @@
 
 package org.elasticsearch.index.query;
 
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.MultiDocValues;
+import org.apache.lucene.search.*;
 import org.apache.lucene.search.Filter;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.QueryWrapperFilter;
 import org.apache.lucene.search.join.BitDocIdSetFilter;
 import org.elasticsearch.common.ParseField;
+import org.apache.lucene.search.join.JoinUtil;
+import org.apache.lucene.search.join.ScoreMode;
+import org.elasticsearch.Version;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.lucene.search.Queries;
 import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.index.fielddata.IndexParentChildFieldData;
 import org.elasticsearch.index.fielddata.plain.ParentChildIndexFieldData;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.internal.ParentFieldMapper;
@@ -38,6 +45,7 @@ import org.elasticsearch.index.search.child.ChildrenConstantScoreQuery;
 import org.elasticsearch.index.search.child.ChildrenQuery;
 import org.elasticsearch.index.search.child.ScoreType;
 import org.elasticsearch.search.fetch.innerhits.InnerHitsContext;
+import org.elasticsearch.search.internal.SearchContext;
 import org.elasticsearch.search.internal.SubSearchContext;
 
 import java.io.IOException;
@@ -137,8 +145,9 @@ public class HasChildQueryParser implements QueryParser {
         if (childDocMapper == null) {
             throw new QueryParsingException(parseContext, "[has_child] No mapping for for type [" + childType + "]");
         }
-        if (!childDocMapper.parentFieldMapper().active()) {
-            throw new QueryParsingException(parseContext, "[has_child]  Type [" + childType + "] does not have parent mapping");
+        ParentFieldMapper parentFieldMapper = childDocMapper.parentFieldMapper();
+        if (parentFieldMapper.active() == false) {
+            throw new QueryParsingException(parseContext, "[has_child] _parent field has no parent type configured");
         }
 
         if (innerHits != null) {
@@ -147,11 +156,6 @@ public class HasChildQueryParser implements QueryParser {
             parseContext.addInnerHits(name, parentChildInnerHits);
         }
 
-        ParentFieldMapper parentFieldMapper = childDocMapper.parentFieldMapper();
-        if (!parentFieldMapper.active()) {
-            throw new QueryParsingException(parseContext, "[has_child] _parent field not configured");
-        }
-
         String parentType = parentFieldMapper.type();
         DocumentMapper parentDocMapper = parseContext.mapperService().documentMapper(parentType);
         if (parentDocMapper == null) {
@@ -171,16 +175,20 @@ public class HasChildQueryParser implements QueryParser {
         // wrap the query with type query
         innerQuery = Queries.filtered(innerQuery, childDocMapper.typeFilter());
 
-        Query query;
-        // TODO: use the query API
-        Filter parentFilter = new QueryWrapperFilter(parentDocMapper.typeFilter());
-        ParentChildIndexFieldData parentChildIndexFieldData = parseContext.getForField(parentFieldMapper);
-        if (minChildren > 1 || maxChildren > 0 || scoreType != ScoreType.NONE) {
-            query = new ChildrenQuery(parentChildIndexFieldData, parentType, childType, parentFilter, innerQuery, scoreType, minChildren,
-                    maxChildren, shortCircuitParentDocSet, nonNestedDocsFilter);
+        final Query query;
+        final ParentChildIndexFieldData parentChildIndexFieldData = parseContext.getForField(parentFieldMapper);
+        if (parseContext.indexVersionCreated().onOrAfter(Version.V_2_0_0)) {
+            query = joinUtilHelper(parentType, parentChildIndexFieldData, parentDocMapper.typeFilter(), scoreType, innerQuery, minChildren, maxChildren);
         } else {
-            query = new ChildrenConstantScoreQuery(parentChildIndexFieldData, innerQuery, parentType, childType, parentFilter,
-                    shortCircuitParentDocSet, nonNestedDocsFilter);
+            // TODO: use the query API
+            Filter parentFilter = new QueryWrapperFilter(parentDocMapper.typeFilter());
+            if (minChildren > 1 || maxChildren > 0 || scoreType != ScoreType.NONE) {
+                query = new ChildrenQuery(parentChildIndexFieldData, parentType, childType, parentFilter, innerQuery, scoreType, minChildren,
+                        maxChildren, shortCircuitParentDocSet, nonNestedDocsFilter);
+            } else {
+                query = new ChildrenConstantScoreQuery(parentChildIndexFieldData, innerQuery, parentType, childType, parentFilter,
+                        shortCircuitParentDocSet, nonNestedDocsFilter);
+            }
         }
         if (queryName != null) {
             parseContext.addNamedQuery(queryName, query);
@@ -188,4 +196,44 @@ public class HasChildQueryParser implements QueryParser {
         query.setBoost(boost);
         return query;
     }
+
+    public static Query joinUtilHelper(String parentType, ParentChildIndexFieldData parentChildIndexFieldData, Query toQuery, ScoreType scoreType, Query innerQuery, int minChildren, int maxChildren) throws IOException {
+        SearchContext searchContext = SearchContext.current();
+        if (searchContext == null) {
+            throw new IllegalStateException("Search context is required to be set");
+        }
+
+        String joinField = ParentFieldMapper.joinField(parentType);
+        ScoreMode scoreMode;
+        // TODO: move entirely over from ScoreType to org.apache.lucene.join.ScoreMode, when we drop the 1.x parent child code.
+        switch (scoreType) {
+            case NONE:
+                scoreMode = ScoreMode.None;
+                break;
+            case MIN:
+                scoreMode = ScoreMode.Min;
+                break;
+            case MAX:
+                scoreMode = ScoreMode.Max;
+                break;
+            case SUM:
+                scoreMode = ScoreMode.Total;
+                break;
+            case AVG:
+                scoreMode = ScoreMode.Avg;
+                break;
+            default:
+                throw new UnsupportedOperationException("score type [" + scoreType + "] not supported");
+        }
+        IndexReader indexReader = searchContext.searcher().getIndexReader();
+        IndexSearcher indexSearcher = new IndexSearcher(indexReader);
+        IndexParentChildFieldData indexParentChildFieldData = parentChildIndexFieldData.loadGlobal(indexReader);
+        MultiDocValues.OrdinalMap ordinalMap = ParentChildIndexFieldData.getOrdinalMap(indexParentChildFieldData, parentType);
+
+        // 0 in pre 2.x p/c impl means unbounded
+        if (maxChildren == 0) {
+            maxChildren = Integer.MAX_VALUE;
+        }
+        return JoinUtil.createJoinQuery(joinField, innerQuery, toQuery, indexSearcher, scoreMode, ordinalMap, minChildren, maxChildren);
+    }
 }
diff --git a/src/main/java/org/elasticsearch/index/query/HasParentQueryParser.java b/src/main/java/org/elasticsearch/index/query/HasParentQueryParser.java
index 8d7076f08fe..bdea5c316bb 100644
--- a/src/main/java/org/elasticsearch/index/query/HasParentQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/HasParentQueryParser.java
@@ -22,6 +22,7 @@ import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.Filter;
 import org.apache.lucene.search.Query;
+import org.elasticsearch.Version;
 import org.apache.lucene.search.QueryWrapperFilter;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.Strings;
@@ -36,6 +37,7 @@ import org.elasticsearch.index.query.support.InnerHitsQueryParserHelper;
 import org.elasticsearch.index.query.support.XContentStructure;
 import org.elasticsearch.index.search.child.ParentConstantScoreQuery;
 import org.elasticsearch.index.search.child.ParentQuery;
+import org.elasticsearch.index.search.child.ScoreType;
 import org.elasticsearch.search.fetch.innerhits.InnerHitsContext;
 import org.elasticsearch.search.internal.SubSearchContext;
 
@@ -43,6 +45,8 @@ import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 
+import static org.elasticsearch.index.query.HasChildQueryParser.joinUtilHelper;
+
 public class HasParentQueryParser implements QueryParser {
 
     public static final String NAME = "has_parent";
@@ -142,7 +146,7 @@ public class HasParentQueryParser implements QueryParser {
         return query;
     }
 
-    static Query createParentQuery(Query innerQuery, String parentType, boolean score, QueryParseContext parseContext, Tuple<String, SubSearchContext> innerHits) {
+    static Query createParentQuery(Query innerQuery, String parentType, boolean score, QueryParseContext parseContext, Tuple<String, SubSearchContext> innerHits) throws IOException {
         DocumentMapper parentDocMapper = parseContext.mapperService().documentMapper(parentType);
         if (parentDocMapper == null) {
             throw new QueryParsingException(parseContext, "[has_parent] query configured 'parent_type' [" + parentType
@@ -197,10 +201,15 @@ public class HasParentQueryParser implements QueryParser {
         // wrap the query with type query
         innerQuery = Queries.filtered(innerQuery, parentDocMapper.typeFilter());
         Filter childrenFilter = new QueryWrapperFilter(Queries.not(parentFilter));
-        if (score) {
-            return new ParentQuery(parentChildIndexFieldData, innerQuery, parentDocMapper.type(), childrenFilter);
+        if (parseContext.indexVersionCreated().onOrAfter(Version.V_2_0_0)) {
+            ScoreType scoreMode = score ? ScoreType.MAX : ScoreType.NONE;
+            return joinUtilHelper(parentType, parentChildIndexFieldData, childrenFilter, scoreMode, innerQuery, 0, Integer.MAX_VALUE);
         } else {
-            return new ParentConstantScoreQuery(parentChildIndexFieldData, innerQuery, parentDocMapper.type(), childrenFilter);
+            if (score) {
+                return new ParentQuery(parentChildIndexFieldData, innerQuery, parentDocMapper.type(), childrenFilter);
+            } else {
+                return new ParentConstantScoreQuery(parentChildIndexFieldData, innerQuery, parentDocMapper.type(), childrenFilter);
+            }
         }
     }
 
diff --git a/src/main/java/org/elasticsearch/index/query/QueryParseContext.java b/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
index e2be1229fa6..8ace1f7bda2 100644
--- a/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
+++ b/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
@@ -21,6 +21,8 @@ package org.elasticsearch.index.query;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
+import org.apache.lucene.index.LeafReaderContext;
+
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.queryparser.classic.MapperQueryParser;
 import org.apache.lucene.queryparser.classic.QueryParserSettings;
@@ -79,6 +81,8 @@ public class QueryParseContext {
 
     private final Index index;
 
+    private final Version indexVersionCreated;
+
     private final IndexQueryParserService indexQueryParser;
 
     private final Map<String, Query> namedQueries = Maps.newHashMap();
@@ -99,6 +103,7 @@ public class QueryParseContext {
 
     public QueryParseContext(Index index, IndexQueryParserService indexQueryParser) {
         this.index = index;
+        this.indexVersionCreated = Version.indexCreated(indexQueryParser.indexSettings());
         this.indexQueryParser = indexQueryParser;
     }
 
@@ -376,4 +381,8 @@ public class QueryParseContext {
     public boolean isDeprecatedSetting(String setting) {
         return CACHE.match(setting) || CACHE_KEY.match(setting);
     }
+
+    public Version indexVersionCreated() {
+        return indexVersionCreated;
+    }
 }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenParser.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenParser.java
index c3a427c1b48..365d9bf7964 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenParser.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/bucket/children/ChildrenParser.java
@@ -80,7 +80,7 @@ public class ChildrenParser implements Aggregator.Parser {
         if (childDocMapper != null) {
             ParentFieldMapper parentFieldMapper = childDocMapper.parentFieldMapper();
             if (!parentFieldMapper.active()) {
-                throw new SearchParseException(context, "[children] _parent field not configured", parser.getTokenLocation());
+                throw new SearchParseException(context, "[children] no [_parent] field not configured that points to a parent type", parser.getTokenLocation());
             }
             parentType = parentFieldMapper.type();
             DocumentMapper parentDocMapper = context.mapperService().documentMapper(parentType);
diff --git a/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java b/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java
index 0e72a35e1d6..461c3272b34 100644
--- a/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java
+++ b/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java
@@ -20,6 +20,7 @@
 package org.elasticsearch.aliases;
 
 import org.apache.lucene.util.LuceneTestCase.Slow;
+import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.admin.indices.alias.Alias;
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder;
@@ -33,6 +34,7 @@ import org.elasticsearch.cluster.metadata.AliasAction;
 import org.elasticsearch.cluster.metadata.AliasMetaData;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.StopWatch;
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -56,30 +58,12 @@ import java.util.concurrent.TimeUnit;
 import static com.google.common.collect.Sets.newHashSet;
 import static org.elasticsearch.client.Requests.createIndexRequest;
 import static org.elasticsearch.client.Requests.indexRequest;
-import static org.elasticsearch.cluster.metadata.IndexMetaData.INDEX_METADATA_BLOCK;
-import static org.elasticsearch.cluster.metadata.IndexMetaData.INDEX_READ_ONLY_BLOCK;
-import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_BLOCKS_METADATA;
-import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_BLOCKS_READ;
-import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_BLOCKS_WRITE;
-import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_READ_ONLY;
+import static org.elasticsearch.cluster.metadata.IndexMetaData.*;
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
-import static org.elasticsearch.index.query.QueryBuilders.hasChildQuery;
-import static org.elasticsearch.index.query.QueryBuilders.hasParentQuery;
-import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
-import static org.elasticsearch.index.query.QueryBuilders.rangeQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termQuery;
+import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.elasticsearch.test.hamcrest.CollectionAssertions.hasKey;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBlocked;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.lessThan;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
+import static org.hamcrest.Matchers.*;
 
 /**
  *
@@ -986,6 +970,30 @@ public class IndexAliasesTests extends ElasticsearchIntegrationTest {
                         .addMapping("parent")
                         .addMapping("child", "_parent", "type=parent")
         );
+        try {
+            assertAcked(admin().indices().prepareAliases().addAlias("my-index", "filter1", hasChildQuery("child", matchAllQuery())));
+        } catch (IllegalArgumentException e) {
+            assertThat(e.getCause(), instanceOf(IllegalStateException.class));
+            assertThat(e.getCause().getMessage(), equalTo("Search context is required to be set"));
+        }
+        try {
+            assertAcked(admin().indices().prepareAliases().addAlias("my-index", "filter2", hasParentQuery("child", matchAllQuery())));
+        } catch (IllegalArgumentException e) {
+            assertThat(e.getCause(), instanceOf(IllegalStateException.class));
+            assertThat(e.getCause().getMessage(), equalTo("Search context is required to be set"));
+        }
+    }
+
+    @Test
+    public void testAliasesFilterWithHasChildQueryPre2Dot0() throws Exception {
+        assertAcked(prepareCreate("my-index")
+                        .setSettings(Settings.builder()
+                                .put(indexSettings())
+                                .put(IndexMetaData.SETTING_VERSION_CREATED, Version.V_1_6_0)
+                        )
+                        .addMapping("parent")
+                        .addMapping("child", "_parent", "type=parent")
+        );
         assertAcked(admin().indices().prepareAliases().addAlias("my-index", "filter1", hasChildQuery("child", matchAllQuery())));
         assertAcked(admin().indices().prepareAliases().addAlias("my-index", "filter2", hasParentQuery("child", matchAllQuery())));
     }
diff --git a/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java
index e03da516b85..19e5c2f0f59 100644
--- a/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java
+++ b/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java
@@ -18,6 +18,7 @@
  */
 package org.elasticsearch.benchmark.search.child;
 
+import org.elasticsearch.Version;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse;
 import org.elasticsearch.action.search.SearchResponse;
@@ -36,12 +37,7 @@ import static org.elasticsearch.client.Requests.createIndexRequest;
 import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_REPLICAS;
 import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
-import static org.elasticsearch.index.query.QueryBuilders.filteredQuery;
-import static org.elasticsearch.index.query.QueryBuilders.hasChildQuery;
-import static org.elasticsearch.index.query.QueryBuilders.hasParentQuery;
-import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
-import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termQuery;
+import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.elasticsearch.node.NodeBuilder.nodeBuilder;
 
 /**
@@ -49,26 +45,49 @@ import static org.elasticsearch.node.NodeBuilder.nodeBuilder;
  */
 public class ChildSearchBenchmark {
 
+    /*
+        Run: MAVEN_OPTS=-Xmx4g mvn test-compile exec:java -Dexec.mainClass="org.elasticsearch.benchmark.search.child.ChildSearchBenchmark" -Dexec.classpathScope="test" -Dexec.args="bwc false"
+     */
+
     public static void main(String[] args) throws Exception {
-        Settings settings = settingsBuilder()
+        boolean bwcMode = false;
+        int numParents = (int) SizeValue.parseSizeValue("2m").singles();;
+
+        if (args.length % 2 != 0) {
+            throw new IllegalArgumentException("Uneven number of arguments");
+        }
+        for (int i = 0; i < args.length; i += 2) {
+            String value = args[i + 1];
+            if ("--bwc_mode".equals(args[i])) {
+                bwcMode = Boolean.valueOf(value);
+            } else if ("--num_parents".equals(args[i])) {
+                numParents = Integer.valueOf(value);
+            }
+        }
+
+
+        Settings.Builder settings = settingsBuilder()
                 .put("index.refresh_interval", "-1")
                 .put(SETTING_NUMBER_OF_SHARDS, 1)
-                .put(SETTING_NUMBER_OF_REPLICAS, 0)
-                .build();
+                .put(SETTING_NUMBER_OF_REPLICAS, 0);
+
+        // enable bwc parent child mode:
+        if (bwcMode) {
+            settings.put("tests.mock.version", Version.V_1_6_0);
+        }
 
         String clusterName = ChildSearchBenchmark.class.getSimpleName();
         Node node1 = nodeBuilder().clusterName(clusterName)
-                .settings(settingsBuilder().put(settings).put("name", "node1")).node();
+                .settings(settingsBuilder().put(settings.build()).put("name", "node1")).node();
         Client client = node1.client();
 
-        int COUNT = (int) SizeValue.parseSizeValue("2m").singles();
         int CHILD_COUNT = 15;
         int QUERY_VALUE_RATIO = 3;
         int QUERY_WARMUP = 10;
         int QUERY_COUNT = 20;
         String indexName = "test";
 
-        ParentChildIndexGenerator parentChildIndexGenerator = new ParentChildIndexGenerator(client, COUNT, CHILD_COUNT, QUERY_VALUE_RATIO);
+        ParentChildIndexGenerator parentChildIndexGenerator = new ParentChildIndexGenerator(client, numParents, CHILD_COUNT, QUERY_VALUE_RATIO);
         client.admin().cluster().prepareHealth(indexName).setWaitForGreenStatus().setTimeout("10s").execute().actionGet();
         try {
             client.admin().indices().create(createIndexRequest(indexName)).actionGet();
diff --git a/src/test/java/org/elasticsearch/index/fielddata/ParentChildFieldDataTests.java b/src/test/java/org/elasticsearch/index/fielddata/ParentChildFieldDataTests.java
index bdd3b716259..2d6beac58bc 100644
--- a/src/test/java/org/elasticsearch/index/fielddata/ParentChildFieldDataTests.java
+++ b/src/test/java/org/elasticsearch/index/fielddata/ParentChildFieldDataTests.java
@@ -21,16 +21,12 @@ package org.elasticsearch.index.fielddata;
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
+import org.apache.lucene.document.SortedDocValuesField;
 import org.apache.lucene.document.StringField;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.SortedDocValues;
-import org.apache.lucene.search.FieldDoc;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.TopFieldDocs;
+import org.apache.lucene.search.*;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.common.compress.CompressedXContent;
@@ -49,7 +45,6 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.nullValue;
 
 /**
@@ -71,37 +66,48 @@ public class ParentChildFieldDataTests extends AbstractFieldDataTests {
 
         Document d = new Document();
         d.add(new StringField(UidFieldMapper.NAME, Uid.createUid(parentType, "1"), Field.Store.NO));
+        d.add(createJoinField(parentType, "1"));
         writer.addDocument(d);
 
         d = new Document();
         d.add(new StringField(UidFieldMapper.NAME, Uid.createUid(childType, "2"), Field.Store.NO));
         d.add(new StringField(ParentFieldMapper.NAME, Uid.createUid(parentType, "1"), Field.Store.NO));
+        d.add(createJoinField(parentType, "1"));
+        d.add(createJoinField(childType, "2"));
         writer.addDocument(d);
         writer.commit();
 
         d = new Document();
         d.add(new StringField(UidFieldMapper.NAME, Uid.createUid(childType, "3"), Field.Store.NO));
         d.add(new StringField(ParentFieldMapper.NAME, Uid.createUid(parentType, "1"), Field.Store.NO));
+        d.add(createJoinField(parentType, "1"));
+        d.add(createJoinField(childType, "3"));
         writer.addDocument(d);
 
         d = new Document();
         d.add(new StringField(UidFieldMapper.NAME, Uid.createUid(parentType, "2"), Field.Store.NO));
+        d.add(createJoinField(parentType, "2"));
         writer.addDocument(d);
 
         d = new Document();
         d.add(new StringField(UidFieldMapper.NAME, Uid.createUid(childType, "4"), Field.Store.NO));
         d.add(new StringField(ParentFieldMapper.NAME, Uid.createUid(parentType, "2"), Field.Store.NO));
+        d.add(createJoinField(parentType, "2"));
+        d.add(createJoinField(childType, "4"));
         writer.addDocument(d);
 
         d = new Document();
         d.add(new StringField(UidFieldMapper.NAME, Uid.createUid(childType, "5"), Field.Store.NO));
         d.add(new StringField(ParentFieldMapper.NAME, Uid.createUid(parentType, "1"), Field.Store.NO));
+        d.add(createJoinField(parentType, "1"));
+        d.add(createJoinField(childType, "5"));
         writer.addDocument(d);
         writer.commit();
 
         d = new Document();
         d.add(new StringField(UidFieldMapper.NAME, Uid.createUid(grandChildType, "6"), Field.Store.NO));
         d.add(new StringField(ParentFieldMapper.NAME, Uid.createUid(childType, "2"), Field.Store.NO));
+        d.add(createJoinField(childType, "2"));
         writer.addDocument(d);
 
         d = new Document();
@@ -109,11 +115,14 @@ public class ParentChildFieldDataTests extends AbstractFieldDataTests {
         writer.addDocument(d);
     }
 
+    private SortedDocValuesField createJoinField(String parentType, String id) {
+        return new SortedDocValuesField(ParentFieldMapper.joinField(parentType), new BytesRef(id));
+    }
+
     @Test
     public void testGetBytesValues() throws Exception {
         IndexFieldData indexFieldData = getForField(childType);
         AtomicFieldData fieldData = indexFieldData.load(refreshReader());
-        assertThat(fieldData.ramBytesUsed(), greaterThan(0l));
 
         SortedBinaryDocValues bytesValues = fieldData.getBytesValues();
         bytesValues.setDocument(0);
diff --git a/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java b/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
index c4f6a66e638..ad55c65938d 100644
--- a/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
+++ b/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
@@ -21,53 +21,23 @@ package org.elasticsearch.index.query;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
 import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
-import org.apache.lucene.index.Fields;
-import org.apache.lucene.index.MultiFields;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.index.Terms;
-import org.apache.lucene.index.TermsEnum;
+import org.apache.lucene.index.*;
 import org.apache.lucene.index.memory.MemoryIndex;
 import org.apache.lucene.queries.BoostingQuery;
 import org.apache.lucene.queries.ExtendedCommonTermsQuery;
 import org.apache.lucene.queries.TermsQuery;
-import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.*;
 import org.apache.lucene.search.BooleanClause.Occur;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.ConstantScoreQuery;
-import org.apache.lucene.search.DisjunctionMaxQuery;
-import org.apache.lucene.search.FuzzyQuery;
-import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.MultiTermQuery;
-import org.apache.lucene.search.NumericRangeQuery;
-import org.apache.lucene.search.PrefixQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.QueryWrapperFilter;
-import org.apache.lucene.search.RegexpQuery;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.TermRangeQuery;
-import org.apache.lucene.search.WildcardQuery;
-import org.apache.lucene.search.spans.FieldMaskingSpanQuery;
-import org.apache.lucene.search.spans.SpanContainingQuery;
-import org.apache.lucene.search.spans.SpanFirstQuery;
-import org.apache.lucene.search.spans.SpanMultiTermQueryWrapper;
-import org.apache.lucene.search.spans.SpanNearQuery;
-import org.apache.lucene.search.spans.SpanNotQuery;
-import org.apache.lucene.search.spans.SpanOrQuery;
-import org.apache.lucene.search.spans.SpanTermQuery;
-import org.apache.lucene.search.spans.SpanWithinQuery;
+import org.apache.lucene.search.join.ToParentBlockJoinQuery;
+import org.apache.lucene.search.spans.*;
 import org.apache.lucene.spatial.prefix.IntersectsPrefixTreeFilter;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.BytesRefBuilder;
 import org.apache.lucene.util.CharsRefBuilder;
 import org.apache.lucene.util.NumericUtils;
 import org.apache.lucene.util.automaton.TooComplexToDeterminizeException;
-import org.elasticsearch.action.termvectors.MultiTermVectorsItemResponse;
-import org.elasticsearch.action.termvectors.MultiTermVectorsRequest;
-import org.elasticsearch.action.termvectors.MultiTermVectorsResponse;
-import org.elasticsearch.action.termvectors.TermVectorsRequest;
-import org.elasticsearch.action.termvectors.TermVectorsResponse;
+import org.elasticsearch.action.termvectors.*;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.compress.CompressedXContent;
@@ -90,7 +60,6 @@ import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.ParsedDocument;
 import org.elasticsearch.index.mapper.core.NumberFieldMapper;
-import org.elasticsearch.index.search.child.ParentConstantScoreQuery;
 import org.elasticsearch.index.search.geo.GeoDistanceRangeQuery;
 import org.elasticsearch.index.search.geo.GeoPolygonQuery;
 import org.elasticsearch.index.search.geo.InMemoryGeoBoundingBoxQuery;
@@ -109,43 +78,10 @@ import java.util.List;
 import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath;
 import static org.elasticsearch.common.io.Streams.copyToStringFromClasspath;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.index.query.QueryBuilders.andQuery;
-import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
-import static org.elasticsearch.index.query.QueryBuilders.boostingQuery;
-import static org.elasticsearch.index.query.QueryBuilders.constantScoreQuery;
-import static org.elasticsearch.index.query.QueryBuilders.disMaxQuery;
-import static org.elasticsearch.index.query.QueryBuilders.filteredQuery;
-import static org.elasticsearch.index.query.QueryBuilders.functionScoreQuery;
-import static org.elasticsearch.index.query.QueryBuilders.fuzzyQuery;
-import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
-import static org.elasticsearch.index.query.QueryBuilders.moreLikeThisQuery;
-import static org.elasticsearch.index.query.QueryBuilders.notQuery;
-import static org.elasticsearch.index.query.QueryBuilders.orQuery;
-import static org.elasticsearch.index.query.QueryBuilders.prefixQuery;
-import static org.elasticsearch.index.query.QueryBuilders.queryStringQuery;
-import static org.elasticsearch.index.query.QueryBuilders.rangeQuery;
-import static org.elasticsearch.index.query.QueryBuilders.regexpQuery;
-import static org.elasticsearch.index.query.QueryBuilders.spanContainingQuery;
-import static org.elasticsearch.index.query.QueryBuilders.spanFirstQuery;
-import static org.elasticsearch.index.query.QueryBuilders.spanNearQuery;
-import static org.elasticsearch.index.query.QueryBuilders.spanNotQuery;
-import static org.elasticsearch.index.query.QueryBuilders.spanOrQuery;
-import static org.elasticsearch.index.query.QueryBuilders.spanTermQuery;
-import static org.elasticsearch.index.query.QueryBuilders.spanWithinQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termsQuery;
-import static org.elasticsearch.index.query.QueryBuilders.wildcardQuery;
+import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.factorFunction;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBooleanSubQuery;
-import static org.hamcrest.Matchers.closeTo;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.Matchers.sameInstance;
+import static org.hamcrest.Matchers.*;
 
 /**
  *
@@ -2485,14 +2421,13 @@ public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest {
     public void testEmptyBoolSubClausesIsMatchAll() throws IOException {
         String query = copyToStringFromClasspath("/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json");
         IndexService indexService = createIndex("testidx", client().admin().indices().prepareCreate("testidx")
-                .addMapping("foo")
-                .addMapping("test", "_parent", "type=foo"));
+                .addMapping("foo", "nested", "type=nested"));
         SearchContext.setCurrent(createSearchContext(indexService));
         IndexQueryParserService queryParser = indexService.queryParserService();
         Query parsedQuery = queryParser.parse(query).query();
         assertThat(parsedQuery, instanceOf(ConstantScoreQuery.class));
-        assertThat(((ConstantScoreQuery) parsedQuery).getQuery(), instanceOf(ParentConstantScoreQuery.class));
-        assertThat(((ConstantScoreQuery) parsedQuery).getQuery().toString(), equalTo("parent_filter[foo](+*:* #ConstantScore(_type:foo))"));
+        assertThat(((ConstantScoreQuery) parsedQuery).getQuery(), instanceOf(ToParentBlockJoinQuery.class));
+        assertThat(((ConstantScoreQuery) parsedQuery).getQuery().toString(), equalTo("ToParentBlockJoinQuery (+*:* #random_access(QueryWrapperFilter(_type:__nested)))"));
         SearchContext.removeCurrent();
     }
     
diff --git a/src/test/java/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json b/src/test/java/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json
index 8071fa96ab5..58643596485 100644
--- a/src/test/java/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json
+++ b/src/test/java/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json
@@ -1,8 +1,8 @@
 {
   "filtered": {
     "filter": {
-      "has_parent": {
-        "type": "foo",
+      "nested": {
+        "path": "nested",
         "query": {
           "bool": {
             "must": [],
diff --git a/src/test/java/org/elasticsearch/index/search/child/AbstractChildTests.java b/src/test/java/org/elasticsearch/index/search/child/AbstractChildTests.java
index 8eabad9735d..e4f8e6c3d16 100644
--- a/src/test/java/org/elasticsearch/index/search/child/AbstractChildTests.java
+++ b/src/test/java/org/elasticsearch/index/search/child/AbstractChildTests.java
@@ -19,19 +19,15 @@
 
 package org.elasticsearch.index.search.child;
 
-import org.apache.lucene.search.DocIdSetIterator;
-import org.apache.lucene.search.Filter;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.QueryCache;
-import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.*;
 import org.apache.lucene.search.join.BitDocIdSetFilter;
 import org.apache.lucene.util.BitDocIdSet;
 import org.apache.lucene.util.BitSet;
-import org.apache.lucene.util.LuceneTestCase;
+import org.elasticsearch.Version;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.common.compress.CompressedXContent;
+import org.elasticsearch.cluster.metadata.IndexMetaData;
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.Index;
@@ -44,8 +40,6 @@ import org.elasticsearch.search.internal.SearchContext;
 import org.elasticsearch.test.ElasticsearchSingleNodeTest;
 import org.hamcrest.Description;
 import org.hamcrest.StringDescription;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Ignore;
 
 import java.io.IOException;
@@ -63,7 +57,10 @@ public abstract class AbstractChildTests extends ElasticsearchSingleNodeTest {
     protected static String CHILD_SCORE_NAME = "childScore";
 
     static SearchContext createSearchContext(String indexName, String parentType, String childType) throws IOException {
-        IndexService indexService = createIndex(indexName);
+        Settings settings = Settings.builder()
+                .put(IndexMetaData.SETTING_VERSION_CREATED, Version.V_1_6_0)
+                .build();
+        IndexService indexService = createIndex(indexName, settings);
         MapperService mapperService = indexService.mapperService();
         // Parent/child parsers require that the parent and child type to be presented in mapping
         // Sometimes we want a nested object field in the parent type that triggers nonNestedDocsFilter to be used
diff --git a/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcTests.java b/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcTests.java
new file mode 100644
index 00000000000..59a04b29c3c
--- /dev/null
+++ b/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcTests.java
@@ -0,0 +1,219 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.elasticsearch.search.child;
+
+import org.apache.lucene.util.LuceneTestCase;
+import org.elasticsearch.Version;
+import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheResponse;
+import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse;
+import org.elasticsearch.action.explain.ExplainResponse;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.cluster.metadata.IndexMetaData;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
+import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
+import org.junit.Test;
+
+import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static org.elasticsearch.index.query.QueryBuilders.*;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
+import static org.hamcrest.Matchers.*;
+
+/**
+ *
+ */
+@ClusterScope(scope = Scope.SUITE)
+public class ChildQuerySearchBwcTests extends ChildQuerySearchTests {
+
+    @Override
+    public Settings indexSettings() {
+        return Settings.builder()
+                .put(super.indexSettings()).put(IndexMetaData.SETTING_VERSION_CREATED, Version.V_1_6_0).build();
+    }
+
+    public void testSelfReferentialIsForbidden() {
+        // we allowed this, but it was actually broken. The has_child/has_parent results were sometimes wrong...
+        assertAcked(prepareCreate("test").addMapping("type", "_parent", "type=type"));
+    }
+
+    @Test
+    public void testAdd_ParentFieldAfterIndexingParentDocButBeforeIndexingChildDoc() throws Exception {
+        assertAcked(prepareCreate("test")
+                .setSettings(Settings.builder()
+                        .put(indexSettings())
+                        .put("index.refresh_interval", -1)));
+        ensureGreen();
+
+        String parentId = "p1";
+        client().prepareIndex("test", "parent", parentId).setSource("p_field", "1").get();
+        refresh();
+        assertAcked(client().admin()
+                .indices()
+                .preparePutMapping("test")
+                .setType("child")
+                .setSource("_parent", "type=parent"));
+        client().prepareIndex("test", "child", "c1").setSource("c_field", "1").setParent(parentId).get();
+        client().admin().indices().prepareRefresh().get();
+
+        SearchResponse searchResponse = client().prepareSearch("test")
+                .setQuery(hasChildQuery("child", termQuery("c_field", "1")))
+                .get();
+        assertHitCount(searchResponse, 1l);
+        assertSearchHits(searchResponse, parentId);
+
+        searchResponse = client().prepareSearch("test")
+                .setQuery(hasChildQuery("child", termQuery("c_field", "1")).scoreType("max"))
+                .get();
+        assertHitCount(searchResponse, 1l);
+        assertSearchHits(searchResponse, parentId);
+
+
+        searchResponse = client().prepareSearch("test")
+                .setPostFilter(hasChildQuery("child", termQuery("c_field", "1")))
+                .get();
+        assertHitCount(searchResponse, 1l);
+        assertSearchHits(searchResponse, parentId);
+
+        searchResponse = client().prepareSearch("test")
+                .setPostFilter(hasParentQuery("parent", termQuery("p_field", "1")))
+                .get();
+        assertHitCount(searchResponse, 1l);
+        assertSearchHits(searchResponse, "c1");
+
+        searchResponse = client().prepareSearch("test")
+                .setQuery(hasParentQuery("parent", termQuery("p_field", "1")).scoreType("score"))
+                .get();
+        assertHitCount(searchResponse, 1l);
+        assertSearchHits(searchResponse, "c1");
+    }
+
+    @Test
+    public void testExplainUsage() throws Exception {
+        assertAcked(prepareCreate("test")
+                .addMapping("parent")
+                .addMapping("child", "_parent", "type=parent"));
+        ensureGreen();
+
+        String parentId = "p1";
+        client().prepareIndex("test", "parent", parentId).setSource("p_field", "1").get();
+        client().prepareIndex("test", "child", "c1").setSource("c_field", "1").setParent(parentId).get();
+        refresh();
+
+        SearchResponse searchResponse = client().prepareSearch("test")
+                .setExplain(true)
+                .setQuery(hasChildQuery("child", termQuery("c_field", "1")).scoreType("max"))
+                .get();
+        assertHitCount(searchResponse, 1l);
+        assertThat(searchResponse.getHits().getAt(0).explanation().getDescription(), equalTo("not implemented yet..."));
+
+        searchResponse = client().prepareSearch("test")
+                .setExplain(true)
+                .setQuery(hasParentQuery("parent", termQuery("p_field", "1")).scoreType("score"))
+                .get();
+        assertHitCount(searchResponse, 1l);
+        assertThat(searchResponse.getHits().getAt(0).explanation().getDescription(), equalTo("not implemented yet..."));
+
+        ExplainResponse explainResponse = client().prepareExplain("test", "parent", parentId)
+                .setQuery(hasChildQuery("child", termQuery("c_field", "1")).scoreType("max"))
+                .get();
+        assertThat(explainResponse.isExists(), equalTo(true));
+        // TODO: improve test once explanations are actually implemented
+        assertThat(explainResponse.getExplanation().toString(), startsWith("1.0 ="));
+    }
+
+    @Test
+    @LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elasticsearch/elasticsearch/issues/9270")
+    public void testParentFieldDataCacheBug() throws Exception {
+        assertAcked(prepareCreate("test")
+                .setSettings(Settings.builder().put(indexSettings())
+                        .put("index.refresh_interval", -1)) // Disable automatic refresh, so that the _parent doesn't get warmed
+                .addMapping("parent", jsonBuilder().startObject().startObject("parent")
+                        .startObject("properties")
+                        .startObject("p_field")
+                        .field("type", "string")
+                        .startObject("fielddata")
+                        .field(FieldDataType.FORMAT_KEY, FieldMapper.Loading.LAZY)
+                        .endObject()
+                        .endObject()
+                        .endObject().endObject().endObject()));
+
+        ensureGreen();
+
+        client().prepareIndex("test", "parent", "p0").setSource("p_field", "p_value0").get();
+        client().prepareIndex("test", "parent", "p1").setSource("p_field", "p_value1").get();
+
+        refresh();
+        // No _parent field yet, there shouldn't be anything in the field data for _parent field
+        IndicesStatsResponse indicesStatsResponse = client().admin().indices()
+                .prepareStats("test").setFieldData(true).get();
+        assertThat(indicesStatsResponse.getTotal().getFieldData().getMemorySizeInBytes(), equalTo(0l));
+
+        // Now add mapping + children
+        client().admin().indices().preparePutMapping("test").setType("child")
+                .setSource(XContentFactory.jsonBuilder().startObject().startObject("child")
+                        .startObject("_parent")
+                        .field("type", "parent")
+                        .endObject()
+                        .startObject("properties")
+                        .startObject("c_field")
+                        .field("type", "string")
+                        .startObject("fielddata")
+                        .field(FieldDataType.FORMAT_KEY, FieldMapper.Loading.LAZY)
+                        .endObject()
+                        .endObject()
+                        .endObject().endObject().endObject())
+                .get();
+
+        // index simple data
+        client().prepareIndex("test", "child", "c1").setSource("c_field", "red").setParent("p1").get();
+        client().prepareIndex("test", "child", "c2").setSource("c_field", "yellow").setParent("p1").get();
+        client().prepareIndex("test", "parent", "p2").setSource("p_field", "p_value2").get();
+        client().prepareIndex("test", "child", "c3").setSource("c_field", "blue").setParent("p2").get();
+        client().prepareIndex("test", "child", "c4").setSource("c_field", "red").setParent("p2").get();
+
+        refresh();
+
+        indicesStatsResponse = client().admin().indices()
+                .prepareStats("test").setFieldData(true).setFieldDataFields("_parent").get();
+        assertThat(indicesStatsResponse.getTotal().getFieldData().getMemorySizeInBytes(), greaterThan(0l));
+        assertThat(indicesStatsResponse.getTotal().getFieldData().getFields().get("_parent"), greaterThan(0l));
+
+        SearchResponse searchResponse = client().prepareSearch("test")
+                .setQuery(constantScoreQuery(hasChildQuery("child", termQuery("c_field", "blue"))))
+                .get();
+        assertNoFailures(searchResponse);
+        assertThat(searchResponse.getHits().totalHits(), equalTo(1l));
+
+        indicesStatsResponse = client().admin().indices()
+                .prepareStats("test").setFieldData(true).setFieldDataFields("_parent").get();
+        assertThat(indicesStatsResponse.getTotal().getFieldData().getMemorySizeInBytes(), greaterThan(0l));
+        assertThat(indicesStatsResponse.getTotal().getFieldData().getFields().get("_parent"), greaterThan(0l));
+
+        ClearIndicesCacheResponse clearCacheResponse = client().admin().indices().prepareClearCache("test").setFieldDataCache(true).get();
+        assertNoFailures(clearCacheResponse);
+        assertAllSuccessful(clearCacheResponse);
+        indicesStatsResponse = client().admin().indices()
+                .prepareStats("test").setFieldData(true).setFieldDataFields("_parent").get();
+        assertThat(indicesStatsResponse.getTotal().getFieldData().getMemorySizeInBytes(), equalTo(0l));
+        assertThat(indicesStatsResponse.getTotal().getFieldData().getFields().get("_parent"), equalTo(0l));
+    }
+}
diff --git a/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java b/src/test/java/org/elasticsearch/search/child/ChildQuerySearchTests.java
similarity index 92%
rename from src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java
rename to src/test/java/org/elasticsearch/search/child/ChildQuerySearchTests.java
index a7720c15bdc..78b2d935350 100644
--- a/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java
+++ b/src/test/java/org/elasticsearch/search/child/ChildQuerySearchTests.java
@@ -19,10 +19,8 @@
 package org.elasticsearch.search.child;
 
 import org.apache.lucene.util.LuceneTestCase;
-import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheResponse;
 import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
-import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse;
 import org.elasticsearch.action.count.CountResponse;
 import org.elasticsearch.action.explain.ExplainResponse;
 import org.elasticsearch.action.index.IndexRequestBuilder;
@@ -32,12 +30,9 @@ import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.common.lucene.search.function.CombineFunction;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.cache.filter.FilterCacheModule;
 import org.elasticsearch.index.cache.filter.FilterCacheModule.FilterCacheSettings;
 import org.elasticsearch.index.cache.filter.index.IndexFilterCache;
-import org.elasticsearch.index.fielddata.FieldDataType;
-import org.elasticsearch.index.mapper.FieldMapper.Loading;
 import org.elasticsearch.index.mapper.MergeMappingException;
 import org.elasticsearch.index.query.HasChildQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
@@ -58,53 +53,23 @@ import org.hamcrest.Matchers;
 import org.junit.Test;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import static com.google.common.collect.Maps.newHashMap;
 import static org.elasticsearch.common.io.Streams.copyToStringFromClasspath;
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
-import static org.elasticsearch.index.query.QueryBuilders.constantScoreQuery;
-import static org.elasticsearch.index.query.QueryBuilders.filteredQuery;
-import static org.elasticsearch.index.query.QueryBuilders.hasParentQuery;
-import static org.elasticsearch.index.query.QueryBuilders.idsQuery;
-import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
-import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
-import static org.elasticsearch.index.query.QueryBuilders.multiMatchQuery;
-import static org.elasticsearch.index.query.QueryBuilders.notQuery;
-import static org.elasticsearch.index.query.QueryBuilders.prefixQuery;
-import static org.elasticsearch.index.query.QueryBuilders.queryStringQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termsQuery;
+import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.factorFunction;
 import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.scriptFunction;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAllSuccessful;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHit;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasId;
-import static org.hamcrest.Matchers.anyOf;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.startsWith;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
+import static org.hamcrest.Matchers.*;
 
 /**
  *
  */
 @ClusterScope(scope = Scope.SUITE)
-public class SimpleChildQuerySearchTests extends ElasticsearchIntegrationTest {
+public class ChildQuerySearchTests extends ElasticsearchIntegrationTest {
 
     @Override
     protected Settings nodeSettings(int nodeOrdinal) {
@@ -115,6 +80,18 @@ public class SimpleChildQuerySearchTests extends ElasticsearchIntegrationTest {
                 .build();
     }
 
+    @Test
+    public void testSelfReferentialIsForbidden() {
+        try {
+            prepareCreate("test").addMapping("type", "_parent", "type=type").get();
+            fail("self referential should be forbidden");
+        } catch (Exception e) {
+            Throwable cause = e.getCause();
+            assertThat(cause, instanceOf(IllegalArgumentException.class));
+            assertThat(cause.getMessage(), equalTo("The [_parent.type] option can't point to the same type"));
+        }
+    }
+
     @Test
     public void multiLevelChild() throws Exception {
         assertAcked(prepareCreate("test")
@@ -281,83 +258,6 @@ public class SimpleChildQuerySearchTests extends ElasticsearchIntegrationTest {
         assertThat(searchResponse.getHits().getAt(1).id(), equalTo("c2"));
     }
 
-    @Test
-    @LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elasticsearch/elasticsearch/issues/9270")
-    public void testParentFieldDataCacheBug() throws Exception {
-        assertAcked(prepareCreate("test")
-                .setSettings(Settings.builder().put(indexSettings())
-                        .put("index.refresh_interval", -1)) // Disable automatic refresh, so that the _parent doesn't get warmed
-                .addMapping("parent", XContentFactory.jsonBuilder().startObject().startObject("parent")
-                        .startObject("properties")
-                            .startObject("p_field")
-                                .field("type", "string")
-                                .startObject("fielddata")
-                                    .field(FieldDataType.FORMAT_KEY, Loading.LAZY)
-                                .endObject()
-                            .endObject()
-                        .endObject().endObject().endObject()));
-
-        ensureGreen();
-
-        client().prepareIndex("test", "parent", "p0").setSource("p_field", "p_value0").get();
-        client().prepareIndex("test", "parent", "p1").setSource("p_field", "p_value1").get();
-
-        refresh();
-        // No _parent field yet, there shouldn't be anything in the field data for _parent field
-        IndicesStatsResponse indicesStatsResponse = client().admin().indices()
-                .prepareStats("test").setFieldData(true).get();
-        assertThat(indicesStatsResponse.getTotal().getFieldData().getMemorySizeInBytes(), equalTo(0l));
-
-        // Now add mapping + children
-        client().admin().indices().preparePutMapping("test").setType("child")
-                .setSource(XContentFactory.jsonBuilder().startObject().startObject("child")
-                        .startObject("_parent")
-                            .field("type", "parent")
-                        .endObject()
-                        .startObject("properties")
-                            .startObject("c_field")
-                                .field("type", "string")
-                                .startObject("fielddata")
-                                    .field(FieldDataType.FORMAT_KEY, Loading.LAZY)
-                                .endObject()
-                            .endObject()
-                        .endObject().endObject().endObject())
-                .get();
-
-        // index simple data
-        client().prepareIndex("test", "child", "c1").setSource("c_field", "red").setParent("p1").get();
-        client().prepareIndex("test", "child", "c2").setSource("c_field", "yellow").setParent("p1").get();
-        client().prepareIndex("test", "parent", "p2").setSource("p_field", "p_value2").get();
-        client().prepareIndex("test", "child", "c3").setSource("c_field", "blue").setParent("p2").get();
-        client().prepareIndex("test", "child", "c4").setSource("c_field", "red").setParent("p2").get();
-
-        refresh();
-
-        indicesStatsResponse = client().admin().indices()
-                .prepareStats("test").setFieldData(true).setFieldDataFields("_parent").get();
-        assertThat(indicesStatsResponse.getTotal().getFieldData().getMemorySizeInBytes(), greaterThan(0l));
-        assertThat(indicesStatsResponse.getTotal().getFieldData().getFields().get("_parent"), greaterThan(0l));
-
-        SearchResponse searchResponse = client().prepareSearch("test")
-                .setQuery(constantScoreQuery(hasChildQuery("child", termQuery("c_field", "blue"))))
-                .get();
-        assertNoFailures(searchResponse);
-        assertThat(searchResponse.getHits().totalHits(), equalTo(1l));
-
-        indicesStatsResponse = client().admin().indices()
-                .prepareStats("test").setFieldData(true).setFieldDataFields("_parent").get();
-        assertThat(indicesStatsResponse.getTotal().getFieldData().getMemorySizeInBytes(), greaterThan(0l));
-        assertThat(indicesStatsResponse.getTotal().getFieldData().getFields().get("_parent"), greaterThan(0l));
-
-        ClearIndicesCacheResponse clearCacheResponse = client().admin().indices().prepareClearCache("test").setFieldDataCache(true).get();
-        assertNoFailures(clearCacheResponse);
-        assertAllSuccessful(clearCacheResponse);
-        indicesStatsResponse = client().admin().indices()
-                .prepareStats("test").setFieldData(true).setFieldDataFields("_parent").get();
-        assertThat(indicesStatsResponse.getTotal().getFieldData().getMemorySizeInBytes(), equalTo(0l));
-        assertThat(indicesStatsResponse.getTotal().getFieldData().getFields().get("_parent"), equalTo(0l));
-    }
-
     @Test
     // See: https://github.com/elasticsearch/elasticsearch/issues/3290
     public void testCachingBug_withFqueryFilter() throws Exception {
@@ -685,21 +585,20 @@ public class SimpleChildQuerySearchTests extends ElasticsearchIntegrationTest {
                 .setQuery(hasChildQuery("child", termQuery("c_field", "1")).scoreType("max"))
                 .get();
         assertHitCount(searchResponse, 1l);
-        assertThat(searchResponse.getHits().getAt(0).explanation().getDescription(), equalTo("not implemented yet..."));
+        assertThat(searchResponse.getHits().getAt(0).explanation().getDescription(), equalTo("Score based on join value p1"));
 
         searchResponse = client().prepareSearch("test")
                 .setExplain(true)
                 .setQuery(hasParentQuery("parent", termQuery("p_field", "1")).scoreType("score"))
                 .get();
         assertHitCount(searchResponse, 1l);
-        assertThat(searchResponse.getHits().getAt(0).explanation().getDescription(), equalTo("not implemented yet..."));
+        assertThat(searchResponse.getHits().getAt(0).explanation().getDescription(), equalTo("Score based on join value p1"));
 
         ExplainResponse explainResponse = client().prepareExplain("test", "parent", parentId)
                 .setQuery(hasChildQuery("child", termQuery("c_field", "1")).scoreType("max"))
                 .get();
         assertThat(explainResponse.isExists(), equalTo(true));
-        // TODO: improve test once explanations are actually implemented
-        assertThat(explainResponse.getExplanation().toString(), startsWith("1.0 ="));
+        assertThat(explainResponse.getExplanation().getDetails()[0].getDescription(), equalTo("Score based on join value p1"));
     }
 
     List<IndexRequestBuilder> createDocBuilders() {
@@ -1454,44 +1353,17 @@ public class SimpleChildQuerySearchTests extends ElasticsearchIntegrationTest {
         String parentId = "p1";
         client().prepareIndex("test", "parent", parentId).setSource("p_field", "1").get();
         refresh();
-        assertAcked(client().admin()
-                .indices()
-                .preparePutMapping("test")
-                .setType("child")
-                .setSource("_parent", "type=parent"));
-        client().prepareIndex("test", "child", "c1").setSource("c_field", "1").setParent(parentId).get();
-        client().admin().indices().prepareRefresh().get();
 
-        SearchResponse searchResponse = client().prepareSearch("test")
-                .setQuery(hasChildQuery("child", termQuery("c_field", "1")))
-                .get();
-        assertHitCount(searchResponse, 1l);
-        assertSearchHits(searchResponse, parentId);
-
-        searchResponse = client().prepareSearch("test")
-                .setQuery(hasChildQuery("child", termQuery("c_field", "1")).scoreType("max"))
-                .get();
-        assertHitCount(searchResponse, 1l);
-        assertSearchHits(searchResponse, parentId);
-
-
-        searchResponse = client().prepareSearch("test")
-                .setPostFilter(hasChildQuery("child", termQuery("c_field", "1")))
-                .get();
-        assertHitCount(searchResponse, 1l);
-        assertSearchHits(searchResponse, parentId);
-
-        searchResponse = client().prepareSearch("test")
-                .setPostFilter(hasParentQuery("parent", termQuery("p_field", "1")))
-                .get();
-        assertHitCount(searchResponse, 1l);
-        assertSearchHits(searchResponse, "c1");
-
-        searchResponse = client().prepareSearch("test")
-                .setQuery(hasParentQuery("parent", termQuery("p_field", "1")).scoreType("score"))
-                .get();
-        assertHitCount(searchResponse, 1l);
-        assertSearchHits(searchResponse, "c1");
+        try {
+            assertAcked(client().admin()
+                    .indices()
+                    .preparePutMapping("test")
+                    .setType("child")
+                    .setSource("_parent", "type=parent"));
+            fail("Shouldn't be able the add the _parent field pointing to an already existing parent type");
+        } catch (IllegalArgumentException e) {
+            assertThat(e.getMessage(), equalTo("can't add a _parent field that points to an already existing type"));
+        }
     }
 
     @Test
@@ -2175,7 +2047,7 @@ public class SimpleChildQuerySearchTests extends ElasticsearchIntegrationTest {
         assertHitCount(response, 0);
     }
 
-    private static HasChildQueryBuilder hasChildQuery(String type, QueryBuilder queryBuilder) {
+    static HasChildQueryBuilder hasChildQuery(String type, QueryBuilder queryBuilder) {
         HasChildQueryBuilder hasChildQueryBuilder = QueryBuilders.hasChildQuery(type, queryBuilder);
         hasChildQueryBuilder.setShortCircuitCutoff(randomInt(10));
         return hasChildQueryBuilder;
diff --git a/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingBwcTest.java b/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingBwcTest.java
new file mode 100644
index 00000000000..c3c1c567e2f
--- /dev/null
+++ b/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingBwcTest.java
@@ -0,0 +1,269 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.search.child;
+
+import org.apache.lucene.util.LuceneTestCase;
+import org.elasticsearch.Version;
+import org.elasticsearch.action.admin.cluster.stats.ClusterStatsResponse;
+import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheResponse;
+import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
+import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.cluster.metadata.IndexMetaData;
+import org.elasticsearch.cluster.routing.ShardRouting;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.index.IndexService;
+import org.elasticsearch.index.fielddata.FieldDataType;
+import org.elasticsearch.index.mapper.DocumentMapper;
+import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.MapperService;
+import org.elasticsearch.index.merge.policy.MergePolicyModule;
+import org.elasticsearch.index.shard.IndexShard;
+import org.elasticsearch.indices.IndicesService;
+import org.elasticsearch.test.ElasticsearchIntegrationTest;
+import org.elasticsearch.test.index.merge.NoMergePolicyProvider;
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static org.elasticsearch.index.query.QueryBuilders.constantScoreQuery;
+import static org.elasticsearch.index.query.QueryBuilders.termQuery;
+import static org.elasticsearch.search.child.ChildQuerySearchTests.hasChildQuery;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+
+/**
+ */
+public class ParentFieldLoadingBwcTest extends ElasticsearchIntegrationTest {
+
+    private final Settings indexSettings = Settings.builder()
+            .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1)
+            .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 0)
+            .put(IndexShard.INDEX_REFRESH_INTERVAL, -1)
+                    // We never want merges in this test to ensure we have two segments for the last validation
+            .put(MergePolicyModule.MERGE_POLICY_TYPE_KEY, NoMergePolicyProvider.class)
+            .put(IndexMetaData.SETTING_VERSION_CREATED, Version.V_1_6_0)
+            .build();
+
+    @Test
+    @LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elasticsearch/elasticsearch/issues/9270")
+    public void testParentFieldDataCacheBug() throws Exception {
+        assertAcked(prepareCreate("test")
+                .setSettings(Settings.builder().put(indexSettings())
+                        .put("index.refresh_interval", -1)) // Disable automatic refresh, so that the _parent doesn't get warmed
+                .addMapping("parent", XContentFactory.jsonBuilder().startObject().startObject("parent")
+                        .startObject("properties")
+                        .startObject("p_field")
+                        .field("type", "string")
+                        .startObject("fielddata")
+                        .field(FieldDataType.FORMAT_KEY, FieldMapper.Loading.LAZY)
+                        .endObject()
+                        .endObject()
+                        .endObject().endObject().endObject()));
+
+        ensureGreen();
+
+        client().prepareIndex("test", "parent", "p0").setSource("p_field", "p_value0").get();
+        client().prepareIndex("test", "parent", "p1").setSource("p_field", "p_value1").get();
+
+        refresh();
+        // No _parent field yet, there shouldn't be anything in the field data for _parent field
+        IndicesStatsResponse indicesStatsResponse = client().admin().indices()
+                .prepareStats("test").setFieldData(true).get();
+        assertThat(indicesStatsResponse.getTotal().getFieldData().getMemorySizeInBytes(), equalTo(0l));
+
+        // Now add mapping + children
+        client().admin().indices().preparePutMapping("test").setType("child")
+                .setSource(XContentFactory.jsonBuilder().startObject().startObject("child")
+                        .startObject("_parent")
+                        .field("type", "parent")
+                        .endObject()
+                        .startObject("properties")
+                        .startObject("c_field")
+                        .field("type", "string")
+                        .startObject("fielddata")
+                        .field(FieldDataType.FORMAT_KEY, FieldMapper.Loading.LAZY)
+                        .endObject()
+                        .endObject()
+                        .endObject().endObject().endObject())
+                .get();
+
+        // index simple data
+        client().prepareIndex("test", "child", "c1").setSource("c_field", "red").setParent("p1").get();
+        client().prepareIndex("test", "child", "c2").setSource("c_field", "yellow").setParent("p1").get();
+        client().prepareIndex("test", "parent", "p2").setSource("p_field", "p_value2").get();
+        client().prepareIndex("test", "child", "c3").setSource("c_field", "blue").setParent("p2").get();
+        client().prepareIndex("test", "child", "c4").setSource("c_field", "red").setParent("p2").get();
+
+        refresh();
+
+        indicesStatsResponse = client().admin().indices()
+                .prepareStats("test").setFieldData(true).setFieldDataFields("_parent").get();
+        assertThat(indicesStatsResponse.getTotal().getFieldData().getMemorySizeInBytes(), greaterThan(0l));
+        assertThat(indicesStatsResponse.getTotal().getFieldData().getFields().get("_parent"), greaterThan(0l));
+
+        SearchResponse searchResponse = client().prepareSearch("test")
+                .setQuery(constantScoreQuery(hasChildQuery("child", termQuery("c_field", "blue"))))
+                .get();
+        assertNoFailures(searchResponse);
+        assertThat(searchResponse.getHits().totalHits(), equalTo(1l));
+
+        indicesStatsResponse = client().admin().indices()
+                .prepareStats("test").setFieldData(true).setFieldDataFields("_parent").get();
+        assertThat(indicesStatsResponse.getTotal().getFieldData().getMemorySizeInBytes(), greaterThan(0l));
+        assertThat(indicesStatsResponse.getTotal().getFieldData().getFields().get("_parent"), greaterThan(0l));
+
+        ClearIndicesCacheResponse clearCacheResponse = client().admin().indices().prepareClearCache("test").setFieldDataCache(true).get();
+        assertNoFailures(clearCacheResponse);
+        assertAllSuccessful(clearCacheResponse);
+        indicesStatsResponse = client().admin().indices()
+                .prepareStats("test").setFieldData(true).setFieldDataFields("_parent").get();
+        assertThat(indicesStatsResponse.getTotal().getFieldData().getMemorySizeInBytes(), equalTo(0l));
+        assertThat(indicesStatsResponse.getTotal().getFieldData().getFields().get("_parent"), equalTo(0l));
+    }
+
+    @Test
+    public void testEagerParentFieldLoading() throws Exception {
+        logger.info("testing lazy loading...");
+        assertAcked(prepareCreate("test")
+                .setSettings(indexSettings)
+                .addMapping("parent")
+                .addMapping("child", childMapping(FieldMapper.Loading.LAZY)));
+        ensureGreen();
+
+        client().prepareIndex("test", "parent", "1").setSource("{}").get();
+        client().prepareIndex("test", "child", "1").setParent("1").setSource("{}").get();
+        refresh();
+
+        ClusterStatsResponse response = client().admin().cluster().prepareClusterStats().get();
+        assertThat(response.getIndicesStats().getFieldData().getMemorySizeInBytes(), equalTo(0l));
+
+        logger.info("testing default loading...");
+        assertAcked(client().admin().indices().prepareDelete("test").get());
+        assertAcked(prepareCreate("test")
+                .setSettings(indexSettings)
+                .addMapping("parent")
+                .addMapping("child", "_parent", "type=parent"));
+        ensureGreen();
+
+        client().prepareIndex("test", "parent", "1").setSource("{}").get();
+        client().prepareIndex("test", "child", "1").setParent("1").setSource("{}").get();
+        refresh();
+
+        response = client().admin().cluster().prepareClusterStats().get();
+        long fielddataSizeDefault = response.getIndicesStats().getFieldData().getMemorySizeInBytes();
+        assertThat(fielddataSizeDefault, greaterThan(0l));
+
+        logger.info("testing eager loading...");
+        assertAcked(client().admin().indices().prepareDelete("test").get());
+        assertAcked(prepareCreate("test")
+                .setSettings(indexSettings)
+                .addMapping("parent")
+                .addMapping("child", childMapping(FieldMapper.Loading.EAGER)));
+        ensureGreen();
+
+        client().prepareIndex("test", "parent", "1").setSource("{}").get();
+        client().prepareIndex("test", "child", "1").setParent("1").setSource("{}").get();
+        refresh();
+
+        response = client().admin().cluster().prepareClusterStats().get();
+        assertThat(response.getIndicesStats().getFieldData().getMemorySizeInBytes(), equalTo(fielddataSizeDefault));
+
+        logger.info("testing eager global ordinals loading...");
+        assertAcked(client().admin().indices().prepareDelete("test").get());
+        assertAcked(prepareCreate("test")
+                .setSettings(indexSettings)
+                .addMapping("parent")
+                .addMapping("child", childMapping(FieldMapper.Loading.EAGER_GLOBAL_ORDINALS)));
+        ensureGreen();
+
+        // Need to do 2 separate refreshes, otherwise we have 1 segment and then we can't measure if global ordinals
+        // is loaded by the size of the field data cache, because global ordinals on 1 segment shards takes no extra memory.
+        client().prepareIndex("test", "parent", "1").setSource("{}").get();
+        refresh();
+        client().prepareIndex("test", "child", "1").setParent("1").setSource("{}").get();
+        refresh();
+
+        response = client().admin().cluster().prepareClusterStats().get();
+        assertThat(response.getIndicesStats().getFieldData().getMemorySizeInBytes(), greaterThan(fielddataSizeDefault));
+    }
+
+    @Test
+    public void testChangingEagerParentFieldLoadingAtRuntime() throws Exception {
+        assertAcked(prepareCreate("test")
+                .setSettings(indexSettings)
+                .addMapping("parent")
+                .addMapping("child", "_parent", "type=parent"));
+        ensureGreen();
+
+        client().prepareIndex("test", "parent", "1").setSource("{}").get();
+        client().prepareIndex("test", "child", "1").setParent("1").setSource("{}").get();
+        refresh();
+
+        ClusterStatsResponse response = client().admin().cluster().prepareClusterStats().get();
+        long fielddataSizeDefault = response.getIndicesStats().getFieldData().getMemorySizeInBytes();
+        assertThat(fielddataSizeDefault, greaterThan(0l));
+
+        PutMappingResponse putMappingResponse = client().admin().indices().preparePutMapping("test").setType("child")
+                .setSource(childMapping(FieldMapper.Loading.EAGER_GLOBAL_ORDINALS))
+                .get();
+        assertAcked(putMappingResponse);
+        assertBusy(new Runnable() {
+            @Override
+            public void run() {
+                ClusterState clusterState = internalCluster().clusterService().state();
+                ShardRouting shardRouting = clusterState.routingTable().index("test").shard(0).getShards().get(0);
+                String nodeName = clusterState.getNodes().get(shardRouting.currentNodeId()).getName();
+
+                boolean verified = false;
+                IndicesService indicesService = internalCluster().getInstance(IndicesService.class, nodeName);
+                IndexService indexService = indicesService.indexService("test");
+                if (indexService != null) {
+                    MapperService mapperService = indexService.mapperService();
+                    DocumentMapper documentMapper = mapperService.documentMapper("child");
+                    if (documentMapper != null) {
+                        verified = documentMapper.parentFieldMapper().fieldDataType().getLoading() == FieldMapper.Loading.EAGER_GLOBAL_ORDINALS;
+                    }
+                }
+                assertTrue(verified);
+            }
+        });
+
+        // Need to add a new doc otherwise the refresh doesn't trigger a new searcher
+        // Because it ends up in its own segment, but isn't of type parent or child, this doc doesn't contribute to the size of the fielddata cache
+        client().prepareIndex("test", "dummy", "dummy").setSource("{}").get();
+        refresh();
+        response = client().admin().cluster().prepareClusterStats().get();
+        assertThat(response.getIndicesStats().getFieldData().getMemorySizeInBytes(), greaterThan(fielddataSizeDefault));
+    }
+
+    private XContentBuilder childMapping(FieldMapper.Loading loading) throws IOException {
+        return jsonBuilder().startObject().startObject("child").startObject("_parent")
+                .field("type", "parent")
+                .startObject("fielddata").field(FieldMapper.Loading.KEY, loading).endObject()
+                .endObject().endObject().endObject();
+    }
+
+}
diff --git a/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingTest.java b/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingTest.java
index 733f0a26cd2..716f61a0c00 100644
--- a/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingTest.java
+++ b/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingTest.java
@@ -85,8 +85,7 @@ public class ParentFieldLoadingTest extends ElasticsearchIntegrationTest {
         refresh();
 
         response = client().admin().cluster().prepareClusterStats().get();
-        long fielddataSizeDefault = response.getIndicesStats().getFieldData().getMemorySizeInBytes();
-        assertThat(fielddataSizeDefault, greaterThan(0l));
+        assertThat(response.getIndicesStats().getFieldData().getMemorySizeInBytes(), equalTo(0l));
 
         logger.info("testing eager loading...");
         assertAcked(client().admin().indices().prepareDelete("test").get());
@@ -101,7 +100,7 @@ public class ParentFieldLoadingTest extends ElasticsearchIntegrationTest {
         refresh();
 
         response = client().admin().cluster().prepareClusterStats().get();
-        assertThat(response.getIndicesStats().getFieldData().getMemorySizeInBytes(), equalTo(fielddataSizeDefault));
+        assertThat(response.getIndicesStats().getFieldData().getMemorySizeInBytes(), equalTo(0l));
 
         logger.info("testing eager global ordinals loading...");
         assertAcked(client().admin().indices().prepareDelete("test").get());
@@ -119,7 +118,7 @@ public class ParentFieldLoadingTest extends ElasticsearchIntegrationTest {
         refresh();
 
         response = client().admin().cluster().prepareClusterStats().get();
-        assertThat(response.getIndicesStats().getFieldData().getMemorySizeInBytes(), greaterThan(fielddataSizeDefault));
+        assertThat(response.getIndicesStats().getFieldData().getMemorySizeInBytes(), greaterThan(0l));
     }
 
     @Test
@@ -135,8 +134,7 @@ public class ParentFieldLoadingTest extends ElasticsearchIntegrationTest {
         refresh();
 
         ClusterStatsResponse response = client().admin().cluster().prepareClusterStats().get();
-        long fielddataSizeDefault = response.getIndicesStats().getFieldData().getMemorySizeInBytes();
-        assertThat(fielddataSizeDefault, greaterThan(0l));
+        assertThat(response.getIndicesStats().getFieldData().getMemorySizeInBytes(), equalTo(0l));
 
         PutMappingResponse putMappingResponse = client().admin().indices().preparePutMapping("test").setType("child")
                 .setSource(childMapping(FieldMapper.Loading.EAGER_GLOBAL_ORDINALS))
@@ -168,7 +166,7 @@ public class ParentFieldLoadingTest extends ElasticsearchIntegrationTest {
         client().prepareIndex("test", "dummy", "dummy").setSource("{}").get();
         refresh();
         response = client().admin().cluster().prepareClusterStats().get();
-        assertThat(response.getIndicesStats().getFieldData().getMemorySizeInBytes(), greaterThan(fielddataSizeDefault));
+        assertThat(response.getIndicesStats().getFieldData().getMemorySizeInBytes(), greaterThan(0l));
     }
 
     private XContentBuilder childMapping(FieldMapper.Loading loading) throws IOException {
diff --git a/src/test/java/org/elasticsearch/update/UpdateTests.java b/src/test/java/org/elasticsearch/update/UpdateTests.java
index 6d9184b788b..63741575afe 100644
--- a/src/test/java/org/elasticsearch/update/UpdateTests.java
+++ b/src/test/java/org/elasticsearch/update/UpdateTests.java
@@ -473,20 +473,23 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void testContextVariables() throws Exception {
-        createTestIndex();
-
-        // Add child type for testing the _parent context variable
-        client().admin().indices().preparePutMapping("test")
-                .setType("subtype1")
-                .setSource(XContentFactory.jsonBuilder()
-                        .startObject()
-                        .startObject("subtype1")
-                        .startObject("_parent").field("type", "type1").endObject()
-                        .startObject("_timestamp").field("enabled", true).field("store", "yes").endObject()
-                        .startObject("_ttl").field("enabled", true).endObject()
-                        .endObject()
-                        .endObject())
-                .execute().actionGet();
+        assertAcked(prepareCreate("test").addAlias(new Alias("alias"))
+                        .addMapping("type1", XContentFactory.jsonBuilder()
+                                .startObject()
+                                .startObject("type1")
+                                .startObject("_timestamp").field("enabled", true).field("store", "yes").endObject()
+                                .startObject("_ttl").field("enabled", true).endObject()
+                                .endObject()
+                                .endObject())
+                        .addMapping("subtype1", XContentFactory.jsonBuilder()
+                                .startObject()
+                                .startObject("subtype1")
+                                .startObject("_parent").field("type", "type1").endObject()
+                                .startObject("_timestamp").field("enabled", true).field("store", "yes").endObject()
+                                .startObject("_ttl").field("enabled", true).endObject()
+                                .endObject()
+                                .endObject())
+        );
         ensureGreen();
 
         // Index some documents
@@ -1215,17 +1218,23 @@ public class UpdateTests extends ElasticsearchIntegrationTest {
      */
     @Test
     public void testContextVariablesOldScriptAPI() throws Exception {
-        createTestIndex();
-
-        // Add child type for testing the _parent context variable
-        client().admin()
-                .indices()
-                .preparePutMapping("test")
-                .setType("subtype1")
-                .setSource(
-                        XContentFactory.jsonBuilder().startObject().startObject("subtype1").startObject("_parent").field("type", "type1")
-                                .endObject().startObject("_timestamp").field("enabled", true).field("store", "yes").endObject()
-                                .startObject("_ttl").field("enabled", true).endObject().endObject().endObject()).execute().actionGet();
+        assertAcked(prepareCreate("test").addAlias(new Alias("alias"))
+                        .addMapping("type1", XContentFactory.jsonBuilder()
+                                .startObject()
+                                .startObject("type1")
+                                .startObject("_timestamp").field("enabled", true).field("store", "yes").endObject()
+                                .startObject("_ttl").field("enabled", true).endObject()
+                                .endObject()
+                                .endObject())
+                        .addMapping("subtype1", XContentFactory.jsonBuilder()
+                                .startObject()
+                                .startObject("subtype1")
+                                .startObject("_parent").field("type", "type1").endObject()
+                                .startObject("_timestamp").field("enabled", true).field("store", "yes").endObject()
+                                .startObject("_ttl").field("enabled", true).endObject()
+                                .endObject()
+                                .endObject())
+        );
         ensureGreen();
 
         // Index some documents

From 359d9ac0d0faafee39b9dff4de6a1c010207ff4c Mon Sep 17 00:00:00 2001
From: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date: Fri, 29 May 2015 22:45:01 +0200
Subject: [PATCH 077/123] docs: added missing ids

---
 docs/reference/index-modules/fielddata.asciidoc     | 2 ++
 docs/reference/mapping/fields/parent-field.asciidoc | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/reference/index-modules/fielddata.asciidoc b/docs/reference/index-modules/fielddata.asciidoc
index 68764a05a27..5698af6d4da 100644
--- a/docs/reference/index-modules/fielddata.asciidoc
+++ b/docs/reference/index-modules/fielddata.asciidoc
@@ -149,6 +149,7 @@ field data format.
     Computes and stores field data data-structures on disk at indexing time.
 
 [float]
+[[global-ordinals]]
 ==== Global ordinals
 
 Global ordinals is a data-structure on top of field data, that maintains an
@@ -182,6 +183,7 @@ ordinals is a small because it is very efficiently compressed. Eager loading of
 can move the loading time from the first search request, to the refresh itself.
 
 [float]
+[[fielddata-loading]]
 === Fielddata loading
 
 By default, field data is loaded lazily, ie. the first time that a query that
diff --git a/docs/reference/mapping/fields/parent-field.asciidoc b/docs/reference/mapping/fields/parent-field.asciidoc
index 8c919b8373e..8caec1d4a71 100644
--- a/docs/reference/mapping/fields/parent-field.asciidoc
+++ b/docs/reference/mapping/fields/parent-field.asciidoc
@@ -35,11 +35,11 @@ Parent/child queries (`has_child` & `has_parent`) can't be used in index aliases
 
 ==== Global ordinals
 
-Parent-child uses <<index-modules-fielddata-global-ordinals,global ordinals>> to speed up joins and global ordinals need to be rebuilt after any change to a shard.
+Parent-child uses <<global-ordinals,global ordinals>> to speed up joins and global ordinals need to be rebuilt after any change to a shard.
 The more parent id values are stored in a shard, the longer it takes to rebuild global ordinals for the `_parent` field.
 
 Global ordinals, by default, are built lazily: the first parent-child query or aggregation after a refresh will trigger building of global ordinals.
-This can introduce a significant latency spike for your users. You can use <<index-modules-fielddata-fielddata-loading,eager_global_ordinals>> to shift the cost of building global ordinals
+This can introduce a significant latency spike for your users. You can use <<fielddata-loading,eager_global_ordinals>> to shift the cost of building global ordinals
 from query time to refresh time, by mapping the _parent field as follows:
 
 ==== Memory usage

From b9b13cd130a7a53e67e1243e24479612fd3bc147 Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Fri, 29 May 2015 08:14:45 -0700
Subject: [PATCH 078/123] Reduce cluster update reroutes with async fetch When
 using async fetch, we can end up with cluster updates and reroutes based on
 teh number of shards. While not disastrous we can optimize it, since a single
 reroute is enough to apply to all the async fetch results that arrived during
 that time.

---
 .../gateway/GatewayAllocator.java             | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java b/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java
index f4385947dc8..43e1f5a5cc9 100644
--- a/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java
+++ b/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java
@@ -56,6 +56,7 @@ import org.elasticsearch.indices.store.TransportNodesListShardStoreMetaData;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  *
@@ -166,7 +167,7 @@ public class GatewayAllocator extends AbstractComponent {
 
             AsyncShardFetch<TransportNodesListGatewayStartedShards.NodeGatewayStartedShards> fetch = asyncFetchStarted.get(shard.shardId());
             if (fetch == null) {
-                fetch = new InternalAsyncFetch<>(logger, "shard_started", shard.shardId(), startedAction, clusterService, allocationService);
+                fetch = new InternalAsyncFetch<>(logger, "shard_started", shard.shardId(), startedAction);
                 asyncFetchStarted.put(shard.shardId(), fetch);
             }
             AsyncShardFetch.FetchResult<TransportNodesListGatewayStartedShards.NodeGatewayStartedShards> shardState = fetch.fetchData(nodes, metaData, allocation.getIgnoreNodes(shard.shardId()));
@@ -403,7 +404,7 @@ public class GatewayAllocator extends AbstractComponent {
 
             AsyncShardFetch<TransportNodesListShardStoreMetaData.NodeStoreFilesMetaData> fetch = asyncFetchStore.get(shard.shardId());
             if (fetch == null) {
-                fetch = new InternalAsyncFetch<>(logger, "shard_store", shard.shardId(), storeAction, clusterService, allocationService);
+                fetch = new InternalAsyncFetch<>(logger, "shard_store", shard.shardId(), storeAction);
                 asyncFetchStore.put(shard.shardId(), fetch);
             }
             AsyncShardFetch.FetchResult<TransportNodesListShardStoreMetaData.NodeStoreFilesMetaData> shardStores = fetch.fetchData(nodes, metaData, allocation.getIgnoreNodes(shard.shardId()));
@@ -513,23 +514,24 @@ public class GatewayAllocator extends AbstractComponent {
         return changed;
     }
 
-    static class InternalAsyncFetch<T extends BaseNodeResponse> extends AsyncShardFetch<T> {
+    private final AtomicBoolean rerouting = new AtomicBoolean();
 
-        private final ClusterService clusterService;
-        private final AllocationService allocationService;
+    class InternalAsyncFetch<T extends BaseNodeResponse> extends AsyncShardFetch<T> {
 
-        public InternalAsyncFetch(ESLogger logger, String type, ShardId shardId, List<? extends BaseNodesResponse<T>, T> action,
-                                  ClusterService clusterService, AllocationService allocationService) {
+        public InternalAsyncFetch(ESLogger logger, String type, ShardId shardId, List<? extends BaseNodesResponse<T>, T> action) {
             super(logger, type, shardId, action);
-            this.clusterService = clusterService;
-            this.allocationService = allocationService;
         }
 
         @Override
         protected void reroute(ShardId shardId, String reason) {
-            clusterService.submitStateUpdateTask("async_shard_fetch(" + type + ") " + shardId + ", reasons (" + reason + ")", Priority.HIGH, new ClusterStateUpdateTask() {
+            if (rerouting.compareAndSet(false, true) == false) {
+                logger.trace("{} already has pending reroute, ignoring {}", shardId, reason);
+                return;
+            }
+            clusterService.submitStateUpdateTask("async_shard_fetch", Priority.HIGH, new ClusterStateUpdateTask() {
                 @Override
                 public ClusterState execute(ClusterState currentState) throws Exception {
+                    rerouting.set(false);
                     if (currentState.nodes().masterNode() == null) {
                         return currentState;
                     }

From 26aeeda310ee41393e0de08b8e2db78280a56cd8 Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Wed, 20 May 2015 16:26:37 -0400
Subject: [PATCH 079/123] Snapshot/Restore: Add support for applying setting
 filters when displaying repository settings

Currently all settings that were specified during repository creation are displayed. This commit enables  plugins such as cloud-aws to filter out sensitive settings from the repository.

Closes #11265
---
 .../metadata/RepositoriesMetaData.java        |  4 +-
 .../get/RestGetRepositoriesAction.java        |  7 +-
 .../DedicatedClusterSnapshotRestoreTests.java | 65 +++++++++++++++++++
 .../mockstore/MockRepositoryPlugin.java       | 31 +++++++++
 4 files changed, 103 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java
index 52e28ffd21e..f4d81028448 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java
@@ -202,9 +202,7 @@ public class RepositoriesMetaData extends AbstractDiffable<Custom> implements Me
         builder.startObject(repository.name(), XContentBuilder.FieldCaseConversion.NONE);
         builder.field("type", repository.type());
         builder.startObject("settings");
-        for (Map.Entry<String, String> settingEntry : repository.settings().getAsMap().entrySet()) {
-            builder.field(settingEntry.getKey(), settingEntry.getValue());
-        }
+        repository.settings().toXContent(builder, params);
         builder.endObject();
 
         builder.endObject();
diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/get/RestGetRepositoriesAction.java b/src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/get/RestGetRepositoriesAction.java
index 85b46925b5f..9f09081417a 100644
--- a/src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/get/RestGetRepositoriesAction.java
+++ b/src/main/java/org/elasticsearch/rest/action/admin/cluster/repositories/get/RestGetRepositoriesAction.java
@@ -27,6 +27,7 @@ import org.elasticsearch.cluster.metadata.RepositoryMetaData;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.settings.SettingsFilter;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.rest.*;
 import org.elasticsearch.rest.action.support.RestBuilderListener;
@@ -40,11 +41,14 @@ import static org.elasticsearch.rest.RestStatus.OK;
  */
 public class RestGetRepositoriesAction extends BaseRestHandler {
 
+    private final SettingsFilter settingsFilter;
+
     @Inject
-    public RestGetRepositoriesAction(Settings settings, RestController controller, Client client) {
+    public RestGetRepositoriesAction(Settings settings, RestController controller, Client client, SettingsFilter settingsFilter) {
         super(settings, controller, client);
         controller.registerHandler(GET, "/_snapshot", this);
         controller.registerHandler(GET, "/_snapshot/{repository}", this);
+        this.settingsFilter = settingsFilter;
     }
 
     @Override
@@ -53,6 +57,7 @@ public class RestGetRepositoriesAction extends BaseRestHandler {
         GetRepositoriesRequest getRepositoriesRequest = getRepositoryRequest(repositories);
         getRepositoriesRequest.masterNodeTimeout(request.paramAsTime("master_timeout", getRepositoriesRequest.masterNodeTimeout()));
         getRepositoriesRequest.local(request.paramAsBoolean("local", getRepositoriesRequest.local()));
+        settingsFilter.addFilterSettingParams(request);
         client.admin().cluster().getRepositories(getRepositoriesRequest, new RestBuilderListener<GetRepositoriesResponse>(channel) {
             @Override
             public RestResponse buildResponse(GetRepositoriesResponse response, XContentBuilder builder) throws Exception {
diff --git a/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreTests.java b/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreTests.java
index f02041bf6f7..d36bd523154 100644
--- a/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreTests.java
+++ b/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreTests.java
@@ -56,9 +56,15 @@ import org.elasticsearch.discovery.zen.elect.ElectMasterService;
 import org.elasticsearch.index.store.IndexStore;
 import org.elasticsearch.indices.ttl.IndicesTTLService;
 import org.elasticsearch.repositories.RepositoryMissingException;
+import org.elasticsearch.rest.RestChannel;
+import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.RestResponse;
+import org.elasticsearch.rest.action.admin.cluster.repositories.get.RestGetRepositoriesAction;
+import org.elasticsearch.rest.action.admin.cluster.state.RestClusterStateAction;
 import org.elasticsearch.snapshots.mockstore.MockRepositoryModule;
 import org.elasticsearch.snapshots.mockstore.MockRepositoryPlugin;
 import org.elasticsearch.test.InternalTestCluster;
+import org.elasticsearch.test.rest.FakeRestRequest;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -70,6 +76,7 @@ import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 
 import static com.google.common.collect.Lists.newArrayList;
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
@@ -622,6 +629,64 @@ public class DedicatedClusterSnapshotRestoreTests extends AbstractSnapshotTests
 
     }
 
+    @Test
+    public void testThatSensitiveRepositorySettingsAreNotExposed() throws Exception {
+        Settings nodeSettings = settingsBuilder().put("plugin.types", MockRepositoryPlugin.class.getName()).build();
+        logger.info("--> start two nodes");
+        internalCluster().startNodesAsync(2, nodeSettings).get();
+        // Register mock repositories
+        client().admin().cluster().preparePutRepository("test-repo")
+                .setType("mock").setSettings(Settings.settingsBuilder()
+                        .put("location", randomRepoPath())
+                        .put("secret.mock.username", "notsecretusername")
+                        .put("secret.mock.password", "verysecretpassword")
+        ).get();
+
+        RestGetRepositoriesAction getRepoAction = internalCluster().getInstance(RestGetRepositoriesAction.class);
+        RestRequest getRepoRequest = new FakeRestRequest();
+        getRepoRequest.params().put("repository", "test-repo");
+        final CountDownLatch getRepoLatch = new CountDownLatch(1);
+        final AtomicReference<AssertionError> getRepoError = new AtomicReference<>();
+        getRepoAction.handleRequest(getRepoRequest, new RestChannel(getRepoRequest, true) {
+            @Override
+            public void sendResponse(RestResponse response) {
+                try {
+                    assertThat(response.content().toUtf8(), containsString("notsecretusername"));
+                    assertThat(response.content().toUtf8(), not(containsString("verysecretpassword")));
+                } catch (AssertionError ex) {
+                    getRepoError.set(ex);
+                }
+                getRepoLatch.countDown();
+            }
+        });
+        assertTrue(getRepoLatch.await(1, TimeUnit.SECONDS));
+        if (getRepoError.get() != null) {
+            throw getRepoError.get();
+        }
+
+        RestClusterStateAction clusterStateAction = internalCluster().getInstance(RestClusterStateAction.class);
+        RestRequest clusterStateRequest = new FakeRestRequest();
+        final CountDownLatch clusterStateLatch = new CountDownLatch(1);
+        final AtomicReference<AssertionError> clusterStateError = new AtomicReference<>();
+        clusterStateAction.handleRequest(clusterStateRequest, new RestChannel(clusterStateRequest, true) {
+            @Override
+            public void sendResponse(RestResponse response) {
+                try {
+                    assertThat(response.content().toUtf8(), containsString("notsecretusername"));
+                    assertThat(response.content().toUtf8(), not(containsString("verysecretpassword")));
+                } catch (AssertionError ex) {
+                    clusterStateError.set(ex);
+                }
+                clusterStateLatch.countDown();
+            }
+        });
+        assertTrue(clusterStateLatch.await(1, TimeUnit.SECONDS));
+        if (clusterStateError.get() != null) {
+            throw clusterStateError.get();
+        }
+        
+    }
+
     @Test
     @Ignore
     public void chaosSnapshotTest() throws Exception {
diff --git a/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepositoryPlugin.java b/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepositoryPlugin.java
index b8aebe421c1..a09c8601f7f 100644
--- a/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepositoryPlugin.java
+++ b/src/test/java/org/elasticsearch/snapshots/mockstore/MockRepositoryPlugin.java
@@ -19,9 +19,17 @@
 
 package org.elasticsearch.snapshots.mockstore;
 
+import org.elasticsearch.common.inject.AbstractModule;
+import org.elasticsearch.common.inject.Inject;
+import org.elasticsearch.common.inject.Module;
+import org.elasticsearch.common.settings.SettingsFilter;
 import org.elasticsearch.plugins.AbstractPlugin;
 import org.elasticsearch.repositories.RepositoriesModule;
 
+import java.util.Collection;
+
+import static com.google.common.collect.Lists.newArrayList;
+
 public class MockRepositoryPlugin extends AbstractPlugin {
 
     @Override
@@ -37,4 +45,27 @@ public class MockRepositoryPlugin extends AbstractPlugin {
     public void onModule(RepositoriesModule repositoriesModule) {
         repositoriesModule.registerRepository("mock", MockRepositoryModule.class);
     }
+
+    @Override
+    public Collection<Class<? extends Module>> modules() {
+        Collection<Class<? extends Module>> modules = newArrayList();
+        modules.add(SettingsFilteringModule.class);
+        return modules;
+    }
+
+    public static class SettingsFilteringModule extends AbstractModule {
+
+        @Override
+        protected void configure() {
+            bind(SettingsFilteringService.class).asEagerSingleton();
+        }
+    }
+
+    public static class SettingsFilteringService {
+        @Inject
+        public SettingsFilteringService(SettingsFilter settingsFilter) {
+            settingsFilter.addFilter("secret.mock.password");
+        }
+    }
+
 }

From 5cc991d4e68aa35f6d1a94544d76b2d381cd66da Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Sat, 30 May 2015 10:40:06 +0200
Subject: [PATCH 080/123] Remove leftover class, not needed anymore

---
 .../index/suggest/SuggestShardModule.java     | 33 -------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 src/main/java/org/elasticsearch/index/suggest/SuggestShardModule.java

diff --git a/src/main/java/org/elasticsearch/index/suggest/SuggestShardModule.java b/src/main/java/org/elasticsearch/index/suggest/SuggestShardModule.java
deleted file mode 100644
index 9e1d0e1375a..00000000000
--- a/src/main/java/org/elasticsearch/index/suggest/SuggestShardModule.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.index.suggest;
-
-import org.elasticsearch.common.inject.AbstractModule;
-import org.elasticsearch.index.suggest.stats.ShardSuggestService;
-
-/**
- *
- */
-public class SuggestShardModule extends AbstractModule {
-    @Override
-    protected void configure() {
-        bind(ShardSuggestService.class).asEagerSingleton();
-    }
-}

From d99b5dfdb4bdfa42e92f68663628134ad0b8d89d Mon Sep 17 00:00:00 2001
From: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date: Sat, 30 May 2015 11:50:00 +0200
Subject: [PATCH 081/123] test: use ElasticsearchTestCase#settings(Version) to
 test bwc behaviour instead of setting the version directly.

---
 .../elasticsearch/search/child/ChildQuerySearchBwcTests.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcTests.java b/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcTests.java
index 59a04b29c3c..57b053db08a 100644
--- a/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcTests.java
+++ b/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcTests.java
@@ -24,7 +24,6 @@ import org.elasticsearch.action.admin.indices.cache.clear.ClearIndicesCacheRespo
 import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse;
 import org.elasticsearch.action.explain.ExplainResponse;
 import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.fielddata.FieldDataType;
@@ -46,8 +45,7 @@ public class ChildQuerySearchBwcTests extends ChildQuerySearchTests {
 
     @Override
     public Settings indexSettings() {
-        return Settings.builder()
-                .put(super.indexSettings()).put(IndexMetaData.SETTING_VERSION_CREATED, Version.V_1_6_0).build();
+        return settings(Version.V_1_6_0).put(super.indexSettings()).build();
     }
 
     public void testSelfReferentialIsForbidden() {

From 1020b321cef8a152069a009991ad3d1a4d69b1d4 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Sat, 30 May 2015 11:17:16 -0400
Subject: [PATCH 082/123] Add more debugging/error messages when mlockall fails

---
 .../elasticsearch/bootstrap/JNACLibrary.java  | 32 ++++++++++++++---
 .../elasticsearch/bootstrap/JNANatives.java   | 36 +++++++++++++------
 2 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java b/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java
index 97bf98e60f6..b4344bd09ef 100644
--- a/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java
+++ b/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java
@@ -20,34 +20,58 @@
 package org.elasticsearch.bootstrap;
 
 import com.sun.jna.Native;
+import com.sun.jna.Structure;
+
+import org.apache.lucene.util.Constants;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
 
+import java.util.Arrays;
+import java.util.List;
+
 
 /**
  *
  */
-class JNACLibrary {
+final class JNACLibrary {
 
     private static final ESLogger logger = Loggers.getLogger(JNACLibrary.class);
 
     public static final int MCL_CURRENT = 1;
-    public static final int MCL_FUTURE = 2;
-
     public static final int ENOMEM = 12;
+    public static final int RLIMIT_MEMLOCK = Constants.MAC_OS_X ? 6 : 8;
 
     static {
         try {
             Native.register("c");
         } catch (UnsatisfiedLinkError e) {
-            logger.warn("unable to link C library. native methods (mlockall) will be disabled.");
+            logger.warn("unable to link C library. native methods (mlockall) will be disabled.", e);
         }
     }
 
     static native int mlockall(int flags);
 
     static native int geteuid();
+    
+    /** corresponds to struct rlimit */
+    public static final class Rlimit extends Structure implements Structure.ByReference {
+        public long rlim_cur = 0;
+        public long rlim_max = 0;
+        
+        @Override
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] { "rlim_cur", "rlim_max" });
+        }
+    }
+    
+    static native int getrlimit(int resource, Rlimit rlimit);
+    
+    static native String strerror(int errno);
 
     private JNACLibrary() {
     }
+    
+    public static void main(String args[]) throws Exception {
+        JNANatives.tryMlockall();
+    }
 }
diff --git a/src/main/java/org/elasticsearch/bootstrap/JNANatives.java b/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
index eb29df85cdb..a9adce4641e 100644
--- a/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
+++ b/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
@@ -43,26 +43,40 @@ class JNANatives {
 
     static void tryMlockall() {
         int errno = Integer.MIN_VALUE;
+        String errMsg = null;
+        boolean rlimitSuccess = false;
+        long softLimit = 0;
+        long hardLimit = 0;
+        
         try {
             int result = JNACLibrary.mlockall(JNACLibrary.MCL_CURRENT);
-            if (result != 0) {
-                errno = Native.getLastError();
-            } else {
+            if (result == 0) {
                 LOCAL_MLOCKALL = true;
+                return;
+            }
+            
+            errno = Native.getLastError();
+            errMsg = JNACLibrary.strerror(errno);
+            JNACLibrary.Rlimit rlimit = new JNACLibrary.Rlimit();
+            if (JNACLibrary.getrlimit(JNACLibrary.RLIMIT_MEMLOCK, rlimit) == 0) {
+              rlimitSuccess = true;
+              softLimit = rlimit.rlim_cur;
+              hardLimit = rlimit.rlim_max;
+            } else {
+              logger.warn("Unable to retrieve resource limits: " + JNACLibrary.strerror(Native.getLastError()));
             }
         } catch (UnsatisfiedLinkError e) {
             // this will have already been logged by CLibrary, no need to repeat it
             return;
         }
 
-        if (errno != Integer.MIN_VALUE) {
-            if (errno == JNACLibrary.ENOMEM && System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("linux")) {
-                logger.warn("Unable to lock JVM memory (ENOMEM)."
-                        + " This can result in part of the JVM being swapped out."
-                        + " Increase RLIMIT_MEMLOCK (ulimit).");
-            } else if (!System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("mac")) {
-                // OS X allows mlockall to be called, but always returns an error
-                logger.warn("Unknown mlockall error " + errno);
+        // mlockall failed for some reason
+        logger.warn("Unable to lock JVM Memory: error=" + errno + ",reason=" + errMsg + ". This can result in part of the JVM being swapped out");
+        if (errno == JNACLibrary.ENOMEM) {
+            if (rlimitSuccess) {
+                logger.warn("Increase RLIMIT_MEMLOCK (ulimit). soft limit:" + softLimit + ", hard limit:" + hardLimit);
+            } else {
+                logger.warn("Increase RLIMIT_MEMLOCK (ulimit).");
             }
         }
     }

From 74bb715689e7e817a04326e87285a4db0080b614 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Sat, 30 May 2015 11:19:14 -0400
Subject: [PATCH 083/123] code cleanups

---
 src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java | 7 +------
 src/main/java/org/elasticsearch/bootstrap/JNANatives.java  | 2 --
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java b/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java
index b4344bd09ef..c43a45a1709 100644
--- a/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java
+++ b/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java
@@ -29,9 +29,8 @@ import org.elasticsearch.common.logging.Loggers;
 import java.util.Arrays;
 import java.util.List;
 
-
 /**
- *
+ * java mapping to some libc functions
  */
 final class JNACLibrary {
 
@@ -70,8 +69,4 @@ final class JNACLibrary {
 
     private JNACLibrary() {
     }
-    
-    public static void main(String args[]) throws Exception {
-        JNANatives.tryMlockall();
-    }
 }
diff --git a/src/main/java/org/elasticsearch/bootstrap/JNANatives.java b/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
index a9adce4641e..463330d8040 100644
--- a/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
+++ b/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
@@ -26,8 +26,6 @@ import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.monitor.jvm.JvmInfo;
 
-import java.util.Locale;
-
 import static org.elasticsearch.bootstrap.JNAKernel32Library.SizeT;
 
 /**

From 1e5e36d48d6dbc54c3db4fbc638d45b49d89c586 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Sat, 30 May 2015 11:20:20 -0400
Subject: [PATCH 084/123] Do the root check first, so resource limits arent
 confusing if you are root.

---
 .../org/elasticsearch/bootstrap/Bootstrap.java  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java b/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
index 15851b9dc18..84663f60a4d 100644
--- a/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
+++ b/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
@@ -84,14 +84,6 @@ public class Bootstrap {
     /** initialize native resources */
     public static void initializeNatives(boolean mlockAll, boolean ctrlHandler, boolean loadSigar) {
         final ESLogger logger = Loggers.getLogger(Bootstrap.class);
-        // mlockall if requested
-        if (mlockAll) {
-            if (Constants.WINDOWS) {
-               Natives.tryVirtualLock();
-            } else {
-               Natives.tryMlockall();
-            }
-        }
         
         // check if the user is running as root, and bail
         if (Natives.definitelyRunningAsRoot()) {
@@ -101,6 +93,15 @@ public class Bootstrap {
                 throw new RuntimeException("don't run elasticsearch as root.");
             }
         }
+        
+        // mlockall if requested
+        if (mlockAll) {
+            if (Constants.WINDOWS) {
+               Natives.tryVirtualLock();
+            } else {
+               Natives.tryMlockall();
+            }
+        }
 
         // listener for windows close event
         if (ctrlHandler) {

From b7163c4a71621c1973d2d86743015cbe5e14804b Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Sat, 30 May 2015 11:33:19 -0400
Subject: [PATCH 085/123] Don't try to getrlimit unless we are sure we will get
 the right one

---
 .../org/elasticsearch/bootstrap/JNANatives.java | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/elasticsearch/bootstrap/JNANatives.java b/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
index 463330d8040..943d509aef7 100644
--- a/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
+++ b/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
@@ -55,13 +55,16 @@ class JNANatives {
             
             errno = Native.getLastError();
             errMsg = JNACLibrary.strerror(errno);
-            JNACLibrary.Rlimit rlimit = new JNACLibrary.Rlimit();
-            if (JNACLibrary.getrlimit(JNACLibrary.RLIMIT_MEMLOCK, rlimit) == 0) {
-              rlimitSuccess = true;
-              softLimit = rlimit.rlim_cur;
-              hardLimit = rlimit.rlim_max;
-            } else {
-              logger.warn("Unable to retrieve resource limits: " + JNACLibrary.strerror(Native.getLastError()));
+            if (Constants.LINUX || Constants.MAC_OS_X) {
+                // we only know RLIMIT_MEMLOCK for these two at the moment. 
+                JNACLibrary.Rlimit rlimit = new JNACLibrary.Rlimit();
+                if (JNACLibrary.getrlimit(JNACLibrary.RLIMIT_MEMLOCK, rlimit) == 0) {
+                    rlimitSuccess = true;
+                    softLimit = rlimit.rlim_cur;
+                    hardLimit = rlimit.rlim_max;
+                } else {
+                    logger.warn("Unable to retrieve resource limits: " + JNACLibrary.strerror(Native.getLastError()));
+                }
             }
         } catch (UnsatisfiedLinkError e) {
             // this will have already been logged by CLibrary, no need to repeat it

From a95528e247fb94c87920d73af684464dbaa5f1c1 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Sat, 30 May 2015 11:49:44 -0400
Subject: [PATCH 086/123] Don't ever print RLIM_INFINITY in a confusing way

---
 .../org/elasticsearch/bootstrap/JNACLibrary.java     |  1 +
 .../java/org/elasticsearch/bootstrap/JNANatives.java | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java b/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java
index c43a45a1709..226fea665cd 100644
--- a/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java
+++ b/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java
@@ -39,6 +39,7 @@ final class JNACLibrary {
     public static final int MCL_CURRENT = 1;
     public static final int ENOMEM = 12;
     public static final int RLIMIT_MEMLOCK = Constants.MAC_OS_X ? 6 : 8;
+    public static final long RLIM_INFINITY = Constants.MAC_OS_X ? 9223372036854775807L : -1L;
 
     static {
         try {
diff --git a/src/main/java/org/elasticsearch/bootstrap/JNANatives.java b/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
index 943d509aef7..2895635d02e 100644
--- a/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
+++ b/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
@@ -75,13 +75,23 @@ class JNANatives {
         logger.warn("Unable to lock JVM Memory: error=" + errno + ",reason=" + errMsg + ". This can result in part of the JVM being swapped out");
         if (errno == JNACLibrary.ENOMEM) {
             if (rlimitSuccess) {
-                logger.warn("Increase RLIMIT_MEMLOCK (ulimit). soft limit:" + softLimit + ", hard limit:" + hardLimit);
+                logger.warn("Increase RLIMIT_MEMLOCK (ulimit). soft limit: " + rlimitToString(softLimit) + ", hard limit: " + rlimitToString(hardLimit));
             } else {
                 logger.warn("Increase RLIMIT_MEMLOCK (ulimit).");
             }
         }
     }
     
+    static String rlimitToString(long value) {
+        assert Constants.LINUX || Constants.MAC_OS_X;
+        if (value == JNACLibrary.RLIM_INFINITY) {
+            return "unlimited";
+        } else {
+            // TODO, on java 8 use Long.toUnsignedString, since thats what it is.
+            return Long.toString(value);
+        }
+    }
+
     /** Returns true if user is root, false if not, or if we don't know */
     static boolean definitelyRunningAsRoot() {
         if (Constants.WINDOWS) {

From b5ad1c257e3b5458f58c6906e013599c98648bb6 Mon Sep 17 00:00:00 2001
From: Britta Weber <britta.weber@elasticsearch.com>
Date: Thu, 28 May 2015 18:13:02 +0200
Subject: [PATCH 087/123] search: release search contexts after failed dfs or
 query phase for dfs queries

When the dfs phase runs a SearchContext is created on each node that has a shard
for this query. When the query phase (or query and fetch phase) failed that SearchContext
was released only if the query was actually executed on the node. If for example
the query was rejected because the thread pool queue was full then the search context
was not released.
This commit adds a dedicated call for releasing the SearchContext in this case.

In addition, we must set the docIdsToLoad to null in case the fetch phase failed, otherwise
search contexts might not be released in releaseIrrelevantSearchContexts.

closes #11400
---
 ...TransportSearchDfsQueryAndFetchAction.java |  6 +-
 ...ransportSearchDfsQueryThenFetchAction.java | 11 ++-
 .../TransportSearchQueryThenFetchAction.java  |  7 +-
 .../type/TransportSearchTypeAction.java       | 14 +--
 .../search/SearchWithRejectionsTests.java     | 96 +++++++++++++++++++
 5 files changed, 124 insertions(+), 10 deletions(-)
 create mode 100644 src/test/java/org/elasticsearch/search/SearchWithRejectionsTests.java

diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java
index 83e9aba54f0..98a5972af0e 100644
--- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java
+++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java
@@ -91,7 +91,7 @@ public class TransportSearchDfsQueryAndFetchAction extends TransportSearchTypeAc
             }
         }
 
-        void executeSecondPhase(final int shardIndex, final DfsSearchResult dfsResult, final AtomicInteger counter, DiscoveryNode node, final QuerySearchRequest querySearchRequest) {
+        void executeSecondPhase(final int shardIndex, final DfsSearchResult dfsResult, final AtomicInteger counter, final DiscoveryNode node, final QuerySearchRequest querySearchRequest) {
             searchService.sendExecuteFetch(node, querySearchRequest, new ActionListener<QueryFetchSearchResult>() {
                 @Override
                 public void onResponse(QueryFetchSearchResult result) {
@@ -105,6 +105,10 @@ public class TransportSearchDfsQueryAndFetchAction extends TransportSearchTypeAc
                 @Override
                 public void onFailure(Throwable t) {
                     onSecondPhaseFailure(t, querySearchRequest, shardIndex, dfsResult, counter);
+                    // the query might not have been executed at all (for example because thread pool rejected execution)
+                    // and the search context that was created in dfs phase might not be released.
+                    // release it again to be in the safe side
+                    sendReleaseSearchContext(querySearchRequest.id(), node);
                 }
             });
         }
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java
index c1a361903e8..7b96cc97225 100644
--- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java
+++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java
@@ -100,7 +100,7 @@ public class TransportSearchDfsQueryThenFetchAction extends TransportSearchTypeA
             }
         }
 
-        void executeQuery(final int shardIndex, final DfsSearchResult dfsResult, final AtomicInteger counter, final QuerySearchRequest querySearchRequest, DiscoveryNode node) {
+        void executeQuery(final int shardIndex, final DfsSearchResult dfsResult, final AtomicInteger counter, final QuerySearchRequest querySearchRequest, final DiscoveryNode node) {
             searchService.sendExecuteQuery(node, querySearchRequest, new ActionListener<QuerySearchResult>() {
                 @Override
                 public void onResponse(QuerySearchResult result) {
@@ -114,6 +114,10 @@ public class TransportSearchDfsQueryThenFetchAction extends TransportSearchTypeA
                 @Override
                 public void onFailure(Throwable t) {
                     onQueryFailure(t, querySearchRequest, shardIndex, dfsResult, counter);
+                    // the query might not have been executed at all (for example because thread pool rejected execution)
+                    // and the search context that was created in dfs phase might not be released.
+                    // release it again to be in the safe side
+                    sendReleaseSearchContext(querySearchRequest.id(), node);
                 }
             });
         }
@@ -176,6 +180,11 @@ public class TransportSearchDfsQueryThenFetchAction extends TransportSearchTypeA
 
                 @Override
                 public void onFailure(Throwable t) {
+                    // the search context might not be cleared on the node where the fetch was executed for example
+                    // because the action was rejected by the thread pool. in this case we need to send a dedicated
+                    // request to clear the search context. by setting docIdsToLoad to null, the context will be cleared
+                    // in TransportSearchTypeAction.releaseIrrelevantSearchContexts() after the search request is done.
+                    docIdsToLoad.set(shardIndex, null);
                     onFetchFailure(t, fetchSearchRequest, shardIndex, shardTarget, counter);
                 }
             });
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java
index 175a770e9c6..79a164c12ef 100644
--- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java
+++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java
@@ -35,8 +35,8 @@ import org.elasticsearch.common.util.concurrent.AtomicArray;
 import org.elasticsearch.search.SearchShardTarget;
 import org.elasticsearch.search.action.SearchServiceTransportAction;
 import org.elasticsearch.search.controller.SearchPhaseController;
-import org.elasticsearch.search.fetch.ShardFetchSearchRequest;
 import org.elasticsearch.search.fetch.FetchSearchResult;
+import org.elasticsearch.search.fetch.ShardFetchSearchRequest;
 import org.elasticsearch.search.internal.InternalSearchResponse;
 import org.elasticsearch.search.internal.ShardSearchTransportRequest;
 import org.elasticsearch.search.query.QuerySearchResultProvider;
@@ -118,7 +118,10 @@ public class TransportSearchQueryThenFetchAction extends TransportSearchTypeActi
 
                 @Override
                 public void onFailure(Throwable t) {
-                    // the failure might happen without managing to clear the search context..., potentially need to clear its context (for example)
+                    // the search context might not be cleared on the node where the fetch was executed for example
+                    // because the action was rejected by the thread pool. in this case we need to send a dedicated
+                    // request to clear the search context. by setting docIdsToLoad to null, the context will be cleared
+                    // in TransportSearchTypeAction.releaseIrrelevantSearchContexts() after the search request is done.
                     docIdsToLoad.set(shardIndex, null);
                     onFetchFailure(t, fetchSearchRequest, shardIndex, shardTarget, counter);
                 }
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java
index e2cf4d87f53..4c1210920d7 100644
--- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java
+++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java
@@ -303,9 +303,7 @@ public abstract class TransportSearchTypeAction extends TransportAction<SearchRe
             for (AtomicArray.Entry<FirstResult> entry : firstResults.asList()) {
                 try {
                     DiscoveryNode node = nodes.get(entry.value.shardTarget().nodeId());
-                    if (node != null) { // should not happen (==null) but safeguard anyhow
-                        searchService.sendFreeContext(node, entry.value.id(), request);
-                    }
+                    sendReleaseSearchContext(entry.value.id(), node);
                 } catch (Throwable t1) {
                     logger.trace("failed to release context", t1);
                 }
@@ -329,9 +327,7 @@ public abstract class TransportSearchTypeAction extends TransportAction<SearchRe
                             && docIdsToLoad.get(entry.index) == null) { // but none of them made it to the global top docs
                         try {
                             DiscoveryNode node = nodes.get(entry.value.queryResult().shardTarget().nodeId());
-                            if (node != null) { // should not happen (==null) but safeguard anyhow
-                                searchService.sendFreeContext(node, entry.value.queryResult().id(), request);
-                            }
+                            sendReleaseSearchContext(entry.value.queryResult().id(), node);
                         } catch (Throwable t1) {
                             logger.trace("failed to release context", t1);
                         }
@@ -340,6 +336,12 @@ public abstract class TransportSearchTypeAction extends TransportAction<SearchRe
             }
         }
 
+        protected void sendReleaseSearchContext(long contextId, DiscoveryNode node) {
+            if (node != null) {
+                searchService.sendFreeContext(node, contextId, request);
+            }
+        }
+
         protected ShardFetchSearchRequest createFetchRequest(QuerySearchResult queryResult, AtomicArray.Entry<IntArrayList> entry, ScoreDoc[] lastEmittedDocPerShard) {
             if (lastEmittedDocPerShard != null) {
                 ScoreDoc lastEmittedDoc = lastEmittedDocPerShard[entry.index];
diff --git a/src/test/java/org/elasticsearch/search/SearchWithRejectionsTests.java b/src/test/java/org/elasticsearch/search/SearchWithRejectionsTests.java
new file mode 100644
index 00000000000..3e5bce138d0
--- /dev/null
+++ b/src/test/java/org/elasticsearch/search/SearchWithRejectionsTests.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.search;
+
+import com.google.common.base.Predicate;
+import org.apache.lucene.util.LuceneTestCase;
+import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.action.search.SearchType;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.test.ElasticsearchIntegrationTest;
+import org.junit.Test;
+
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import static org.elasticsearch.common.settings.Settings.settingsBuilder;
+import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+
+@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE)
+@LuceneTestCase.Slow
+public class SearchWithRejectionsTests extends ElasticsearchIntegrationTest {
+    @Override
+    public Settings nodeSettings(int nodeOrdinal) {
+        return settingsBuilder().put(super.nodeSettings(nodeOrdinal))
+                .put("threadpool.search.type", "fixed")
+                .put("threadpool.search.size", 1)
+                .put("threadpool.search.queue_size", 1)
+                .build();
+    }
+
+    @Test
+    public void testOpenContextsAfterRejections() throws InterruptedException {
+        createIndex("test");
+        ensureGreen("test");
+        final int docs = scaledRandomIntBetween(20, 50);
+        for (int i = 0; i < docs; i++) {
+            client().prepareIndex("test", "type", Integer.toString(i)).setSource("field", "value").execute().actionGet();
+        }
+        IndicesStatsResponse indicesStats = client().admin().indices().prepareStats().execute().actionGet();
+        assertThat(indicesStats.getTotal().getSearch().getOpenContexts(), equalTo(0l));
+        refresh();
+
+        int numSearches = 10;
+        Future<SearchResponse>[] responses = new Future[numSearches];
+        SearchType searchType = randomFrom(SearchType.DEFAULT, SearchType.QUERY_AND_FETCH, SearchType.QUERY_THEN_FETCH, SearchType.DFS_QUERY_AND_FETCH, SearchType.DFS_QUERY_THEN_FETCH);
+        logger.info("search type is {}", searchType);
+        for (int i = 0; i < numSearches; i++) {
+            responses[i] = client().prepareSearch()
+                    .setQuery(matchAllQuery())
+                    .setSearchType(searchType)
+                    .execute();
+        }
+        int failures = 0;
+        for (int i = 0; i < numSearches; i++) {
+            try {
+                SearchResponse searchResponse = responses[i].get();
+                if (searchResponse.getFailedShards() > 0) {
+                    failures++;
+                }
+            } catch (Throwable t) {
+                failures++;
+            }
+        }
+        assertThat(failures, greaterThanOrEqualTo(1));
+        awaitBusy(new Predicate<Object>() {
+            @Override
+            public boolean apply(Object input) {
+                // we must wait here because the requests to release search contexts might still be in flight
+                // although the search request has already returned
+                return client().admin().indices().prepareStats().execute().actionGet().getTotal().getSearch().getOpenContexts() == 0;
+            }
+        }, 1, TimeUnit.SECONDS);
+        indicesStats = client().admin().indices().prepareStats().execute().actionGet();
+        assertThat(indicesStats.getTotal().getSearch().getOpenContexts(), equalTo(0l));
+    }
+}

From 56d269e075bc3c0cc71eaf65a2ac358a28941f18 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Sat, 30 May 2015 12:23:14 -0400
Subject: [PATCH 088/123] Give specific instructions on Linux

---
 .../org/elasticsearch/bootstrap/JNANatives.java     | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/elasticsearch/bootstrap/JNANatives.java b/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
index 2895635d02e..ba6eef16257 100644
--- a/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
+++ b/src/main/java/org/elasticsearch/bootstrap/JNANatives.java
@@ -72,10 +72,19 @@ class JNANatives {
         }
 
         // mlockall failed for some reason
-        logger.warn("Unable to lock JVM Memory: error=" + errno + ",reason=" + errMsg + ". This can result in part of the JVM being swapped out");
+        logger.warn("Unable to lock JVM Memory: error=" + errno + ",reason=" + errMsg + ". This can result in part of the JVM being swapped out.");
         if (errno == JNACLibrary.ENOMEM) {
             if (rlimitSuccess) {
-                logger.warn("Increase RLIMIT_MEMLOCK (ulimit). soft limit: " + rlimitToString(softLimit) + ", hard limit: " + rlimitToString(hardLimit));
+                logger.warn("Increase RLIMIT_MEMLOCK, soft limit: " + rlimitToString(softLimit) + ", hard limit: " + rlimitToString(hardLimit));
+                if (Constants.LINUX) {
+                    // give specific instructions for the linux case to make it easy
+                    logger.warn("These can be adjusted by modifying /etc/security/limits.conf, for example: \n" +
+                                "\t# allow user 'esuser' mlockall\n" +
+                                "\tesuser soft memlock unlimited\n" +
+                                "\tesuser hard memlock unlimited"
+                               );
+                    logger.warn("If you are logged in interactively, you will have to re-login for the new limits to take effect.");
+                }
             } else {
                 logger.warn("Increase RLIMIT_MEMLOCK (ulimit).");
             }

From 1a6613b33760508fdb574a8433c3b4dc2fd8d78e Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Sat, 30 May 2015 22:40:38 +0200
Subject: [PATCH 089/123] [TEST] Draw a new path if the random file name
 contains an illegal character

---
 .../org/elasticsearch/index/translog/TranslogTests.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/elasticsearch/index/translog/TranslogTests.java b/src/test/java/org/elasticsearch/index/translog/TranslogTests.java
index 58f4759d79f..98c1d3917ef 100644
--- a/src/test/java/org/elasticsearch/index/translog/TranslogTests.java
+++ b/src/test/java/org/elasticsearch/index/translog/TranslogTests.java
@@ -124,7 +124,6 @@ public class TranslogTests extends ElasticsearchTestCase {
         translog.add(op);
     }
 
-
     public void testIdParsingFromFile() {
         long id = randomIntBetween(0, Integer.MAX_VALUE);
         Path file = translogDir.resolve(Translog.TRANSLOG_FILE_PREFIX + id);
@@ -141,8 +140,8 @@ public class TranslogTests extends ElasticsearchTestCase {
     }
 
     private String randomNonTranslogPatternString(int min, int max) {
-       String string;
-        boolean validPathString = false;
+        String string;
+        boolean validPathString;
         do {
             validPathString = false;
             string = randomRealisticUnicodeOfCodepointLength(randomIntBetween(min, max));
@@ -152,7 +151,7 @@ public class TranslogTests extends ElasticsearchTestCase {
             } catch (InvalidPathException ex) {
                 // some FS don't like our random file names -- let's just skip these random choices
             }
-        } while (Translog.PARSE_ID_PATTERN.matcher(string).matches() && validPathString);
+        } while (Translog.PARSE_ID_PATTERN.matcher(string).matches() || validPathString == false);
         return string;
     }
 

From a70fd88d623cfe928d4e5cfd98ea4a4f56d22412 Mon Sep 17 00:00:00 2001
From: Adrien Grand <jpountz@gmail.com>
Date: Sun, 31 May 2015 11:08:06 +0200
Subject: [PATCH 090/123] Tests: Disable random wrapping of index readers in
 IndexCacheableQueryTests until LUCENE-6500 is fixed.

---
 .../common/lucene/IndexCacheableQueryTests.java       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/elasticsearch/common/lucene/IndexCacheableQueryTests.java b/src/test/java/org/elasticsearch/common/lucene/IndexCacheableQueryTests.java
index cb72ec45c22..c96134d9222 100644
--- a/src/test/java/org/elasticsearch/common/lucene/IndexCacheableQueryTests.java
+++ b/src/test/java/org/elasticsearch/common/lucene/IndexCacheableQueryTests.java
@@ -35,6 +35,7 @@ import org.apache.lucene.search.Scorer;
 import org.apache.lucene.search.Weight;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.util.Bits;
+import org.apache.lucene.util.Version;
 import org.elasticsearch.test.ElasticsearchTestCase;
 
 import java.io.IOException;
@@ -103,7 +104,10 @@ public class IndexCacheableQueryTests extends ElasticsearchTestCase {
         }
 
         IndexReader reader = writer.getReader();
-        IndexSearcher searcher = newSearcher(reader);
+        // IndexReader wrapping is disabled because of LUCENE-6500.
+        // Add it back when we are on 5.3
+        assert Version.LATEST == Version.LUCENE_5_2_0;
+        IndexSearcher searcher = newSearcher(reader, false);
         reader = searcher.getIndexReader(); // reader might be wrapped
         searcher.setQueryCache(cache);
         searcher.setQueryCachingPolicy(policy);
@@ -119,7 +123,10 @@ public class IndexCacheableQueryTests extends ElasticsearchTestCase {
         writer.addDocument(new Document());
 
         IndexReader reader2 = writer.getReader();
-        searcher = newSearcher(reader2);
+        // IndexReader wrapping is disabled because of LUCENE-6500.
+        // Add it back when we are on 5.3
+        assert Version.LATEST == Version.LUCENE_5_2_0;
+        searcher = newSearcher(reader2, false);
         reader2 = searcher.getIndexReader(); // reader might be wrapped
         searcher.setQueryCache(cache);
         searcher.setQueryCachingPolicy(policy);

From 7a082cea4f7fa22365c60e54a1007400697b9d4b Mon Sep 17 00:00:00 2001
From: Britta Weber <britta.weber@elasticsearch.com>
Date: Sun, 31 May 2015 12:45:19 +0200
Subject: [PATCH 091/123] remove check for failure, might rarely not fail at
 all

---
 .../elasticsearch/search/SearchWithRejectionsTests.java   | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/test/java/org/elasticsearch/search/SearchWithRejectionsTests.java b/src/test/java/org/elasticsearch/search/SearchWithRejectionsTests.java
index 3e5bce138d0..322679a584e 100644
--- a/src/test/java/org/elasticsearch/search/SearchWithRejectionsTests.java
+++ b/src/test/java/org/elasticsearch/search/SearchWithRejectionsTests.java
@@ -70,18 +70,12 @@ public class SearchWithRejectionsTests extends ElasticsearchIntegrationTest {
                     .setSearchType(searchType)
                     .execute();
         }
-        int failures = 0;
         for (int i = 0; i < numSearches; i++) {
             try {
-                SearchResponse searchResponse = responses[i].get();
-                if (searchResponse.getFailedShards() > 0) {
-                    failures++;
-                }
+                responses[i].get();
             } catch (Throwable t) {
-                failures++;
             }
         }
-        assertThat(failures, greaterThanOrEqualTo(1));
         awaitBusy(new Predicate<Object>() {
             @Override
             public boolean apply(Object input) {

From ff119f3dffbd8144c0cf61b4edf41c363d54db91 Mon Sep 17 00:00:00 2001
From: Britta Weber <britta.weber@elasticsearch.com>
Date: Sun, 31 May 2015 12:48:56 +0200
Subject: [PATCH 092/123] send request to release search context in finally
 block to be on the save side

---
 .../type/TransportSearchDfsQueryAndFetchAction.java | 13 ++++++++-----
 .../TransportSearchDfsQueryThenFetchAction.java     | 13 ++++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java
index 98a5972af0e..01eefdb564d 100644
--- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java
+++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java
@@ -104,11 +104,14 @@ public class TransportSearchDfsQueryAndFetchAction extends TransportSearchTypeAc
 
                 @Override
                 public void onFailure(Throwable t) {
-                    onSecondPhaseFailure(t, querySearchRequest, shardIndex, dfsResult, counter);
-                    // the query might not have been executed at all (for example because thread pool rejected execution)
-                    // and the search context that was created in dfs phase might not be released.
-                    // release it again to be in the safe side
-                    sendReleaseSearchContext(querySearchRequest.id(), node);
+                    try {
+                        onSecondPhaseFailure(t, querySearchRequest, shardIndex, dfsResult, counter);
+                    } finally {
+                        // the query might not have been executed at all (for example because thread pool rejected execution)
+                        // and the search context that was created in dfs phase might not be released.
+                        // release it again to be in the safe side
+                        sendReleaseSearchContext(querySearchRequest.id(), node);
+                    }
                 }
             });
         }
diff --git a/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java b/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java
index 7b96cc97225..3a4e6d70533 100644
--- a/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java
+++ b/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java
@@ -113,11 +113,14 @@ public class TransportSearchDfsQueryThenFetchAction extends TransportSearchTypeA
 
                 @Override
                 public void onFailure(Throwable t) {
-                    onQueryFailure(t, querySearchRequest, shardIndex, dfsResult, counter);
-                    // the query might not have been executed at all (for example because thread pool rejected execution)
-                    // and the search context that was created in dfs phase might not be released.
-                    // release it again to be in the safe side
-                    sendReleaseSearchContext(querySearchRequest.id(), node);
+                    try {
+                        onQueryFailure(t, querySearchRequest, shardIndex, dfsResult, counter);
+                    } finally {
+                        // the query might not have been executed at all (for example because thread pool rejected execution)
+                        // and the search context that was created in dfs phase might not be released.
+                        // release it again to be in the safe side
+                        sendReleaseSearchContext(querySearchRequest.id(), node);
+                    }
                 }
             });
         }

From 2fe7cde8d1b44215657a6d7096e4f03dc0eda3db Mon Sep 17 00:00:00 2001
From: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date: Sun, 31 May 2015 13:20:49 +0200
Subject: [PATCH 093/123] parent/child: Fix `_parent.type` validation.

A `_parent` field can only point to a type that doesn't exist yet.
The validation that checks this relied on have all mappings in the
MapperService. The issue is that this check is performed on the
elected master node and it may not have the IndexService at all
to perform this check. In that case it creates a temporary IndexService and
MapperService to perform mapping validation, but only the mappings
that are part of the put index call are created, not the already existing mappings.
Because of that the `_parent` field validation can't be performed.

By changing the validation to rely on the cluster state's IndexMetaData instead
we can get around the issue with the IndexService/MapperService on the elected
master node. The IndexMetaData always holds the MappingMetaData instances
for all types.
---
 .../cluster/metadata/MetaDataMappingService.java       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
index 3c2e77316ed..ae6f32edd13 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
@@ -19,6 +19,7 @@
 
 package org.elasticsearch.cluster.metadata;
 
+import com.carrotsearch.hppc.cursors.ObjectCursor;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -37,10 +38,10 @@ import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.Index;
+import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.MergeMappingException;
-import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.mapper.MergeResult;
 import org.elasticsearch.indices.IndexMissingException;
 import org.elasticsearch.indices.IndicesService;
@@ -396,8 +397,11 @@ public class MetaDataMappingService extends AbstractComponent {
                                 // and a put mapping api call, so we don't which type did exist before.
                                 // Also the order of the mappings may be backwards.
                                 if (Version.indexCreated(indexService.getIndexSettings()).onOrAfter(Version.V_2_0_0) && newMapper.parentFieldMapper().active()) {
-                                    if (indexService.mapperService().types().contains(newMapper.parentFieldMapper().type())) {
-                                        throw new IllegalArgumentException("can't add a _parent field that points to an already existing type");
+                                    IndexMetaData indexMetaData = currentState.metaData().index(index);
+                                    for (ObjectCursor<MappingMetaData> mapping : indexMetaData.mappings().values()) {
+                                        if (newMapper.parentFieldMapper().type().equals(mapping.value.type())) {
+                                            throw new IllegalArgumentException("can't add a _parent field that points to an already existing type");
+                                        }
                                     }
                                 }
                             }

From ee08ab6c5ce3e8c6a452d15b8c0eb810ece58871 Mon Sep 17 00:00:00 2001
From: Colin Goodheart-Smithe <colings86@users.noreply.github.com>
Date: Mon, 1 Jun 2015 11:29:05 +0100
Subject: [PATCH 094/123] [TEST] fix failing script REST tests

---
 .../action/update/UpdateRequest.java          |  4 ++++
 .../index/query/TemplateQueryParser.java      |  9 +++++++++
 .../script/AbstractScriptParser.java          |  2 +-
 .../elasticsearch/script/ScriptService.java   |  3 ++-
 .../org/elasticsearch/script/Template.java    | 19 +++++++++++++------
 .../test/rest/ElasticsearchRestTestCase.java  |  2 --
 6 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/elasticsearch/action/update/UpdateRequest.java b/src/main/java/org/elasticsearch/action/update/UpdateRequest.java
index ac1b52a5493..8673e80981d 100644
--- a/src/main/java/org/elasticsearch/action/update/UpdateRequest.java
+++ b/src/main/java/org/elasticsearch/action/update/UpdateRequest.java
@@ -636,6 +636,7 @@ public class UpdateRequest extends InstanceShardOperationRequest<UpdateRequest>
     public UpdateRequest source(BytesReference source) throws Exception {
         ScriptParameterParser scriptParameterParser = new ScriptParameterParser();
         Map<String, Object> scriptParams = null;
+        Script script = null;
         XContentType xContentType = XContentFactory.xContentType(source);
         try (XContentParser parser = XContentFactory.xContent(xContentType).createParser(source)) {
             XContentParser.Token token = parser.nextToken();
@@ -675,6 +676,9 @@ public class UpdateRequest extends InstanceShardOperationRequest<UpdateRequest>
                     script = new Script(scriptValue.script(), scriptValue.scriptType(), scriptParameterParser.lang(), scriptParams);
                 }
             }
+            if (script != null) {
+                this.script = script;
+            }
         }
         return this;
     }
diff --git a/src/main/java/org/elasticsearch/index/query/TemplateQueryParser.java b/src/main/java/org/elasticsearch/index/query/TemplateQueryParser.java
index 040df24ec9f..e48a4fbb686 100644
--- a/src/main/java/org/elasticsearch/index/query/TemplateQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/TemplateQueryParser.java
@@ -96,6 +96,15 @@ public class TemplateQueryParser implements QueryParser {
         return parse(parser, parameterMap);
     }
 
+    public static Template parse(String defaultLang, XContentParser parser, String... parameters) throws IOException {
+
+        Map<String, ScriptService.ScriptType> parameterMap = new HashMap<>(parametersToTypes);
+        for (String parameter : parameters) {
+            parameterMap.put(parameter, ScriptService.ScriptType.INLINE);
+        }
+        return Template.parse(parser, parameterMap, defaultLang);
+    }
+
     public static Template parse(XContentParser parser) throws IOException {
         return parse(parser, parametersToTypes);
     }
diff --git a/src/main/java/org/elasticsearch/script/AbstractScriptParser.java b/src/main/java/org/elasticsearch/script/AbstractScriptParser.java
index 8198dd18ebc..f03edce9682 100644
--- a/src/main/java/org/elasticsearch/script/AbstractScriptParser.java
+++ b/src/main/java/org/elasticsearch/script/AbstractScriptParser.java
@@ -125,7 +125,7 @@ public abstract class AbstractScriptParser<S extends Script> {
         return null;
     }
 
-    public Script parse(Map<String, Object> config, boolean removeMatchedEntries) {
+    public S parse(Map<String, Object> config, boolean removeMatchedEntries) {
         String script = null;
         ScriptType type = null;
         String lang = null;
diff --git a/src/main/java/org/elasticsearch/script/ScriptService.java b/src/main/java/org/elasticsearch/script/ScriptService.java
index f0a50189cd2..60da06ecf93 100644
--- a/src/main/java/org/elasticsearch/script/ScriptService.java
+++ b/src/main/java/org/elasticsearch/script/ScriptService.java
@@ -25,6 +25,7 @@ import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.RemovalListener;
 import com.google.common.cache.RemovalNotification;
 import com.google.common.collect.ImmutableMap;
+
 import org.apache.lucene.util.IOUtils;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.delete.DeleteRequest;
@@ -317,7 +318,7 @@ public class ScriptService extends AbstractComponent implements Closeable {
         try {
             XContentParser parser = XContentFactory.xContent(scriptBytes).createParser(scriptBytes);
             parser.nextToken();
-            Template template = TemplateQueryParser.parse(parser, "params", "script", "template");
+            Template template = TemplateQueryParser.parse(scriptLang, parser, "params", "script", "template");
             if (Strings.hasLength(template.getScript())) {
                 //Just try and compile it
                 //This will have the benefit of also adding the script to the cache if it compiles
diff --git a/src/main/java/org/elasticsearch/script/Template.java b/src/main/java/org/elasticsearch/script/Template.java
index c50a57087bb..b5d8d302ffa 100644
--- a/src/main/java/org/elasticsearch/script/Template.java
+++ b/src/main/java/org/elasticsearch/script/Template.java
@@ -120,17 +120,22 @@ public class Template extends Script {
 
     @SuppressWarnings("unchecked")
     public static Script parse(Map<String, Object> config, boolean removeMatchedEntries) {
-        return new TemplateParser(Collections.EMPTY_MAP).parse(config, removeMatchedEntries);
+        return new TemplateParser(Collections.EMPTY_MAP, MustacheScriptEngineService.NAME).parse(config, removeMatchedEntries);
     }
 
     @SuppressWarnings("unchecked")
     public static Template parse(XContentParser parser) throws IOException {
-        return new TemplateParser(Collections.EMPTY_MAP).parse(parser);
+        return new TemplateParser(Collections.EMPTY_MAP, MustacheScriptEngineService.NAME).parse(parser);
     }
 
     @Deprecated
     public static Template parse(XContentParser parser, Map<String, ScriptType> additionalTemplateFieldNames) throws IOException {
-        return new TemplateParser(additionalTemplateFieldNames).parse(parser);
+        return new TemplateParser(additionalTemplateFieldNames, MustacheScriptEngineService.NAME).parse(parser);
+    }
+
+    @Deprecated
+    public static Template parse(XContentParser parser, Map<String, ScriptType> additionalTemplateFieldNames, String defaultLang) throws IOException {
+        return new TemplateParser(additionalTemplateFieldNames, defaultLang).parse(parser);
     }
 
     @Override
@@ -159,9 +164,11 @@ public class Template extends Script {
 
         private XContentType contentType = null;
         private final Map<String, ScriptType> additionalTemplateFieldNames;
+        private String defaultLang;
 
-        public TemplateParser(Map<String, ScriptType> additionalTemplateFieldNames) {
+        public TemplateParser(Map<String, ScriptType> additionalTemplateFieldNames, String defaultLang) {
             this.additionalTemplateFieldNames = additionalTemplateFieldNames;
+            this.defaultLang = defaultLang;
         }
 
         @Override
@@ -171,7 +178,7 @@ public class Template extends Script {
 
         @Override
         protected Template createScript(String script, ScriptType type, String lang, Map<String, Object> params) {
-            return new Template(script, type, lang == null ? MustacheScriptEngineService.NAME : lang, contentType, params);
+            return new Template(script, type, lang, contentType, params);
         }
 
         @Override
@@ -192,7 +199,7 @@ public class Template extends Script {
 
         @Override
         protected String getDefaultScriptLang() {
-            return MustacheScriptEngineService.NAME;
+            return defaultLang;
         }
     }
 }
diff --git a/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java b/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java
index e8066a5c939..5874b31f09a 100644
--- a/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java
+++ b/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java
@@ -25,7 +25,6 @@ import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
 import com.google.common.collect.Lists;
 
 import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.LuceneTestCase.AwaitsFix;
 import org.apache.lucene.util.LuceneTestCase.Slow;
 import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
 import org.apache.lucene.util.LuceneTestCase.SuppressFsync;
@@ -85,7 +84,6 @@ import java.util.Set;
 @SuppressCodecs("*") // requires custom completion postings format
 @ClusterScope(randomDynamicTemplates = false)
 @TimeoutSuite(millis = 40 * TimeUnits.MINUTE) // timeout the suite after 40min and fail the test.
-@AwaitsFix(bugUrl = "script/10_basic/Indexed script and update/15_script/Script fail due to commit 35a58d874ef56be50a0ad1d7bfb13edb4204d0a3")
 public abstract class ElasticsearchRestTestCase extends ElasticsearchIntegrationTest {
 
     /**

From 4e206cd02d3e8622f34f44736798ea8ae3680ea6 Mon Sep 17 00:00:00 2001
From: Britta Weber <britta.weber@elasticsearch.com>
Date: Mon, 1 Jun 2015 16:38:48 +0200
Subject: [PATCH 095/123] fix log message. exception first, parameters later

---
 .../org/elasticsearch/indices/flush/SyncedFlushService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java b/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java
index 537392a9c98..6c6e38eb87a 100644
--- a/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java
+++ b/src/main/java/org/elasticsearch/indices/flush/SyncedFlushService.java
@@ -381,7 +381,7 @@ public class SyncedFlushService extends AbstractComponent {
 
                 @Override
                 public void handleException(TransportException exp) {
-                    logger.trace("{} error while performing pre synced flush on [{}], skipping", shardId, exp, shard);
+                    logger.trace("{} error while performing pre synced flush on [{}], skipping", exp, shardId, shard);
                     if (countDown.countDown()) {
                         listener.onResponse(commitIds);
                     }

From 4261ee33c2980357f7e87308304aa1893f3241b1 Mon Sep 17 00:00:00 2001
From: Kis Marcell <mkis@inf.u-szeged.hu>
Date: Sun, 17 May 2015 12:48:20 +0200
Subject: [PATCH 096/123] Issue #10588 Display low disk watermark to be
 consistent with documentaiton

Change log entries, add convenience methods, unit tests

Correct allocation decision messages to display used space

Missed a word

Correct displayed threshold value
---
 .../org/elasticsearch/cluster/DiskUsage.java  |  4 ++
 .../decider/DiskThresholdDecider.java         | 54 ++++++++++++-------
 .../elasticsearch/cluster/DiskUsageTests.java |  3 ++
 .../DiskThresholdDeciderUnitTests.java        |  2 +
 4 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/elasticsearch/cluster/DiskUsage.java b/src/main/java/org/elasticsearch/cluster/DiskUsage.java
index 29cac6d7b7c..92725b08831 100644
--- a/src/main/java/org/elasticsearch/cluster/DiskUsage.java
+++ b/src/main/java/org/elasticsearch/cluster/DiskUsage.java
@@ -59,6 +59,10 @@ public class DiskUsage {
         return 100.0 * ((double)freeBytes / totalBytes);
     }
 
+    public double getUsedDiskAsPercentage() {
+        return 100.0 - getFreeDiskAsPercentage();
+    }
+
     public long getFreeBytes() {
         return freeBytes;
     }
diff --git a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java
index 517a729afbf..f87a0521c83 100644
--- a/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java
+++ b/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDecider.java
@@ -142,20 +142,20 @@ public class DiskThresholdDecider extends AllocationDecider {
         private void warnAboutDiskIfNeeded(DiskUsage usage) {
             // Check absolute disk values
             if (usage.getFreeBytes() < DiskThresholdDecider.this.freeBytesThresholdHigh.bytes()) {
-                logger.warn("high disk watermark [{} free] exceeded on {}, shards will be relocated away from this node",
+                logger.warn("high disk watermark [{}] exceeded on {}, shards will be relocated away from this node",
                         DiskThresholdDecider.this.freeBytesThresholdHigh, usage);
             } else if (usage.getFreeBytes() < DiskThresholdDecider.this.freeBytesThresholdLow.bytes()) {
-                logger.info("low disk watermark [{} free] exceeded on {}, replicas will not be assigned to this node",
+                logger.info("low disk watermark [{}] exceeded on {}, replicas will not be assigned to this node",
                         DiskThresholdDecider.this.freeBytesThresholdLow, usage);
             }
 
             // Check percentage disk values
             if (usage.getFreeDiskAsPercentage() < DiskThresholdDecider.this.freeDiskThresholdHigh) {
-                logger.warn("high disk watermark [{} free] exceeded on {}, shards will be relocated away from this node",
-                        Strings.format1Decimals(DiskThresholdDecider.this.freeDiskThresholdHigh, "%"), usage);
+                logger.warn("high disk watermark [{}] exceeded on {}, shards will be relocated away from this node",
+                        Strings.format1Decimals(100.0 - DiskThresholdDecider.this.freeDiskThresholdHigh, "%"), usage);
             } else if (usage.getFreeDiskAsPercentage() < DiskThresholdDecider.this.freeDiskThresholdLow) {
-                logger.info("low disk watermark [{} free] exceeded on {}, replicas will not be assigned to this node",
-                        Strings.format1Decimals(DiskThresholdDecider.this.freeDiskThresholdLow, "%"), usage);
+                logger.info("low disk watermark [{}] exceeded on {}, replicas will not be assigned to this node",
+                        Strings.format1Decimals(100.0 - DiskThresholdDecider.this.freeDiskThresholdLow, "%"), usage);
             }
         }
 
@@ -234,6 +234,16 @@ public class DiskThresholdDecider extends AllocationDecider {
         return freeDiskThresholdHigh;
     }
 
+    // For Testing
+    public Double getUsedDiskThresholdLow() {
+        return 100.0 - freeDiskThresholdLow;
+    }
+
+    // For Testing
+    public Double getUsedDiskThresholdHigh() {
+        return 100.0 - freeDiskThresholdHigh;
+    }
+
     // For Testing
     public ByteSizeValue getFreeBytesThresholdLow() {
         return freeBytesThresholdLow;
@@ -285,6 +295,8 @@ public class DiskThresholdDecider extends AllocationDecider {
 
     @Override
     public Decision canAllocate(ShardRouting shardRouting, RoutingNode node, RoutingAllocation allocation) {
+        double usedDiskThresholdLow = 100.0 - DiskThresholdDecider.this.freeDiskThresholdLow;
+        double usedDiskThresholdHigh = 100.0 - DiskThresholdDecider.this.freeDiskThresholdHigh;
 
         // Always allow allocation if the decider is disabled
         if (!enabled) {
@@ -342,9 +354,11 @@ public class DiskThresholdDecider extends AllocationDecider {
 
         // First, check that the node currently over the low watermark
         double freeDiskPercentage = usage.getFreeDiskAsPercentage();
+        // Cache the used disk percentage for displaying disk percentages consistent with documentation
+        double usedDiskPercentage = usage.getUsedDiskAsPercentage();
         long freeBytes = usage.getFreeBytes();
         if (logger.isTraceEnabled()) {
-            logger.trace("Node [{}] has {}% free disk", node.nodeId(), freeDiskPercentage);
+            logger.trace("Node [{}] has {}% used disk", node.nodeId(), usedDiskPercentage);
         }
 
         // a flag for whether the primary shard has been previously allocated
@@ -387,20 +401,20 @@ public class DiskThresholdDecider extends AllocationDecider {
             // If the shard is a replica or has a primary that has already been allocated before, check the low threshold
             if (!shardRouting.primary() || (shardRouting.primary() && primaryHasBeenAllocated)) {
                 if (logger.isDebugEnabled()) {
-                    logger.debug("Less than the required {} free disk threshold ({} free) on node [{}], preventing allocation",
-                            Strings.format1Decimals(freeDiskThresholdLow, "%"),
-                            Strings.format1Decimals(freeDiskPercentage, "%"), node.nodeId());
+                    logger.debug("More than the allowed {} used disk threshold ({} used) on node [{}], preventing allocation",
+                            Strings.format1Decimals(usedDiskThresholdLow, "%"),
+                            Strings.format1Decimals(usedDiskPercentage, "%"), node.nodeId());
                 }
-                return allocation.decision(Decision.NO, NAME, "less than required [%s%%] free disk on node, free: [%s%%]",
-                        freeDiskThresholdLow, freeDiskPercentage);
+                return allocation.decision(Decision.NO, NAME, "more than allowed [%s%%] used disk on node, free: [%s%%]",
+                        usedDiskThresholdLow, freeDiskPercentage);
             } else if (freeDiskPercentage > freeDiskThresholdHigh) {
                 // Allow the shard to be allocated because it is primary that
                 // has never been allocated if it's under the high watermark
                 if (logger.isDebugEnabled()) {
-                    logger.debug("Less than the required {} free disk threshold ({} free) on node [{}], " +
+                    logger.debug("More than the allowed {} used disk threshold ({} used) on node [{}], " +
                                     "but allowing allocation because primary has never been allocated",
-                            Strings.format1Decimals(freeDiskThresholdLow, "%"),
-                            Strings.format1Decimals(freeDiskPercentage, "%"), node.nodeId());
+                            Strings.format1Decimals(usedDiskThresholdLow, "%"),
+                            Strings.format1Decimals(usedDiskPercentage, "%"), node.nodeId());
                 }
                 return allocation.decision(Decision.YES, NAME, "primary has never been allocated before");
             } else {
@@ -412,8 +426,8 @@ public class DiskThresholdDecider extends AllocationDecider {
                             Strings.format1Decimals(freeDiskThresholdHigh, "%"),
                             Strings.format1Decimals(freeDiskPercentage, "%"), node.nodeId());
                 }
-                return allocation.decision(Decision.NO, NAME, "less than required [%s%%] free disk on node, free: [%s%%]",
-                        freeDiskThresholdLow, freeDiskPercentage);
+                return allocation.decision(Decision.NO, NAME, "more than allowed [%s%%] used disk on node, free: [%s%%]",
+                        usedDiskThresholdHigh, freeDiskPercentage);
             }
         }
 
@@ -429,10 +443,10 @@ public class DiskThresholdDecider extends AllocationDecider {
                     freeBytesThresholdLow, new ByteSizeValue(freeBytesAfterShard));
         }
         if (freeSpaceAfterShard < freeDiskThresholdHigh) {
-            logger.warn("After allocating, node [{}] would have less than the required {} free disk threshold ({} free), preventing allocation",
+            logger.warn("After allocating, node [{}] would have more than the allowed {} free disk threshold ({} free), preventing allocation",
                     node.nodeId(), Strings.format1Decimals(freeDiskThresholdHigh, "%"), Strings.format1Decimals(freeSpaceAfterShard, "%"));
-            return allocation.decision(Decision.NO, NAME, "after allocation less than required [%s%%] free disk on node, free: [%s%%]",
-                    freeDiskThresholdLow, freeSpaceAfterShard);
+            return allocation.decision(Decision.NO, NAME, "after allocation more than allowed [%s%%] used disk on node, free: [%s%%]",
+                    usedDiskThresholdLow, freeSpaceAfterShard);
         }
 
         return allocation.decision(Decision.YES, NAME, "enough disk for shard on node, free: [%s]", new ByteSizeValue(freeBytes));
diff --git a/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java b/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java
index 62196446de8..c6e5ce2fb59 100644
--- a/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java
+++ b/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java
@@ -30,6 +30,7 @@ public class DiskUsageTests extends ElasticsearchTestCase {
     public void diskUsageCalcTest() {
         DiskUsage du = new DiskUsage("node1", "n1", 100, 40);
         assertThat(du.getFreeDiskAsPercentage(), equalTo(40.0));
+        assertThat(du.getUsedDiskAsPercentage(), equalTo(100.0 - 40.0));
         assertThat(du.getFreeBytes(), equalTo(40L));
         assertThat(du.getUsedBytes(), equalTo(60L));
         assertThat(du.getTotalBytes(), equalTo(100L));
@@ -67,11 +68,13 @@ public class DiskUsageTests extends ElasticsearchTestCase {
                 assertThat(du.getTotalBytes(), equalTo(0L));
                 assertThat(du.getUsedBytes(), equalTo(-free));
                 assertThat(du.getFreeDiskAsPercentage(), equalTo(100.0));
+                assertThat(du.getUsedDiskAsPercentage(), equalTo(0.0));
             } else {
                 assertThat(du.getFreeBytes(), equalTo(free));
                 assertThat(du.getTotalBytes(), equalTo(total));
                 assertThat(du.getUsedBytes(), equalTo(total - free));
                 assertThat(du.getFreeDiskAsPercentage(), equalTo(100.0 * ((double) free / total)));
+                assertThat(du.getUsedDiskAsPercentage(), equalTo(100.0 - (100.0 * ((double) free / total))));
             }
         }
     }
diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java
index 4424af66fa6..6b76a41c333 100644
--- a/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java
+++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java
@@ -20,6 +20,7 @@
 package org.elasticsearch.cluster.routing.allocation.decider;
 
 import com.google.common.collect.ImmutableMap;
+
 import org.elasticsearch.cluster.ClusterInfo;
 import org.elasticsearch.cluster.ClusterInfoService;
 import org.elasticsearch.cluster.DiskUsage;
@@ -62,6 +63,7 @@ public class DiskThresholdDeciderUnitTests extends ElasticsearchTestCase {
         assertThat(decider.getFreeDiskThresholdHigh(), equalTo(10.0d));
         assertThat(decider.getFreeBytesThresholdLow(), equalTo(ByteSizeValue.parseBytesSizeValue("0b")));
         assertThat(decider.getFreeDiskThresholdLow(), equalTo(15.0d));
+        assertThat(decider.getUsedDiskThresholdLow(), equalTo(85.0d));
         assertThat(decider.getRerouteInterval().seconds(), equalTo(60L));
         assertTrue(decider.isEnabled());
         assertTrue(decider.isIncludeRelocations());

From d437135321587a9090fca25282513ecb98aeba77 Mon Sep 17 00:00:00 2001
From: jaymode <jay.modi@elasticsearch.com>
Date: Mon, 1 Jun 2015 15:10:42 -0400
Subject: [PATCH 097/123] always normalize root paths during resolution of
 paths

Currently, when trying to determine if a location is within one of the configured repository
paths, we compare the root path against a normalized path but the root path is never
normalized so the check may incorrectly fail. This change normalizes the root path and
compares it to the other normalized path.

Relates to #11426
---
 src/main/java/org/elasticsearch/common/io/PathUtils.java  | 5 +++--
 src/test/java/org/elasticsearch/env/EnvironmentTests.java | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/elasticsearch/common/io/PathUtils.java b/src/main/java/org/elasticsearch/common/io/PathUtils.java
index 83ec5cf8214..103ac19df68 100644
--- a/src/main/java/org/elasticsearch/common/io/PathUtils.java
+++ b/src/main/java/org/elasticsearch/common/io/PathUtils.java
@@ -83,8 +83,9 @@ public final class PathUtils {
      */
     public static Path get(Path[] roots, String path) {
         for (Path root : roots) {
-            Path normalizedPath = root.resolve(path).normalize();
-            if(normalizedPath.startsWith(root)) {
+            Path normalizedRoot = root.normalize();
+            Path normalizedPath = normalizedRoot.resolve(path).normalize();
+            if(normalizedPath.startsWith(normalizedRoot)) {
                 return normalizedPath;
             }
         }
diff --git a/src/test/java/org/elasticsearch/env/EnvironmentTests.java b/src/test/java/org/elasticsearch/env/EnvironmentTests.java
index 68a4bbdcbea..3eba6c46c5a 100644
--- a/src/test/java/org/elasticsearch/env/EnvironmentTests.java
+++ b/src/test/java/org/elasticsearch/env/EnvironmentTests.java
@@ -77,13 +77,14 @@ public class EnvironmentTests extends ElasticsearchTestCase {
         Environment environment = newEnvironment();
         assertThat(environment.resolveRepoFile("/test/repos/repo1"), nullValue());
         assertThat(environment.resolveRepoFile("test/repos/repo1"), nullValue());
-        environment = newEnvironment(settingsBuilder().putArray("path.repo", "/test/repos", "/another/repos").build());
+        environment = newEnvironment(settingsBuilder().putArray("path.repo", "/test/repos", "/another/repos", "/test/repos/../other").build());
         assertThat(environment.resolveRepoFile("/test/repos/repo1"), notNullValue());
         assertThat(environment.resolveRepoFile("test/repos/repo1"), notNullValue());
         assertThat(environment.resolveRepoFile("/another/repos/repo1"), notNullValue());
         assertThat(environment.resolveRepoFile("/test/repos/../repo1"), nullValue());
         assertThat(environment.resolveRepoFile("/test/repos/../repos/repo1"), notNullValue());
         assertThat(environment.resolveRepoFile("/somethingeles/repos/repo1"), nullValue());
+        assertThat(environment.resolveRepoFile("/test/other/repo"), notNullValue());
     }
 
 }

From a4e0ecc17278eba5db3f17fe7c5338ea0ea643c6 Mon Sep 17 00:00:00 2001
From: Lee Hinman <lee@writequit.org>
Date: Mon, 1 Jun 2015 15:45:26 -0600
Subject: [PATCH 098/123] [TEST] Fix incorrect message in
 DiskThresholdDeciderTests

---
 .../routing/allocation/decider/DiskThresholdDeciderTests.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java b/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java
index c1a83da0b78..707d54ee517 100644
--- a/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java
+++ b/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java
@@ -786,7 +786,7 @@ public class DiskThresholdDeciderTests extends ElasticsearchAllocationTestCase {
             fail("should not have been able to reroute the shard");
         } catch (IllegalArgumentException e) {
             assertThat("can't allocated because there isn't enough room: " + e.getMessage(),
-                    e.getMessage().contains("less than required [30.0%] free disk on node, free: [26.0%]"), equalTo(true));
+                    e.getMessage().contains("more than allowed [70.0%] used disk on node, free: [26.0%]"), equalTo(true));
         }
 
     }

From f6191d05defc0c6c6d6cb42f25eab42bfdf520f4 Mon Sep 17 00:00:00 2001
From: jaymode <jay.modi@elasticsearch.com>
Date: Thu, 30 Apr 2015 13:14:05 -0400
Subject: [PATCH 099/123] add ability to prompt for selected settings on
 startup

Some settings may be considered sensitive, such as passwords, and storing them
in the configuration file on disk is not good from a security perspective. This change
allows settings to have a special value, `${prompt::text}` or `${prompt::secret}`, to
indicate that  elasticsearch should prompt the user for the actual value on startup.
This only works when started in the foreground. In cases where elasticsearch is started
as a service or in the background, an exception will be thrown.

Closes #10838
---
 docs/reference/setup/configuration.asciidoc   | 23 +++++
 .../elasticsearch/bootstrap/Bootstrap.java    | 20 +++--
 .../org/elasticsearch/common/cli/CliTool.java |  2 +-
 .../common/settings/Settings.java             | 16 +++-
 .../internal/InternalSettingsPreparer.java    | 83 +++++++++++++++++--
 .../elasticsearch/plugins/PluginManager.java  |  3 +-
 .../org/elasticsearch/tribe/TribeService.java |  3 +-
 .../transport/TransportClientRetryTests.java  |  3 +-
 .../transport/TransportClientTests.java       |  3 +-
 .../common/cli/CliToolTests.java              | 45 ++++++++++
 .../common/settings/SettingsTests.java        | 11 +++
 .../memory/IndexingMemoryControllerTests.java |  3 +-
 .../InternalSettingsPreparerTests.java        | 81 +++++++++++++++++-
 .../test/ElasticsearchSingleNodeTest.java     |  3 +-
 .../org/elasticsearch/test/ExternalNode.java  |  5 +-
 .../test/ExternalTestCluster.java             |  3 +-
 .../test/InternalTestCluster.java             |  5 +-
 .../elasticsearch/tribe/TribeUnitTests.java   |  5 +-
 18 files changed, 288 insertions(+), 29 deletions(-)

diff --git a/docs/reference/setup/configuration.asciidoc b/docs/reference/setup/configuration.asciidoc
index b822b223ce5..2bff0957690 100644
--- a/docs/reference/setup/configuration.asciidoc
+++ b/docs/reference/setup/configuration.asciidoc
@@ -264,6 +264,29 @@ file which will resolve to an environment setting, for example:
 }
 --------------------------------------------------
 
+Additionally, for settings that you do not wish to store in the configuration
+file, you can use the value `${prompt::text}` or `${prompt::secret}` and start
+Elasticsearch in the foreground. `${prompt::secret}` has echoing disabled so
+that the value entered will not be shown in your terminal; `${prompt::text}`
+will allow you to see the value as you type it in. For example:
+
+[source,yaml]
+--------------------------------------------------
+node:
+  name: ${prompt::text}
+--------------------------------------------------
+
+On execution of the `elasticsearch` command, you will be prompted to enter
+the actual value like so:
+
+[source,sh]
+--------------------------------------------------
+Enter value for [node.name]:
+--------------------------------------------------
+
+NOTE: Elasticsearch will not start if `${prompt::text}` or `${prompt::secret}`
+is used in the settings and the process is run as a service or in the background.
+
 The location of the configuration file can be set externally using a
 system property:
 
diff --git a/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java b/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
index 84663f60a4d..912d0800533 100644
--- a/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
+++ b/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
@@ -25,6 +25,7 @@ import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.Version;
 import org.elasticsearch.common.PidFile;
 import org.elasticsearch.common.SuppressForbidden;
+import org.elasticsearch.common.cli.Terminal;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.inject.CreationException;
 import org.elasticsearch.common.inject.spi.Message;
@@ -163,8 +164,16 @@ public class Bootstrap {
         
         // install SM after natives, shutdown hooks, etc.
         setupSecurity(settings, environment);
-        
-        NodeBuilder nodeBuilder = NodeBuilder.nodeBuilder().settings(settings).loadConfigSettings(false);
+
+        // We do not need to reload system properties here as we have already applied them in building the settings and
+        // reloading could cause multiple prompts to the user for values if a system property was specified with a prompt
+        // placeholder
+        Settings nodeSettings = Settings.settingsBuilder()
+                .put(settings)
+                .put(InternalSettingsPreparer.IGNORE_SYSTEM_PROPERTIES_SETTING, true)
+                .build();
+
+        NodeBuilder nodeBuilder = NodeBuilder.nodeBuilder().settings(nodeSettings).loadConfigSettings(false);
         node = nodeBuilder.build();
     }
     
@@ -195,8 +204,9 @@ public class Bootstrap {
         }
     }
 
-    private static Tuple<Settings, Environment> initialSettings() {
-        return InternalSettingsPreparer.prepareSettings(EMPTY_SETTINGS, true);
+    private static Tuple<Settings, Environment> initialSettings(boolean foreground) {
+        Terminal terminal = foreground ? Terminal.DEFAULT : null;
+        return InternalSettingsPreparer.prepareSettings(EMPTY_SETTINGS, true, terminal);
     }
 
     private void start() {
@@ -227,7 +237,7 @@ public class Bootstrap {
         Settings settings = null;
         Environment environment = null;
         try {
-            Tuple<Settings, Environment> tuple = initialSettings();
+            Tuple<Settings, Environment> tuple = initialSettings(foreground);
             settings = tuple.v1();
             environment = tuple.v2();
 
diff --git a/src/main/java/org/elasticsearch/common/cli/CliTool.java b/src/main/java/org/elasticsearch/common/cli/CliTool.java
index 71e87943349..b0784a57ca7 100644
--- a/src/main/java/org/elasticsearch/common/cli/CliTool.java
+++ b/src/main/java/org/elasticsearch/common/cli/CliTool.java
@@ -93,7 +93,7 @@ public abstract class CliTool {
         Preconditions.checkArgument(config.cmds().size() != 0, "At least one command must be configured");
         this.config = config;
         this.terminal = terminal;
-        Tuple<Settings, Environment> tuple = InternalSettingsPreparer.prepareSettings(EMPTY_SETTINGS, true);
+        Tuple<Settings, Environment> tuple = InternalSettingsPreparer.prepareSettings(EMPTY_SETTINGS, true, terminal);
         settings = tuple.v1();
         env = tuple.v2();
     }
diff --git a/src/main/java/org/elasticsearch/common/settings/Settings.java b/src/main/java/org/elasticsearch/common/settings/Settings.java
index 67bd3b00f44..7c79b3fc1d4 100644
--- a/src/main/java/org/elasticsearch/common/settings/Settings.java
+++ b/src/main/java/org/elasticsearch/common/settings/Settings.java
@@ -1211,7 +1211,7 @@ public final class Settings implements ToXContent {
          * tries and resolve it against an environment variable ({@link System#getenv(String)}), and last, tries
          * and replace it with another setting already set on this builder.
          */
-        public Builder replacePropertyPlaceholders() {
+        public Builder replacePropertyPlaceholders(String... ignoredValues) {
             PropertyPlaceholder propertyPlaceholder = new PropertyPlaceholder("${", "}", false);
             PropertyPlaceholder.PlaceholderResolver placeholderResolver = new PropertyPlaceholder.PlaceholderResolver() {
                     @Override
@@ -1241,7 +1241,19 @@ public final class Settings implements ToXContent {
                     }
                 };
             for (Map.Entry<String, String> entry : Maps.newHashMap(map).entrySet()) {
-                String value = propertyPlaceholder.replacePlaceholders(entry.getValue(), placeholderResolver);
+                String possiblePlaceholder = entry.getValue();
+                boolean ignored = false;
+                for (String ignoredValue : ignoredValues) {
+                    if (ignoredValue.equals(possiblePlaceholder)) {
+                        ignored = true;
+                        break;
+                    }
+                }
+                if (ignored) {
+                    continue;
+                }
+
+                String value = propertyPlaceholder.replacePlaceholders(possiblePlaceholder, placeholderResolver);
                 // if the values exists and has length, we should maintain it  in the map
                 // otherwise, the replace process resolved into removing it
                 if (Strings.hasLength(value)) {
diff --git a/src/main/java/org/elasticsearch/node/internal/InternalSettingsPreparer.java b/src/main/java/org/elasticsearch/node/internal/InternalSettingsPreparer.java
index e8973753b2a..68c2722940e 100644
--- a/src/main/java/org/elasticsearch/node/internal/InternalSettingsPreparer.java
+++ b/src/main/java/org/elasticsearch/node/internal/InternalSettingsPreparer.java
@@ -20,9 +20,11 @@
 package org.elasticsearch.node.internal;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.UnmodifiableIterator;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.common.Names;
 import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.cli.Terminal;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
@@ -41,10 +43,38 @@ public class InternalSettingsPreparer {
 
     static final List<String> ALLOWED_SUFFIXES = ImmutableList.of(".yml", ".yaml", ".json", ".properties");
 
+    public static final String SECRET_PROMPT_VALUE = "${prompt::secret}";
+    public static final String TEXT_PROMPT_VALUE = "${prompt::text}";
+    public static final String IGNORE_SYSTEM_PROPERTIES_SETTING = "config.ignore_system_properties";
+
+    /**
+     * Prepares the settings by gathering all elasticsearch system properties, optionally loading the configuration settings,
+     * and then replacing all property placeholders. This method will not work with settings that have <code>__prompt__</code>
+     * as their value unless they have been resolved previously.
+     * @param pSettings The initial settings to use
+     * @param loadConfigSettings flag to indicate whether to load settings from the configuration directory/file
+     * @return the {@link Settings} and {@link Environment} as a {@link Tuple}
+     */
     public static Tuple<Settings, Environment> prepareSettings(Settings pSettings, boolean loadConfigSettings) {
+        return prepareSettings(pSettings, loadConfigSettings, null);
+    }
+
+    /**
+     * Prepares the settings by gathering all elasticsearch system properties, optionally loading the configuration settings,
+     * and then replacing all property placeholders. If a {@link Terminal} is provided and configuration settings are loaded,
+     * settings with the <code>__prompt__</code> value will result in a prompt for the setting to the user.
+     * @param pSettings The initial settings to use
+     * @param loadConfigSettings flag to indicate whether to load settings from the configuration directory/file
+     * @param terminal the Terminal to use for input/output
+     * @return the {@link Settings} and {@link Environment} as a {@link Tuple}
+     */
+    public static Tuple<Settings, Environment> prepareSettings(Settings pSettings, boolean loadConfigSettings, Terminal terminal) {
         // ignore this prefixes when getting properties from es. and elasticsearch.
         String[] ignorePrefixes = new String[]{"es.default.", "elasticsearch.default."};
-        boolean useSystemProperties = !pSettings.getAsBoolean("config.ignore_system_properties", false);
+        // ignore the special prompt placeholders since they have the same format as property placeholders and will be resolved
+        // as having a default value because of the ':' in the format
+        String[] ignoredPlaceholders = new String[] { SECRET_PROMPT_VALUE, TEXT_PROMPT_VALUE };
+        boolean useSystemProperties = !pSettings.getAsBoolean(IGNORE_SYSTEM_PROPERTIES_SETTING, false);
         // just create enough settings to build the environment
         Settings.Builder settingsBuilder = settingsBuilder().put(pSettings);
         if (useSystemProperties) {
@@ -53,7 +83,7 @@ public class InternalSettingsPreparer {
                     .putProperties("elasticsearch.", System.getProperties(), ignorePrefixes)
                     .putProperties("es.", System.getProperties(), ignorePrefixes);
         }
-        settingsBuilder.replacePropertyPlaceholders();
+        settingsBuilder.replacePropertyPlaceholders(ignoredPlaceholders);
 
         Environment environment = new Environment(settingsBuilder.build());
 
@@ -91,17 +121,17 @@ public class InternalSettingsPreparer {
             settingsBuilder.putProperties("elasticsearch.", System.getProperties(), ignorePrefixes)
                     .putProperties("es.", System.getProperties(), ignorePrefixes);
         }
-        settingsBuilder.replacePropertyPlaceholders();
+        settingsBuilder.replacePropertyPlaceholders(ignoredPlaceholders);
 
         // allow to force set properties based on configuration of the settings provided
         for (Map.Entry<String, String> entry : pSettings.getAsMap().entrySet()) {
             String setting = entry.getKey();
             if (setting.startsWith("force.")) {
                 settingsBuilder.remove(setting);
-                settingsBuilder.put(setting.substring(".force".length()), entry.getValue());
+                settingsBuilder.put(setting.substring("force.".length()), entry.getValue());
             }
         }
-        settingsBuilder.replacePropertyPlaceholders();
+        settingsBuilder.replacePropertyPlaceholders(ignoredPlaceholders);
 
         // generate the name
         if (settingsBuilder.get("name") == null) {
@@ -123,7 +153,7 @@ public class InternalSettingsPreparer {
             settingsBuilder.put(ClusterName.SETTING, ClusterName.DEFAULT.value());
         }
 
-        Settings v1 = settingsBuilder.build();
+        Settings v1 = replacePromptPlaceholders(settingsBuilder.build(), terminal);
         environment = new Environment(v1);
 
         // put back the env settings
@@ -135,4 +165,45 @@ public class InternalSettingsPreparer {
 
         return new Tuple<>(v1, environment);
     }
+
+    static Settings replacePromptPlaceholders(Settings settings, Terminal terminal) {
+        UnmodifiableIterator<Map.Entry<String, String>> iter = settings.getAsMap().entrySet().iterator();
+        Settings.Builder builder = Settings.builder();
+
+        while (iter.hasNext()) {
+            Map.Entry<String, String> entry = iter.next();
+            String value = entry.getValue();
+            String key = entry.getKey();
+            switch (value) {
+                case SECRET_PROMPT_VALUE:
+                    String secretValue = promptForValue(key, terminal, true);
+                    if (Strings.hasLength(secretValue)) {
+                        builder.put(key, secretValue);
+                    }
+                    break;
+                case TEXT_PROMPT_VALUE:
+                    String textValue = promptForValue(key, terminal, false);
+                    if (Strings.hasLength(textValue)) {
+                        builder.put(key, textValue);
+                    }
+                    break;
+                default:
+                    builder.put(key, value);
+                    break;
+            }
+        }
+
+        return builder.build();
+    }
+
+    static String promptForValue(String key, Terminal terminal, boolean secret) {
+        if (terminal == null) {
+            throw new UnsupportedOperationException("found property [" + key + "] with value [" + (secret ? SECRET_PROMPT_VALUE : TEXT_PROMPT_VALUE) +"]. prompting for property values is only supported when running elasticsearch in the foreground");
+        }
+
+        if (secret) {
+            return new String(terminal.readSecret("Enter value for [%s]: ", key));
+        }
+        return terminal.readText("Enter value for [%s]: ", key);
+    }
 }
diff --git a/src/main/java/org/elasticsearch/plugins/PluginManager.java b/src/main/java/org/elasticsearch/plugins/PluginManager.java
index f8802b658c2..31b235ceda7 100644
--- a/src/main/java/org/elasticsearch/plugins/PluginManager.java
+++ b/src/main/java/org/elasticsearch/plugins/PluginManager.java
@@ -25,6 +25,7 @@ import com.google.common.collect.Iterators;
 import org.apache.lucene.util.IOUtils;
 import org.elasticsearch.*;
 import org.elasticsearch.common.SuppressForbidden;
+import org.elasticsearch.common.cli.Terminal;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.http.client.HttpDownloadHelper;
 import org.elasticsearch.common.io.FileSystemUtils;
@@ -338,7 +339,7 @@ public class PluginManager {
     private static final int EXIT_CODE_ERROR = 70;
 
     public static void main(String[] args) {
-        Tuple<Settings, Environment> initialSettings = InternalSettingsPreparer.prepareSettings(EMPTY_SETTINGS, true);
+        Tuple<Settings, Environment> initialSettings = InternalSettingsPreparer.prepareSettings(EMPTY_SETTINGS, true, Terminal.DEFAULT);
 
         try {
             Files.createDirectories(initialSettings.v2().pluginsFile());
diff --git a/src/main/java/org/elasticsearch/tribe/TribeService.java b/src/main/java/org/elasticsearch/tribe/TribeService.java
index 546977c3aca..f2f21a1d1ca 100644
--- a/src/main/java/org/elasticsearch/tribe/TribeService.java
+++ b/src/main/java/org/elasticsearch/tribe/TribeService.java
@@ -45,6 +45,7 @@ import org.elasticsearch.discovery.DiscoveryService;
 import org.elasticsearch.gateway.GatewayService;
 import org.elasticsearch.node.Node;
 import org.elasticsearch.node.NodeBuilder;
+import org.elasticsearch.node.internal.InternalSettingsPreparer;
 import org.elasticsearch.rest.RestStatus;
 
 import java.util.EnumSet;
@@ -128,7 +129,7 @@ public class TribeService extends AbstractLifecycleComponent<TribeService> {
             sb.put("node.name", settings.get("name") + "/" + entry.getKey());
             sb.put("path.home", settings.get("path.home")); // pass through ES home dir
             sb.put(TRIBE_NAME, entry.getKey());
-            sb.put("config.ignore_system_properties", true);
+            sb.put(InternalSettingsPreparer.IGNORE_SYSTEM_PROPERTIES_SETTING, true);
             if (sb.get("http.enabled") == null) {
                 sb.put("http.enabled", false);
             }
diff --git a/src/test/java/org/elasticsearch/client/transport/TransportClientRetryTests.java b/src/test/java/org/elasticsearch/client/transport/TransportClientRetryTests.java
index 724e5ff50a9..dec47e58008 100644
--- a/src/test/java/org/elasticsearch/client/transport/TransportClientRetryTests.java
+++ b/src/test/java/org/elasticsearch/client/transport/TransportClientRetryTests.java
@@ -28,6 +28,7 @@ import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.TransportAddress;
+import org.elasticsearch.node.internal.InternalSettingsPreparer;
 import org.elasticsearch.plugins.PluginsService;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.elasticsearch.test.InternalTestCluster;
@@ -61,7 +62,7 @@ public class TransportClientRetryTests extends ElasticsearchIntegrationTest {
                 .put("node.mode", InternalTestCluster.nodeMode())
                 .put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, false)
                 .put(ClusterName.SETTING, internalCluster().getClusterName())
-                .put("config.ignore_system_properties", true)
+                .put(InternalSettingsPreparer.IGNORE_SYSTEM_PROPERTIES_SETTING, true)
                 .put("path.home", createTempDir());
 
         try (TransportClient transportClient = TransportClient.builder().settings(builder.build()).build()) {
diff --git a/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java b/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java
index 86d39bb936b..70f96f2ede0 100644
--- a/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java
+++ b/src/test/java/org/elasticsearch/client/transport/TransportClientTests.java
@@ -25,6 +25,7 @@ import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.node.Node;
+import org.elasticsearch.node.internal.InternalSettingsPreparer;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
 import org.elasticsearch.transport.TransportService;
@@ -59,7 +60,7 @@ public class TransportClientTests extends ElasticsearchIntegrationTest {
                 .put("path.home", createTempDir())
                 .put("node.name", "testNodeVersionIsUpdated")
                 .put("http.enabled", false)
-                .put("config.ignore_system_properties", true) // make sure we get what we set :)
+                .put(InternalSettingsPreparer.IGNORE_SYSTEM_PROPERTIES_SETTING, true) // make sure we get what we set :)
                 .build()).clusterName("foobar").build();
         node.start();
         try {
diff --git a/src/test/java/org/elasticsearch/common/cli/CliToolTests.java b/src/test/java/org/elasticsearch/common/cli/CliToolTests.java
index 72db9950ded..eea1d0614a1 100644
--- a/src/test/java/org/elasticsearch/common/cli/CliToolTests.java
+++ b/src/test/java/org/elasticsearch/common/cli/CliToolTests.java
@@ -25,10 +25,12 @@ import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
+import org.elasticsearch.node.internal.InternalSettingsPreparer;
 import org.junit.Test;
 
 import java.io.IOException;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static org.elasticsearch.common.cli.CliToolConfig.Builder.cmd;
@@ -271,6 +273,49 @@ public class CliToolTests extends CliToolTestCase {
         tool.parse("cmd", Strings.splitStringByCommaToArray("--help"));
     }
 
+    @Test
+    public void testPromptForSetting() throws Exception {
+        final AtomicInteger counter = new AtomicInteger();
+        final AtomicReference<String> promptedSecretValue = new AtomicReference<>(null);
+        final AtomicReference<String> promptedTextValue = new AtomicReference<>(null);
+        final Terminal terminal = new MockTerminal() {
+            @Override
+            public char[] readSecret(String text, Object... args) {
+                counter.incrementAndGet();
+                assertThat(args, arrayContaining((Object) "foo.password"));
+                return "changeit".toCharArray();
+            }
+
+            @Override
+            public String readText(String text, Object... args) {
+                counter.incrementAndGet();
+                assertThat(args, arrayContaining((Object) "replace"));
+                return "replaced";
+            }
+        };
+        final NamedCommand cmd = new NamedCommand("noop", terminal) {
+            @Override
+            public CliTool.ExitStatus execute(Settings settings, Environment env) {
+                promptedSecretValue.set(settings.get("foo.password"));
+                promptedTextValue.set(settings.get("replace"));
+                return CliTool.ExitStatus.OK;
+            }
+        };
+
+        System.setProperty("es.foo.password", InternalSettingsPreparer.SECRET_PROMPT_VALUE);
+        System.setProperty("es.replace", InternalSettingsPreparer.TEXT_PROMPT_VALUE);
+        try {
+            new SingleCmdTool("tool", terminal, cmd).execute();
+        } finally {
+            System.clearProperty("es.foo.password");
+            System.clearProperty("es.replace");
+        }
+
+        assertThat(counter.intValue(), is(2));
+        assertThat(promptedSecretValue.get(), is("changeit"));
+        assertThat(promptedTextValue.get(), is("replaced"));
+    }
+
     private void assertStatus(int status, CliTool.ExitStatus expectedStatus) {
         assertThat(status, is(expectedStatus.status()));
     }
diff --git a/src/test/java/org/elasticsearch/common/settings/SettingsTests.java b/src/test/java/org/elasticsearch/common/settings/SettingsTests.java
index c8334ba0691..1dbaf32f06c 100644
--- a/src/test/java/org/elasticsearch/common/settings/SettingsTests.java
+++ b/src/test/java/org/elasticsearch/common/settings/SettingsTests.java
@@ -137,6 +137,17 @@ public class SettingsTests extends ElasticsearchTestCase {
         assertThat(settings.get("setting1"), is(nullValue()));
     }
 
+    @Test
+    public void testReplacePropertiesPlaceholderIgnores() {
+        Settings settings = settingsBuilder()
+                .put("setting1", "${foo.bar}")
+                .put("setting2", "${foo.bar1}")
+                .replacePropertyPlaceholders("${foo.bar}", "${foo.bar1}")
+                .build();
+        assertThat(settings.get("setting1"), is("${foo.bar}"));
+        assertThat(settings.get("setting2"), is("${foo.bar1}"));
+    }
+
     @Test
     public void testUnFlattenedSettings() {
         Settings settings = settingsBuilder()
diff --git a/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerTests.java b/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerTests.java
index a7e09a3af88..6914bcb95d4 100644
--- a/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerTests.java
+++ b/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerTests.java
@@ -27,6 +27,7 @@ import org.elasticsearch.common.util.concurrent.EsExecutors;
 import org.elasticsearch.index.engine.EngineConfig;
 import org.elasticsearch.index.shard.IndexShard;
 import org.elasticsearch.indices.IndicesService;
+import org.elasticsearch.node.internal.InternalSettingsPreparer;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.junit.Test;
 
@@ -143,7 +144,7 @@ public class IndexingMemoryControllerTests extends ElasticsearchIntegrationTest
                         .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 0)
                         .put(EsExecutors.PROCESSORS, 1) // limit the number of threads created
                         .put("http.enabled", false)
-                        .put("config.ignore_system_properties", true) // make sure we get what we set :)
+                        .put(InternalSettingsPreparer.IGNORE_SYSTEM_PROPERTIES_SETTING, true) // make sure we get what we set :)
                         .put("indices.memory.interval", "100ms")
                         .put(settings)
         );
diff --git a/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java b/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java
index 315a5f7f2bd..82b6a2a601b 100644
--- a/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java
+++ b/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java
@@ -19,6 +19,8 @@
 
 package org.elasticsearch.node.internal;
 
+import org.elasticsearch.common.cli.CliToolTestCase;
+import org.elasticsearch.common.cli.Terminal;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
@@ -27,11 +29,16 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
 
 public class InternalSettingsPreparerTests extends ElasticsearchTestCase {
+
     @Before
     public void setupSystemProperties() {
         System.setProperty("es.node.zone", "foo");
@@ -53,7 +60,7 @@ public class InternalSettingsPreparerTests extends ElasticsearchTestCase {
         assertThat(tuple.v1().get("node.zone"), equalTo("foo"));
 
         settings = settingsBuilder()
-                .put("config.ignore_system_properties", true)
+                .put(InternalSettingsPreparer.IGNORE_SYSTEM_PROPERTIES_SETTING, true)
                 .put("node.zone", "bar")
                 .put("path.home", createTempDir().toString())
                 .build();
@@ -74,4 +81,74 @@ public class InternalSettingsPreparerTests extends ElasticsearchTestCase {
         assertThat(tuple.v1().get("json.config.exists"), equalTo("true"));
         assertThat(tuple.v1().get("properties.config.exists"), equalTo("true"));
     }
+
+    @Test
+    public void testReplacePromptPlaceholders() {
+        final List<String> replacedSecretProperties = new ArrayList<>();
+        final List<String> replacedTextProperties = new ArrayList<>();
+        final Terminal terminal = new CliToolTestCase.MockTerminal() {
+            @Override
+            public char[] readSecret(String message, Object... args) {
+                for (Object arg : args) {
+                    replacedSecretProperties.add((String) arg);
+                }
+                return "replaced".toCharArray();
+            }
+
+            @Override
+            public String readText(String message, Object... args) {
+                for (Object arg : args) {
+                    replacedTextProperties.add((String) arg);
+                }
+                return "text";
+            }
+        };
+
+        Settings.Builder builder = settingsBuilder()
+                .put("password.replace", InternalSettingsPreparer.SECRET_PROMPT_VALUE)
+                .put("dont.replace", "prompt:secret")
+                .put("dont.replace2", "_prompt:secret_")
+                .put("dont.replace3", "_prompt:text__")
+                .put("dont.replace4", "__prompt:text_")
+                .put("dont.replace5", "prompt:secret__")
+                .put("replace_me", InternalSettingsPreparer.TEXT_PROMPT_VALUE);
+        Settings settings = builder.build();
+        settings = InternalSettingsPreparer.replacePromptPlaceholders(settings, terminal);
+
+        assertThat(replacedSecretProperties.size(), is(1));
+        assertThat(replacedTextProperties.size(), is(1));
+        assertThat(settings.get("password.replace"), equalTo("replaced"));
+        assertThat(settings.get("replace_me"), equalTo("text"));
+
+        // verify other values unchanged
+        assertThat(settings.get("dont.replace"), equalTo("prompt:secret"));
+        assertThat(settings.get("dont.replace2"), equalTo("_prompt:secret_"));
+        assertThat(settings.get("dont.replace3"), equalTo("_prompt:text__"));
+        assertThat(settings.get("dont.replace4"), equalTo("__prompt:text_"));
+        assertThat(settings.get("dont.replace5"), equalTo("prompt:secret__"));
+    }
+
+    @Test
+    public void testReplaceSecretPromptPlaceholderWithNullTerminal() {
+        Settings.Builder builder = settingsBuilder()
+                .put("replace_me1", InternalSettingsPreparer.SECRET_PROMPT_VALUE);
+        try {
+            InternalSettingsPreparer.replacePromptPlaceholders(builder.build(), null);
+            fail("an exception should have been thrown since no terminal was provided!");
+        } catch (UnsupportedOperationException e) {
+            assertThat(e.getMessage(), containsString("with value [" + InternalSettingsPreparer.SECRET_PROMPT_VALUE + "]"));
+        }
+    }
+
+    @Test
+    public void testReplaceTextPromptPlaceholderWithNullTerminal() {
+        Settings.Builder builder = settingsBuilder()
+                .put("replace_me1", InternalSettingsPreparer.TEXT_PROMPT_VALUE);
+        try {
+            InternalSettingsPreparer.replacePromptPlaceholders(builder.build(), null);
+            fail("an exception should have been thrown since no terminal was provided!");
+        } catch (UnsupportedOperationException e) {
+            assertThat(e.getMessage(), containsString("with value [" + InternalSettingsPreparer.TEXT_PROMPT_VALUE + "]"));
+        }
+    }
 }
diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchSingleNodeTest.java b/src/test/java/org/elasticsearch/test/ElasticsearchSingleNodeTest.java
index 49be171eba2..bc868417c75 100644
--- a/src/test/java/org/elasticsearch/test/ElasticsearchSingleNodeTest.java
+++ b/src/test/java/org/elasticsearch/test/ElasticsearchSingleNodeTest.java
@@ -39,6 +39,7 @@ import org.elasticsearch.index.IndexService;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.node.Node;
 import org.elasticsearch.node.NodeBuilder;
+import org.elasticsearch.node.internal.InternalSettingsPreparer;
 import org.elasticsearch.search.internal.SearchContext;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.junit.After;
@@ -127,7 +128,7 @@ public abstract class ElasticsearchSingleNodeTest extends ElasticsearchTestCase
             .put("script.indexed", "on")
             .put(EsExecutors.PROCESSORS, 1) // limit the number of threads created
             .put("http.enabled", false)
-            .put("config.ignore_system_properties", true) // make sure we get what we set :)
+            .put(InternalSettingsPreparer.IGNORE_SYSTEM_PROPERTIES_SETTING, true) // make sure we get what we set :)
         ).build();
         build.start();
         assertThat(DiscoveryNode.localNode(build.settings()), is(true));
diff --git a/src/test/java/org/elasticsearch/test/ExternalNode.java b/src/test/java/org/elasticsearch/test/ExternalNode.java
index 40a6223aca9..4116632fd27 100644
--- a/src/test/java/org/elasticsearch/test/ExternalNode.java
+++ b/src/test/java/org/elasticsearch/test/ExternalNode.java
@@ -33,6 +33,7 @@ import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.discovery.DiscoveryModule;
+import org.elasticsearch.node.internal.InternalSettingsPreparer;
 import org.elasticsearch.transport.TransportModule;
 
 import java.io.Closeable;
@@ -53,7 +54,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 final class ExternalNode implements Closeable {
 
     public static final Settings REQUIRED_SETTINGS = Settings.builder()
-            .put("config.ignore_system_properties", true)
+            .put(InternalSettingsPreparer.IGNORE_SYSTEM_PROPERTIES_SETTING, true)
             .put(DiscoveryModule.DISCOVERY_TYPE_KEY, "zen")
             .put("node.mode", "network").build(); // we need network mode for this
 
@@ -115,7 +116,7 @@ final class ExternalNode implements Closeable {
                 case TransportModule.TRANSPORT_TYPE_KEY:
                 case DiscoveryModule.DISCOVERY_TYPE_KEY:
                 case TransportModule.TRANSPORT_SERVICE_TYPE_KEY:
-                case "config.ignore_system_properties":
+                case InternalSettingsPreparer.IGNORE_SYSTEM_PROPERTIES_SETTING:
                     continue;
                 default:
                     externaNodeSettingsBuilder.put(entry.getKey(), entry.getValue());
diff --git a/src/test/java/org/elasticsearch/test/ExternalTestCluster.java b/src/test/java/org/elasticsearch/test/ExternalTestCluster.java
index fcb977a6104..228bf05ff41 100644
--- a/src/test/java/org/elasticsearch/test/ExternalTestCluster.java
+++ b/src/test/java/org/elasticsearch/test/ExternalTestCluster.java
@@ -33,6 +33,7 @@ import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.InetSocketTransportAddress;
 import org.elasticsearch.common.transport.TransportAddress;
+import org.elasticsearch.node.internal.InternalSettingsPreparer;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -67,7 +68,7 @@ public final class ExternalTestCluster extends TestCluster {
         super(0);
         Settings clientSettings = Settings.settingsBuilder()
                 .put("name", InternalTestCluster.TRANSPORT_CLIENT_PREFIX + EXTERNAL_CLUSTER_PREFIX + counter.getAndIncrement())
-                .put("config.ignore_system_properties", true) // prevents any settings to be replaced by system properties.
+                .put(InternalSettingsPreparer.IGNORE_SYSTEM_PROPERTIES_SETTING, true) // prevents any settings to be replaced by system properties.
                 .put("client.transport.ignore_cluster_name", true)
                 .put("node.mode", "network").build(); // we require network here!
 
diff --git a/src/test/java/org/elasticsearch/test/InternalTestCluster.java b/src/test/java/org/elasticsearch/test/InternalTestCluster.java
index 285463a176b..77135db8646 100644
--- a/src/test/java/org/elasticsearch/test/InternalTestCluster.java
+++ b/src/test/java/org/elasticsearch/test/InternalTestCluster.java
@@ -88,6 +88,7 @@ import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService;
 import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache;
 import org.elasticsearch.indices.recovery.RecoverySettings;
 import org.elasticsearch.node.Node;
+import org.elasticsearch.node.internal.InternalSettingsPreparer;
 import org.elasticsearch.node.service.NodeService;
 import org.elasticsearch.plugins.PluginsService;
 import org.elasticsearch.search.SearchService;
@@ -279,7 +280,7 @@ public final class InternalTestCluster extends TestCluster {
         builder.put("path.repo", baseDir.resolve("repos"));
         builder.put("transport.tcp.port", BASE_PORT + "-" + (BASE_PORT+100));
         builder.put("http.port", BASE_PORT+101 + "-" + (BASE_PORT+200));
-        builder.put("config.ignore_system_properties", true);
+        builder.put(InternalSettingsPreparer.IGNORE_SYSTEM_PROPERTIES_SETTING, true);
         builder.put("node.mode", NODE_MODE);
         builder.put("http.pipelining", enableHttpPipelining);
         builder.put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, false);
@@ -874,7 +875,7 @@ public final class InternalTestCluster extends TestCluster {
                     .put("node.local", nodeSettings.get("node.local", ""))
                     .put("logger.prefix", nodeSettings.get("logger.prefix", ""))
                     .put("logger.level", nodeSettings.get("logger.level", "INFO"))
-                    .put("config.ignore_system_properties", true)
+                    .put(InternalSettingsPreparer.IGNORE_SYSTEM_PROPERTIES_SETTING, true)
                     .put(settings);
 
             TransportClient client = TransportClient.builder().settings(builder.build()).build();
diff --git a/src/test/java/org/elasticsearch/tribe/TribeUnitTests.java b/src/test/java/org/elasticsearch/tribe/TribeUnitTests.java
index 5959ed3a6c4..1eb962bb86f 100644
--- a/src/test/java/org/elasticsearch/tribe/TribeUnitTests.java
+++ b/src/test/java/org/elasticsearch/tribe/TribeUnitTests.java
@@ -25,6 +25,7 @@ import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.node.Node;
 import org.elasticsearch.node.NodeBuilder;
+import org.elasticsearch.node.internal.InternalSettingsPreparer;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.elasticsearch.test.InternalTestCluster;
 import org.junit.AfterClass;
@@ -51,7 +52,7 @@ public class TribeUnitTests extends ElasticsearchTestCase {
     @BeforeClass
     public static void createTribes() {
         Settings baseSettings = Settings.builder()
-            .put("config.ignore_system_properties", true)
+            .put(InternalSettingsPreparer.IGNORE_SYSTEM_PROPERTIES_SETTING, true)
             .put("http.enabled", false)
             .put("node.mode", NODE_MODE)
             .put("path.home", createTempDir()).build();
@@ -86,7 +87,7 @@ public class TribeUnitTests extends ElasticsearchTestCase {
     @Test
     public void testThatTribeClientsIgnoreGlobalConfig() throws Exception {
         Path pathConf = getDataPath("elasticsearch.yml").getParent();
-        Settings settings = Settings.builder().put("config.ignore_system_properties", true).put("path.conf", pathConf).build();
+        Settings settings = Settings.builder().put(InternalSettingsPreparer.IGNORE_SYSTEM_PROPERTIES_SETTING, true).put("path.conf", pathConf).build();
         assertTribeNodeSuccesfullyCreated(settings);
     }
 

From 0b57f4611c88c1f6d564c033d63976714ca2a35c Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Tue, 2 Jun 2015 05:23:50 -1000
Subject: [PATCH 100/123] Tests: Increase block timeout for snapshot to
 complete in batchingShardUpdateTaskTest

For a large number of shards in the test 10 seconds doesn't seem to be enough on some CI hardware.
---
 .../snapshots/SharedClusterSnapshotRestoreTests.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java b/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java
index 1e8d45d3699..aabebed72c6 100644
--- a/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java
+++ b/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java
@@ -1929,7 +1929,7 @@ public class SharedClusterSnapshotRestoreTests extends AbstractSnapshotTests {
         private long stopWaitingAt = -1;
 
         public BlockingClusterStateListener(ClusterService clusterService, String blockOn, String countOn, Priority passThroughPriority) {
-            this(clusterService, blockOn, countOn, passThroughPriority, TimeValue.timeValueSeconds(10));
+            this(clusterService, blockOn, countOn, passThroughPriority, TimeValue.timeValueMinutes(1));
         }
 
         public BlockingClusterStateListener(ClusterService clusterService, final String blockOn, final String countOn, Priority passThroughPriority, TimeValue timeout) {

From 740fe483bb5e311539331d369e6d0b4dc24dcfd8 Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Sun, 31 May 2015 17:37:23 -0700
Subject: [PATCH 101/123] Fail shard if search execution uncovers corruption
 If, as part of the search execution, a corruption is uncovered, we should
 fail the shard relates to #11419

---
 .../elasticsearch/search/SearchService.java   | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/elasticsearch/search/SearchService.java b/src/main/java/org/elasticsearch/search/SearchService.java
index 2c203aa7851..c68669ee5f8 100644
--- a/src/main/java/org/elasticsearch/search/SearchService.java
+++ b/src/main/java/org/elasticsearch/search/SearchService.java
@@ -41,6 +41,7 @@ import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.lease.Releasables;
+import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.util.BigArrays;
@@ -233,7 +234,7 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
             return context.dfsResult();
         } catch (Throwable e) {
             logger.trace("Dfs phase failed", e);
-            freeContext(context.id());
+            processFailure(context, e);
             throw ExceptionsHelper.convertToRuntime(e);
         } finally {
             cleanContext(context);
@@ -263,7 +264,7 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
             return context.queryResult();
         } catch (Throwable e) {
             logger.trace("Scan phase failed", e);
-            freeContext(context.id());
+            processFailure(context, e);
             throw ExceptionsHelper.convertToRuntime(e);
         } finally {
             context.size(originalSize);
@@ -292,7 +293,7 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
             return new ScrollQueryFetchSearchResult(new QueryFetchSearchResult(context.queryResult(), context.fetchResult()), context.shardTarget());
         } catch (Throwable e) {
             logger.trace("Scan phase failed", e);
-            freeContext(context.id());
+            processFailure(context, e);
             throw ExceptionsHelper.convertToRuntime(e);
         } finally {
             cleanContext(context);
@@ -336,7 +337,7 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
             }
             context.indexShard().searchService().onFailedQueryPhase(context);
             logger.trace("Query phase failed", e);
-            freeContext(context.id());
+            processFailure(context, e);
             throw ExceptionsHelper.convertToRuntime(e);
         } finally {
             cleanContext(context);
@@ -357,7 +358,7 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
         } catch (Throwable e) {
             context.indexShard().searchService().onFailedQueryPhase(context);
             logger.trace("Query phase failed", e);
-            freeContext(context.id());
+            processFailure(context, e);
             throw ExceptionsHelper.convertToRuntime(e);
         } finally {
             cleanContext(context);
@@ -372,7 +373,7 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
             context.searcher().dfSource(new CachedDfSource(context.searcher().getIndexReader(), request.dfs(), context.similarityService().similarity(),
                     indexCache.filter(), indexCache.filterPolicy()));
         } catch (Throwable e) {
-            freeContext(context.id());
+            processFailure(context, e);
             cleanContext(context);
             throw new QueryPhaseExecutionException(context, "Failed to set aggregated df", e);
         }
@@ -391,7 +392,7 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
         } catch (Throwable e) {
             context.indexShard().searchService().onFailedQueryPhase(context);
             logger.trace("Query phase failed", e);
-            freeContext(context.id());
+            processFailure(context, e);
             throw ExceptionsHelper.convertToRuntime(e);
         } finally {
             cleanContext(context);
@@ -429,7 +430,7 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
             return new QueryFetchSearchResult(context.queryResult(), context.fetchResult());
         } catch (Throwable e) {
             logger.trace("Fetch phase failed", e);
-            freeContext(context.id());
+            processFailure(context, e);
             throw ExceptionsHelper.convertToRuntime(e);
         } finally {
             cleanContext(context);
@@ -476,7 +477,7 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
             return new QueryFetchSearchResult(context.queryResult(), context.fetchResult());
         } catch (Throwable e) {
             logger.trace("Fetch phase failed", e);
-            freeContext(context.id());
+            processFailure(context, e);
             throw ExceptionsHelper.convertToRuntime(e);
         } finally {
             cleanContext(context);
@@ -515,7 +516,7 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
             return new ScrollQueryFetchSearchResult(new QueryFetchSearchResult(context.queryResult(), context.fetchResult()), context.shardTarget());
         } catch (Throwable e) {
             logger.trace("Fetch phase failed", e);
-            freeContext(context.id());
+            processFailure(context, e);
             throw ExceptionsHelper.convertToRuntime(e);
         } finally {
             cleanContext(context);
@@ -543,7 +544,7 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
         } catch (Throwable e) {
             context.indexShard().searchService().onFailedFetchPhase(context);
             logger.trace("Fetch phase failed", e);
-            freeContext(context.id()); // we just try to make sure this is freed - rethrow orig exception.
+            processFailure(context, e);
             throw ExceptionsHelper.convertToRuntime(e);
         } finally {
             cleanContext(context);
@@ -668,6 +669,17 @@ public class SearchService extends AbstractLifecycleComponent<SearchService> {
         SearchContext.removeCurrent();
     }
 
+    private void processFailure(SearchContext context, Throwable t) {
+        freeContext(context.id());
+        try {
+            if (Lucene.isCorruptionException(t)) {
+                context.indexShard().failShard("search execution corruption failure", t);
+            }
+        } catch (Throwable e) {
+            logger.warn("failed to process shard failure to (potentially) send back shard failure on corruption", e);
+        }
+    }
+
     private void parseTemplate(ShardSearchRequest request) {
 
         final ExecutableScript executable;

From 6812ed0bb69dedc16dd3b8acb9f97b264f9b50af Mon Sep 17 00:00:00 2001
From: Timur <yanberdint@gmail.com>
Date: Tue, 19 May 2015 13:00:41 +0300
Subject: [PATCH 102/123] Docs: fix typo

Closes #112220
---
 docs/reference/getting-started.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/reference/getting-started.asciidoc b/docs/reference/getting-started.asciidoc
index f21ed1162e1..d897b97ab27 100755
--- a/docs/reference/getting-started.asciidoc
+++ b/docs/reference/getting-started.asciidoc
@@ -566,7 +566,7 @@ Which means that we just successfully bulk indexed 1000 documents into the bank
 
 === The Search API
 
-Now let's start with some simple searches. There are two basic ways to run searches: one is by sending search parameters through the <<search-uri-request,REST request URI>> and the other by sending them through the<<search-request-body,[REST request body>>. The request body method allows you to be more expressive and also to define your searches in a more readable JSON format. We'll try one example of the request URI method but for the remainder of this tutorial, we will exclusively be using the request body method.
+Now let's start with some simple searches. There are two basic ways to run searches: one is by sending search parameters through the <<search-uri-request,REST request URI>> and the other by sending them through the <<search-request-body,REST request body>>. The request body method allows you to be more expressive and also to define your searches in a more readable JSON format. We'll try one example of the request URI method but for the remainder of this tutorial, we will exclusively be using the request body method.
 
 The REST API for search is accessible from the `_search` endpoint. This example returns all documents in the bank index:
 

From c381a64c66ee742296603969febebe14ac4dd0cb Mon Sep 17 00:00:00 2001
From: Lee Hinman <lee@writequit.org>
Date: Tue, 2 Jun 2015 14:09:14 -0600
Subject: [PATCH 103/123] Add missing `shard` object in trace logging statement

---
 .../java/org/elasticsearch/gateway/GatewayAllocator.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java b/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java
index 43e1f5a5cc9..e0e7a847d45 100644
--- a/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java
+++ b/src/main/java/org/elasticsearch/gateway/GatewayAllocator.java
@@ -172,7 +172,7 @@ public class GatewayAllocator extends AbstractComponent {
             }
             AsyncShardFetch.FetchResult<TransportNodesListGatewayStartedShards.NodeGatewayStartedShards> shardState = fetch.fetchData(nodes, metaData, allocation.getIgnoreNodes(shard.shardId()));
             if (shardState.hasData() == false) {
-                logger.trace("{}: ignoring allocation, still fetching shard started state");
+                logger.trace("{}: ignoring allocation, still fetching shard started state", shard);
                 unassignedIterator.remove();
                 routingNodes.ignoredUnassigned().add(shard);
                 continue;
@@ -396,7 +396,7 @@ public class GatewayAllocator extends AbstractComponent {
             }
 
             if (!canBeAllocatedToAtLeastOneNode) {
-                logger.trace("{}: ignoring allocation, can't be allocated on any node");
+                logger.trace("{}: ignoring allocation, can't be allocated on any node", shard);
                 unassignedIterator.remove();
                 routingNodes.ignoredUnassigned().add(shard);
                 continue;
@@ -409,7 +409,7 @@ public class GatewayAllocator extends AbstractComponent {
             }
             AsyncShardFetch.FetchResult<TransportNodesListShardStoreMetaData.NodeStoreFilesMetaData> shardStores = fetch.fetchData(nodes, metaData, allocation.getIgnoreNodes(shard.shardId()));
             if (shardStores.hasData() == false) {
-                logger.trace("{}: ignoring allocation, still fetching shard stores");
+                logger.trace("{}: ignoring allocation, still fetching shard stores", shard);
                 unassignedIterator.remove();
                 routingNodes.ignoredUnassigned().add(shard);
                 continue; // still fetching

From 59d9f7e1579ca70973d14e94da0b8794e60f3b85 Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Tue, 2 Jun 2015 12:18:44 -1000
Subject: [PATCH 104/123] Improve snapshot creation and deletion performance on
 repositories with large number of snapshots

Each shard repository consists of snapshot file for each snapshot - this file contains a map between original physical file that is snapshotted and its representation in repository. This data includes original filename, checksum and length. When a new snapshot is created, elasticsearch needs to read all these snapshot files to figure which file are already present in the repository and which files still have to be copied there. This change adds a new index file that contains all this information combined into a single file. So, if a repository has 1000 snapshots with 1000 shards elasticsearch will only need to read 1000 blobs (one per shard) instead of 1,000,000 to delete a snapshot. This change should also improve snapshot creation speed on repositories with large number of snapshot and high latency.

Fixes #8958
---
 .../BlobStoreIndexShardRepository.java        | 236 +++++++++++++----
 .../BlobStoreIndexShardSnapshot.java          |  52 ++--
 .../BlobStoreIndexShardSnapshots.java         | 250 ++++++++++++++++--
 .../snapshots/blobstore/SnapshotFiles.java    |  81 ++++++
 .../blobstore/BlobStoreRepository.java        |  14 +-
 5 files changed, 517 insertions(+), 116 deletions(-)
 create mode 100644 src/main/java/org/elasticsearch/index/snapshots/blobstore/SnapshotFiles.java

diff --git a/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardRepository.java b/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardRepository.java
index 707e77dbefe..d498119c5fa 100644
--- a/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardRepository.java
+++ b/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardRepository.java
@@ -19,9 +19,11 @@
 
 package org.elasticsearch.index.snapshots.blobstore;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+import com.google.common.io.ByteStreams;
 import org.apache.lucene.index.CorruptIndexException;
 import org.apache.lucene.index.IndexFormatTooNewException;
 import org.apache.lucene.index.IndexFormatTooOldException;
@@ -41,8 +43,11 @@ import org.elasticsearch.common.blobstore.BlobContainer;
 import org.elasticsearch.common.blobstore.BlobMetaData;
 import org.elasticsearch.common.blobstore.BlobPath;
 import org.elasticsearch.common.blobstore.BlobStore;
+import org.elasticsearch.common.bytes.BytesArray;
+import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.component.AbstractComponent;
 import org.elasticsearch.common.inject.Inject;
+import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.lucene.store.InputStreamIndexInput;
 import org.elasticsearch.common.settings.Settings;
@@ -65,10 +70,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.*;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 import static com.google.common.collect.Lists.newArrayList;
 import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.testBlobPrefix;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.toStreamOutput;
 
 /**
  * Blob store based implementation of IndexShardRepository
@@ -96,7 +101,15 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
 
     private RateLimitingInputStream.Listener snapshotThrottleListener;
 
-    private static final String SNAPSHOT_PREFIX = "snapshot-";
+    private boolean compress;
+
+    protected static final String SNAPSHOT_PREFIX = "snapshot-";
+
+    protected static final String SNAPSHOT_INDEX_PREFIX = "index-";
+
+    protected static final String SNAPSHOT_TEMP_PREFIX = "pending-";
+
+    protected static final String DATA_BLOB_PREFIX = "__";
 
     @Inject
     public BlobStoreIndexShardRepository(Settings settings, RepositoryName repositoryName, IndicesService indicesService, ClusterService clusterService) {
@@ -115,7 +128,7 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
      */
     public void initialize(BlobStore blobStore, BlobPath basePath, ByteSizeValue chunkSize,
                            RateLimiter snapshotRateLimiter, RateLimiter restoreRateLimiter,
-                           final RateLimiterListener rateLimiterListener) {
+                           final RateLimiterListener rateLimiterListener, boolean compress) {
         this.blobStore = blobStore;
         this.basePath = basePath;
         this.chunkSize = chunkSize;
@@ -128,6 +141,7 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
                 rateLimiterListener.onSnapshotPause(nanos);
             }
         };
+        this.compress = compress;
     }
 
     /**
@@ -232,11 +246,11 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
      * Serializes snapshot to JSON
      *
      * @param snapshot snapshot
-     * @param stream   the stream to output the snapshot JSON represetation to
+     * @param output the stream to output the snapshot JSON representation to
      * @throws IOException if an IOException occurs
      */
-    public static void writeSnapshot(BlobStoreIndexShardSnapshot snapshot, OutputStream stream) throws IOException {
-        XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON, stream).prettyPrint();
+    public void writeSnapshot(BlobStoreIndexShardSnapshot snapshot, StreamOutput output) throws IOException {
+        XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON, output).prettyPrint();
         BlobStoreIndexShardSnapshot.toXContent(snapshot, builder, ToXContent.EMPTY_PARAMS);
         builder.flush();
     }
@@ -249,12 +263,36 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
      * @throws IOException if an IOException occurs
      */
     public static BlobStoreIndexShardSnapshot readSnapshot(InputStream stream) throws IOException {
-        try (XContentParser parser = XContentFactory.xContent(XContentType.JSON).createParser(stream)) {
+        byte[] data = ByteStreams.toByteArray(stream);
+        try (XContentParser parser = XContentHelper.createParser(new BytesArray(data))) {
             parser.nextToken();
             return BlobStoreIndexShardSnapshot.fromXContent(parser);
         }
     }
 
+    /**
+     * Parses JSON representation of a snapshot
+     *
+     * @param stream JSON
+     * @return snapshot
+     * @throws IOException if an IOException occurs
+     * */
+    public static BlobStoreIndexShardSnapshots readSnapshots(InputStream stream) throws IOException {
+        byte[] data = ByteStreams.toByteArray(stream);
+        try (XContentParser parser = XContentHelper.createParser(new BytesArray(data))) {
+            parser.nextToken();
+            return BlobStoreIndexShardSnapshots.fromXContent(parser);
+        }
+    }
+    /**
+     * Returns true if metadata files should be compressed
+     *
+     * @return true if compression is needed
+     */
+    protected boolean isCompress() {
+        return compress;
+    }
+
     /**
      * Context for snapshot/restore operations
      */
@@ -287,7 +325,9 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
                 throw new IndexShardSnapshotException(shardId, "Failed to list content of gateway", e);
             }
 
-            BlobStoreIndexShardSnapshots snapshots = buildBlobStoreIndexShardSnapshots(blobs);
+            Tuple<BlobStoreIndexShardSnapshots, Integer> tuple = buildBlobStoreIndexShardSnapshots(blobs);
+            BlobStoreIndexShardSnapshots snapshots = tuple.v1();
+            int fileListGeneration = tuple.v2();
 
             String commitPointName = snapshotBlobName(snapshotId);
 
@@ -297,15 +337,15 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
                 logger.debug("[{}] [{}] failed to delete shard snapshot file", shardId, snapshotId);
             }
 
-            // delete all files that are not referenced by any commit point
-            // build a new BlobStoreIndexShardSnapshot, that includes this one and all the saved ones
-            List<BlobStoreIndexShardSnapshot> newSnapshotsList = Lists.newArrayList();
-            for (BlobStoreIndexShardSnapshot point : snapshots) {
+            // Build a list of snapshots that should be preserved
+            List<SnapshotFiles> newSnapshotsList = Lists.newArrayList();
+            for (SnapshotFiles point : snapshots) {
                 if (!point.snapshot().equals(snapshotId.getSnapshot())) {
                     newSnapshotsList.add(point);
                 }
             }
-            cleanup(newSnapshotsList, blobs);
+            // finalize the snapshot and rewrite the snapshot index with the next sequential snapshot index
+            finalize(newSnapshotsList, fileListGeneration + 1, blobs);
         }
 
         /**
@@ -322,26 +362,63 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
         }
 
         /**
-         * Removes all unreferenced files from the repository
+         * Removes all unreferenced files from the repository and writes new index file
+         *
+         * We need to be really careful in handling index files in case of failures to make sure we have index file that
+         * points to files that were deleted.
+         *
          *
          * @param snapshots list of active snapshots in the container
+         * @param fileListGeneration the generation number of the snapshot index file
          * @param blobs     list of blobs in the container
          */
-        protected void cleanup(List<BlobStoreIndexShardSnapshot> snapshots, ImmutableMap<String, BlobMetaData> blobs) {
+        protected void finalize(List<SnapshotFiles> snapshots, int fileListGeneration, ImmutableMap<String, BlobMetaData> blobs) {
             BlobStoreIndexShardSnapshots newSnapshots = new BlobStoreIndexShardSnapshots(snapshots);
-            // now go over all the blobs, and if they don't exists in a snapshot, delete them
+            // delete old index files first
             for (String blobName : blobs.keySet()) {
-                if (!blobName.startsWith("__")) {
-                    continue;
-                }
-                if (newSnapshots.findNameFile(FileInfo.canonicalName(blobName)) == null) {
+                // delete old file lists
+                if (blobName.startsWith(SNAPSHOT_TEMP_PREFIX) || blobName.startsWith(SNAPSHOT_INDEX_PREFIX)) {
                     try {
                         blobContainer.deleteBlob(blobName);
                     } catch (IOException e) {
-                        logger.debug("[{}] [{}] error deleting blob [{}] during cleanup", e, snapshotId, shardId, blobName);
+                        // We cannot delete index file - this is fatal, we cannot continue, otherwise we might end up
+                        // with references to non-existing files
+                        throw new IndexShardSnapshotFailedException(shardId, "error deleting index file [{}] during cleanup", e);
                     }
                 }
             }
+
+            // now go over all the blobs, and if they don't exists in a snapshot, delete them
+            for (String blobName : blobs.keySet()) {
+                // delete old file lists
+                if (blobName.startsWith(DATA_BLOB_PREFIX)) {
+                    if (newSnapshots.findNameFile(FileInfo.canonicalName(blobName)) == null) {
+                        try {
+                            blobContainer.deleteBlob(blobName);
+                        } catch (IOException e) {
+                            logger.debug("[{}] [{}] error deleting blob [{}] during cleanup", e, snapshotId, shardId, blobName);
+                        }
+                    }
+                }
+            }
+
+            // If we deleted all snapshots - we don't need to create the index file
+            if (snapshots.size() > 0) {
+                String newSnapshotIndexName = SNAPSHOT_INDEX_PREFIX + fileListGeneration;
+                try (OutputStream output = blobContainer.createOutput(SNAPSHOT_TEMP_PREFIX + fileListGeneration)) {
+                    StreamOutput stream = compressIfNeeded(output);
+                    XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON, stream);
+                    newSnapshots.toXContent(builder, ToXContent.EMPTY_PARAMS);
+                    builder.flush();
+                } catch (IOException e) {
+                    throw new IndexShardSnapshotFailedException(shardId, "Failed to write file list", e);
+                }
+                try {
+                    blobContainer.move(SNAPSHOT_TEMP_PREFIX + fileListGeneration, newSnapshotIndexName);
+                } catch (IOException e) {
+                    throw new IndexShardSnapshotFailedException(shardId, "Failed to rename file list", e);
+                }
+            }
         }
 
         /**
@@ -351,7 +428,7 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
          * @return the blob name
          */
         protected String fileNameFromGeneration(long generation) {
-            return "__" + Long.toString(generation, Character.MAX_RADIX);
+            return DATA_BLOB_PREFIX + Long.toString(generation, Character.MAX_RADIX);
         }
 
         /**
@@ -363,17 +440,17 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
         protected long findLatestFileNameGeneration(ImmutableMap<String, BlobMetaData> blobs) {
             long generation = -1;
             for (String name : blobs.keySet()) {
-                if (!name.startsWith("__")) {
+                if (!name.startsWith(DATA_BLOB_PREFIX)) {
                     continue;
                 }
                 name = FileInfo.canonicalName(name);
                 try {
-                    long currentGen = Long.parseLong(name.substring(2) /*__*/, Character.MAX_RADIX);
+                    long currentGen = Long.parseLong(name.substring(DATA_BLOB_PREFIX.length()), Character.MAX_RADIX);
                     if (currentGen > generation) {
                         generation = currentGen;
                     }
                 } catch (NumberFormatException e) {
-                    logger.warn("file [{}] does not conform to the '__' schema");
+                    logger.warn("file [{}] does not conform to the '{}' schema", name, DATA_BLOB_PREFIX);
                 }
             }
             return generation;
@@ -383,20 +460,47 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
          * Loads all available snapshots in the repository
          *
          * @param blobs list of blobs in repository
-         * @return BlobStoreIndexShardSnapshots
+         * @return tuple of BlobStoreIndexShardSnapshots and the last snapshot index generation
          */
-        protected BlobStoreIndexShardSnapshots buildBlobStoreIndexShardSnapshots(ImmutableMap<String, BlobMetaData> blobs) {
-            List<BlobStoreIndexShardSnapshot> snapshots = Lists.newArrayList();
+        protected Tuple<BlobStoreIndexShardSnapshots, Integer> buildBlobStoreIndexShardSnapshots(ImmutableMap<String, BlobMetaData> blobs) {
+            int latest = -1;
+            for (String name : blobs.keySet()) {
+                if (name.startsWith(SNAPSHOT_INDEX_PREFIX)) {
+                    try {
+                        int gen = Integer.parseInt(name.substring(SNAPSHOT_INDEX_PREFIX.length()));
+                        if (gen > latest) {
+                            latest = gen;
+                        }
+                    } catch (NumberFormatException ex) {
+                        logger.warn("failed to parse index file name [{}]", name);
+                    }
+                }
+            }
+            if (latest >= 0) {
+                try (InputStream stream = blobContainer.openInput(SNAPSHOT_INDEX_PREFIX + latest)) {
+                    return new Tuple<>(readSnapshots(stream), latest);
+                } catch (IOException e) {
+                    logger.warn("failed to read index file  [{}]", e, SNAPSHOT_INDEX_PREFIX + latest);
+                }
+            }
+
+            // We couldn't load the index file - falling back to loading individual snapshots
+            List<SnapshotFiles> snapshots = Lists.newArrayList();
             for (String name : blobs.keySet()) {
                 if (name.startsWith(SNAPSHOT_PREFIX)) {
                     try (InputStream stream = blobContainer.openInput(name)) {
-                        snapshots.add(readSnapshot(stream));
+                        BlobStoreIndexShardSnapshot snapshot = readSnapshot(stream);
+                        snapshots.add(new SnapshotFiles(snapshot.snapshot(), snapshot.indexFiles()));
                     } catch (IOException e) {
                         logger.warn("failed to read commit point [{}]", e, name);
                     }
                 }
             }
-            return new BlobStoreIndexShardSnapshots(snapshots);
+            return new Tuple<>(new BlobStoreIndexShardSnapshots(snapshots), -1);
+        }
+
+        protected StreamOutput compressIfNeeded(OutputStream output) throws IOException {
+            return toStreamOutput(output, isCompress());
         }
 
     }
@@ -442,9 +546,10 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
                 }
 
                 long generation = findLatestFileNameGeneration(blobs);
-                BlobStoreIndexShardSnapshots snapshots = buildBlobStoreIndexShardSnapshots(blobs);
+                Tuple<BlobStoreIndexShardSnapshots, Integer> tuple = buildBlobStoreIndexShardSnapshots(blobs);
+                BlobStoreIndexShardSnapshots snapshots = tuple.v1();
+                int fileListGeneration = tuple.v2();
 
-                final CopyOnWriteArrayList<Throwable> failures = new CopyOnWriteArrayList<>();
                 final List<BlobStoreIndexShardSnapshot.FileInfo> indexCommitPointFiles = newArrayList();
 
                 int indexNumberOfFiles = 0;
@@ -464,23 +569,28 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
                     }
                     logger.trace("[{}] [{}] Processing [{}]", shardId, snapshotId, fileName);
                     final StoreFileMetaData md = metadata.get(fileName);
-                    boolean snapshotRequired = false;
-                    BlobStoreIndexShardSnapshot.FileInfo fileInfo = snapshots.findPhysicalIndexFile(fileName);
-                    try {
-                        // in 1.3.3 we added additional hashes for .si / segments_N files
-                        // to ensure we don't double the space in the repo since old snapshots
-                        // don't have this hash we try to read that hash from the blob store
-                        // in a bwc compatible way.
-                        maybeRecalculateMetadataHash(blobContainer, fileInfo, metadata);
-                    } catch (Throwable e) {
-                        logger.warn("{} Can't calculate hash from blob for file [{}] [{}]", e, shardId, fileInfo.physicalName(), fileInfo.metadata());
+                    FileInfo existingFileInfo = null;
+                    ImmutableList<FileInfo> filesInfo = snapshots.findPhysicalIndexFiles(fileName);
+                    if (filesInfo != null) {
+                        for (FileInfo fileInfo : filesInfo) {
+                            try {
+                                // in 1.3.3 we added additional hashes for .si / segments_N files
+                                // to ensure we don't double the space in the repo since old snapshots
+                                // don't have this hash we try to read that hash from the blob store
+                                // in a bwc compatible way.
+                                maybeRecalculateMetadataHash(blobContainer, fileInfo, metadata);
+                            } catch (Throwable e) {
+                                logger.warn("{} Can't calculate hash from blob for file [{}] [{}]", e, shardId, fileInfo.physicalName(), fileInfo.metadata());
+                            }
+                            if (fileInfo.isSame(md) && snapshotFileExistsInBlobs(fileInfo, blobs)) {
+                                // a commit point file with the same name, size and checksum was already copied to repository
+                                // we will reuse it for this snapshot
+                                existingFileInfo = fileInfo;
+                                break;
+                            }
+                        }
                     }
-                    if (fileInfo == null || !fileInfo.isSame(md) || !snapshotFileExistsInBlobs(fileInfo, blobs)) {
-                        // commit point file does not exists in any commit point, or has different length, or does not fully exists in the listed blobs
-                        snapshotRequired = true;
-                    }
-
-                    if (snapshotRequired) {
+                    if (existingFileInfo == null) {
                         indexNumberOfFiles++;
                         indexTotalFilesSize += md.length();
                         // create a new FileInfo
@@ -488,7 +598,7 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
                         indexCommitPointFiles.add(snapshotFileInfo);
                         filesToSnapshot.add(snapshotFileInfo);
                     } else {
-                        indexCommitPointFiles.add(fileInfo);
+                        indexCommitPointFiles.add(existingFileInfo);
                     }
                 }
 
@@ -515,7 +625,7 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
                         System.currentTimeMillis() - snapshotStatus.startTime(), indexNumberOfFiles, indexTotalFilesSize);
                 //TODO: The time stored in snapshot doesn't include cleanup time.
                 logger.trace("[{}] [{}] writing shard snapshot file", shardId, snapshotId);
-                try (OutputStream output = blobContainer.createOutput(snapshotBlobName)) {
+                try (StreamOutput output = compressIfNeeded(blobContainer.createOutput(snapshotBlobName))) {
                     writeSnapshot(snapshot, output);
                 } catch (IOException e) {
                     throw new IndexShardSnapshotFailedException(shardId, "Failed to write commit point", e);
@@ -523,12 +633,13 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
 
                 // delete all files that are not referenced by any commit point
                 // build a new BlobStoreIndexShardSnapshot, that includes this one and all the saved ones
-                List<BlobStoreIndexShardSnapshot> newSnapshotsList = Lists.newArrayList();
-                newSnapshotsList.add(snapshot);
-                for (BlobStoreIndexShardSnapshot point : snapshots) {
+                List<SnapshotFiles> newSnapshotsList = Lists.newArrayList();
+                newSnapshotsList.add(new SnapshotFiles(snapshot.snapshot(), snapshot.indexFiles()));
+                for (SnapshotFiles point : snapshots) {
                     newSnapshotsList.add(point);
                 }
-                cleanup(newSnapshotsList, blobs);
+                // finalize the snapshot and rewrite the snapshot index with the next sequential snapshot index
+                finalize(newSnapshotsList, fileListGeneration + 1, blobs);
                 snapshotStatus.updateStage(IndexShardSnapshotStatus.Stage.DONE);
             } finally {
                 store.decRef();
@@ -709,6 +820,7 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
             try {
                 logger.debug("[{}] [{}] restoring to [{}] ...", snapshotId, repositoryName, shardId);
                 BlobStoreIndexShardSnapshot snapshot = loadSnapshot();
+                SnapshotFiles snapshotFiles = new SnapshotFiles(snapshot.snapshot(), snapshot.indexFiles());
                 final Store.MetadataSnapshot recoveryTargetMetadata;
                 try {
                     recoveryTargetMetadata = store.getMetadataOrEmpty();
@@ -786,6 +898,22 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
                     throw new IndexShardRestoreFailedException(shardId, "Failed to fetch index version after copying it over", e);
                 }
                 recoveryState.getIndex().updateVersion(segmentCommitInfos.getVersion());
+
+                /// now, go over and clean files that are in the store, but were not in the snapshot
+                try {
+                    for (String storeFile : store.directory().listAll()) {
+                        if (!Store.isChecksum(storeFile) && !snapshotFiles.containPhysicalIndexFile(storeFile)) {
+                            try {
+                                store.deleteQuiet("restore", storeFile);
+                                store.directory().deleteFile(storeFile);
+                            } catch (IOException e) {
+                                logger.warn("[{}] failed to delete file [{}] during snapshot cleanup", snapshotId, storeFile);
+                            }
+                        }
+                    }
+                } catch (IOException e) {
+                    logger.warn("[{}] failed to list directory - some of files might not be deleted", snapshotId);
+                }
             } finally {
                 store.decRef();
             }
diff --git a/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java b/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java
index b643bf234e5..e2acff96f57 100644
--- a/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java
+++ b/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java
@@ -190,6 +190,24 @@ public class BlobStoreIndexShardSnapshot {
             return metadata.isSame(md);
         }
 
+        /**
+         * Checks if a file in a store is the same file
+         *
+         * @param fileInfo file in a store
+         * @return true if file in a store this this file have the same checksum and length
+         */
+        public boolean isSame(FileInfo fileInfo) {
+            if (numberOfParts != fileInfo.numberOfParts) return false;
+            if (partBytes != fileInfo.partBytes) return false;
+            if (!name.equals(fileInfo.name)) return false;
+            if (partSize != null) {
+                if (!partSize.equals(fileInfo.partSize)) return false;
+            } else {
+                if (fileInfo.partSize != null) return false;
+            }
+            return metadata.isSame(fileInfo.metadata);
+        }
+
         static final class Fields {
             static final XContentBuilderString NAME = new XContentBuilderString("name");
             static final XContentBuilderString PHYSICAL_NAME = new XContentBuilderString("physical_name");
@@ -484,38 +502,4 @@ public class BlobStoreIndexShardSnapshot {
                 startTime, time, numberOfFiles, totalSize);
     }
 
-    /**
-     * Returns true if this snapshot contains a file with a given original name
-     *
-     * @param physicalName original file name
-     * @return true if the file was found, false otherwise
-     */
-    public boolean containPhysicalIndexFile(String physicalName) {
-        return findPhysicalIndexFile(physicalName) != null;
-    }
-
-    public FileInfo findPhysicalIndexFile(String physicalName) {
-        for (FileInfo file : indexFiles) {
-            if (file.physicalName().equals(physicalName)) {
-                return file;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns true if this snapshot contains a file with a given name
-     *
-     * @param name file name
-     * @return true if file was found, false otherwise
-     */
-    public FileInfo findNameFile(String name) {
-        for (FileInfo file : indexFiles) {
-            if (file.name().equals(name)) {
-                return file;
-            }
-        }
-        return null;
-    }
-
 }
diff --git a/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java b/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java
index a8657655122..11a8689bb26 100644
--- a/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java
+++ b/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java
@@ -20,10 +20,22 @@
 package org.elasticsearch.index.snapshots.blobstore;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import org.elasticsearch.ElasticsearchParseException;
+import org.elasticsearch.common.ParseField;
+import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentBuilderString;
+import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshot.FileInfo;
 
+import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+
+import static com.google.common.collect.Lists.newArrayList;
+import static com.google.common.collect.Maps.newHashMap;
 
 /**
  * Contains information about all snapshot for the given shard in repository
@@ -31,19 +43,72 @@ import java.util.List;
  * This class is used to find files that were already snapshoted and clear out files that no longer referenced by any
  * snapshots
  */
-public class BlobStoreIndexShardSnapshots implements Iterable<BlobStoreIndexShardSnapshot> {
-    private final ImmutableList<BlobStoreIndexShardSnapshot> shardSnapshots;
+public class BlobStoreIndexShardSnapshots implements Iterable<SnapshotFiles>, ToXContent {
+    private final ImmutableList<SnapshotFiles> shardSnapshots;
+    private final ImmutableMap<String, FileInfo> files;
+    private final ImmutableMap<String, ImmutableList<FileInfo>> physicalFiles;
 
-    public BlobStoreIndexShardSnapshots(List<BlobStoreIndexShardSnapshot> shardSnapshots) {
+    public BlobStoreIndexShardSnapshots(List<SnapshotFiles> shardSnapshots) {
         this.shardSnapshots = ImmutableList.copyOf(shardSnapshots);
+        // Map between blob names and file info
+        Map<String, FileInfo> newFiles = newHashMap();
+        // Map between original physical names and file info
+        Map<String, List<FileInfo>> physicalFiles = newHashMap();
+        for (SnapshotFiles snapshot : shardSnapshots) {
+            // First we build map between filenames in the repo and their original file info
+            // this map will be used in the next loop
+            for (FileInfo fileInfo : snapshot.indexFiles()) {
+                FileInfo oldFile = newFiles.put(fileInfo.name(), fileInfo);
+                assert oldFile == null || oldFile.isSame(fileInfo);
+            }
+            // We are doing it in two loops here so we keep only one copy of the fileInfo per blob
+            // the first loop de-duplicates fileInfo objects that were loaded from different snapshots but refer to
+            // the same blob
+            for (FileInfo fileInfo : snapshot.indexFiles()) {
+                List<FileInfo> physicalFileList = physicalFiles.get(fileInfo.physicalName());
+                if (physicalFileList == null) {
+                    physicalFileList = newArrayList();
+                    physicalFiles.put(fileInfo.physicalName(), physicalFileList);
+                }
+                physicalFileList.add(newFiles.get(fileInfo.name()));
+            }
+        }
+        ImmutableMap.Builder<String, ImmutableList<FileInfo>> mapBuilder = ImmutableMap.builder();
+        for (Map.Entry<String, List<FileInfo>> entry : physicalFiles.entrySet()) {
+            mapBuilder.put(entry.getKey(), ImmutableList.copyOf(entry.getValue()));
+        }
+        this.physicalFiles = mapBuilder.build();
+        this.files = ImmutableMap.copyOf(newFiles);
     }
 
+    private BlobStoreIndexShardSnapshots(ImmutableMap<String, FileInfo> files, ImmutableList<SnapshotFiles> shardSnapshots) {
+        this.shardSnapshots = shardSnapshots;
+        this.files = files;
+        Map<String, List<FileInfo>> physicalFiles = newHashMap();
+        for (SnapshotFiles snapshot : shardSnapshots) {
+            for (FileInfo fileInfo : snapshot.indexFiles()) {
+                List<FileInfo> physicalFileList = physicalFiles.get(fileInfo.physicalName());
+                if (physicalFileList == null) {
+                    physicalFileList = newArrayList();
+                    physicalFiles.put(fileInfo.physicalName(), physicalFileList);
+                }
+                physicalFileList.add(files.get(fileInfo.name()));
+            }
+        }
+        ImmutableMap.Builder<String, ImmutableList<FileInfo>> mapBuilder = ImmutableMap.builder();
+        for (Map.Entry<String, List<FileInfo>> entry : physicalFiles.entrySet()) {
+            mapBuilder.put(entry.getKey(), ImmutableList.copyOf(entry.getValue()));
+        }
+        this.physicalFiles = mapBuilder.build();
+    }
+
+
     /**
      * Returns list of snapshots
      *
      * @return list of snapshots
      */
-    public ImmutableList<BlobStoreIndexShardSnapshot> snapshots() {
+    public ImmutableList<SnapshotFiles> snapshots() {
         return this.shardSnapshots;
     }
 
@@ -51,16 +116,10 @@ public class BlobStoreIndexShardSnapshots implements Iterable<BlobStoreIndexShar
      * Finds reference to a snapshotted file by its original name
      *
      * @param physicalName original name
-     * @return file info or null if file is not present in any of snapshots
+     * @return a list of file infos that match specified physical file or null if the file is not present in any of snapshots
      */
-    public FileInfo findPhysicalIndexFile(String physicalName) {
-        for (BlobStoreIndexShardSnapshot snapshot : shardSnapshots) {
-            FileInfo fileInfo = snapshot.findPhysicalIndexFile(physicalName);
-            if (fileInfo != null) {
-                return fileInfo;
-            }
-        }
-        return null;
+    public ImmutableList<FileInfo> findPhysicalIndexFiles(String physicalName) {
+        return physicalFiles.get(physicalName);
     }
 
     /**
@@ -70,17 +129,166 @@ public class BlobStoreIndexShardSnapshots implements Iterable<BlobStoreIndexShar
      * @return file info or null if file is not present in any of snapshots
      */
     public FileInfo findNameFile(String name) {
-        for (BlobStoreIndexShardSnapshot snapshot : shardSnapshots) {
-            FileInfo fileInfo = snapshot.findNameFile(name);
-            if (fileInfo != null) {
-                return fileInfo;
-            }
-        }
-        return null;
+        return files.get(name);
     }
 
     @Override
-    public Iterator<BlobStoreIndexShardSnapshot> iterator() {
+    public Iterator<SnapshotFiles> iterator() {
         return shardSnapshots.iterator();
     }
+
+    static final class Fields {
+        static final XContentBuilderString FILES = new XContentBuilderString("files");
+        static final XContentBuilderString SNAPSHOTS = new XContentBuilderString("snapshots");
+    }
+
+    static final class ParseFields {
+        static final ParseField FILES = new ParseField("files");
+        static final ParseField SNAPSHOTS = new ParseField("snapshots");
+    }
+
+    /**
+     * Writes index file for the shard in the following format.
+     * <pre>
+     * {@code
+     * {
+     *     "files": [{
+     *         "name": "__3",
+     *         "physical_name": "_0.si",
+     *         "length": 310,
+     *         "checksum": "1tpsg3p",
+     *         "written_by": "5.1.0",
+     *         "meta_hash": "P9dsFxNMdWNlb......"
+     *     }, {
+     *         "name": "__2",
+     *         "physical_name": "segments_2",
+     *         "length": 150,
+     *         "checksum": "11qjpz6",
+     *         "written_by": "5.1.0",
+     *         "meta_hash": "P9dsFwhzZWdtZ......."
+     *     }, {
+     *         "name": "__1",
+     *         "physical_name": "_0.cfe",
+     *         "length": 363,
+     *         "checksum": "er9r9g",
+     *         "written_by": "5.1.0"
+     *     }, {
+     *         "name": "__0",
+     *         "physical_name": "_0.cfs",
+     *         "length": 3354,
+     *         "checksum": "491liz",
+     *         "written_by": "5.1.0"
+     *     }, {
+     *         "name": "__4",
+     *         "physical_name": "segments_3",
+     *         "length": 150,
+     *         "checksum": "134567",
+     *         "written_by": "5.1.0",
+     *         "meta_hash": "P9dsFwhzZWdtZ......."
+     *     }],
+     *     "snapshots": {
+     *         "snapshot_1": {
+     *             "files": ["__0", "__1", "__2", "__3"]
+     *         },
+     *         "snapshot_2": {
+     *             "files": ["__0", "__1", "__2", "__4"]
+     *         }
+     *     }
+     * }
+     * }
+     * </pre>
+     */
+    @Override
+    public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+        builder.startObject();
+        // First we list all blobs with their file infos:
+        builder.startArray(Fields.FILES);
+        for (Map.Entry<String, FileInfo> entry : files.entrySet()) {
+            FileInfo.toXContent(entry.getValue(), builder, params);
+        }
+        builder.endArray();
+        // Then we list all snapshots with list of all blobs that are used by the snapshot
+        builder.startObject(Fields.SNAPSHOTS);
+        for (SnapshotFiles snapshot : shardSnapshots) {
+            builder.startObject(snapshot.snapshot(), XContentBuilder.FieldCaseConversion.NONE);
+            builder.startArray(Fields.FILES);
+            for (FileInfo fileInfo : snapshot.indexFiles()) {
+                builder.value(fileInfo.name());
+            }
+            builder.endArray();
+            builder.endObject();
+        }
+        builder.endObject();
+
+        builder.endObject();
+        return builder;
+    }
+
+    public static BlobStoreIndexShardSnapshots fromXContent(XContentParser parser) throws IOException {
+        XContentParser.Token token = parser.currentToken();
+        Map<String, List<String>> snapshotsMap = newHashMap();
+        ImmutableMap.Builder<String, FileInfo> filesBuilder = ImmutableMap.builder();
+        if (token == XContentParser.Token.START_OBJECT) {
+            while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
+                if (token != XContentParser.Token.FIELD_NAME) {
+                    throw new ElasticsearchParseException("unexpected token  [" + token + "]");
+                }
+                String currentFieldName = parser.currentName();
+                token = parser.nextToken();
+                if (token == XContentParser.Token.START_ARRAY) {
+                    if (ParseFields.FILES.match(currentFieldName) == false) {
+                        throw new ElasticsearchParseException("unknown array [" + currentFieldName + "]");
+                    }
+                    while (parser.nextToken() != XContentParser.Token.END_ARRAY) {
+                        FileInfo fileInfo = FileInfo.fromXContent(parser);
+                        filesBuilder.put(fileInfo.name(), fileInfo);
+                    }
+                } else if (token == XContentParser.Token.START_OBJECT) {
+                    if (ParseFields.SNAPSHOTS.match(currentFieldName) == false) {
+                        throw new ElasticsearchParseException("unknown object [" + currentFieldName + "]");
+                    }
+                    while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
+                        if (token != XContentParser.Token.FIELD_NAME) {
+                            throw new ElasticsearchParseException("unknown object [" + currentFieldName + "]");
+                        }
+                        String snapshot = parser.currentName();
+                        if (parser.nextToken() != XContentParser.Token.START_OBJECT) {
+                            throw new ElasticsearchParseException("unknown object [" + currentFieldName + "]");
+                        }
+                        while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
+                            if (token == XContentParser.Token.FIELD_NAME) {
+                                currentFieldName = parser.currentName();
+                                if (parser.nextToken() == XContentParser.Token.START_ARRAY) {
+                                    if (ParseFields.FILES.match(currentFieldName) == false) {
+                                        throw new ElasticsearchParseException("unknown array [" + currentFieldName + "]");
+                                    }
+                                    List<String> fileNames = newArrayList();
+                                    while (parser.nextToken() != XContentParser.Token.END_ARRAY) {
+                                        fileNames.add(parser.text());
+                                    }
+                                    snapshotsMap.put(snapshot, fileNames);
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    throw new ElasticsearchParseException("unexpected token  [" + token + "]");
+                }
+            }
+        }
+
+        ImmutableMap<String, FileInfo> files = filesBuilder.build();
+        ImmutableList.Builder<SnapshotFiles> snapshots = ImmutableList.builder();
+        for (Map.Entry<String, List<String>> entry : snapshotsMap.entrySet()) {
+            ImmutableList.Builder<FileInfo> fileInfosBuilder = ImmutableList.builder();
+            for (String file : entry.getValue()) {
+                FileInfo fileInfo = files.get(file);
+                assert fileInfo != null;
+                fileInfosBuilder.add(fileInfo);
+            }
+            snapshots.add(new SnapshotFiles(entry.getKey(), fileInfosBuilder.build()));
+        }
+        return new BlobStoreIndexShardSnapshots(files, snapshots.build());
+    }
+
 }
diff --git a/src/main/java/org/elasticsearch/index/snapshots/blobstore/SnapshotFiles.java b/src/main/java/org/elasticsearch/index/snapshots/blobstore/SnapshotFiles.java
new file mode 100644
index 00000000000..0dad85d2d54
--- /dev/null
+++ b/src/main/java/org/elasticsearch/index/snapshots/blobstore/SnapshotFiles.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.elasticsearch.index.snapshots.blobstore;
+
+import com.google.common.collect.ImmutableList;
+import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshot.FileInfo;
+
+import java.util.Map;
+
+import static com.google.common.collect.Maps.newHashMap;
+
+/**
+ * Contains a list of files participating in a snapshot
+ */
+public class SnapshotFiles {
+
+    private final String snapshot;
+
+    private final ImmutableList<FileInfo> indexFiles;
+
+    private Map<String, FileInfo> physicalFiles = null;
+
+    public String snapshot() {
+        return snapshot;
+    }
+
+    public SnapshotFiles(String snapshot, ImmutableList<FileInfo> indexFiles ) {
+        this.snapshot = snapshot;
+        this.indexFiles = indexFiles;
+    }
+
+    /**
+     * Returns a list of file in the snapshot
+     */
+    public ImmutableList<FileInfo> indexFiles() {
+        return indexFiles;
+    }
+
+    /**
+     * Returns true if this snapshot contains a file with a given original name
+     *
+     * @param physicalName original file name
+     * @return true if the file was found, false otherwise
+     */
+    public boolean containPhysicalIndexFile(String physicalName) {
+        return findPhysicalIndexFile(physicalName) != null;
+    }
+
+    /**
+     * Returns information about a physical file with the given name
+     * @param physicalName the original file name
+     * @return information about this file
+     */
+    public FileInfo findPhysicalIndexFile(String physicalName) {
+        if (physicalFiles == null) {
+            Map<String, FileInfo> files = newHashMap();
+            for(FileInfo fileInfo : indexFiles) {
+                files.put(fileInfo.physicalName(), fileInfo);
+            }
+            this.physicalFiles = files;
+        }
+        return physicalFiles.get(physicalName);
+    }
+
+}
diff --git a/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java b/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
index 2cf35a9905d..a505b4b5493 100644
--- a/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
+++ b/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
@@ -174,9 +174,8 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent<Rep
      */
     @Override
     protected void doStart() {
-
         this.snapshotsBlobContainer = blobStore().blobContainer(basePath());
-        indexShardRepository.initialize(blobStore(), basePath(), chunkSize(), snapshotRateLimiter, restoreRateLimiter, this);
+        indexShardRepository.initialize(blobStore(), basePath(), chunkSize(), snapshotRateLimiter, restoreRateLimiter, this, isCompress());
     }
 
     /**
@@ -329,11 +328,15 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent<Rep
     }
 
     private StreamOutput compressIfNeeded(OutputStream output) throws IOException {
+        return toStreamOutput(output, isCompress());
+    }
+
+    public static StreamOutput toStreamOutput(OutputStream output, boolean compress) throws IOException {
         StreamOutput out = null;
         boolean success = false;
         try {
             out = new OutputStreamStreamOutput(output);
-            if (isCompress()) {
+            if (compress) {
                 out = CompressorFactory.defaultCompressor().streamOutput(out);
             }
             success = true;
@@ -596,10 +599,7 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent<Rep
      */
     protected void writeSnapshotList(ImmutableList<SnapshotId> snapshots) throws IOException {
         BytesStreamOutput bStream = new BytesStreamOutput();
-        StreamOutput stream = bStream;
-        if (isCompress()) {
-            stream = CompressorFactory.defaultCompressor().streamOutput(stream);
-        }
+        StreamOutput stream = compressIfNeeded(bStream);
         XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON, stream);
         builder.startObject();
         builder.startArray("snapshots");

From 6598d82ae8f1ce36991ddc7af2a7e53a3f1a8541 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Wed, 3 Jun 2015 11:56:25 +0200
Subject: [PATCH 105/123] fix bad merge for parent field mapper, and change
 most field types to be pkg-private and final

---
 .../elasticsearch/index/mapper/core/BinaryFieldMapper.java  | 2 +-
 .../elasticsearch/index/mapper/core/BooleanFieldMapper.java | 2 +-
 .../elasticsearch/index/mapper/core/ByteFieldMapper.java    | 2 +-
 .../index/mapper/core/CompletionFieldMapper.java            | 2 +-
 .../elasticsearch/index/mapper/core/DoubleFieldMapper.java  | 2 +-
 .../elasticsearch/index/mapper/core/FloatFieldMapper.java   | 2 +-
 .../elasticsearch/index/mapper/core/IntegerFieldMapper.java | 2 +-
 .../elasticsearch/index/mapper/core/ShortFieldMapper.java   | 2 +-
 .../elasticsearch/index/mapper/core/StringFieldMapper.java  | 2 +-
 .../elasticsearch/index/mapper/geo/GeoPointFieldMapper.java | 2 +-
 .../elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java | 2 +-
 .../elasticsearch/index/mapper/internal/AllFieldMapper.java | 2 +-
 .../index/mapper/internal/FieldNamesFieldMapper.java        | 2 +-
 .../elasticsearch/index/mapper/internal/IdFieldMapper.java  | 2 +-
 .../index/mapper/internal/IndexFieldMapper.java             | 2 +-
 .../index/mapper/internal/ParentFieldMapper.java            | 6 +++---
 .../index/mapper/internal/RoutingFieldMapper.java           | 2 +-
 .../index/mapper/internal/SourceFieldMapper.java            | 2 +-
 .../elasticsearch/index/mapper/internal/TTLFieldMapper.java | 2 +-
 .../index/mapper/internal/TimestampFieldMapper.java         | 2 +-
 .../index/mapper/internal/TypeFieldMapper.java              | 2 +-
 .../elasticsearch/index/mapper/internal/UidFieldMapper.java | 2 +-
 .../index/mapper/internal/VersionFieldMapper.java           | 2 +-
 .../org/elasticsearch/index/mapper/ip/IpFieldMapper.java    | 3 +--
 24 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java
index cc638623e99..20bcb15ad53 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/BinaryFieldMapper.java
@@ -105,7 +105,7 @@ public class BinaryFieldMapper extends AbstractFieldMapper {
         }
     }
 
-    public static class BinaryFieldType extends MappedFieldType {
+    static final class BinaryFieldType extends MappedFieldType {
         protected boolean tryUncompressing = false;
 
         public BinaryFieldType() {
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java
index cfbcbc45ef1..f33a24d15e1 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/BooleanFieldMapper.java
@@ -128,7 +128,7 @@ public class BooleanFieldMapper extends AbstractFieldMapper {
         }
     }
 
-    public static class BooleanFieldType extends MappedFieldType {
+    static final class BooleanFieldType extends MappedFieldType {
 
         public BooleanFieldType() {
             super(AbstractFieldMapper.Defaults.FIELD_TYPE);
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java
index 1a65d58025e..f9800ce9ffa 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/ByteFieldMapper.java
@@ -130,7 +130,7 @@ public class ByteFieldMapper extends NumberFieldMapper {
         }
     }
 
-    public static class ByteFieldType extends NumberFieldType {
+    static final class ByteFieldType extends NumberFieldType {
         public ByteFieldType() {}
 
         protected ByteFieldType(ByteFieldType ref) {
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java
index eeb28e24121..d229d6a9b6f 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java
@@ -220,7 +220,7 @@ public class CompletionFieldMapper extends AbstractFieldMapper {
         }
     }
 
-    public static class CompletionFieldType extends MappedFieldType {
+    static final class CompletionFieldType extends MappedFieldType {
 
         public CompletionFieldType() {
             super(AbstractFieldMapper.Defaults.FIELD_TYPE);
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java
index a8f4a44e6ab..63f0c87939b 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/DoubleFieldMapper.java
@@ -135,7 +135,7 @@ public class DoubleFieldMapper extends NumberFieldMapper {
         }
     }
 
-    public static class DoubleFieldType extends NumberFieldType {
+    static final class DoubleFieldType extends NumberFieldType {
 
         public DoubleFieldType() {}
 
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java
index 50c5f578a48..1a7996befe7 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/FloatFieldMapper.java
@@ -136,7 +136,7 @@ public class FloatFieldMapper extends NumberFieldMapper {
         }
     }
 
-    public static class FloatFieldType extends NumberFieldType {
+    static final class FloatFieldType extends NumberFieldType {
 
         public FloatFieldType() {}
 
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java
index 893722d5a0a..0f9eb053fbf 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/IntegerFieldMapper.java
@@ -132,7 +132,7 @@ public class IntegerFieldMapper extends NumberFieldMapper {
         }
     }
 
-    public static class IntegerFieldType extends NumberFieldType {
+    static final class IntegerFieldType extends NumberFieldType {
 
         public IntegerFieldType() {}
 
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java
index 382f30eab40..3eefdaf1b6d 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/ShortFieldMapper.java
@@ -134,7 +134,7 @@ public class ShortFieldMapper extends NumberFieldMapper {
         }
     }
 
-    public static class ShortFieldType extends NumberFieldType {
+    static final class ShortFieldType extends NumberFieldType {
 
         public ShortFieldType() {}
 
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java
index 0fd77fe5875..52458fffb00 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/StringFieldMapper.java
@@ -189,7 +189,7 @@ public class StringFieldMapper extends AbstractFieldMapper implements AllFieldMa
         }
     }
 
-    public static class StringFieldType extends MappedFieldType {
+    static final class StringFieldType extends MappedFieldType {
 
         public StringFieldType() {
             super(AbstractFieldMapper.Defaults.FIELD_TYPE);
diff --git a/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java
index 4485aed953b..bb3ada8278d 100644
--- a/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java
@@ -277,7 +277,7 @@ public class GeoPointFieldMapper extends AbstractFieldMapper implements ArrayVal
         }
     }
 
-    public static class GeoPointFieldType extends MappedFieldType {
+    public static final class GeoPointFieldType extends MappedFieldType {
 
         private MappedFieldType geohashFieldType;
         private int geohashPrecision;
diff --git a/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java
index 9468088c982..817b09bd071 100644
--- a/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapper.java
@@ -232,7 +232,7 @@ public class GeoShapeFieldMapper extends AbstractFieldMapper {
         }
     }
 
-    public static class GeoShapeFieldType extends MappedFieldType {
+    public static final class GeoShapeFieldType extends MappedFieldType {
 
         private PrefixTreeStrategy defaultStrategy;
         private RecursivePrefixTreeStrategy recursiveStrategy;
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java
index 364dee5852b..2af2f2f6d3f 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/AllFieldMapper.java
@@ -155,7 +155,7 @@ public class AllFieldMapper extends AbstractFieldMapper implements RootMapper {
         }
     }
 
-    public static class AllFieldType extends MappedFieldType {
+    static final class AllFieldType extends MappedFieldType {
 
         public AllFieldType() {
             super(AbstractFieldMapper.Defaults.FIELD_TYPE);
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java
index 631fdb87771..39bf0344ed4 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapper.java
@@ -133,7 +133,7 @@ public class FieldNamesFieldMapper extends AbstractFieldMapper implements RootMa
         }
     }
 
-    public static class FieldNamesFieldType extends MappedFieldType {
+    static final class FieldNamesFieldType extends MappedFieldType {
 
         public FieldNamesFieldType() {
             super(AbstractFieldMapper.Defaults.FIELD_TYPE);
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java
index 87cd4f7cb31..6a22f038d2c 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java
@@ -136,7 +136,7 @@ public class IdFieldMapper extends AbstractFieldMapper implements RootMapper {
         }
     }
 
-    public static class IdFieldType extends MappedFieldType {
+    static final class IdFieldType extends MappedFieldType {
 
         public IdFieldType() {
             super(AbstractFieldMapper.Defaults.FIELD_TYPE);
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/IndexFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/IndexFieldMapper.java
index 00fe4013ed8..f558b501840 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/IndexFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/IndexFieldMapper.java
@@ -119,7 +119,7 @@ public class IndexFieldMapper extends AbstractFieldMapper implements RootMapper
         }
     }
 
-    public static class IndexFieldType extends MappedFieldType {
+    static final class IndexFieldType extends MappedFieldType {
 
         public IndexFieldType() {
             super(AbstractFieldMapper.Defaults.FIELD_TYPE);
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java
index e0e03ec9b1d..a0cb94bf939 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java
@@ -114,7 +114,7 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
             if (type == null) {
                 throw new MapperParsingException("[_parent] field mapping must contain the [type] option");
             }
-            fieldType.setNames(new MappedFieldType.Names(name, indexName, indexName, name));
+            setupFieldType(context);
             return new ParentFieldMapper(fieldType, type, fieldDataSettings, context.indexSettings());
         }
     }
@@ -147,7 +147,7 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
         }
     }
 
-    public static class ParentFieldType extends MappedFieldType {
+    static final class ParentFieldType extends MappedFieldType {
 
         public ParentFieldType() {
             super(AbstractFieldMapper.Defaults.FIELD_TYPE);
@@ -232,7 +232,7 @@ public class ParentFieldMapper extends AbstractFieldMapper implements RootMapper
     private final BytesRef typeAsBytes;
 
     protected ParentFieldMapper(MappedFieldType fieldType, String type, @Nullable Settings fieldDataSettings, Settings indexSettings) {
-        super(fieldType, false, fieldDataSettings, indexSettings);
+        super(fieldType, Version.indexCreated(indexSettings).onOrAfter(Version.V_2_0_0), fieldDataSettings, indexSettings);
         this.type = type;
         this.typeAsBytes = type == null ? null : new BytesRef(type);
     }
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/RoutingFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/RoutingFieldMapper.java
index d03238caf6e..ccf6d84293d 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/RoutingFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/RoutingFieldMapper.java
@@ -124,7 +124,7 @@ public class RoutingFieldMapper extends AbstractFieldMapper implements RootMappe
         }
     }
 
-    public static class RoutingFieldType extends MappedFieldType {
+    static final class RoutingFieldType extends MappedFieldType {
 
         public RoutingFieldType() {
             super(AbstractFieldMapper.Defaults.FIELD_TYPE);
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java
index 7fe65d13296..8dcf7f7e746 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java
@@ -200,7 +200,7 @@ public class SourceFieldMapper extends AbstractFieldMapper implements RootMapper
         }
     }
 
-    public static class SourceFieldType extends MappedFieldType {
+    static final class SourceFieldType extends MappedFieldType {
 
         public SourceFieldType() {
             super(AbstractFieldMapper.Defaults.FIELD_TYPE);
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/TTLFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/TTLFieldMapper.java
index 0040b4a5140..cec4941afec 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/TTLFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/TTLFieldMapper.java
@@ -136,7 +136,7 @@ public class TTLFieldMapper extends LongFieldMapper implements RootMapper {
         }
     }
 
-    public static class TTLFieldType extends LongFieldType {
+    static final class TTLFieldType extends LongFieldType {
 
         public TTLFieldType() {
         }
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java
index 5f068395a03..e517a1f801c 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java
@@ -210,7 +210,7 @@ public class TimestampFieldMapper extends DateFieldMapper implements RootMapper
         }
     }
 
-    public static class TimestampFieldType extends DateFieldType {
+    static final class TimestampFieldType extends DateFieldType {
 
         public TimestampFieldType() {}
 
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java
index 9128534c468..7fea8b5f391 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/TypeFieldMapper.java
@@ -105,7 +105,7 @@ public class TypeFieldMapper extends AbstractFieldMapper implements RootMapper {
         }
     }
 
-    public static class TypeFieldType extends MappedFieldType {
+    static final class TypeFieldType extends MappedFieldType {
 
         public TypeFieldType() {
             super(AbstractFieldMapper.Defaults.FIELD_TYPE);
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java
index 3d49df6089c..594ec2f7ccb 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/UidFieldMapper.java
@@ -106,7 +106,7 @@ public class UidFieldMapper extends AbstractFieldMapper implements RootMapper {
         }
     }
 
-    public static class UidFieldType extends MappedFieldType {
+    static final class UidFieldType extends MappedFieldType {
 
         public UidFieldType() {
             super(AbstractFieldMapper.Defaults.FIELD_TYPE);
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/VersionFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/VersionFieldMapper.java
index f4a33b80b5c..5e33faf0ebb 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/VersionFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/VersionFieldMapper.java
@@ -91,7 +91,7 @@ public class VersionFieldMapper extends AbstractFieldMapper implements RootMappe
         }
     }
 
-    public static class VersionFieldType extends MappedFieldType {
+    static final class VersionFieldType extends MappedFieldType {
 
         public VersionFieldType() {
             super(AbstractFieldMapper.Defaults.FIELD_TYPE);
diff --git a/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java
index 8cf6b93f5ca..8bc1f3eeecf 100644
--- a/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/ip/IpFieldMapper.java
@@ -162,7 +162,7 @@ public class IpFieldMapper extends NumberFieldMapper {
         }
     }
 
-    public static class IpFieldType extends NumberFieldType {
+    static final class IpFieldType extends NumberFieldType {
 
         public IpFieldType() {}
 
@@ -175,7 +175,6 @@ public class IpFieldMapper extends NumberFieldMapper {
             return new IpFieldType(this);
         }
 
-
         @Override
         public Long value(Object value) {
             if (value == null) {

From a805cef045eca2ad0bdcf28b50105e01697bdf48 Mon Sep 17 00:00:00 2001
From: Tanguy Leroux <tlrx.dev@gmail.com>
Date: Tue, 2 Jun 2015 18:14:14 +0200
Subject: [PATCH 106/123] Bulk: allow null values in action/metadata line
 parameters

Closes #11458
---
 .../elasticsearch/action/bulk/BulkRequest.java    |  2 +-
 .../action/bulk/BulkRequestTests.java             |  8 ++++++++
 .../elasticsearch/action/bulk/simple-bulk10.json  | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/elasticsearch/action/bulk/simple-bulk10.json

diff --git a/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java b/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java
index a562dc046b2..d699b8c038f 100644
--- a/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java
+++ b/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java
@@ -332,7 +332,7 @@ public class BulkRequest extends ActionRequest<BulkRequest> implements Composite
                             } else {
                                 throw new IllegalArgumentException("Action/metadata line [" + line + "] contains an unknown parameter [" + currentFieldName + "]");
                             }
-                        } else {
+                        } else if (token != XContentParser.Token.VALUE_NULL) {
                             throw new IllegalArgumentException("Malformed action/metadata line [" + line + "], expected a simple value for field [" + currentFieldName + "] but found [" + token + "]");
                         }
                     }
diff --git a/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java b/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java
index 8600092f1d7..6220958a0c6 100644
--- a/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java
+++ b/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java
@@ -177,4 +177,12 @@ public class BulkRequestTests extends ElasticsearchTestCase {
                     e.getMessage().contains("Malformed action/metadata line [3], expected START_OBJECT or END_OBJECT but found [START_ARRAY]"), equalTo(true));
         }
     }
+
+    @Test
+    public void testSimpleBulk10() throws Exception {
+        String bulkAction = copyToStringFromClasspath("/org/elasticsearch/action/bulk/simple-bulk10.json");
+        BulkRequest bulkRequest = new BulkRequest();
+        bulkRequest.add(bulkAction.getBytes(Charsets.UTF_8), 0, bulkAction.length(), null, null);
+        assertThat(bulkRequest.numberOfActions(), equalTo(9));
+    }
 }
diff --git a/src/test/java/org/elasticsearch/action/bulk/simple-bulk10.json b/src/test/java/org/elasticsearch/action/bulk/simple-bulk10.json
new file mode 100644
index 00000000000..3556dc261b0
--- /dev/null
+++ b/src/test/java/org/elasticsearch/action/bulk/simple-bulk10.json
@@ -0,0 +1,15 @@
+{ "index"  : {"_index":null, "_type":"type1", "_id":"0"} }
+{ "field1" : "value1" }
+{ "index"  : {"_index":"test", "_type":null, "_id":"0"} }
+{ "field1" : "value1" }
+{ "index"  : {"_index":"test", "_type":"type1", "_id":null} }
+{ "field1" : "value1" }
+{ "delete"  : {"_index":null, "_type":"type1", "_id":"0"} }
+{ "delete"  : {"_index":"test", "_type":null, "_id":"0"} }
+{ "delete"  : {"_index":"test", "_type":"type1", "_id":null} }
+{ "create"  : {"_index":null, "_type":"type1", "_id":"0"} }
+{ "field1" : "value1" }
+{ "create"  : {"_index":"test", "_type":null, "_id":"0"} }
+{ "field1" : "value1" }
+{ "create"  : {"_index":"test", "_type":"type1", "_id":null} }
+{ "field1" : "value1" }

From 5fd96d9371f68645ac6ec2ec17c0faeaa21610a8 Mon Sep 17 00:00:00 2001
From: Lee Hinman <lee@writequit.org>
Date: Thu, 7 May 2015 12:43:00 -0600
Subject: [PATCH 107/123] [DOCS] Document the
 `index.shared_filesystem.recover_on_any_node` setting

Relates to #10960
Closes #11047
---
 .../indices/shadow-replicas.asciidoc          | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/docs/reference/indices/shadow-replicas.asciidoc b/docs/reference/indices/shadow-replicas.asciidoc
index 1f4db1c90cf..89dccd9f62e 100644
--- a/docs/reference/indices/shadow-replicas.asciidoc
+++ b/docs/reference/indices/shadow-replicas.asciidoc
@@ -16,6 +16,25 @@ settings, you need to enable using it in elasticsearch.yml:
 node.enable_custom_paths: true
 --------------------------------------------------
 
+You will also need to disable the default security manager that Elasticsearch
+runs with. You can do this by either passing
+`-Des.security.manager.enabled=false` with the parameters while starting
+Elasticsearch, or you can disable it in elasticsearch.yml:
+
+[source,yaml]
+--------------------------------------------------
+security.manager.enabled: false
+--------------------------------------------------
+
+[WARNING]
+========================
+Disabling the security manager means that the Elasticsearch process is not
+limited to the directories and files that it can read and write. However,
+because the `index.data_path` setting is set when creating the index, the
+security manager would prevent writing or reading from the index's location, so
+it must be disabled.
+========================
+
 You can then create an index with a custom data path, where each node will use
 this path for the data:
 
@@ -88,6 +107,12 @@ settings API:
     Boolean value indicating this index uses a shared filesystem. Defaults to
     the `true` if `index.shadow_replicas` is set to true, `false` otherwise.
 
+`index.shared_filesystem.recover_on_any_node`::
+    Boolean value indicating whether the primary shards for the index should be
+    allowed to recover on any node in the cluster, regardless of the number of
+    replicas or whether the node has previously had the shard allocated to it
+    before. Defaults to `false`.
+
 === Node level settings related to shadow replicas
 
 These are non-dynamic settings that need to be configured in `elasticsearch.yml`

From 0f207bf4fb85725e0c3893b1232675d79ada83ed Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Wed, 3 Jun 2015 12:56:25 +0200
Subject: [PATCH 108/123] Cleanup DeleteByQuery code from IndexShard

---
 .../elasticsearch/index/shard/IndexShard.java | 20 ----------------
 .../shard/TranslogRecoveryPerformer.java      | 24 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/src/main/java/org/elasticsearch/index/shard/IndexShard.java
index 06400a3bf82..dbf1af95ade 100644
--- a/src/main/java/org/elasticsearch/index/shard/IndexShard.java
+++ b/src/main/java/org/elasticsearch/index/shard/IndexShard.java
@@ -550,26 +550,6 @@ public class IndexShard extends AbstractIndexShardComponent {
         indexingService.postDelete(delete);
     }
 
-    public Engine.DeleteByQuery prepareDeleteByQuery(BytesReference source, @Nullable String[] filteringAliases, Engine.Operation.Origin origin, String... types) {
-        return prepareDeleteByQuery(queryParserService, mapperService, indexAliasesService, indexCache, source, filteringAliases, origin, types);
-    }
-
-    static Engine.DeleteByQuery prepareDeleteByQuery(IndexQueryParserService queryParserService, MapperService mapperService, IndexAliasesService indexAliasesService, IndexCache indexCache, BytesReference source, @Nullable String[] filteringAliases, Engine.Operation.Origin origin, String... types) {
-        long startTime = System.nanoTime();
-        if (types == null) {
-            types = Strings.EMPTY_ARRAY;
-        }
-        Query query = queryParserService.parseQuery(source).query();
-        Query searchFilter = mapperService.searchFilter(types);
-        if (searchFilter != null) {
-            query = Queries.filtered(query, searchFilter);
-        }
-
-        Query aliasFilter = indexAliasesService.aliasFilter(filteringAliases);
-        BitDocIdSetFilter parentFilter = mapperService.hasNested() ? indexCache.bitsetFilterCache().getBitDocIdSetFilter(Queries.newNonNestedFilter()) : null;
-        return new Engine.DeleteByQuery(query, source, filteringAliases, aliasFilter, parentFilter, origin, startTime, types);
-    }
-
     public Engine.GetResult get(Engine.Get get) {
         readAllowed();
         return engine().get(get);
diff --git a/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java b/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java
index b2dbc1022cf..60d3cfc71b6 100644
--- a/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java
+++ b/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java
@@ -18,8 +18,14 @@
  */
 package org.elasticsearch.index.shard;
 
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.join.BitDocIdSetFilter;
 import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.common.Nullable;
+import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.collect.Tuple;
+import org.elasticsearch.common.lucene.search.Queries;
 import org.elasticsearch.index.aliases.IndexAliasesService;
 import org.elasticsearch.index.cache.IndexCache;
 import org.elasticsearch.index.engine.Engine;
@@ -122,7 +128,7 @@ public class TranslogRecoveryPerformer {
                     break;
                 case DELETE_BY_QUERY:
                     Translog.DeleteByQuery deleteByQuery = (Translog.DeleteByQuery) operation;
-                    engine.delete(IndexShard.prepareDeleteByQuery(queryParserService, mapperService, indexAliasesService, indexCache,
+                    engine.delete(prepareDeleteByQuery(queryParserService, mapperService, indexAliasesService, indexCache,
                             deleteByQuery.source(), deleteByQuery.filteringAliases(), Engine.Operation.Origin.RECOVERY, deleteByQuery.types()));
                     break;
                 default:
@@ -149,6 +155,22 @@ public class TranslogRecoveryPerformer {
         operationProcessed();
     }
 
+    private static Engine.DeleteByQuery prepareDeleteByQuery(IndexQueryParserService queryParserService, MapperService mapperService, IndexAliasesService indexAliasesService, IndexCache indexCache, BytesReference source, @Nullable String[] filteringAliases, Engine.Operation.Origin origin, String... types) {
+        long startTime = System.nanoTime();
+        if (types == null) {
+            types = Strings.EMPTY_ARRAY;
+        }
+        Query query = queryParserService.parseQuery(source).query();
+        Query searchFilter = mapperService.searchFilter(types);
+        if (searchFilter != null) {
+            query = Queries.filtered(query, searchFilter);
+        }
+
+        Query aliasFilter = indexAliasesService.aliasFilter(filteringAliases);
+        BitDocIdSetFilter parentFilter = mapperService.hasNested() ? indexCache.bitsetFilterCache().getBitDocIdSetFilter(Queries.newNonNestedFilter()) : null;
+        return new Engine.DeleteByQuery(query, source, filteringAliases, aliasFilter, parentFilter, origin, startTime, types);
+    }
+
     /**
      * Called once for every processed operation by this recovery performer.
      * This can be used to get progress information on the translog execution.

From 01e8eaf181148d1ae5239800b5d71bd38c0c2896 Mon Sep 17 00:00:00 2001
From: Alexander Reelsen <alexander@reelsen.net>
Date: Wed, 3 Jun 2015 18:07:47 +0200
Subject: [PATCH 109/123] Date Parsing: Add parsing for epoch and epoch in
 milliseconds

This commit changes the date handling. First and foremost Elasticsearch
does not try to convert every date to a unix timestamp first and then
uses the configured date. This now allows for dates like `2015121212` to
be parsed correctly.

Instead it is now explicit by adding a `epoch_second` and `epoch_millis`
date format. This also means, that the default date format now is
`epoch_millis||dateOptionalTime` to remain backwards compatible.

Closes #5328
Relates #10971
---
 docs/reference/mapping/date-format.asciidoc   |  5 ++
 .../mapping/fields/timestamp-field.asciidoc   |  2 +-
 .../mapping/types/core-types.asciidoc         |  2 +-
 .../mapping/types/root-object-type.asciidoc   |  4 +-
 .../action/TimestampParsingException.java     |  5 ++
 .../cluster/metadata/MappingMetaData.java     | 14 ++---
 .../common/joda/DateMathParser.java           | 22 ++------
 .../org/elasticsearch/common/joda/Joda.java   | 51 +++++++++++++++++++
 .../index/mapper/core/DateFieldMapper.java    | 35 ++++---------
 .../mapper/internal/TimestampFieldMapper.java |  2 +-
 .../index/query/RangeQueryParser.java         |  7 +--
 .../support/format/ValueFormat.java           |  2 +-
 .../support/format/ValueParser.java           |  9 ++--
 .../common/joda/DateMathParserTests.java      | 27 ++++++----
 .../count/simple/SimpleCountTests.java        | 44 ++++++++++++++++
 .../deps/joda/SimpleJodaTests.java            | 35 +++++++++++++
 .../mapper/date/SimpleDateMappingTests.java   | 48 ++++++++++-------
 .../timestamp/TimestampMappingTests.java      | 14 +++++
 18 files changed, 228 insertions(+), 100 deletions(-)

diff --git a/docs/reference/mapping/date-format.asciidoc b/docs/reference/mapping/date-format.asciidoc
index a548d282ee9..9f52f4e8789 100644
--- a/docs/reference/mapping/date-format.asciidoc
+++ b/docs/reference/mapping/date-format.asciidoc
@@ -198,6 +198,11 @@ year.
 
 |`year_month_day`|A formatter for a four digit year, two digit month of
 year, and two digit day of month.
+
+|`epoch_second`|A formatter for the number of seconds since the epoch.
+
+|`epoch_millis`|A formatter for the number of milliseconds since
+the epoch.
 |=======================================================================
 
 [float]
diff --git a/docs/reference/mapping/fields/timestamp-field.asciidoc b/docs/reference/mapping/fields/timestamp-field.asciidoc
index ce7520708f8..0fb1a91d7f5 100644
--- a/docs/reference/mapping/fields/timestamp-field.asciidoc
+++ b/docs/reference/mapping/fields/timestamp-field.asciidoc
@@ -79,7 +79,7 @@ format>> used to parse the provided timestamp value. For example:
 }
 --------------------------------------------------
 
-Note, the default format is `dateOptionalTime`. The timestamp value will
+Note, the default format is `epoch_millis||dateOptionalTime`. The timestamp value will
 first be parsed as a number and if it fails the format will be tried.
 
 [float]
diff --git a/docs/reference/mapping/types/core-types.asciidoc b/docs/reference/mapping/types/core-types.asciidoc
index 7d25d8d9ab1..43fcc07a0ca 100644
--- a/docs/reference/mapping/types/core-types.asciidoc
+++ b/docs/reference/mapping/types/core-types.asciidoc
@@ -349,7 +349,7 @@ date type:
 Defaults to the property/field name.
 
 |`format` |The <<mapping-date-format,date
-format>>. Defaults to `dateOptionalTime`.
+format>>. Defaults to `epoch_millis||dateOptionalTime`.
 
 |`store` |Set to `true` to store actual field in the index, `false` to not
 store it. Defaults to `false` (note, the JSON document itself is stored,
diff --git a/docs/reference/mapping/types/root-object-type.asciidoc b/docs/reference/mapping/types/root-object-type.asciidoc
index a8e8ea000cd..a97f7f57635 100644
--- a/docs/reference/mapping/types/root-object-type.asciidoc
+++ b/docs/reference/mapping/types/root-object-type.asciidoc
@@ -42,8 +42,8 @@ and will use the matching format as its format attribute. The date
 format itself is explained
 <<mapping-date-format,here>>.
 
-The default formats are: `dateOptionalTime` (ISO) and
-`yyyy/MM/dd HH:mm:ss Z||yyyy/MM/dd Z`.
+The default formats are: `dateOptionalTime` (ISO),
+`yyyy/MM/dd HH:mm:ss Z||yyyy/MM/dd Z` and `epoch_millis`.
 
 *Note:* `dynamic_date_formats` are used *only* for dynamically added
 date fields, not for `date` fields that you specify in your mapping.
diff --git a/src/main/java/org/elasticsearch/action/TimestampParsingException.java b/src/main/java/org/elasticsearch/action/TimestampParsingException.java
index 634a0bf34a9..d865483a6ac 100644
--- a/src/main/java/org/elasticsearch/action/TimestampParsingException.java
+++ b/src/main/java/org/elasticsearch/action/TimestampParsingException.java
@@ -32,6 +32,11 @@ public class TimestampParsingException extends ElasticsearchException {
         this.timestamp = timestamp;
     }
 
+    public TimestampParsingException(String timestamp, Throwable cause) {
+        super("failed to parse timestamp [" + timestamp + "]", cause);
+        this.timestamp = timestamp;
+    }
+
     public String timestamp() {
         return timestamp;
     }
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
index 778effc226b..f3cde99079f 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
@@ -161,19 +161,11 @@ public class MappingMetaData extends AbstractDiffable<MappingMetaData> {
     public static class Timestamp {
 
         public static String parseStringTimestamp(String timestampAsString, FormatDateTimeFormatter dateTimeFormatter) throws TimestampParsingException {
-            long ts;
             try {
-                // if we manage to parse it, its a millisecond timestamp, just return the string as is
-                ts = Long.parseLong(timestampAsString);
-                return timestampAsString;
-            } catch (NumberFormatException e) {
-                try {
-                    ts = dateTimeFormatter.parser().parseMillis(timestampAsString);
-                } catch (RuntimeException e1) {
-                    throw new TimestampParsingException(timestampAsString);
-                }
+                return Long.toString(dateTimeFormatter.parser().parseMillis(timestampAsString));
+            } catch (RuntimeException e) {
+                throw new TimestampParsingException(timestampAsString, e);
             }
-            return Long.toString(ts);
         }
 
 
diff --git a/src/main/java/org/elasticsearch/common/joda/DateMathParser.java b/src/main/java/org/elasticsearch/common/joda/DateMathParser.java
index 232630ac61a..7fa1947a501 100644
--- a/src/main/java/org/elasticsearch/common/joda/DateMathParser.java
+++ b/src/main/java/org/elasticsearch/common/joda/DateMathParser.java
@@ -19,14 +19,14 @@
 
 package org.elasticsearch.common.joda;
 
-import org.apache.commons.lang3.StringUtils;
 import org.elasticsearch.ElasticsearchParseException;
 import org.joda.time.DateTimeZone;
 import org.joda.time.MutableDateTime;
 import org.joda.time.format.DateTimeFormatter;
 
 import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
+
+import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * A parser for date/time formatted text with optional date math.
@@ -38,13 +38,10 @@ import java.util.concurrent.TimeUnit;
 public class DateMathParser {
 
     private final FormatDateTimeFormatter dateTimeFormatter;
-    private final TimeUnit timeUnit;
 
-    public DateMathParser(FormatDateTimeFormatter dateTimeFormatter, TimeUnit timeUnit) {
-        if (dateTimeFormatter == null) throw new NullPointerException();
-        if (timeUnit == null) throw new NullPointerException();
+    public DateMathParser(FormatDateTimeFormatter dateTimeFormatter) {
+        checkNotNull(dateTimeFormatter);
         this.dateTimeFormatter = dateTimeFormatter;
-        this.timeUnit = timeUnit;
     }
 
     public long parse(String text, Callable<Long> now) {
@@ -195,17 +192,6 @@ public class DateMathParser {
     }
 
     private long parseDateTime(String value, DateTimeZone timeZone) {
-        
-        // first check for timestamp
-        if (value.length() > 4 && StringUtils.isNumeric(value)) {
-            try {
-                long time = Long.parseLong(value);
-                return timeUnit.toMillis(time);
-            } catch (NumberFormatException e) {
-                throw new ElasticsearchParseException("failed to parse date field [" + value + "] as timestamp", e);
-            }
-        }
-        
         DateTimeFormatter parser = dateTimeFormatter.parser();
         if (timeZone != null) {
             parser = parser.withZone(timeZone);
diff --git a/src/main/java/org/elasticsearch/common/joda/Joda.java b/src/main/java/org/elasticsearch/common/joda/Joda.java
index 06d6760727f..b00c1ebbd47 100644
--- a/src/main/java/org/elasticsearch/common/joda/Joda.java
+++ b/src/main/java/org/elasticsearch/common/joda/Joda.java
@@ -27,6 +27,7 @@ import org.joda.time.field.ScaledDurationField;
 import org.joda.time.format.*;
 
 import java.util.Locale;
+import java.util.regex.Pattern;
 
 /**
  *
@@ -133,6 +134,10 @@ public class Joda {
             formatter = ISODateTimeFormat.yearMonth();
         } else if ("yearMonthDay".equals(input) || "year_month_day".equals(input)) {
             formatter = ISODateTimeFormat.yearMonthDay();
+        } else if ("epoch_second".equals(input)) {
+            formatter = new DateTimeFormatterBuilder().append(new EpochTimeParser(false)).toFormatter();
+        } else if ("epoch_millis".equals(input)) {
+            formatter = new DateTimeFormatterBuilder().append(new EpochTimeParser(true)).toFormatter();
         } else if (Strings.hasLength(input) && input.contains("||")) {
                 String[] formats = Strings.delimitedListToStringArray(input, "||");
                 DateTimeParser[] parsers = new DateTimeParser[formats.length];
@@ -192,4 +197,50 @@ public class Joda {
             return new OffsetDateTimeField(new DividedDateTimeField(new OffsetDateTimeField(chronology.monthOfYear(), -1), QuarterOfYear, 3), 1);
         }
     };
+
+    public static class EpochTimeParser implements DateTimeParser {
+
+        private static final Pattern MILLI_SECOND_PRECISION_PATTERN = Pattern.compile("^\\d{1,13}$");
+        private static final Pattern SECOND_PRECISION_PATTERN = Pattern.compile("^\\d{1,10}$");
+
+        private final boolean hasMilliSecondPrecision;
+        private final Pattern pattern;
+
+        public EpochTimeParser(boolean hasMilliSecondPrecision) {
+            this.hasMilliSecondPrecision = hasMilliSecondPrecision;
+            this.pattern = hasMilliSecondPrecision ? MILLI_SECOND_PRECISION_PATTERN : SECOND_PRECISION_PATTERN;
+        }
+
+        @Override
+        public int estimateParsedLength() {
+            return hasMilliSecondPrecision ? 13 : 10;
+        }
+
+        @Override
+        public int parseInto(DateTimeParserBucket bucket, String text, int position) {
+            if (text.length() > estimateParsedLength() ||
+                // timestamps have to have UTC timezone
+                bucket.getZone() != DateTimeZone.UTC ||
+                pattern.matcher(text).matches() == false) {
+                return -1;
+            }
+
+            int factor = hasMilliSecondPrecision ? 1 : 1000;
+            try {
+                long millis = Long.valueOf(text) * factor;
+                DateTime dt = new DateTime(millis, DateTimeZone.UTC);
+                bucket.saveField(DateTimeFieldType.year(), dt.getYear());
+                bucket.saveField(DateTimeFieldType.monthOfYear(), dt.getMonthOfYear());
+                bucket.saveField(DateTimeFieldType.dayOfMonth(), dt.getDayOfMonth());
+                bucket.saveField(DateTimeFieldType.hourOfDay(), dt.getHourOfDay());
+                bucket.saveField(DateTimeFieldType.minuteOfHour(), dt.getMinuteOfHour());
+                bucket.saveField(DateTimeFieldType.secondOfMinute(), dt.getSecondOfMinute());
+                bucket.saveField(DateTimeFieldType.millisOfSecond(), dt.getMillisOfSecond());
+                bucket.setZone(DateTimeZone.UTC);
+            } catch (Exception e) {
+                return -1;
+            }
+            return text.length();
+        }
+    };
 }
diff --git a/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java
index b33182d8b17..510e068464d 100644
--- a/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java
@@ -46,12 +46,7 @@ import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.analysis.NumericDateAnalyzer;
 import org.elasticsearch.index.fielddata.FieldDataType;
-import org.elasticsearch.index.mapper.MappedFieldType;
-import org.elasticsearch.index.mapper.Mapper;
-import org.elasticsearch.index.mapper.MapperParsingException;
-import org.elasticsearch.index.mapper.MergeMappingException;
-import org.elasticsearch.index.mapper.MergeResult;
-import org.elasticsearch.index.mapper.ParseContext;
+import org.elasticsearch.index.mapper.*;
 import org.elasticsearch.index.mapper.core.LongFieldMapper.CustomLongNumericField;
 import org.elasticsearch.index.query.QueryParseContext;
 import org.elasticsearch.search.internal.SearchContext;
@@ -223,7 +218,7 @@ public class DateFieldMapper extends NumberFieldMapper {
 
         protected FormatDateTimeFormatter dateTimeFormatter = Defaults.DATE_TIME_FORMATTER;
         protected TimeUnit timeUnit = Defaults.TIME_UNIT;
-        protected DateMathParser dateMathParser = new DateMathParser(dateTimeFormatter, timeUnit);
+        protected DateMathParser dateMathParser = new DateMathParser(dateTimeFormatter);
 
         public DateFieldType() {}
 
@@ -245,7 +240,7 @@ public class DateFieldMapper extends NumberFieldMapper {
         public void setDateTimeFormatter(FormatDateTimeFormatter dateTimeFormatter) {
             checkIfFrozen();
             this.dateTimeFormatter = dateTimeFormatter;
-            this.dateMathParser = new DateMathParser(dateTimeFormatter, timeUnit);
+            this.dateMathParser = new DateMathParser(dateTimeFormatter);
         }
 
         public TimeUnit timeUnit() {
@@ -255,7 +250,7 @@ public class DateFieldMapper extends NumberFieldMapper {
         public void setTimeUnit(TimeUnit timeUnit) {
             checkIfFrozen();
             this.timeUnit = timeUnit;
-            this.dateMathParser = new DateMathParser(dateTimeFormatter, timeUnit);
+            this.dateMathParser = new DateMathParser(dateTimeFormatter);
         }
 
         protected DateMathParser dateMathParser() {
@@ -365,9 +360,6 @@ public class DateFieldMapper extends NumberFieldMapper {
         }
 
         public long parseToMilliseconds(Object value, boolean inclusive, @Nullable DateTimeZone zone, @Nullable DateMathParser forcedDateParser) {
-            if (value instanceof Number) {
-                return ((Number) value).longValue();
-            }
             DateMathParser dateParser = dateMathParser();
             if (forcedDateParser != null) {
                 dateParser = forcedDateParser;
@@ -434,17 +426,12 @@ public class DateFieldMapper extends NumberFieldMapper {
     @Override
     protected void innerParseCreateField(ParseContext context, List<Field> fields) throws IOException {
         String dateAsString = null;
-        Long value = null;
         float boost = this.fieldType.boost();
         if (context.externalValueSet()) {
             Object externalValue = context.externalValue();
-            if (externalValue instanceof Number) {
-                value = ((Number) externalValue).longValue();
-            } else {
-                dateAsString = (String) externalValue;
-                if (dateAsString == null) {
-                    dateAsString = nullValue;
-                }
+            dateAsString = (String) externalValue;
+            if (dateAsString == null) {
+                dateAsString = nullValue;
             }
         } else {
             XContentParser parser = context.parser();
@@ -452,7 +439,7 @@ public class DateFieldMapper extends NumberFieldMapper {
             if (token == XContentParser.Token.VALUE_NULL) {
                 dateAsString = nullValue;
             } else if (token == XContentParser.Token.VALUE_NUMBER) {
-                value = parser.longValue(coerce.value());
+                dateAsString = parser.text();
             } else if (token == XContentParser.Token.START_OBJECT) {
                 String currentFieldName = null;
                 while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
@@ -462,8 +449,6 @@ public class DateFieldMapper extends NumberFieldMapper {
                         if ("value".equals(currentFieldName) || "_value".equals(currentFieldName)) {
                             if (token == XContentParser.Token.VALUE_NULL) {
                                 dateAsString = nullValue;
-                            } else if (token == XContentParser.Token.VALUE_NUMBER) {
-                                value = parser.longValue(coerce.value());
                             } else {
                                 dateAsString = parser.text();
                             }
@@ -479,14 +464,12 @@ public class DateFieldMapper extends NumberFieldMapper {
             }
         }
 
+        Long value = null;
         if (dateAsString != null) {
-            assert value == null;
             if (context.includeInAll(includeInAll, this)) {
                 context.allEntries().addText(fieldType.names().fullName(), dateAsString, boost);
             }
             value = fieldType().parseStringValue(dateAsString);
-        } else if (value != null) {
-            value = ((DateFieldType)fieldType).timeUnit().toMillis(value);
         }
 
         if (value != null) {
diff --git a/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java b/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java
index e517a1f801c..149cac7f1aa 100644
--- a/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java
+++ b/src/main/java/org/elasticsearch/index/mapper/internal/TimestampFieldMapper.java
@@ -58,7 +58,7 @@ public class TimestampFieldMapper extends DateFieldMapper implements RootMapper
 
     public static final String NAME = "_timestamp";
     public static final String CONTENT_TYPE = "_timestamp";
-    public static final String DEFAULT_DATE_TIME_FORMAT = "dateOptionalTime";
+    public static final String DEFAULT_DATE_TIME_FORMAT = "epoch_millis||dateOptionalTime";
 
     public static class Defaults extends DateFieldMapper.Defaults {
         public static final String NAME = "_timestamp";
diff --git a/src/main/java/org/elasticsearch/index/query/RangeQueryParser.java b/src/main/java/org/elasticsearch/index/query/RangeQueryParser.java
index fed95b9eb02..a4e04856500 100644
--- a/src/main/java/org/elasticsearch/index/query/RangeQueryParser.java
+++ b/src/main/java/org/elasticsearch/index/query/RangeQueryParser.java
@@ -102,7 +102,7 @@ public class RangeQueryParser implements QueryParser {
                         } else if ("time_zone".equals(currentFieldName) || "timeZone".equals(currentFieldName)) {
                             timeZone = DateTimeZone.forID(parser.text());
                         } else if ("format".equals(currentFieldName)) {
-                            forcedDateParser = new DateMathParser(Joda.forPattern(parser.text()), DateFieldMapper.Defaults.TIME_UNIT);
+                            forcedDateParser = new DateMathParser(Joda.forPattern(parser.text()));
                         } else {
                             throw new QueryParsingException(parseContext, "[range] query does not support [" + currentFieldName + "]");
                         }
@@ -123,11 +123,6 @@ public class RangeQueryParser implements QueryParser {
         FieldMapper mapper = parseContext.fieldMapper(fieldName);
         if (mapper != null) {
             if (mapper instanceof DateFieldMapper) {
-                if ((from instanceof Number || to instanceof Number) && timeZone != null) {
-                    throw new QueryParsingException(parseContext,
-                            "[range] time_zone when using ms since epoch format as it's UTC based can not be applied to [" + fieldName
-                                    + "]");
-                }
                 query = ((DateFieldMapper) mapper).fieldType().rangeQuery(from, to, includeLower, includeUpper, timeZone, forcedDateParser, parseContext);
             } else  {
                 if (timeZone != null) {
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormat.java b/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormat.java
index 7efef92364c..696137059d5 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormat.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueFormat.java
@@ -68,7 +68,7 @@ public class ValueFormat {
         public static final DateTime DEFAULT = new DateTime(DateFieldMapper.Defaults.DATE_TIME_FORMATTER.format(), ValueFormatter.DateTime.DEFAULT, ValueParser.DateMath.DEFAULT);
 
         public static DateTime format(String format) {
-            return new DateTime(format, new ValueFormatter.DateTime(format), new ValueParser.DateMath(format, DateFieldMapper.Defaults.TIME_UNIT));
+            return new DateTime(format, new ValueFormatter.DateTime(format), new ValueParser.DateMath(format));
         }
 
         public static DateTime mapper(DateFieldMapper mapper) {
diff --git a/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueParser.java b/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueParser.java
index ccc57c34288..296b945632a 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueParser.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/support/format/ValueParser.java
@@ -32,7 +32,6 @@ import java.text.NumberFormat;
 import java.text.ParseException;
 import java.util.Locale;
 import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
 
 /**
  *
@@ -81,12 +80,12 @@ public interface ValueParser {
      */
     static class DateMath implements ValueParser {
 
-        public static final DateMath DEFAULT = new ValueParser.DateMath(new DateMathParser(DateFieldMapper.Defaults.DATE_TIME_FORMATTER, DateFieldMapper.Defaults.TIME_UNIT));
+        public static final DateMath DEFAULT = new ValueParser.DateMath(new DateMathParser(DateFieldMapper.Defaults.DATE_TIME_FORMATTER));
 
         private DateMathParser parser;
 
-        public DateMath(String format, TimeUnit timeUnit) {
-            this(new DateMathParser(Joda.forPattern(format), timeUnit));
+        public DateMath(String format) {
+            this(new DateMathParser(Joda.forPattern(format)));
         }
 
         public DateMath(DateMathParser parser) {
@@ -110,7 +109,7 @@ public interface ValueParser {
         }
 
         public static DateMath mapper(DateFieldMapper mapper) {
-            return new DateMath(new DateMathParser(mapper.fieldType().dateTimeFormatter(), DateFieldMapper.Defaults.TIME_UNIT));
+            return new DateMath(new DateMathParser(mapper.fieldType().dateTimeFormatter()));
         }
     }
 
diff --git a/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java b/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java
index cba7a259f41..359e418bb6a 100644
--- a/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java
+++ b/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java
@@ -23,16 +23,18 @@ import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.joda.time.DateTimeZone;
+import org.junit.Test;
 
+import java.util.TimeZone;
 import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.hamcrest.Matchers.equalTo;
 
 public class DateMathParserTests extends ElasticsearchTestCase {
-    FormatDateTimeFormatter formatter = Joda.forPattern("dateOptionalTime");
-    DateMathParser parser = new DateMathParser(formatter, TimeUnit.MILLISECONDS);
+
+    FormatDateTimeFormatter formatter = Joda.forPattern("dateOptionalTime||epoch_millis");
+    DateMathParser parser = new DateMathParser(formatter);
 
     private static Callable<Long> callable(final long value) {
         return new Callable<Long>() {
@@ -195,25 +197,22 @@ public class DateMathParserTests extends ElasticsearchTestCase {
     public void testTimestamps() {
         assertDateMathEquals("1418248078000", "2014-12-10T21:47:58.000");
 
-        // timezone does not affect timestamps
-        assertDateMathEquals("1418248078000", "2014-12-10T21:47:58.000", 0, false, DateTimeZone.forID("-08:00"));
-
         // datemath still works on timestamps
         assertDateMathEquals("1418248078000||/m", "2014-12-10T21:47:00.000");
         
         // also check other time units
-        DateMathParser parser = new DateMathParser(Joda.forPattern("dateOptionalTime"), TimeUnit.SECONDS);
+        DateMathParser parser = new DateMathParser(Joda.forPattern("epoch_second||dateOptionalTime"));
         long datetime = parser.parse("1418248078", callable(0));
         assertDateEquals(datetime, "1418248078", "2014-12-10T21:47:58.000");
         
         // a timestamp before 10000 is a year
         assertDateMathEquals("9999", "9999-01-01T00:00:00.000");
-        // 10000 is the first timestamp
-        assertDateMathEquals("10000", "1970-01-01T00:00:10.000");
+        // 10000 is also a year, breaking bwc, used to be a timestamp
+        assertDateMathEquals("10000", "10000-01-01T00:00:00.000");
         // but 10000 with T is still a date format
         assertDateMathEquals("10000T", "10000-01-01T00:00:00.000");
     }
-    
+
     void assertParseException(String msg, String date, String exc) {
         try {
             parser.parse(date, callable(0));
@@ -232,7 +231,7 @@ public class DateMathParserTests extends ElasticsearchTestCase {
     }
     
     public void testIllegalDateFormat() {
-        assertParseException("Expected bad timestamp exception", Long.toString(Long.MAX_VALUE) + "0", "timestamp");
+        assertParseException("Expected bad timestamp exception", Long.toString(Long.MAX_VALUE) + "0", "failed to parse date field");
         assertParseException("Expected bad date format exception", "123bogus", "with format");
     }
 
@@ -250,4 +249,10 @@ public class DateMathParserTests extends ElasticsearchTestCase {
         parser.parse("now/d", now, false, null);
         assertTrue(called.get());
     }
+
+    @Test(expected = ElasticsearchParseException.class)
+    public void testThatUnixTimestampMayNotHaveTimeZone() {
+        DateMathParser parser = new DateMathParser(Joda.forPattern("epoch_millis"));
+        parser.parse("1234567890123", callable(42), false, DateTimeZone.forTimeZone(TimeZone.getTimeZone("CET")));
+    }
 }
diff --git a/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java b/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java
index 074d226f4f1..8d613fb6acf 100644
--- a/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java
+++ b/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java
@@ -22,6 +22,7 @@ package org.elasticsearch.count.simple;
 import org.apache.lucene.util.Constants;
 import org.elasticsearch.action.count.CountResponse;
 import org.elasticsearch.action.index.IndexRequestBuilder;
+import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
@@ -39,6 +40,7 @@ import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
 import static org.elasticsearch.index.query.QueryBuilders.rangeQuery;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
+import static org.hamcrest.Matchers.is;
 
 public class SimpleCountTests extends ElasticsearchIntegrationTest {
 
@@ -177,4 +179,46 @@ public class SimpleCountTests extends ElasticsearchIntegrationTest {
             assertHitCount(countResponse, 20l);
         }
     }
+
+    @Test
+    public void testThatNonEpochDatesCanBeSearch() throws Exception {
+        assertAcked(prepareCreate("test")
+                .addMapping("type1",
+                    jsonBuilder().startObject().startObject("type1")
+                .startObject("properties").startObject("date_field").field("type", "date").field("format", "yyyyMMddHH").endObject().endObject()
+                .endObject().endObject()));
+        ensureGreen("test");
+
+        XContentBuilder document = jsonBuilder()
+                .startObject()
+                .field("date_field", "2015060210")
+                .endObject();
+        assertThat(client().prepareIndex("test", "type1").setSource(document).get().isCreated(), is(true));
+
+        document = jsonBuilder()
+                .startObject()
+                .field("date_field", "2014060210")
+                .endObject();
+        assertThat(client().prepareIndex("test", "type1").setSource(document).get().isCreated(), is(true));
+
+        // this is a timestamp in 2015 and should not be returned in counting when filtering by year
+        document = jsonBuilder()
+                .startObject()
+                .field("date_field", "1433236702")
+                .endObject();
+        assertThat(client().prepareIndex("test", "type1").setSource(document).get().isCreated(), is(true));
+
+        refresh();
+
+        assertHitCount(client().prepareCount("test").get(), 3);
+
+        CountResponse countResponse = client().prepareCount("test").setQuery(QueryBuilders.rangeQuery("date_field").from("2015010100").to("2015123123")).get();
+        assertHitCount(countResponse, 1);
+
+        countResponse = client().prepareCount("test").setQuery(QueryBuilders.rangeQuery("date_field").from(2015010100).to(2015123123)).get();
+        assertHitCount(countResponse, 1);
+
+        countResponse = client().prepareCount("test").setQuery(QueryBuilders.rangeQuery("date_field").from(2015010100).to(2015123123).timeZone("UTC")).get();
+        assertHitCount(countResponse, 1);
+    }
 }
diff --git a/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java b/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java
index c306b5546b3..c35953ca210 100644
--- a/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java
+++ b/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java
@@ -23,6 +23,7 @@ import org.elasticsearch.common.joda.FormatDateTimeFormatter;
 import org.elasticsearch.common.joda.Joda;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.test.ElasticsearchTestCase;
+import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.MutableDateTime;
 import org.joda.time.format.*;
@@ -248,6 +249,40 @@ public class SimpleJodaTests extends ElasticsearchTestCase {
         assertThat(time.getMillis(), equalTo(utcTime.getMillis() - TimeValue.timeValueHours(22).millis()));
     }
 
+    @Test
+    public void testThatEpochsInSecondsCanBeParsed() {
+        boolean parseMilliSeconds = randomBoolean();
+
+        // epoch: 1433144433655 => date: Mon Jun  1 09:40:33.655 CEST 2015
+        FormatDateTimeFormatter formatter = Joda.forPattern(parseMilliSeconds ? "epoch_millis" : "epoch_second");
+        DateTime dateTime = formatter.parser().parseDateTime(parseMilliSeconds ? "1433144433655" : "1433144433");
+
+        assertThat(dateTime.getYear(), is(2015));
+        assertThat(dateTime.getDayOfMonth(), is(1));
+        assertThat(dateTime.getMonthOfYear(), is(6));
+        assertThat(dateTime.getHourOfDay(), is(7)); // utc timezone, +2 offset due to CEST
+        assertThat(dateTime.getMinuteOfHour(), is(40));
+        assertThat(dateTime.getSecondOfMinute(), is(33));
+
+        if (parseMilliSeconds) {
+            assertThat(dateTime.getMillisOfSecond(), is(655));
+        } else {
+            assertThat(dateTime.getMillisOfSecond(), is(0));
+        }
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testForInvalidDatesInEpochSecond() {
+        FormatDateTimeFormatter formatter = Joda.forPattern("epoch_second");
+        formatter.parser().parseDateTime(randomFrom("invalid date", "12345678901", "12345678901234"));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testForInvalidDatesInEpochMillis() {
+        FormatDateTimeFormatter formatter = Joda.forPattern("epoch_millis");
+        formatter.parser().parseDateTime(randomFrom("invalid date", "12345678901234"));
+    }
+
     private long utcTimeInMillis(String time) {
         return ISODateTimeFormat.dateOptionalTimeParser().withZone(DateTimeZone.UTC).parseMillis(time);
     }
diff --git a/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java
index 859bc4ebf0b..86d9fc322e7 100644
--- a/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java
@@ -25,6 +25,7 @@ import org.apache.lucene.index.DocValuesType;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.search.NumericRangeQuery;
 import org.apache.lucene.util.Constants;
+import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.util.LocaleUtils;
@@ -33,13 +34,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.json.JsonXContent;
 import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.mapper.DocumentMapper;
-import org.elasticsearch.index.mapper.FieldMapper;
-import org.elasticsearch.index.mapper.MapperParsingException;
-import org.elasticsearch.index.mapper.MergeResult;
-import org.elasticsearch.index.mapper.ParseContext;
+import org.elasticsearch.index.mapper.*;
 import org.elasticsearch.index.mapper.ParseContext.Document;
-import org.elasticsearch.index.mapper.ParsedDocument;
 import org.elasticsearch.index.mapper.core.DateFieldMapper;
 import org.elasticsearch.index.mapper.core.LongFieldMapper;
 import org.elasticsearch.index.mapper.core.StringFieldMapper;
@@ -51,21 +47,12 @@ import org.joda.time.DateTimeZone;
 import org.junit.Before;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 
 import static com.carrotsearch.randomizedtesting.RandomizedTest.systemPropertyAsBoolean;
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 import static org.elasticsearch.index.mapper.string.SimpleStringMappingTests.docValuesType;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasKey;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.*;
 
 public class SimpleDateMappingTests extends ElasticsearchSingleNodeTest {
     
@@ -439,4 +426,31 @@ public class SimpleDateMappingTests extends ElasticsearchSingleNodeTest {
                 .bytes());
         assertThat(getDateAsMillis(doc.rootDoc(), "date_field"), equalTo(44000L));
     }
+
+    public void testThatEpochCanBeIgnoredWithCustomFormat() throws Exception {
+        String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
+                .startObject("properties").startObject("date_field").field("type", "date").field("format", "yyyyMMddHH").endObject().endObject()
+                .endObject().endObject().string();
+
+        DocumentMapper defaultMapper = mapper("type", mapping);
+
+        XContentBuilder document = XContentFactory.jsonBuilder()
+                .startObject()
+                .field("date_field", "2015060210")
+                .endObject();
+        ParsedDocument doc = defaultMapper.parse("type", "1", document.bytes());
+        assertThat(getDateAsMillis(doc.rootDoc(), "date_field"), equalTo(1433239200000L));
+        IndexResponse indexResponse = client().prepareIndex("test", "test").setSource(document).get();
+        assertThat(indexResponse.isCreated(), is(true));
+
+        // integers should always be parsed as well... cannot be sure it is a unix timestamp only
+        doc = defaultMapper.parse("type", "1", XContentFactory.jsonBuilder()
+                .startObject()
+                .field("date_field", 2015060210)
+                .endObject()
+                .bytes());
+        assertThat(getDateAsMillis(doc.rootDoc(), "date_field"), equalTo(1433239200000L));
+        indexResponse = client().prepareIndex("test", "test").setSource(document).get();
+        assertThat(indexResponse.isCreated(), is(true));
+    }
 }
diff --git a/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java b/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java
index 4a127154c54..8c65418892d 100644
--- a/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java
+++ b/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java
@@ -775,4 +775,18 @@ public class TimestampMappingTests extends ElasticsearchSingleNodeTest {
         assertEquals(MappingMetaData.Timestamp.parseStringTimestamp("1970", Joda.forPattern("YYYY")), request.timestamp());
         assertNull(docMapper.parse("type", "1", doc.bytes()).rootDoc().get("_timestamp"));
     }
+
+    public void testThatEpochCanBeIgnoredWithCustomFormat() throws Exception {
+        String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
+            .startObject("_timestamp").field("enabled", true).field("format", "yyyyMMddHH").field("path", "custom_timestamp").endObject()
+            .endObject().endObject().string();
+        DocumentMapper docMapper = createIndex("test").mapperService().documentMapperParser().parse(mapping);
+
+        XContentBuilder doc = XContentFactory.jsonBuilder().startObject().field("custom_timestamp", 2015060210).endObject();
+        IndexRequest request = new IndexRequest("test", "type", "1").source(doc);
+        MappingMetaData mappingMetaData = new MappingMetaData(docMapper);
+        request.process(MetaData.builder().build(), mappingMetaData, true, "test");
+
+        assertThat(request.timestamp(), is("1433239200000"));
+    }
 }

From b3779a03fcee69ceb794c8d4b88331fe77d49f4c Mon Sep 17 00:00:00 2001
From: Alexander Reelsen <alexander@reelsen.net>
Date: Wed, 3 Jun 2015 19:01:29 +0200
Subject: [PATCH 110/123] Test: Fix search query tests to use correct date,
 mark one test as awaitsfix

---
 .../org/elasticsearch/search/query/SearchQueryTests.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java b/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java
index 61cbcec2aea..45e866717aa 100644
--- a/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java
+++ b/src/test/java/org/elasticsearch/search/query/SearchQueryTests.java
@@ -1674,7 +1674,7 @@ public class SearchQueryTests extends ElasticsearchIntegrationTest {
                 .startObject("ts")
                 .field("type", "date")
                 .field("ignore_malformed", false)
-                .field("format", "dateOptionalTime")
+                .field("format", "epoch_millis")
                 .endObject()
                 .startObject("bs")
                 .field("type", "string")
@@ -1683,7 +1683,7 @@ public class SearchQueryTests extends ElasticsearchIntegrationTest {
                 .endObject()
                 .endObject()
                 .endObject())
-            .addMapping("bs", "online", "type=boolean", "ts", "type=date,ignore_malformed=false,format=dateOptionalTime"));
+            .addMapping("bs", "online", "type=boolean", "ts", "type=date,ignore_malformed=false,format=epoch_millis"));
         ensureGreen();
 
         client().prepareIndex("test", "s", "1").setRouting("Y").setSource("online", false, "bs", "Y", "ts", System.currentTimeMillis() - 100).get();
@@ -2195,6 +2195,7 @@ functionScoreQuery(scriptFunction(new Script("_doc['score'].value")))).setMinSco
         }
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/11478")
     @Test
     public void testDateProvidedAsNumber() throws ExecutionException, InterruptedException {
         createIndex("test");

From 7264fd4eb810c514e80ee7b5e5dfd1c8f95e5d26 Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Wed, 3 Jun 2015 14:48:30 +0200
Subject: [PATCH 111/123] Fix possible BWC break after upgrading from pre 1.0.0

This is happening because of #4074 when we required that the top-level "query" is present to delete-by-query requests, but prior to that we required that it is not present. So the translog has a DBQ without "query" and when we try to parse it we hit this exception.

This commit adds special handling for pre 1.0.0 indices if we hit parse exception, we
try to reparse without a top-level query object to be BWC compatible for these indices.

Closes #10262

Conflicts:
	src/main/java/org/elasticsearch/index/shard/IndexShard.java
	src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
---
 .../shard/TranslogRecoveryPerformer.java      | 24 +++++++++++++-
 .../index/shard/IndexShardTests.java          | 33 +++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java b/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java
index 60d3cfc71b6..bbe613b61c9 100644
--- a/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java
+++ b/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java
@@ -21,11 +21,14 @@ package org.elasticsearch.index.shard;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.join.BitDocIdSetFilter;
 import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.Version;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.lucene.search.Queries;
+import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.aliases.IndexAliasesService;
 import org.elasticsearch.index.cache.IndexCache;
 import org.elasticsearch.index.engine.Engine;
@@ -37,6 +40,8 @@ import org.elasticsearch.index.mapper.MapperUtils;
 import org.elasticsearch.index.mapper.Mapping;
 import org.elasticsearch.index.mapper.Uid;
 import org.elasticsearch.index.query.IndexQueryParserService;
+import org.elasticsearch.index.query.ParsedQuery;
+import org.elasticsearch.index.query.QueryParsingException;
 import org.elasticsearch.index.translog.Translog;
 
 import java.util.HashMap;
@@ -160,7 +165,24 @@ public class TranslogRecoveryPerformer {
         if (types == null) {
             types = Strings.EMPTY_ARRAY;
         }
-        Query query = queryParserService.parseQuery(source).query();
+        Query query;
+        try {
+            query = queryParserService.parseQuery(source).query();
+        } catch (QueryParsingException ex) {
+            // for BWC we try to parse directly the query since pre 1.0.0.Beta2 we didn't require a top level query field
+            if ( queryParserService.getIndexCreatedVersion().onOrBefore(Version.V_1_0_0_Beta2)) {
+                try {
+                    XContentParser parser = XContentHelper.createParser(source);
+                    ParsedQuery parse = queryParserService.parse(parser);
+                    query = parse.query();
+                } catch (Throwable t) {
+                    ex.addSuppressed(t);
+                    throw ex;
+                }
+            } else {
+                throw ex;
+            }
+        }
         Query searchFilter = mapperService.searchFilter(types);
         if (searchFilter != null) {
             query = Queries.filtered(query, searchFilter);
diff --git a/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
index 97e988f819f..da7f17ce48d 100644
--- a/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
+++ b/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
@@ -19,22 +19,26 @@
 package org.elasticsearch.index.shard;
 
 import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.Version;
 import org.elasticsearch.action.admin.indices.stats.IndexStats;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.routing.MutableShardRouting;
 import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.cluster.routing.ShardRoutingState;
+import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.NodeEnvironment;
 import org.elasticsearch.env.ShardLock;
 import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.engine.Engine;
+import org.elasticsearch.index.query.QueryParsingException;
 import org.elasticsearch.index.translog.Translog;
 import org.elasticsearch.index.translog.TranslogConfig;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.test.DummyShardLock;
 import org.elasticsearch.test.ElasticsearchSingleNodeTest;
+import org.elasticsearch.test.VersionUtils;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -329,4 +333,33 @@ public class IndexShardTests extends ElasticsearchSingleNodeTest {
         client().admin().indices().prepareUpdateSettings(shard.shardId.getIndex()).setSettings(settingsBuilder().put(TranslogConfig.INDEX_TRANSLOG_DURABILITY, durabilty.name()).build()).get();
         assertEquals(durabilty, shard.getTranslogDurability());
     }
+
+    public void testDeleteByQueryBWC() {
+        Version version = VersionUtils.randomVersion(random());
+        assertAcked(client().admin().indices().prepareCreate("test")
+                .setSettings(SETTING_NUMBER_OF_SHARDS, 1, SETTING_NUMBER_OF_REPLICAS, 0, IndexMetaData.SETTING_VERSION_CREATED, version.id));
+        ensureGreen("test");
+        client().prepareIndex("test", "person").setSource("{ \"user\" : \"kimchy\" }").get();
+
+        IndicesService indicesService = getInstanceFromNode(IndicesService.class);
+        IndexService test = indicesService.indexService("test");
+        IndexShard shard = test.shard(0);
+        int numDocs = 1;
+        shard.state = IndexShardState.RECOVERING;
+        try {
+            shard.recoveryState().getTranslog().totalOperations(1);
+            shard.engine().config().getTranslogRecoveryPerformer().performRecoveryOperation(shard.engine(), new Translog.DeleteByQuery(new Engine.DeleteByQuery(null, new BytesArray("{\"term\" : { \"user\" : \"kimchy\" }}"), null, null, null, Engine.Operation.Origin.RECOVERY, 0, "person")));
+            assertTrue(version.onOrBefore(Version.V_1_0_0_Beta2));
+            numDocs = 0;
+        } catch (QueryParsingException ex) {
+            assertTrue(version.after(Version.V_1_0_0_Beta2));
+        } finally {
+            shard.state = IndexShardState.STARTED;
+        }
+        shard.engine().refresh("foo");
+
+        try (Engine.Searcher searcher = shard.engine().acquireSearcher("foo")) {
+            assertEquals(numDocs, searcher.reader().numDocs());
+        }
+    }
 }

From d621b160e9b940add546a6234bc2d17381334f33 Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Wed, 3 Jun 2015 15:45:07 +0200
Subject: [PATCH 112/123] Use the smallest version rather than the default
 version

The minimum version comparison was always using the default version
sicne the comparison was flipped.

Closes #11474
---
 .../elasticsearch/index/shard/IndexShard.java   | 11 +++--------
 .../index/shard/IndexShardTests.java            | 16 ++++++++++++++++
 .../upgrade/UpgradeReallyOldIndexTest.java      | 17 +++++++++++++++++
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/src/main/java/org/elasticsearch/index/shard/IndexShard.java
index dbf1af95ade..75b322f45a6 100644
--- a/src/main/java/org/elasticsearch/index/shard/IndexShard.java
+++ b/src/main/java/org/elasticsearch/index/shard/IndexShard.java
@@ -23,8 +23,6 @@ import com.google.common.base.Charsets;
 import com.google.common.base.Preconditions;
 import org.apache.lucene.codecs.PostingsFormat;
 import org.apache.lucene.index.CheckIndex;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.join.BitDocIdSetFilter;
 import org.apache.lucene.store.AlreadyClosedException;
 import org.apache.lucene.util.IOUtils;
 import org.apache.lucene.util.ThreadInterruptedException;
@@ -41,14 +39,11 @@ import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.cluster.routing.ShardRoutingState;
 import org.elasticsearch.common.Booleans;
 import org.elasticsearch.common.Nullable;
-import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.lucene.Lucene;
-import org.elasticsearch.common.lucene.search.Queries;
 import org.elasticsearch.common.metrics.MeanMetric;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.ByteSizeValue;
@@ -720,13 +715,13 @@ public class IndexShard extends AbstractIndexShardComponent {
     }
 
     public org.apache.lucene.util.Version minimumCompatibleVersion() {
-        org.apache.lucene.util.Version luceneVersion = Version.LUCENE_3_EMULATION_VERSION;
+        org.apache.lucene.util.Version luceneVersion = null;
         for(Segment segment : engine().segments(false)) {
-            if (luceneVersion.onOrAfter(segment.getVersion())) {
+            if (luceneVersion == null || luceneVersion.onOrAfter(segment.getVersion())) {
                 luceneVersion = segment.getVersion();
             }
         }
-        return luceneVersion;
+        return luceneVersion == null ?  Version.indexCreated(indexSettings).luceneVersion : luceneVersion;
     }
 
     public SnapshotIndexCommit snapshotIndex(boolean flushFirst) throws EngineException {
diff --git a/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
index da7f17ce48d..3e7fcc79d55 100644
--- a/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
+++ b/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
@@ -50,6 +50,7 @@ import java.util.concurrent.ExecutionException;
 import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_REPLICAS;
 import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
 import static org.elasticsearch.common.settings.Settings.settingsBuilder;
+import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_VERSION_CREATED;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
 import static org.hamcrest.Matchers.equalTo;
@@ -362,4 +363,19 @@ public class IndexShardTests extends ElasticsearchSingleNodeTest {
             assertEquals(numDocs, searcher.reader().numDocs());
         }
     }
+
+    public void testMinimumCompatVersion() {
+        Version versionCreated = VersionUtils.randomVersion(random());
+        assertAcked(client().admin().indices().prepareCreate("test")
+                .setSettings(SETTING_NUMBER_OF_SHARDS, 1, SETTING_NUMBER_OF_REPLICAS, 0, SETTING_VERSION_CREATED, versionCreated.id));
+        client().prepareIndex("test", "test").setSource("{}").get();
+        ensureGreen("test");
+        IndicesService indicesService = getInstanceFromNode(IndicesService.class);
+        IndexShard test = indicesService.indexService("test").shard(0);
+        assertEquals(versionCreated.luceneVersion, test.minimumCompatibleVersion());
+        client().prepareIndex("test", "test").setSource("{}").get();
+        assertEquals(versionCreated.luceneVersion, test.minimumCompatibleVersion());
+        test.engine().flush();
+        assertEquals(Version.CURRENT.luceneVersion, test.minimumCompatibleVersion());
+    }
 }
diff --git a/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeReallyOldIndexTest.java b/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeReallyOldIndexTest.java
index ce2d54bb30f..3fd6bf4c5fb 100644
--- a/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeReallyOldIndexTest.java
+++ b/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeReallyOldIndexTest.java
@@ -19,7 +19,11 @@
 
 package org.elasticsearch.rest.action.admin.indices.upgrade;
 
+import org.elasticsearch.Version;
 import org.elasticsearch.bwcompat.StaticIndexBackwardCompatibilityTest;
+import org.elasticsearch.cluster.metadata.IndexMetaData;
+import org.elasticsearch.index.IndexService;
+import org.elasticsearch.indices.IndicesService;
 
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
 
@@ -29,6 +33,7 @@ public class UpgradeReallyOldIndexTest extends StaticIndexBackwardCompatibilityT
         String indexName = "index-0.90.6";
 
         loadIndex(indexName);
+        assertMinVersion(indexName, org.apache.lucene.util.Version.parse("4.5.1"));
         UpgradeTest.assertNotUpgraded(client(), indexName);
         assertTrue(UpgradeTest.hasAncientSegments(client(), indexName));
         assertNoFailures(client().admin().indices().prepareUpgrade(indexName).setUpgradeOnlyAncientSegments(true).get());
@@ -36,6 +41,18 @@ public class UpgradeReallyOldIndexTest extends StaticIndexBackwardCompatibilityT
         assertFalse(UpgradeTest.hasAncientSegments(client(), "index-0.90.6"));
         // This index has only ancient segments, so it should now be fully upgraded:
         UpgradeTest.assertUpgraded(client(), indexName);
+        assertEquals(Version.CURRENT.luceneVersion.toString(), client().admin().indices().prepareGetSettings(indexName).get().getSetting(indexName, IndexMetaData.SETTING_VERSION_MINIMUM_COMPATIBLE));
+        assertMinVersion(indexName, Version.CURRENT.luceneVersion);
+    }
+
+    private void assertMinVersion(String index, org.apache.lucene.util.Version version) {
+        for (IndicesService services : internalCluster().getInstances(IndicesService.class)) {
+            IndexService indexService = services.indexService(index);
+            if (indexService != null) {
+                assertEquals(version, indexService.shard(0).minimumCompatibleVersion());
+            }
+        }
+
     }
 
 }

From f0e6addc53bdd82dd55bab96f024012a7ba8456c Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Mon, 1 Jun 2015 13:54:31 -1000
Subject: [PATCH 113/123] Snapshot/Restore: sync up snapshot shard status on a
 master restart

When a snapshot operation on a particular shard finishes, the data node where this shard resides sends an update shard status request to the master node to indicate that the operation on the shard is done. When the master node receives the command it queues cluster state update task and acknowledges the receipt of the command to the data node.

The update snapshot shard status tasks have relatively low priority, so during cluster instability they tend to get stuck at the end of the queue. If the master node gets restarted before processing these tasks the information about the shards can be lost and the new master assumes that they are still in process while the data node thinks that these shards are already done.

 This commit add a retry mechanism that checks compares cluster state of a newly elected master and the current state of snapshot shards and updates the cluster state on the master again if needed.

Closes #11314
---
 .../snapshots/SnapshotsService.java           |  65 ++++++++-
 .../snapshots/AbstractSnapshotTests.java      | 131 ++++++++++++++++++
 .../DedicatedClusterSnapshotRestoreTests.java |  80 +++++++++++
 .../SharedClusterSnapshotRestoreTests.java    | 122 ----------------
 4 files changed, 271 insertions(+), 127 deletions(-)

diff --git a/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java b/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java
index cdf068cecee..ae22fbfa055 100644
--- a/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java
+++ b/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java
@@ -549,13 +549,18 @@ public class SnapshotsService extends AbstractLifecycleComponent<SnapshotsServic
 
             if (prev == null) {
                 if (curr != null) {
-                    processIndexShardSnapshots(curr);
+                    processIndexShardSnapshots(event);
                 }
             } else {
                 if (!prev.equals(curr)) {
-                    processIndexShardSnapshots(curr);
+                    processIndexShardSnapshots(event);
                 }
             }
+            if (event.state().nodes().masterNodeId() != null &&
+                    event.state().nodes().masterNodeId().equals(event.previousState().nodes().masterNodeId()) == false) {
+                syncShardStatsOnNewMaster(event);
+            }
+
         } catch (Throwable t) {
             logger.warn("Failed to update snapshot state ", t);
         }
@@ -778,9 +783,10 @@ public class SnapshotsService extends AbstractLifecycleComponent<SnapshotsServic
     /**
      * Checks if any new shards should be snapshotted on this node
      *
-     * @param snapshotMetaData snapshot metadata to be processed
+     * @param event cluster state changed event
      */
-    private void processIndexShardSnapshots(SnapshotMetaData snapshotMetaData) {
+    private void processIndexShardSnapshots(ClusterChangedEvent event) {
+        SnapshotMetaData snapshotMetaData = event.state().metaData().custom(SnapshotMetaData.TYPE);
         Map<SnapshotId, SnapshotShards> survivors = newHashMap();
         // First, remove snapshots that are no longer there
         for (Map.Entry<SnapshotId, SnapshotShards> entry : shardSnapshots.entrySet()) {
@@ -830,7 +836,17 @@ public class SnapshotsService extends AbstractLifecycleComponent<SnapshotsServic
                         for (Map.Entry<ShardId, SnapshotMetaData.ShardSnapshotStatus> shard : entry.shards().entrySet()) {
                             IndexShardSnapshotStatus snapshotStatus = snapshotShards.shards.get(shard.getKey());
                             if (snapshotStatus != null) {
-                                snapshotStatus.abort();
+                                if (snapshotStatus.stage() == IndexShardSnapshotStatus.Stage.STARTED) {
+                                    snapshotStatus.abort();
+                                } else if (snapshotStatus.stage() == IndexShardSnapshotStatus.Stage.DONE) {
+                                    logger.debug("[{}] trying to cancel snapshot on the shard [{}] that is already done, updating status on the master", entry.snapshotId(), shard.getKey());
+                                    updateIndexShardSnapshotStatus(new UpdateIndexShardSnapshotStatusRequest(entry.snapshotId(), shard.getKey(),
+                                            new ShardSnapshotStatus(event.state().nodes().localNodeId(), SnapshotMetaData.State.SUCCESS)));
+                                } else if (snapshotStatus.stage() == IndexShardSnapshotStatus.Stage.FAILURE) {
+                                    logger.debug("[{}] trying to cancel snapshot on the shard [{}] that has already failed, updating status on the master", entry.snapshotId(), shard.getKey());
+                                    updateIndexShardSnapshotStatus(new UpdateIndexShardSnapshotStatusRequest(entry.snapshotId(), shard.getKey(),
+                                            new ShardSnapshotStatus(event.state().nodes().localNodeId(), State.FAILED, snapshotStatus.failure())));
+                                }
                             }
                         }
                     }
@@ -878,6 +894,45 @@ public class SnapshotsService extends AbstractLifecycleComponent<SnapshotsServic
         }
     }
 
+    /**
+     * Checks if any shards were processed that the new master doesn't know about
+     * @param event
+     */
+    private void syncShardStatsOnNewMaster(ClusterChangedEvent event) {
+        SnapshotMetaData snapshotMetaData = event.state().getMetaData().custom(SnapshotMetaData.TYPE);
+        if (snapshotMetaData == null) {
+            return;
+        }
+        for (SnapshotMetaData.Entry snapshot : snapshotMetaData.entries()) {
+            if (snapshot.state() == State.STARTED || snapshot.state() == State.ABORTED) {
+                ImmutableMap<ShardId, IndexShardSnapshotStatus> localShards = currentSnapshotShards(snapshot.snapshotId());
+                if (localShards != null) {
+                    ImmutableMap<ShardId, ShardSnapshotStatus> masterShards = snapshot.shards();
+                    for(Map.Entry<ShardId, IndexShardSnapshotStatus> localShard : localShards.entrySet()) {
+                        ShardId shardId = localShard.getKey();
+                        IndexShardSnapshotStatus localShardStatus = localShard.getValue();
+                        ShardSnapshotStatus masterShard = masterShards.get(shardId);
+                        if (masterShard != null && masterShard.state().completed() == false) {
+                            // Master knows about the shard and thinks it has not completed
+                            if (localShardStatus.stage() == IndexShardSnapshotStatus.Stage.DONE) {
+                                // but we think the shard is done - we need to make new master know that the shard is done
+                                logger.debug("[{}] new master thinks the shard [{}] is not completed but the shard is done locally, updating status on the master", snapshot.snapshotId(), shardId);
+                                updateIndexShardSnapshotStatus(new UpdateIndexShardSnapshotStatusRequest(snapshot.snapshotId(), shardId,
+                                        new ShardSnapshotStatus(event.state().nodes().localNodeId(), SnapshotMetaData.State.SUCCESS)));
+                            } else if (localShard.getValue().stage() == IndexShardSnapshotStatus.Stage.FAILURE) {
+                                // but we think the shard failed - we need to make new master know that the shard failed
+                                logger.debug("[{}] new master thinks the shard [{}] is not completed but the shard failed locally, updating status on master", snapshot.snapshotId(), shardId);
+                                updateIndexShardSnapshotStatus(new UpdateIndexShardSnapshotStatusRequest(snapshot.snapshotId(), shardId,
+                                        new ShardSnapshotStatus(event.state().nodes().localNodeId(), State.FAILED, localShardStatus.failure())));
+
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * Updates the shard status
      *
diff --git a/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotTests.java b/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotTests.java
index 04ff667b3f3..024065a1d2f 100644
--- a/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotTests.java
+++ b/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotTests.java
@@ -22,8 +22,12 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
 
 import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
+import org.elasticsearch.action.admin.cluster.tasks.PendingClusterTasksResponse;
+import org.elasticsearch.cluster.*;
 import org.elasticsearch.cluster.metadata.SnapshotId;
 import org.elasticsearch.cluster.metadata.SnapshotMetaData;
+import org.elasticsearch.cluster.service.PendingClusterTask;
+import org.elasticsearch.common.Priority;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.repositories.RepositoriesService;
@@ -37,9 +41,12 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 
 /**
  */
@@ -121,4 +128,128 @@ public abstract class AbstractSnapshotTests extends ElasticsearchIntegrationTest
     public static void unblockNode(String node) {
         ((MockRepository)internalCluster().getInstance(RepositoriesService.class, node).repository("test-repo")).unblock();
     }
+
+    protected void assertBusyPendingTasks(final String taskPrefix, final int expectedCount) throws Exception {
+        assertBusy(new Runnable() {
+            @Override
+            public void run() {
+                PendingClusterTasksResponse tasks = client().admin().cluster().preparePendingClusterTasks().get();
+                int count = 0;
+                for(PendingClusterTask task : tasks) {
+                    if (task.getSource().toString().startsWith(taskPrefix)) {
+                        count++;
+                    }
+                }
+                assertThat(count, greaterThanOrEqualTo(expectedCount));
+            }
+        }, 1, TimeUnit.MINUTES);
+    }
+
+    /**
+     * Cluster state task that blocks waits for the blockOn task to show up and then blocks execution not letting
+     * any cluster state update task to be performed unless they have priority higher then passThroughPriority.
+     *
+     * This class is useful to testing of cluster state update task batching for lower priority tasks.
+     */
+    protected class BlockingClusterStateListener implements ClusterStateListener {
+
+        private final Predicate<ClusterChangedEvent> blockOn;
+        private final Predicate<ClusterChangedEvent> countOn;
+        private final ClusterService clusterService;
+        private final CountDownLatch latch;
+        private final Priority passThroughPriority;
+        private int count;
+        private boolean timedOut;
+        private final TimeValue timeout;
+        private long stopWaitingAt = -1;
+
+        public BlockingClusterStateListener(ClusterService clusterService, String blockOn, String countOn, Priority passThroughPriority) {
+            this(clusterService, blockOn, countOn, passThroughPriority, TimeValue.timeValueMinutes(1));
+        }
+
+        public BlockingClusterStateListener(ClusterService clusterService, final String blockOn, final String countOn, Priority passThroughPriority, TimeValue timeout) {
+            this.clusterService = clusterService;
+            this.blockOn = new Predicate<ClusterChangedEvent>() {
+                @Override
+                public boolean apply(ClusterChangedEvent clusterChangedEvent) {
+                    return clusterChangedEvent.source().startsWith(blockOn);
+                }
+            };
+            this.countOn = new Predicate<ClusterChangedEvent>() {
+                @Override
+                public boolean apply(ClusterChangedEvent clusterChangedEvent) {
+                    return clusterChangedEvent.source().startsWith(countOn);
+                }
+            };
+            this.latch = new CountDownLatch(1);
+            this.passThroughPriority = passThroughPriority;
+            this.timeout = timeout;
+
+        }
+
+        public void unblock() {
+            latch.countDown();
+        }
+
+        @Override
+        public void clusterChanged(ClusterChangedEvent event) {
+            if (blockOn.apply(event)) {
+                logger.info("blocking cluster state tasks on [{}]", event.source());
+                assert stopWaitingAt < 0; // Make sure we are the first time here
+                stopWaitingAt = System.currentTimeMillis() + timeout.getMillis();
+                addBlock();
+            }
+            if (countOn.apply(event)) {
+                count++;
+            }
+        }
+
+        private void addBlock() {
+            // We should block after this task - add blocking cluster state update task
+            clusterService.submitStateUpdateTask("test_block", passThroughPriority, new ClusterStateUpdateTask() {
+                @Override
+                public ClusterState execute(ClusterState currentState) throws Exception {
+                    while(System.currentTimeMillis() < stopWaitingAt) {
+                        for (PendingClusterTask task : clusterService.pendingTasks()) {
+                            if (task.getSource().string().equals("test_block") == false && passThroughPriority.sameOrAfter(task.getPriority())) {
+                                // There are other higher priority tasks in the queue and let them pass through and then set the block again
+                                logger.info("passing through cluster state task {}", task.getSource());
+                                addBlock();
+                                return currentState;
+                            }
+                        }
+                        try {
+                            logger.info("waiting....");
+                            if (latch.await(Math.min(100, timeout.millis()), TimeUnit.MILLISECONDS)){
+                                // Done waiting - unblock
+                                logger.info("unblocked");
+                                return currentState;
+                            }
+                            logger.info("done waiting....");
+                        } catch (InterruptedException ex) {
+                            logger.info("interrupted....");
+                            Thread.currentThread().interrupt();
+                            return currentState;
+                        }
+                    }
+                    timedOut = true;
+                    return currentState;
+                }
+
+                @Override
+                public void onFailure(String source, Throwable t) {
+                    logger.warn("failed to execute [{}]", t, source);
+                }
+            });
+
+        }
+
+        public int count() {
+            return count;
+        }
+
+        public boolean timedOut() {
+            return timedOut;
+        }
+    }
 }
diff --git a/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreTests.java b/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreTests.java
index d36bd523154..9716d23a04f 100644
--- a/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreTests.java
+++ b/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreTests.java
@@ -34,6 +34,7 @@ import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotR
 import org.elasticsearch.action.admin.cluster.snapshots.status.SnapshotStatus;
 import org.elasticsearch.action.admin.cluster.snapshots.status.SnapshotsStatusResponse;
 import org.elasticsearch.action.admin.indices.recovery.ShardRecoveryResponse;
+import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
@@ -41,6 +42,7 @@ import org.elasticsearch.cluster.ProcessedClusterStateUpdateTask;
 import org.elasticsearch.cluster.AbstractDiffable;
 import org.elasticsearch.cluster.metadata.MetaData;
 import org.elasticsearch.cluster.metadata.MetaData.Custom;
+import org.elasticsearch.cluster.metadata.SnapshotMetaData;
 import org.elasticsearch.cluster.routing.allocation.decider.EnableAllocationDecider;
 import org.elasticsearch.cluster.metadata.MetaDataIndexStateService;
 import org.elasticsearch.common.Nullable;
@@ -64,6 +66,7 @@ import org.elasticsearch.rest.action.admin.cluster.state.RestClusterStateAction;
 import org.elasticsearch.snapshots.mockstore.MockRepositoryModule;
 import org.elasticsearch.snapshots.mockstore.MockRepositoryPlugin;
 import org.elasticsearch.test.InternalTestCluster;
+import org.elasticsearch.test.junit.annotations.TestLogging;
 import org.elasticsearch.test.rest.FakeRestRequest;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -791,6 +794,83 @@ public class DedicatedClusterSnapshotRestoreTests extends AbstractSnapshotTests
         logger.info("--> done");
     }
 
+    @Test
+    public void masterShutdownDuringSnapshotTest() throws Exception {
+
+        Settings masterSettings = settingsBuilder().put("node.data", false).build();
+        Settings dataSettings = settingsBuilder().put("node.master", false).build();
+
+        logger.info("-->  starting two master nodes and two data nodes");
+        internalCluster().startNode(masterSettings);
+        internalCluster().startNode(masterSettings);
+        internalCluster().startNode(dataSettings);
+        internalCluster().startNode(dataSettings);
+
+        final Client client = client();
+
+        logger.info("-->  creating repository");
+        assertAcked(client.admin().cluster().preparePutRepository("test-repo")
+                .setType("fs").setSettings(Settings.settingsBuilder()
+                        .put("location", randomRepoPath())
+                        .put("compress", randomBoolean())
+                        .put("chunk_size", randomIntBetween(100, 1000))));
+
+        assertAcked(prepareCreate("test-idx", 0, settingsBuilder().put("number_of_shards", between(1, 20))
+                .put("number_of_replicas", 0)));
+        ensureGreen();
+
+        logger.info("--> indexing some data");
+        final int numdocs = randomIntBetween(10, 100);
+        IndexRequestBuilder[] builders = new IndexRequestBuilder[numdocs];
+        for (int i = 0; i < builders.length; i++) {
+            builders[i] = client().prepareIndex("test-idx", "type1", Integer.toString(i)).setSource("field1", "bar " + i);
+        }
+        indexRandom(true, builders);
+        flushAndRefresh();
+
+        final int numberOfShards = getNumShards("test-idx").numPrimaries;
+        logger.info("number of shards: {}", numberOfShards);
+
+        final ClusterService clusterService = internalCluster().clusterService(internalCluster().getMasterName());
+        BlockingClusterStateListener snapshotListener = new BlockingClusterStateListener(clusterService, "update_snapshot [", "update snapshot state", Priority.HIGH);
+        try {
+            clusterService.addFirst(snapshotListener);
+            logger.info("--> snapshot");
+            dataNodeClient().admin().cluster().prepareCreateSnapshot("test-repo", "test-snap").setWaitForCompletion(false).setIndices("test-idx").get();
+
+            // Await until some updates are in pending state.
+            assertBusyPendingTasks("update snapshot state", 1);
+
+            logger.info("--> stopping master node");
+            internalCluster().stopCurrentMasterNode();
+
+            logger.info("--> unblocking snapshot execution");
+            snapshotListener.unblock();
+
+            logger.info("--> wait until the snapshot is done");
+
+        } finally {
+            clusterService.remove(snapshotListener);
+        }
+
+        assertBusy(new Runnable() {
+            @Override
+            public void run() {
+                SnapshotsStatusResponse snapshotsStatusResponse = client().admin().cluster().prepareSnapshotStatus("test-repo").setSnapshots("test-snap").get();
+                ImmutableList<SnapshotStatus> snapshotStatuses = snapshotsStatusResponse.getSnapshots();
+                assertEquals(1, snapshotStatuses.size());
+                assertTrue(snapshotStatuses.get(0).getState().completed());
+            }
+        });
+
+        GetSnapshotsResponse snapshotsStatusResponse = client().admin().cluster().prepareGetSnapshots("test-repo").setSnapshots("test-snap").get();
+        SnapshotInfo snapshotInfo = snapshotsStatusResponse.getSnapshots().get(0);
+        assertEquals(SnapshotState.SUCCESS, snapshotInfo.state());
+        assertEquals(snapshotInfo.totalShards(), snapshotInfo.successfulShards());
+        assertEquals(0, snapshotInfo.failedShards());
+    }
+
+
     private boolean snapshotIsDone(String repository, String snapshot) {
         try {
             SnapshotsStatusResponse snapshotsStatusResponse = client().admin().cluster().prepareSnapshotStatus(repository).setSnapshots(snapshot).get();
diff --git a/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java b/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java
index aabebed72c6..d75e3d3a18b 100644
--- a/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java
+++ b/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreTests.java
@@ -1893,126 +1893,4 @@ public class SharedClusterSnapshotRestoreTests extends AbstractSnapshotTests {
         // Check that cluster state update task was called only once
         assertEquals(1, restoreListener.count());
     }
-
-    private void assertBusyPendingTasks(final String taskPrefix, final int expectedCount) throws Exception {
-        assertBusy(new Runnable() {
-            @Override
-            public void run() {
-                PendingClusterTasksResponse tasks = client().admin().cluster().preparePendingClusterTasks().get();
-                int count = 0;
-                for(PendingClusterTask task : tasks) {
-                    if (task.getSource().toString().startsWith(taskPrefix)) {
-                        count++;
-                    }
-                }
-                assertThat(count, equalTo(expectedCount));
-            }
-        }, 1, TimeUnit.MINUTES);
-    }
-
-    /**
-     * Cluster state task that blocks waits for the blockOn task to show up and then blocks execution not letting
-     * any cluster state update task to be performed unless they have priority higher then passThroughPriority.
-     *
-     * This class is useful to testing of cluster state update task batching for lower priority tasks.
-     */
-    public class BlockingClusterStateListener implements ClusterStateListener {
-
-        private final Predicate<ClusterChangedEvent> blockOn;
-        private final Predicate<ClusterChangedEvent> countOn;
-        private final ClusterService clusterService;
-        private final CountDownLatch latch;
-        private final Priority passThroughPriority;
-        private int count;
-        private boolean timedOut;
-        private final TimeValue timeout;
-        private long stopWaitingAt = -1;
-
-        public BlockingClusterStateListener(ClusterService clusterService, String blockOn, String countOn, Priority passThroughPriority) {
-            this(clusterService, blockOn, countOn, passThroughPriority, TimeValue.timeValueMinutes(1));
-        }
-
-        public BlockingClusterStateListener(ClusterService clusterService, final String blockOn, final String countOn, Priority passThroughPriority, TimeValue timeout) {
-            this.clusterService = clusterService;
-            this.blockOn = new Predicate<ClusterChangedEvent>() {
-                @Override
-                public boolean apply(ClusterChangedEvent clusterChangedEvent) {
-                    return clusterChangedEvent.source().startsWith(blockOn);
-                }
-            };
-            this.countOn = new Predicate<ClusterChangedEvent>() {
-                @Override
-                public boolean apply(ClusterChangedEvent clusterChangedEvent) {
-                    return clusterChangedEvent.source().startsWith(countOn);
-                }
-            };
-            this.latch = new CountDownLatch(1);
-            this.passThroughPriority = passThroughPriority;
-            this.timeout = timeout;
-
-        }
-
-        public void unblock() {
-            latch.countDown();
-        }
-
-        @Override
-        public void clusterChanged(ClusterChangedEvent event) {
-            if (blockOn.apply(event)) {
-                logger.info("blocking cluster state tasks on [{}]", event.source());
-                assert stopWaitingAt < 0; // Make sure we are the first time here
-                stopWaitingAt = System.currentTimeMillis() + timeout.getMillis();
-                addBlock();
-            }
-            if (countOn.apply(event)) {
-                count++;
-            }
-        }
-
-        private void addBlock() {
-            // We should block after this task - add blocking cluster state update task
-            clusterService.submitStateUpdateTask("test_block", passThroughPriority, new ClusterStateUpdateTask() {
-                @Override
-                public ClusterState execute(ClusterState currentState) throws Exception {
-                    while(System.currentTimeMillis() < stopWaitingAt) {
-                        for (PendingClusterTask task : clusterService.pendingTasks()) {
-                            if (task.getSource().string().equals("test_block") == false && passThroughPriority.sameOrAfter(task.getPriority())) {
-                                // There are other higher priority tasks in the queue and let them pass through and then set the block again
-                                logger.info("passing through cluster state task {}", task.getSource());
-                                addBlock();
-                                return currentState;
-                            }
-                        }
-                        try {
-                            logger.info("wating....");
-                            if (latch.await(Math.min(100, timeout.millis()), TimeUnit.MILLISECONDS)){
-                                // Done waiting - unblock
-                                logger.info("unblocked");
-                                return currentState;
-                            }
-                            logger.info("done wating....");
-                        } catch (InterruptedException ex) {
-                            Thread.currentThread().interrupt();
-                        }
-                    }
-                    timedOut = true;
-                    return currentState;
-                }
-
-                @Override
-                public void onFailure(String source, Throwable t) {
-                    logger.warn("failed to execute [{}]", t, source);
-                }
-            });
-
-        }
-
-        public int count() {
-            return count;
-        }
-
-        public boolean timedOut() {
-            return timedOut;
-        }
-    }
 }

From 90cbf80fc4e0864d83f3d8ebe9ff14b0f0cecde0 Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Wed, 3 Jun 2015 10:05:46 -1000
Subject: [PATCH 114/123] Tests: remove race condition in the
 masterShutdownDuringSnapshotTest

---
 .../DedicatedClusterSnapshotRestoreTests.java     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreTests.java b/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreTests.java
index 9716d23a04f..c1c59dda13b 100644
--- a/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreTests.java
+++ b/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreTests.java
@@ -847,21 +847,22 @@ public class DedicatedClusterSnapshotRestoreTests extends AbstractSnapshotTests
             logger.info("--> unblocking snapshot execution");
             snapshotListener.unblock();
 
-            logger.info("--> wait until the snapshot is done");
-
         } finally {
             clusterService.remove(snapshotListener);
         }
 
+        logger.info("--> wait until the snapshot is done");
+
         assertBusy(new Runnable() {
             @Override
             public void run() {
-                SnapshotsStatusResponse snapshotsStatusResponse = client().admin().cluster().prepareSnapshotStatus("test-repo").setSnapshots("test-snap").get();
-                ImmutableList<SnapshotStatus> snapshotStatuses = snapshotsStatusResponse.getSnapshots();
-                assertEquals(1, snapshotStatuses.size());
-                assertTrue(snapshotStatuses.get(0).getState().completed());
+                GetSnapshotsResponse snapshotsStatusResponse = client().admin().cluster().prepareGetSnapshots("test-repo").setSnapshots("test-snap").get();
+                SnapshotInfo snapshotInfo = snapshotsStatusResponse.getSnapshots().get(0);
+                assertTrue(snapshotInfo.state().completed());
             }
-        });
+        }, 1, TimeUnit.MINUTES);
+
+        logger.info("--> verify that snapshot was succesful");
 
         GetSnapshotsResponse snapshotsStatusResponse = client().admin().cluster().prepareGetSnapshots("test-repo").setSnapshots("test-snap").get();
         SnapshotInfo snapshotInfo = snapshotsStatusResponse.getSnapshots().get(0);

From 26d71fe00e8b9f5986a277ab5b6d2bb470a13766 Mon Sep 17 00:00:00 2001
From: Boaz Leskes <b.leskes@gmail.com>
Date: Wed, 3 Jun 2015 18:47:44 +0200
Subject: [PATCH 115/123] Reduce shard inactivity timeout to 5m

To better distribute the memory allocating to indexing, the IndexingMemoryController periodically checks the different shard for their last indexing activity. If no activity has happened for a while, the controller marks the shards as in active and allocated it's memory buffer budget (but a small minimal budget) to other active shards. The recently added synced flush feature (#11179, #11336) uses this inactivity trigger to attempt as a trigger to attempt adding a sync id marker (which will speed up future recoveries).

We wait for 30m before declaring a shard inactive. However, these days the operation just requires a refresh and is light. We can be stricter (and 5m) increase the chance a synced flush will be triggered.

Closes #11479
---
 docs/reference/indices/flush.asciidoc                         | 4 ++--
 .../indices/memory/IndexingMemoryController.java              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/reference/indices/flush.asciidoc b/docs/reference/indices/flush.asciidoc
index 118a68b7128..3ee2601bb38 100644
--- a/docs/reference/indices/flush.asciidoc
+++ b/docs/reference/indices/flush.asciidoc
@@ -50,7 +50,7 @@ POST /_flush
 === Synced Flush
 
 Elasticsearch tracks the indexing activity of each shard. Shards that have not
-received any indexing operations for 30 minutes are automatically marked as inactive. This presents
+received any indexing operations for 5 minutes are automatically marked as inactive. This presents
 an opportunity for Elasticsearch to reduce shard resources and also perform
 a special kind of flush, called `synced flush`. A synced flush performs a normal flush, then adds
 a generated unique marker (sync_id) to all shards.
@@ -117,7 +117,7 @@ which returns something similar to:
 === Synced Flush API
 
 The Synced Flush API allows an administrator to initiate a synced flush manually. This can be particularly useful for
-a planned (rolling) cluster restart where you can stop indexing and don't want to wait the default 30 minutes for
+a planned (rolling) cluster restart where you can stop indexing and don't want to wait the default 5 minutes for
 idle indices to be sync-flushed automatically.
 
 While handy, there are a couple of caveats for this API:
diff --git a/src/main/java/org/elasticsearch/indices/memory/IndexingMemoryController.java b/src/main/java/org/elasticsearch/indices/memory/IndexingMemoryController.java
index b70a21c9df9..430b7634672 100644
--- a/src/main/java/org/elasticsearch/indices/memory/IndexingMemoryController.java
+++ b/src/main/java/org/elasticsearch/indices/memory/IndexingMemoryController.java
@@ -115,7 +115,7 @@ public class IndexingMemoryController extends AbstractLifecycleComponent<Indexin
         this.minShardTranslogBufferSize = this.settings.getAsBytesSize("indices.memory.min_shard_translog_buffer_size", new ByteSizeValue(2, ByteSizeUnit.KB));
         this.maxShardTranslogBufferSize = this.settings.getAsBytesSize("indices.memory.max_shard_translog_buffer_size", new ByteSizeValue(64, ByteSizeUnit.KB));
 
-        this.inactiveTime = this.settings.getAsTime("indices.memory.shard_inactive_time", TimeValue.timeValueMinutes(30));
+        this.inactiveTime = this.settings.getAsTime("indices.memory.shard_inactive_time", TimeValue.timeValueMinutes(5));
         // we need to have this relatively small to move a shard from inactive to active fast (enough)
         this.interval = this.settings.getAsTime("indices.memory.interval", TimeValue.timeValueSeconds(30));
 

From 171687d207fdf88c1e8a285d1b785682969e9426 Mon Sep 17 00:00:00 2001
From: Clinton Gormley <clint@traveljury.com>
Date: Thu, 4 Jun 2015 01:59:22 +0200
Subject: [PATCH 116/123] Docs: Reorganised the Query DSL docs into families
 and explaing query vs filter context

---
 docs/reference/query-dsl.asciidoc             | 62 ++++++++-----
 docs/reference/query-dsl/and-query.asciidoc   |  2 +-
 docs/reference/query-dsl/bool-query.asciidoc  |  2 +-
 .../query-dsl/boosting-query.asciidoc         |  2 +-
 .../query-dsl/common-terms-query.asciidoc     |  8 +-
 .../query-dsl/compound-queries.asciidoc       | 69 ++++++++++++++
 .../query-dsl/constant-score-query.asciidoc   |  2 +-
 .../query-dsl/dis-max-query.asciidoc          |  2 +-
 .../reference/query-dsl/exists-query.asciidoc |  4 +-
 .../query-dsl/filtered-query.asciidoc         |  8 +-
 .../query-dsl/full-text-queries.asciidoc      | 44 +++++++++
 .../query-dsl/function-score-query.asciidoc   | 38 ++++----
 docs/reference/query-dsl/fuzzy-query.asciidoc |  8 +-
 .../query-dsl/geo-bounding-box-query.asciidoc | 20 ++--
 .../query-dsl/geo-distance-query.asciidoc     | 18 ++--
 .../geo-distance-range-query.asciidoc         |  2 +-
 .../query-dsl/geo-polygon-query.asciidoc      | 12 +--
 docs/reference/query-dsl/geo-queries.asciidoc | 50 ++++++++++
 .../query-dsl/geo-shape-query.asciidoc        | 10 +-
 .../query-dsl/geohash-cell-query.asciidoc     |  2 +-
 .../query-dsl/has-child-query.asciidoc        |  6 +-
 .../query-dsl/has-parent-query.asciidoc       |  4 +-
 docs/reference/query-dsl/ids-query.asciidoc   |  2 +-
 docs/reference/query-dsl/index.asciidoc       |  2 +
 .../query-dsl/indices-query.asciidoc          |  6 +-
 .../query-dsl/joining-queries.asciidoc        | 32 +++++++
 docs/reference/query-dsl/limit-query.asciidoc |  2 +-
 .../query-dsl/match-all-query.asciidoc        | 13 +--
 docs/reference/query-dsl/match-query.asciidoc | 15 +--
 .../query-dsl/missing-query.asciidoc          |  6 +-
 docs/reference/query-dsl/mlt-query.asciidoc   | 12 +--
 .../query-dsl/multi-match-query.asciidoc      | 22 ++---
 .../reference/query-dsl/nested-query.asciidoc |  2 +-
 docs/reference/query-dsl/not-query.asciidoc   |  2 +-
 docs/reference/query-dsl/or-query.asciidoc    |  2 +-
 .../reference/query-dsl/prefix-query.asciidoc |  2 +-
 .../query-dsl/query-string-query.asciidoc     |  6 +-
 .../query-dsl/query-string-syntax.asciidoc    | 36 +++----
 .../query-dsl/query_filter_context.asciidoc   | 77 +++++++++++++++
 docs/reference/query-dsl/range-query.asciidoc |  4 +-
 .../reference/query-dsl/regexp-query.asciidoc |  2 +-
 .../query-dsl/regexp-syntax.asciidoc          | 10 +-
 .../reference/query-dsl/script-query.asciidoc |  4 +-
 .../simple-query-string-query.asciidoc        | 10 +-
 .../query-dsl/span-containing-query.asciidoc  |  2 +-
 .../query-dsl/span-first-query.asciidoc       |  2 +-
 .../query-dsl/span-multi-term-query.asciidoc  |  2 +-
 .../query-dsl/span-near-query.asciidoc        |  2 +-
 .../query-dsl/span-not-query.asciidoc         |  2 +-
 .../query-dsl/span-or-query.asciidoc          |  2 +-
 .../reference/query-dsl/span-queries.asciidoc | 65 +++++++++++++
 .../query-dsl/span-term-query.asciidoc        |  2 +-
 .../query-dsl/span-within-query.asciidoc      |  2 +-
 .../query-dsl/special-queries.asciidoc        | 29 ++++++
 .../query-dsl/template-query.asciidoc         |  4 +-
 .../query-dsl/term-level-queries.asciidoc     | 93 +++++++++++++++++++
 docs/reference/query-dsl/term-query.asciidoc  |  2 +-
 docs/reference/query-dsl/terms-query.asciidoc | 17 ++--
 docs/reference/query-dsl/type-query.asciidoc  |  2 +-
 .../query-dsl/wildcard-query.asciidoc         |  2 +-
 60 files changed, 668 insertions(+), 206 deletions(-)
 create mode 100644 docs/reference/query-dsl/compound-queries.asciidoc
 create mode 100644 docs/reference/query-dsl/full-text-queries.asciidoc
 create mode 100644 docs/reference/query-dsl/geo-queries.asciidoc
 create mode 100644 docs/reference/query-dsl/joining-queries.asciidoc
 create mode 100644 docs/reference/query-dsl/query_filter_context.asciidoc
 create mode 100644 docs/reference/query-dsl/span-queries.asciidoc
 create mode 100644 docs/reference/query-dsl/special-queries.asciidoc
 create mode 100644 docs/reference/query-dsl/term-level-queries.asciidoc

diff --git a/docs/reference/query-dsl.asciidoc b/docs/reference/query-dsl.asciidoc
index 3f2869e5981..b4a82afdc28 100644
--- a/docs/reference/query-dsl.asciidoc
+++ b/docs/reference/query-dsl.asciidoc
@@ -3,32 +3,48 @@
 
 [partintro]
 --
-*elasticsearch* provides a full Query DSL based on JSON to define
-queries. In general, there are basic queries such as
-<<query-dsl-term-query,term>> or
-<<query-dsl-prefix-query,prefix>>. There are
-also compound queries like the
-<<query-dsl-bool-query,bool>> query.
 
-While queries have scoring capabilities, in some contexts they will
-only be used to filter the result set, such as in the
-<<query-dsl-filtered-query,filtered>> or
-<<query-dsl-constant-score-query,constant_score>>
-queries.
+Elasticsearch provides a full Query DSL based on JSON to define queries.
+Think of the Query DSL as an AST of queries, consisting of two types of
+clauses:
 
-Think of the Query DSL as an AST of queries.
-Some queries can be used by themselves like the
-<<query-dsl-term-query,term>> query but other queries can contain
-queries (like the <<query-dsl-bool-query,bool>> query), and each
-of these composite queries can contain *any* query of the list of
-queries, resulting in the ability to build quite
-complex (and interesting) queries.
+Leaf query clauses::
 
-Queries can be used in different APIs. For example,
-within a <<search-request-query,search query>>, or
-as an <<search-aggregations-bucket-filter-aggregation,aggregation filter>>.
-This section explains the queries that can form the AST one can use.
+Leaf query clauses look for a particular value in a particular field, such as the
+<<query-dsl-match-query,`match`>>, <<query-dsl-term-query,`term`>> or
+<<query-dsl-range-query,`range`>> queries.  These queries can be used
+by themselves.
 
+Compound query clauses::
+
+Compound query clauses wrap other leaf *or* compound queries and are used to combine
+multiple queries in a logical fashion (such as the
+<<query-dsl-bool-query,`bool`>> or <<query-dsl-dis-max-query,`dis_max`>> query),
+or to alter their behaviour (such as the <<query-dsl-not-query,`not`>> or
+<<query-dsl-constant-score-query,`constant_score`>> query).
+
+Query clauses behave differently depending on whether they are used in
+<<query-filter-context,query context or filter context>>.
 --
 
-include::query-dsl/index.asciidoc[]
+include::query-dsl/query_filter_context.asciidoc[]
+
+include::query-dsl/match-all-query.asciidoc[]
+
+include::query-dsl/full-text-queries.asciidoc[]
+
+include::query-dsl/term-level-queries.asciidoc[]
+
+include::query-dsl/compound-queries.asciidoc[]
+
+include::query-dsl/joining-queries.asciidoc[]
+
+include::query-dsl/geo-queries.asciidoc[]
+
+include::query-dsl/special-queries.asciidoc[]
+
+include::query-dsl/span-queries.asciidoc[]
+
+include::query-dsl/minimum-should-match.asciidoc[]
+
+include::query-dsl/multi-term-rewrite.asciidoc[]
diff --git a/docs/reference/query-dsl/and-query.asciidoc b/docs/reference/query-dsl/and-query.asciidoc
index 15a52e57b16..864feac4cf2 100644
--- a/docs/reference/query-dsl/and-query.asciidoc
+++ b/docs/reference/query-dsl/and-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-and-query]]
-== And Query
+=== And Query
 
 deprecated[2.0.0, Use the `bool` query instead]
 
diff --git a/docs/reference/query-dsl/bool-query.asciidoc b/docs/reference/query-dsl/bool-query.asciidoc
index ac6e9f62250..9f0c3246c07 100644
--- a/docs/reference/query-dsl/bool-query.asciidoc
+++ b/docs/reference/query-dsl/bool-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-bool-query]]
-== Bool Query
+=== Bool Query
 
 A query that matches documents matching boolean combinations of other
 queries. The bool query maps to Lucene `BooleanQuery`. It is built using
diff --git a/docs/reference/query-dsl/boosting-query.asciidoc b/docs/reference/query-dsl/boosting-query.asciidoc
index 752fc2b9f64..969b3bbedfe 100644
--- a/docs/reference/query-dsl/boosting-query.asciidoc
+++ b/docs/reference/query-dsl/boosting-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-boosting-query]]
-== Boosting Query
+=== Boosting Query
 
 The `boosting` query can be used to effectively demote results that
 match a given query. Unlike the "NOT" clause in bool query, this still
diff --git a/docs/reference/query-dsl/common-terms-query.asciidoc b/docs/reference/query-dsl/common-terms-query.asciidoc
index 1c5fa7cc1f6..b9aee04e401 100644
--- a/docs/reference/query-dsl/common-terms-query.asciidoc
+++ b/docs/reference/query-dsl/common-terms-query.asciidoc
@@ -1,12 +1,12 @@
 [[query-dsl-common-terms-query]]
-== Common Terms Query
+=== Common Terms Query
 
 The `common` terms query is a modern alternative to stopwords which
 improves the precision and recall of search results (by taking stopwords
 into account), without sacrificing performance.
 
 [float]
-=== The problem
+==== The problem
 
 Every term in a query has a cost. A search for `"The brown fox"`
 requires three term queries, one for each of `"the"`, `"brown"` and
@@ -25,7 +25,7 @@ and `"not happy"`) and we lose recall (eg text like `"The The"` or
 `"To be or not to be"` would simply not exist in the index).
 
 [float]
-=== The solution
+==== The solution
 
 The `common` terms query divides the query terms into two groups: more
 important (ie _low frequency_ terms) and less important (ie _high
@@ -63,7 +63,7 @@ site, common terms like `"clip"` or `"video"` will automatically behave
 as stopwords without the need to maintain a manual list.
 
 [float]
-=== Examples
+==== Examples
 
 In this example, words that have a document frequency greater than 0.1%
 (eg `"this"` and `"is"`) will be treated as _common terms_.
diff --git a/docs/reference/query-dsl/compound-queries.asciidoc b/docs/reference/query-dsl/compound-queries.asciidoc
new file mode 100644
index 00000000000..adce4bebd59
--- /dev/null
+++ b/docs/reference/query-dsl/compound-queries.asciidoc
@@ -0,0 +1,69 @@
+[[compound-queries]]
+== Compound queries
+
+Compound queries wrap other compound or leaf queries, either to combine their
+results and scores, to change their behaviour, or to switch from query to
+filter context.
+
+The queries in this group are:
+
+<<query-dsl-constant-score-query,`constant_score` query>>::
+
+A query which wraps another query, but executes it in filter context.  All
+matching documents are given the same ``constant'' `_score`.
+
+<<query-dsl-bool-query,`bool` query>>::
+
+The default query for combining multiple leaf or compound query clauses, as
+`must`, `should`, `must_not`, or `filter` clauses.  The `must` and `should`
+clauses have their scores combined -- the more matching clauses, the better --
+while the `must_not` and `filter` clauses are executed in filter context.
+
+<<query-dsl-dis-max-query,`dis_max` query>>::
+
+A query which accepts multiple queries, and returns any documents which match
+any of the query clauses.  While the `bool` query combines the scores from all
+matching queries, the `dis_max` query uses the score of the single best-
+matching query clause.
+
+<<query-dsl-function-score-query,`function_score` query>>::
+
+Modify the scores returned by the main query with functions to take into
+account factors like popularity, recency, distance, or custom algorithms
+implemented with scripting.
+
+<<query-dsl-boosting-query,`boosting` query>>::
+
+Return documents which match a `positive` query, but reduce the score of
+documents which also match a `negative` query.
+
+<<query-dsl-indices-query,`indices` query>>::
+
+Execute one query for the specified indices, and another for other indices.
+
+<<query-dsl-and-query,`and`>>, <<query-dsl-or-query,`or`>>, <<query-dsl-not-query,`not`>>::
+
+Synonyms for the `bool` query.
+
+<<query-dsl-filtered-query,`filtered` query>>::
+
+Combine a query clause in query context with another in filter context. deprecated[2.0.0,Use the `bool` query instead]
+
+<<query-dsl-limit-query,`limit` query>>::
+
+Limits the number of documents examined per shard. deprecated[1.6.0]
+
+
+include::constant-score-query.asciidoc[]
+include::bool-query.asciidoc[]
+include::dis-max-query.asciidoc[]
+include::function-score-query.asciidoc[]
+include::boosting-query.asciidoc[]
+include::indices-query.asciidoc[]
+include::and-query.asciidoc[]
+include::not-query.asciidoc[]
+include::or-query.asciidoc[]
+include::filtered-query.asciidoc[]
+include::limit-query.asciidoc[]
+
+
diff --git a/docs/reference/query-dsl/constant-score-query.asciidoc b/docs/reference/query-dsl/constant-score-query.asciidoc
index e31b7b801a5..8e76ac13ff5 100644
--- a/docs/reference/query-dsl/constant-score-query.asciidoc
+++ b/docs/reference/query-dsl/constant-score-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-constant-score-query]]
-== Constant Score Query
+=== Constant Score Query
 
 A query that wraps another query and simply returns a
 constant score equal to the query boost for every document in the
diff --git a/docs/reference/query-dsl/dis-max-query.asciidoc b/docs/reference/query-dsl/dis-max-query.asciidoc
index ae8445ca5dd..2938c8db8ea 100644
--- a/docs/reference/query-dsl/dis-max-query.asciidoc
+++ b/docs/reference/query-dsl/dis-max-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-dis-max-query]]
-== Dis Max Query
+=== Dis Max Query
 
 A query that generates the union of documents produced by its
 subqueries, and that scores each document with the maximum score for
diff --git a/docs/reference/query-dsl/exists-query.asciidoc b/docs/reference/query-dsl/exists-query.asciidoc
index 02460da7b65..d25ebdecd89 100644
--- a/docs/reference/query-dsl/exists-query.asciidoc
+++ b/docs/reference/query-dsl/exists-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-exists-query]]
-== Exists Query
+=== Exists Query
 
 Returns documents that have at least one non-`null` value in the original field:
 
@@ -42,7 +42,7 @@ These documents would *not* match the above query:
 <3> The `user` field is missing completely.
 
 [float]
-==== `null_value` mapping
+===== `null_value` mapping
 
 If the field mapping includes the `null_value` setting (see <<mapping-core-types>>)
 then explicit `null` values are replaced with the specified `null_value`.  For
diff --git a/docs/reference/query-dsl/filtered-query.asciidoc b/docs/reference/query-dsl/filtered-query.asciidoc
index 094d3edefc1..d12d32a974d 100644
--- a/docs/reference/query-dsl/filtered-query.asciidoc
+++ b/docs/reference/query-dsl/filtered-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-filtered-query]]
-== Filtered Query
+=== Filtered Query
 
 deprecated[2.0.0, Use the `bool` query instead with a `must` clause for the query and a `filter` clause for the filter]
 
@@ -47,7 +47,7 @@ curl -XGET localhost:9200/_search -d '
 <1> The `filtered` query is passed as the value of the `query`
     parameter in the search request.
 
-=== Filtering without a query
+==== Filtering without a query
 
 If a `query` is not specified, it defaults to the
 <<query-dsl-match-all-query,`match_all` query>>.  This means that the
@@ -71,7 +71,7 @@ curl -XGET localhost:9200/_search -d '
 <1> No `query` has been specified, so this request applies just the filter,
    returning all documents created since yesterday.
 
-==== Multiple filters
+===== Multiple filters
 
 Multiple filters can be applied by wrapping them in a
 <<query-dsl-bool-query,`bool` query>>, for example:
@@ -95,7 +95,7 @@ Multiple filters can be applied by wrapping them in a
 }
 --------------------------------------------------
 
-==== Filter strategy
+===== Filter strategy
 
 You can control how the filter and query are executed with the `strategy`
 parameter:
diff --git a/docs/reference/query-dsl/full-text-queries.asciidoc b/docs/reference/query-dsl/full-text-queries.asciidoc
new file mode 100644
index 00000000000..9c61f9f5681
--- /dev/null
+++ b/docs/reference/query-dsl/full-text-queries.asciidoc
@@ -0,0 +1,44 @@
+[[full-text-queries]]
+== Full text queries
+
+The high-level full text queries are usually used for running full text
+queries on full text fields like the body of an email. They understand how the
+field being queried is <<analysis,analyzed>> and will apply each field's
+`analyzer` (or `search_analyzer`) to the query string before executing.
+
+The queries in this group are:
+
+<<query-dsl-match-query,`match` query>>::
+
+    The standard query for performing full text queries, including fuzzy matching
+    and phrase or proximity queries.
+
+<<query-dsl-multi-match-query,`multi_match` query>>::
+
+    The multi-field version of the `match` query.
+
+<<query-dsl-common-terms-query,`common_terms` query>>::
+
+    A more specialized query which gives more preference to uncommon words.
+
+<<query-dsl-query-string-query,`query_string` query>>::
+
+    Supports the compact Lucene <<query-string-syntax,query string syntax>>,
+    allowing you to specify AND|OR|NOT conditions and multi-field search
+    within a single query string. For expert users only.
+
+<<query-dsl-simple-query-string-query,`simple_query_string`>>::
+
+    A simpler, more robust version of the `query_string` syntax suitable
+    for exposing directly to users.
+
+include::match-query.asciidoc[]
+
+include::multi-match-query.asciidoc[]
+
+include::common-terms-query.asciidoc[]
+
+include::query-string-query.asciidoc[]
+
+include::simple-query-string-query.asciidoc[]
+
diff --git a/docs/reference/query-dsl/function-score-query.asciidoc b/docs/reference/query-dsl/function-score-query.asciidoc
index a5618a23c48..5d1ee98f83a 100644
--- a/docs/reference/query-dsl/function-score-query.asciidoc
+++ b/docs/reference/query-dsl/function-score-query.asciidoc
@@ -1,15 +1,13 @@
 [[query-dsl-function-score-query]]
-== Function Score Query
+=== Function Score Query
 
 The `function_score` allows you to modify the score of documents that are
 retrieved by a query. This can be useful if, for example, a score
 function is computationally expensive and it is sufficient to compute
 the score on a filtered set of documents.
 
-=== Using function score
-
 To use `function_score`, the user has to define a query and one or
-several functions, that compute a new score for each document returned
+more functions, that compute a new score for each document returned
 by the query.
 
 `function_score` can be used with only one function like this:
@@ -89,13 +87,13 @@ query. The parameter `boost_mode` defines how:
 `min`::         min of query score and function score
 
 By default, modifying the score does not change which documents match. To exclude
-documents that do not meet a certain score threshold the `min_score` parameter can be set to the desired score threshold.  
+documents that do not meet a certain score threshold the `min_score` parameter can be set to the desired score threshold.
 
 ==== Score functions
 
 The `function_score` query provides several types of score functions.
 
-===== Script score
+====== Script score
 
 The `script_score` function allows you to wrap another query and customize
 the scoring of it optionally with a computation derived from other numeric
@@ -135,7 +133,7 @@ Note that unlike the `custom_score` query, the
 score of the query is multiplied with the result of the script scoring. If
 you wish to inhibit this, set `"boost_mode": "replace"`
 
-===== Weight
+====== Weight
 
 The `weight` score allows you to multiply the score by the provided
 `weight`. This can sometimes be desired since boost value set on
@@ -147,7 +145,7 @@ not.
 "weight" : number
 --------------------------------------------------
 
-===== Random
+====== Random
 
 The `random_score` generates scores using a hash of the `_uid` field,
 with a `seed` for variation. If `seed` is not specified, the current
@@ -163,7 +161,7 @@ be a memory intensive operation since the values are unique.
 }
 --------------------------------------------------
 
-===== Field Value factor
+====== Field Value factor
 
 The `field_value_factor` function allows you to use a field from a document to
 influence the score. It's similar to using the `script_score` function, however,
@@ -207,7 +205,7 @@ is an illegal operation, and an exception will be thrown. Be sure to limit the
 values of the field with a range filter to avoid this, or use `log1p` and
 `ln1p`.
 
-===== Decay functions
+====== Decay functions
 
 Decay functions score a document with a function that decays depending
 on the distance of a numeric field value of the document from a user
@@ -254,13 +252,13 @@ The `offset` and `decay` parameters are optional.
 
 [horizontal]
 `origin`::
-    The point of origin used for calculating distance. Must be given as a 
-    number for numeric field, date for date fields and geo point for geo fields. 
+    The point of origin used for calculating distance. Must be given as a
+    number for numeric field, date for date fields and geo point for geo fields.
     Required for geo and numeric field. For date fields the default is `now`. Date
     math (for example `now-1h`) is supported for origin.
 
 `scale`::
-    Required for all types. Defines the distance from origin at which the computed 
+    Required for all types. Defines the distance from origin at which the computed
     score will equal `decay` parameter. For geo fields: Can be defined as number+unit (1km, 12m,...).
     Default unit is meters. For date fields: Can to be defined as a number+unit ("1h", "10d",...).
     Default unit is milliseconds. For numeric field: Any number.
@@ -334,7 +332,7 @@ For single functions the three decay functions together with their parameters ca
 
 image:images/decay_2d.png[width=600]
 
-===== Multiple values:
+====== Multiple values:
 
 If a field used for computing the decay contains multiple values, per default the value closest to the origin is chosen for determining the distance.
 This can be changed by setting `multi_value_mode`.
@@ -360,7 +358,7 @@ Example:
 
 
 
-==== Detailed example
+===== Detailed example
 
 Suppose you are searching for a hotel in a certain town. Your budget is
 limited. Also, you would like the hotel to be close to the town center,
@@ -450,7 +448,7 @@ curl 'localhost:9200/hotels/_search/' -d '{
 Next, we show how the computed score looks like for each of the three
 possible decay functions.
 
-===== Normal decay, keyword `gauss`
+====== Normal decay, keyword `gauss`
 
 When choosing `gauss` as the decay function in the above example, the
 contour and surface plot of the multiplier looks like this:
@@ -471,7 +469,7 @@ of 0.56. "BnB Bellevue" and "Backback Nap" are both pretty close to the
 defined location but "BnB Bellevue" is cheaper, so it gets a multiplier
 of 0.86 whereas "Backpack Nap" gets a value of 0.66.
 
-===== Exponential decay, keyword `exp`
+====== Exponential decay, keyword `exp`
 
 When choosing `exp` as the decay function in the above example, the
 contour and surface plot of the multiplier looks like this:
@@ -480,7 +478,7 @@ image::https://f.cloud.github.com/assets/4320215/768161/082975c0-e899-11e2-86f7-
 
 image::https://f.cloud.github.com/assets/4320215/768162/0b606884-e899-11e2-907b-aefc77eefef6.png[width="700px"]
 
-===== Linear' decay, keyword `linear`
+====== Linear' decay, keyword `linear`
 
 When choosing `linear` as the decay function in the above example, the
 contour and surface plot of the multiplier looks like this:
@@ -489,12 +487,12 @@ image::https://f.cloud.github.com/assets/4320215/768164/1775b0ca-e899-11e2-9f4a-
 
 image::https://f.cloud.github.com/assets/4320215/768165/19d8b1aa-e899-11e2-91bc-6b0553e8d722.png[width="700px"]
 
-==== Supported fields for decay functions
+===== Supported fields for decay functions
 
 Only single valued numeric fields, including time and geo locations,
 are supported.
 
-==== What if a field is missing?
+===== What if a field is missing?
 
 If the numeric field is missing in the document, the function will
 return 1.
diff --git a/docs/reference/query-dsl/fuzzy-query.asciidoc b/docs/reference/query-dsl/fuzzy-query.asciidoc
index 0da33928855..b8af3aee066 100644
--- a/docs/reference/query-dsl/fuzzy-query.asciidoc
+++ b/docs/reference/query-dsl/fuzzy-query.asciidoc
@@ -1,10 +1,10 @@
 [[query-dsl-fuzzy-query]]
-== Fuzzy Query
+=== Fuzzy Query
 
 The fuzzy query uses similarity based on Levenshtein edit distance for
 `string` fields, and a `+/-` margin on numeric and date fields.
 
-=== String fields
+==== String fields
 
 The `fuzzy` query generates all possible matching terms that are within  the
 maximum edit distance specified in `fuzziness` and then checks the term
@@ -38,7 +38,7 @@ Or with more advanced settings:
 --------------------------------------------------
 
 [float]
-==== Parameters
+===== Parameters
 
 [horizontal]
 `fuzziness`::
@@ -62,7 +62,7 @@ are both set to `0`. This could cause every term in the index to be examined!
 
 
 [float]
-=== Numeric and date fields
+==== Numeric and date fields
 
 Performs a <<query-dsl-range-query>> ``around'' the value using the
 `fuzziness` value as a `+/-` range, where:
diff --git a/docs/reference/query-dsl/geo-bounding-box-query.asciidoc b/docs/reference/query-dsl/geo-bounding-box-query.asciidoc
index deb0727d61f..e2d404b69e1 100644
--- a/docs/reference/query-dsl/geo-bounding-box-query.asciidoc
+++ b/docs/reference/query-dsl/geo-bounding-box-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-geo-bounding-box-query]]
-== Geo Bounding Box Query
+=== Geo Bounding Box Query
 
 A query allowing to filter hits based on a point location using a
 bounding box. Assuming the following indexed document:
@@ -45,13 +45,13 @@ Then the following simple query can be executed with a
 --------------------------------------------------
 
 [float]
-=== Accepted Formats
+==== Accepted Formats
 
 In much the same way the geo_point type can accept different
 representation of the geo point, the filter can accept it as well:
 
 [float]
-==== Lat Lon As Properties
+===== Lat Lon As Properties
 
 [source,js]
 --------------------------------------------------
@@ -79,7 +79,7 @@ representation of the geo point, the filter can accept it as well:
 --------------------------------------------------
 
 [float]
-==== Lat Lon As Array
+===== Lat Lon As Array
 
 Format in `[lon, lat]`, note, the order of lon/lat here in order to
 conform with http://geojson.org/[GeoJSON].
@@ -104,7 +104,7 @@ conform with http://geojson.org/[GeoJSON].
 --------------------------------------------------
 
 [float]
-==== Lat Lon As String
+===== Lat Lon As String
 
 Format in `lat,lon`.
 
@@ -128,7 +128,7 @@ Format in `lat,lon`.
 --------------------------------------------------
 
 [float]
-==== Geohash
+===== Geohash
 
 [source,js]
 --------------------------------------------------
@@ -150,7 +150,7 @@ Format in `lat,lon`.
 --------------------------------------------------
 
 [float]
-=== Vertices
+==== Vertices
 
 The vertices of the bounding box can either be set by `top_left` and
 `bottom_right` or by `top_right` and `bottom_left` parameters. More
@@ -182,20 +182,20 @@ values separately.
 
 
 [float]
-=== geo_point Type
+==== geo_point Type
 
 The filter *requires* the `geo_point` type to be set on the relevant
 field.
 
 [float]
-=== Multi Location Per Document
+==== Multi Location Per Document
 
 The filter can work with multiple locations / points per document. Once
 a single location / point matches the filter, the document will be
 included in the filter
 
 [float]
-=== Type
+==== Type
 
 The type of the bounding box execution by default is set to `memory`,
 which means in memory checks if the doc falls within the bounding box
diff --git a/docs/reference/query-dsl/geo-distance-query.asciidoc b/docs/reference/query-dsl/geo-distance-query.asciidoc
index 2fe109afd76..a0f0d3163c0 100644
--- a/docs/reference/query-dsl/geo-distance-query.asciidoc
+++ b/docs/reference/query-dsl/geo-distance-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-geo-distance-query]]
-== Geo Distance Query
+=== Geo Distance Query
 
 Filters documents that include only hits that exists within a specific
 distance from a geo point. Assuming the following indexed json:
@@ -40,13 +40,13 @@ filter:
 --------------------------------------------------
 
 [float]
-=== Accepted Formats
+==== Accepted Formats
 
 In much the same way the `geo_point` type can accept different
 representation of the geo point, the filter can accept it as well:
 
 [float]
-==== Lat Lon As Properties
+===== Lat Lon As Properties
 
 [source,js]
 --------------------------------------------------
@@ -69,7 +69,7 @@ representation of the geo point, the filter can accept it as well:
 --------------------------------------------------
 
 [float]
-==== Lat Lon As Array
+===== Lat Lon As Array
 
 Format in `[lon, lat]`, note, the order of lon/lat here in order to
 conform with http://geojson.org/[GeoJSON].
@@ -92,7 +92,7 @@ conform with http://geojson.org/[GeoJSON].
 --------------------------------------------------
 
 [float]
-==== Lat Lon As String
+===== Lat Lon As String
 
 Format in `lat,lon`.
 
@@ -114,7 +114,7 @@ Format in `lat,lon`.
 --------------------------------------------------
 
 [float]
-==== Geohash
+===== Geohash
 
 [source,js]
 --------------------------------------------------
@@ -134,7 +134,7 @@ Format in `lat,lon`.
 --------------------------------------------------
 
 [float]
-=== Options
+==== Options
 
 The following are options allowed on the filter:
 
@@ -160,13 +160,13 @@ The following are options allowed on the filter:
 
 
 [float]
-=== geo_point Type
+==== geo_point Type
 
 The filter *requires* the `geo_point` type to be set on the relevant
 field.
 
 [float]
-=== Multi Location Per Document
+==== Multi Location Per Document
 
 The `geo_distance` filter can work with multiple locations / points per
 document. Once a single location / point matches the filter, the
diff --git a/docs/reference/query-dsl/geo-distance-range-query.asciidoc b/docs/reference/query-dsl/geo-distance-range-query.asciidoc
index 8109f3c9452..855159bd3a2 100644
--- a/docs/reference/query-dsl/geo-distance-range-query.asciidoc
+++ b/docs/reference/query-dsl/geo-distance-range-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-geo-distance-range-query]]
-== Geo Distance Range Query
+=== Geo Distance Range Query
 
 Filters documents that exists within a range from a specific point:
 
diff --git a/docs/reference/query-dsl/geo-polygon-query.asciidoc b/docs/reference/query-dsl/geo-polygon-query.asciidoc
index ea22643ebe6..b9b624bda4c 100644
--- a/docs/reference/query-dsl/geo-polygon-query.asciidoc
+++ b/docs/reference/query-dsl/geo-polygon-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-geo-polygon-query]]
-== Geo Polygon Query
+=== Geo Polygon Query
 
 A query allowing to include hits that only fall within a polygon of
 points. Here is an example:
@@ -27,10 +27,10 @@ points. Here is an example:
 --------------------------------------------------
 
 [float]
-=== Allowed Formats
+==== Allowed Formats
 
 [float]
-==== Lat Long as Array
+===== Lat Long as Array
 
 Format in `[lon, lat]`, note, the order of lon/lat here in order to
 conform with http://geojson.org/[GeoJSON].
@@ -58,7 +58,7 @@ conform with http://geojson.org/[GeoJSON].
 --------------------------------------------------
 
 [float]
-==== Lat Lon as String
+===== Lat Lon as String
 
 Format in `lat,lon`.
 
@@ -85,7 +85,7 @@ Format in `lat,lon`.
 --------------------------------------------------
 
 [float]
-==== Geohash
+===== Geohash
 
 [source,js]
 --------------------------------------------------
@@ -110,7 +110,7 @@ Format in `lat,lon`.
 --------------------------------------------------
 
 [float]
-=== geo_point Type
+==== geo_point Type
 
 The filter *requires* the
 <<mapping-geo-point-type,geo_point>> type to be
diff --git a/docs/reference/query-dsl/geo-queries.asciidoc b/docs/reference/query-dsl/geo-queries.asciidoc
new file mode 100644
index 00000000000..01f42831e00
--- /dev/null
+++ b/docs/reference/query-dsl/geo-queries.asciidoc
@@ -0,0 +1,50 @@
+[[geo-queries]]
+== Geo queries
+
+Elasticsearch supports two types of geo data:
+<<mapping-geo-point-type,`geo_point`>> fields which support lat/lon pairs, and
+<<mapping-geo-shape-type,`geo_shape`>> fields, which support points,
+lines, circles, polygons, multi-polygons etc.
+
+The queries in this group are:
+
+<<query-dsl-geo-shape-query,`geo_shape`>> query::
+
+    Find document with geo-shapes which either intersect, are contained by, or
+    do not interesect with the specified geo-shape.
+
+<<query-dsl-geo-bounding-box-query,`geo_bounding_box`>> query::
+
+    Finds documents with geo-points that fall into the specified rectangle.
+
+<<query-dsl-geo-distance-query,`geo_distance`>> query::
+
+    Finds document with geo-points within the specified distance of a central
+    point.
+
+<<query-dsl-geo-distance-range-query,`geo_distance_range`>> query::
+
+    Like the `geo_point` query, but the range starts at a specified distance
+    from the central point.
+
+<<query-dsl-geo-polygon-query,`geo_polygon`>> query::
+
+    Find documents with geo-points within the specified polygon.
+
+<<query-dsl-geohash-cell-query,`geohash_cell`>> query::
+
+    Find geo-points whose geohash intersects with the geohash of the specified
+    point.
+
+
+include::geo-shape-query.asciidoc[]
+
+include::geo-bounding-box-query.asciidoc[]
+
+include::geo-distance-query.asciidoc[]
+
+include::geo-distance-range-query.asciidoc[]
+
+include::geo-polygon-query.asciidoc[]
+
+include::geohash-cell-query.asciidoc[]
diff --git a/docs/reference/query-dsl/geo-shape-query.asciidoc b/docs/reference/query-dsl/geo-shape-query.asciidoc
index 0addabc342a..94c085c0902 100644
--- a/docs/reference/query-dsl/geo-shape-query.asciidoc
+++ b/docs/reference/query-dsl/geo-shape-query.asciidoc
@@ -1,17 +1,15 @@
 [[query-dsl-geo-shape-query]]
-== GeoShape Filter
+=== GeoShape Filter
 
 Filter documents indexed using the `geo_shape` type.
 
-Requires the <<mapping-geo-shape-type,geo_shape
-Mapping>>.
+Requires the <<mapping-geo-shape-type,geo_shape Mapping>>.
 
 The `geo_shape` query uses the same grid square representation as the
 geo_shape mapping to find documents that have a shape that intersects
 with the query shape. It will also use the same PrefixTree configuration
 as defined for the field mapping.
 
-[float]
 ==== Filter Format
 
 The Filter supports two ways of defining the Filter shape, either by
@@ -19,8 +17,7 @@ providing a whole shape definition, or by referencing the name of a shape
 pre-indexed in another index. Both formats are defined below with
 examples.
 
-[float]
-===== Provided Shape Definition
+====== Provided Shape Definition
 
 Similar to the `geo_shape` type, the `geo_shape` Filter uses
 http://www.geojson.org[GeoJSON] to represent shapes.
@@ -64,7 +61,6 @@ The following query will find the point using the Elasticsearch's
 }
 --------------------------------------------------
 
-[float]
 ===== Pre-Indexed Shape
 
 The Filter also supports using a shape which has already been indexed in
diff --git a/docs/reference/query-dsl/geohash-cell-query.asciidoc b/docs/reference/query-dsl/geohash-cell-query.asciidoc
index b0004b64dee..8b75f3c60b4 100644
--- a/docs/reference/query-dsl/geohash-cell-query.asciidoc
+++ b/docs/reference/query-dsl/geohash-cell-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-geohash-cell-query]]
-== Geohash Cell Query
+=== Geohash Cell Query
 
 The `geohash_cell` query provides access to a hierarchy of geohashes.
 By defining a geohash cell, only <<mapping-geo-point-type,geopoints>>
diff --git a/docs/reference/query-dsl/has-child-query.asciidoc b/docs/reference/query-dsl/has-child-query.asciidoc
index 606c6a58459..6f42e6f6df6 100644
--- a/docs/reference/query-dsl/has-child-query.asciidoc
+++ b/docs/reference/query-dsl/has-child-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-has-child-query]]
-== Has Child Query
+=== Has Child Query
 
 The `has_child` filter accepts a query and the child type to run against, and
 results in parent documents that have child docs matching the query. Here is
@@ -20,7 +20,7 @@ an example:
 --------------------------------------------------
 
 [float]
-=== Scoring capabilities
+==== Scoring capabilities
 
 The `has_child` also has scoring support. The
 supported score types are `min`, `max`, `sum`, `avg` or `none`. The default is
@@ -46,7 +46,7 @@ inside the `has_child` query:
 --------------------------------------------------
 
 [float]
-=== Min/Max Children
+==== Min/Max Children
 
 The `has_child` query allows you to specify that a minimum and/or maximum
 number of children are required to match for the parent doc to be considered
diff --git a/docs/reference/query-dsl/has-parent-query.asciidoc b/docs/reference/query-dsl/has-parent-query.asciidoc
index cbd4fb9358e..70e9ba524bc 100644
--- a/docs/reference/query-dsl/has-parent-query.asciidoc
+++ b/docs/reference/query-dsl/has-parent-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-has-parent-query]]
-== Has Parent Query
+=== Has Parent Query
 
 The `has_parent` query accepts a query and a parent type. The query is
 executed in the parent document space, which is specified by the parent
@@ -22,7 +22,7 @@ in the same manner as the `has_child` query.
 --------------------------------------------------
 
 [float]
-=== Scoring capabilities
+==== Scoring capabilities
 
 The `has_parent` also has scoring support. The
 supported score types are `score` or `none`. The default is `none` and
diff --git a/docs/reference/query-dsl/ids-query.asciidoc b/docs/reference/query-dsl/ids-query.asciidoc
index 8811b8fa767..7d08243a78f 100644
--- a/docs/reference/query-dsl/ids-query.asciidoc
+++ b/docs/reference/query-dsl/ids-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-ids-query]]
-== Ids Query
+=== Ids Query
 
 Filters documents that only have the provided ids. Note, this query
 uses the <<mapping-uid-field,_uid>> field.
diff --git a/docs/reference/query-dsl/index.asciidoc b/docs/reference/query-dsl/index.asciidoc
index d2fa27c719b..ecb520443bb 100644
--- a/docs/reference/query-dsl/index.asciidoc
+++ b/docs/reference/query-dsl/index.asciidoc
@@ -1,3 +1,5 @@
+include::query_filter_context.asciidoc[]
+
 include::match-query.asciidoc[]
 
 include::multi-match-query.asciidoc[]
diff --git a/docs/reference/query-dsl/indices-query.asciidoc b/docs/reference/query-dsl/indices-query.asciidoc
index 651d3f22f61..f8e9e58d117 100644
--- a/docs/reference/query-dsl/indices-query.asciidoc
+++ b/docs/reference/query-dsl/indices-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-indices-query]]
-== Indices Query
+=== Indices Query
 
 The `indices` query can be used when executed across multiple indices,
 allowing to have a query that executes only when executed on an index
@@ -29,9 +29,9 @@ documents), and `all` (to match all). Defaults to `all`.
 `query` is mandatory, as well as `indices` (or `index`).
 
 [TIP]
-===================================================================
+====================================================================
 The fields order is important: if the `indices` are provided before `query`
 or `no_match_query`, the related queries get parsed only against the indices
 that they are going to be executed on. This is useful to avoid parsing queries
 when it is not necessary and prevent potential mapping errors.
-===================================================================
+====================================================================
diff --git a/docs/reference/query-dsl/joining-queries.asciidoc b/docs/reference/query-dsl/joining-queries.asciidoc
new file mode 100644
index 00000000000..a230dedae92
--- /dev/null
+++ b/docs/reference/query-dsl/joining-queries.asciidoc
@@ -0,0 +1,32 @@
+[[joining-queries]]
+== Joining queries
+
+Performing full SQL-style joins in a distributed system like Elasticsearch is
+prohibitively expensive.  Instead, Elasticsearch offers two forms of join
+which are designed to scale horizontally.
+
+<<query-dsl-nested-query,`nested` query>>::
+
+Documents may contains fields of type <<mapping-nested-type,`nested`>>. These
+fields are used to index arrays of objects, where each object can be queried
+(with the `nested` query) as an independent document.
+
+<<query-dsl-has-child-query,`has_child`>> and <<query-dsl-has-parent-query,`has_parent`>> queries::
+
+A <<mapping-parent-field,parent-child relationship>> can exist between two
+document types within a single index. The `has_child` query returns parent
+documents whose child documents match the specified query, while the
+`has_parent` query returns child documents whose parent document matches the
+specified query.
+
+Also see the <<query-dsl-terms-lookup,terms-lookup mechanism>> in the `terms`
+query, which allows you to build a `terms` query from values contained in
+another document.
+
+include::nested-query.asciidoc[]
+
+include::has-child-query.asciidoc[]
+
+include::has-parent-query.asciidoc[]
+
+
diff --git a/docs/reference/query-dsl/limit-query.asciidoc b/docs/reference/query-dsl/limit-query.asciidoc
index 52140296c2c..1cfb0b852a9 100644
--- a/docs/reference/query-dsl/limit-query.asciidoc
+++ b/docs/reference/query-dsl/limit-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-limit-query]]
-== Limit Query
+=== Limit Query
 
 deprecated[1.6.0, Use <<search-request-body,terminate_after>> instead]
 
diff --git a/docs/reference/query-dsl/match-all-query.asciidoc b/docs/reference/query-dsl/match-all-query.asciidoc
index 85b0a2ff95e..b7f4251f0cd 100644
--- a/docs/reference/query-dsl/match-all-query.asciidoc
+++ b/docs/reference/query-dsl/match-all-query.asciidoc
@@ -1,20 +1,17 @@
 [[query-dsl-match-all-query]]
 == Match All Query
 
-A query that matches all documents. Maps to Lucene `MatchAllDocsQuery`.
+The most simple query, which matches all documents, giving them all a `_score`
+of `1.0`.
 
 [source,js]
 --------------------------------------------------
-{
-    "match_all" : { }
-}
+{ "match_all": {} }
 --------------------------------------------------
 
-Which can also have boost associated with it:
+The `_score` can be changed with the `boost` parameter:
 
 [source,js]
 --------------------------------------------------
-{
-    "match_all" : { "boost" : 1.2 }
-}
+{ "match_all": { "boost" : 1.2 }}
 --------------------------------------------------
diff --git a/docs/reference/query-dsl/match-query.asciidoc b/docs/reference/query-dsl/match-query.asciidoc
index 986228ce4eb..e06f2e92a5a 100644
--- a/docs/reference/query-dsl/match-query.asciidoc
+++ b/docs/reference/query-dsl/match-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-match-query]]
-== Match Query
+=== Match Query
 
 A family of `match` queries that accept text/numerics/dates, analyzes
 it, and constructs a query out of it. For example:
@@ -16,10 +16,8 @@ it, and constructs a query out of it. For example:
 Note, `message` is the name of a field, you can substitute the name of
 any field (including `_all`) instead.
 
-[float]
-=== Types of Match Queries
+There are three types of `match` query: `boolean`, `phrase`, and `phrase_prefix`:
 
-[float]
 [[query-dsl-match-query-boolean]]
 ==== boolean
 
@@ -40,8 +38,7 @@ data-type mismatches,  such as trying to query a numeric field with a text
 query string. Defaults to `false`.
 
 [[query-dsl-match-query-fuzziness]]
-[float]
-===== Fuzziness
+====== Fuzziness
 
 `fuzziness` allows _fuzzy matching_ based on the type of field being queried.
 See <<fuzziness>> for allowed settings.
@@ -69,7 +66,6 @@ change in structure, `message` is the field name):
 --------------------------------------------------
 
 [[query-dsl-match-query-zero]]
-[float]
 ===== Zero terms query
 If the analyzer used removes all tokens in a query like a `stop` filter
 does, the default behavior is to match no documents at all. In order to
@@ -90,7 +86,6 @@ change that the `zero_terms_query` option can be used, which accepts
 --------------------------------------------------
 
 [[query-dsl-match-query-cutoff]]
-[float]
 ===== Cutoff frequency
 
 The match query supports a `cutoff_frequency` that allows
@@ -132,7 +127,6 @@ that when trying it out on test indexes with low document numbers you
 should follow the advice in {defguide}/relevance-is-broken.html[Relevance is broken].
 
 [[query-dsl-match-query-phrase]]
-[float]
 ==== phrase
 
 The `match_phrase` query analyzes the text and creates a `phrase` query
@@ -181,9 +175,8 @@ definition, or the default search analyzer, for example:
 }
 --------------------------------------------------
 
-[float]
 [[query-dsl-match-query-phrase-prefix]]
-===== match_phrase_prefix
+==== match_phrase_prefix
 
 The `match_phrase_prefix` is the same as `match_phrase`, except that it
 allows for prefix matches on the last term in the text. For example:
diff --git a/docs/reference/query-dsl/missing-query.asciidoc b/docs/reference/query-dsl/missing-query.asciidoc
index 906823291f9..276722bd4c6 100644
--- a/docs/reference/query-dsl/missing-query.asciidoc
+++ b/docs/reference/query-dsl/missing-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-missing-query]]
-== Missing Query
+=== Missing Query
 
 Returns documents that have only `null` values or no value in the original field:
 
@@ -42,7 +42,7 @@ These documents would *not* match the above filter:
 <3> This field has one non-`null` value.
 
 [float]
-=== `null_value` mapping
+==== `null_value` mapping
 
 If the field mapping includes a `null_value` (see <<mapping-core-types>>) then explicit `null` values
 are replaced with the specified `null_value`.  For instance, if the `user` field were mapped
@@ -75,7 +75,7 @@ no values in the `user` field and thus would match the `missing` filter:
 --------------------------------------------------
 
 [float]
-==== `existence` and `null_value` parameters
+===== `existence` and `null_value` parameters
 
 When the field being queried has a `null_value` mapping, then the behaviour of
 the `missing` filter can be altered with the `existence` and `null_value`
diff --git a/docs/reference/query-dsl/mlt-query.asciidoc b/docs/reference/query-dsl/mlt-query.asciidoc
index d0097627e1d..37246db5023 100644
--- a/docs/reference/query-dsl/mlt-query.asciidoc
+++ b/docs/reference/query-dsl/mlt-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-mlt-query]]
-== More Like This Query
+=== More Like This Query
 
 The More Like This Query (MLT Query) finds documents that are "like" a given
 set of documents. In order to do so, MLT selects a set of representative terms
@@ -87,7 +87,7 @@ present in the index, the syntax is similar to <<docs-termvectors-artificial-doc
 }
 --------------------------------------------------
 
-=== How it Works
+==== How it Works
 
 Suppose we wanted to find all documents similar to a given input document.
 Obviously, the input document itself should be its best match for that type of
@@ -139,14 +139,14 @@ curl -s -XPUT 'http://localhost:9200/imdb/' -d '{
 }
 --------------------------------------------------
 
-=== Parameters
+==== Parameters
 
 The only required parameter is `like`, all other parameters have sensible
 defaults. There are three types of parameters: one to specify the document
 input, the other one for term selection and for query formation.
 
 [float]
-=== Document Input Parameters
+==== Document Input Parameters
 
 [horizontal]
 `like`:: coming[2.0]
@@ -179,7 +179,7 @@ A list of documents following the same syntax as the <<docs-multi-get,Multi GET
 
 [float]
 [[mlt-query-term-selection]]
-=== Term Selection Parameters
+==== Term Selection Parameters
 
 [horizontal]
 `max_query_terms`::
@@ -219,7 +219,7 @@ The analyzer that is used to analyze the free form text. Defaults to the
 analyzer associated with the first field in `fields`.
 
 [float]
-=== Query Formation Parameters
+==== Query Formation Parameters
 
 [horizontal]
 `minimum_should_match`::
diff --git a/docs/reference/query-dsl/multi-match-query.asciidoc b/docs/reference/query-dsl/multi-match-query.asciidoc
index 0b57c59cc18..940fd05ab2e 100644
--- a/docs/reference/query-dsl/multi-match-query.asciidoc
+++ b/docs/reference/query-dsl/multi-match-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-multi-match-query]]
-== Multi Match Query
+=== Multi Match Query
 
 The `multi_match` query builds on the <<query-dsl-match-query,`match` query>>
 to allow multi-field queries:
@@ -17,7 +17,7 @@ to allow multi-field queries:
 <2> The fields to be queried.
 
 [float]
-=== `fields` and per-field boosting
+==== `fields` and per-field boosting
 
 Fields can be specified with wildcards, eg:
 
@@ -47,7 +47,7 @@ Individual fields can be boosted with the caret (`^`) notation:
 
 [[multi-match-types]]
 [float]
-=== Types of `multi_match` query:
+==== Types of `multi_match` query:
 
 The way the `multi_match` query is executed internally depends on the `type`
 parameter, which can be set to:
@@ -70,7 +70,7 @@ parameter, which can be set to:
                     combines the `_score` from each field.  See <<type-phrase>>.
 
 [[type-best-fields]]
-=== `best_fields`
+==== `best_fields`
 
 The `best_fields` type is most useful when you are searching for multiple
 words best found in the same field. For instance ``brown fox'' in a single
@@ -121,7 +121,7 @@ and `cutoff_frequency`, as explained in <<query-dsl-match-query, match query>>.
 [IMPORTANT]
 [[operator-min]]
 .`operator` and `minimum_should_match`
-==================================================
+===================================================
 
 The `best_fields` and `most_fields` types are _field-centric_ -- they generate
 a `match` query *per field*.  This means that the `operator` and
@@ -153,10 +153,10 @@ to match.
 
 See <<type-cross-fields>> for a better solution.
 
-==================================================
+===================================================
 
 [[type-most-fields]]
-=== `most_fields`
+==== `most_fields`
 
 The `most_fields` type is most useful when querying multiple fields that
 contain the same text analyzed in different ways.  For instance, the main
@@ -203,7 +203,7 @@ and `cutoff_frequency`, as explained in <<query-dsl-match-query,match query>>, b
 *see <<operator-min>>*.
 
 [[type-phrase]]
-=== `phrase` and `phrase_prefix`
+==== `phrase` and `phrase_prefix`
 
 The `phrase` and `phrase_prefix` types behave just like <<type-best-fields>>,
 but they use a `match_phrase` or `match_phrase_prefix` query instead of a
@@ -240,7 +240,7 @@ in <<query-dsl-match-query>>.  Type `phrase_prefix` additionally accepts
 `max_expansions`.
 
 [[type-cross-fields]]
-=== `cross_fields`
+==== `cross_fields`
 
 The `cross_fields` type is particularly useful with structured documents where
 multiple fields *should* match.  For instance, when querying the `first_name`
@@ -317,7 +317,7 @@ Also, accepts `analyzer`, `boost`, `operator`, `minimum_should_match`,
 `zero_terms_query` and `cutoff_frequency`, as explained in
 <<query-dsl-match-query, match query>>.
 
-==== `cross_field` and analysis
+===== `cross_field` and analysis
 
 The `cross_field` type can only work in term-centric mode on fields that have
 the same analyzer. Fields with the same analyzer are grouped together as in
@@ -411,7 +411,7 @@ which will be executed as:
     blended("will",  fields: [first, first.edge, last.edge, last])
     blended("smith", fields: [first, first.edge, last.edge, last])
 
-==== `tie_breaker`
+===== `tie_breaker`
 
 By default, each per-term `blended` query will use the best score returned by
 any field in a group, then these scores are added together to give the final
diff --git a/docs/reference/query-dsl/nested-query.asciidoc b/docs/reference/query-dsl/nested-query.asciidoc
index 27e6b620f38..6460e027885 100644
--- a/docs/reference/query-dsl/nested-query.asciidoc
+++ b/docs/reference/query-dsl/nested-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-nested-query]]
-== Nested Query
+=== Nested Query
 
 Nested query allows to query nested objects / docs (see
 <<mapping-nested-type,nested mapping>>). The
diff --git a/docs/reference/query-dsl/not-query.asciidoc b/docs/reference/query-dsl/not-query.asciidoc
index 414722aaf2b..a74a0f11734 100644
--- a/docs/reference/query-dsl/not-query.asciidoc
+++ b/docs/reference/query-dsl/not-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-not-query]]
-== Not Query
+=== Not Query
 
 A query that filters out matched documents using a query. For example:
 
diff --git a/docs/reference/query-dsl/or-query.asciidoc b/docs/reference/query-dsl/or-query.asciidoc
index ad85faabe3e..8a75b625d44 100644
--- a/docs/reference/query-dsl/or-query.asciidoc
+++ b/docs/reference/query-dsl/or-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-or-query]]
-== Or Query
+=== Or Query
 
 deprecated[2.0.0, Use the `bool` query instead]
 
diff --git a/docs/reference/query-dsl/prefix-query.asciidoc b/docs/reference/query-dsl/prefix-query.asciidoc
index b1a3a1e9611..cf26e850ad8 100644
--- a/docs/reference/query-dsl/prefix-query.asciidoc
+++ b/docs/reference/query-dsl/prefix-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-prefix-query]]
-== Prefix Query
+=== Prefix Query
 
 Matches documents that have fields containing terms with a specified
 prefix (*not analyzed*). The prefix query maps to Lucene `PrefixQuery`.
diff --git a/docs/reference/query-dsl/query-string-query.asciidoc b/docs/reference/query-dsl/query-string-query.asciidoc
index 9df7998c961..0f0763f65c5 100644
--- a/docs/reference/query-dsl/query-string-query.asciidoc
+++ b/docs/reference/query-dsl/query-string-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-query-string-query]]
-== Query String Query
+=== Query String Query
 
 A query that uses a query parser in order to parse its content. Here is
 an example:
@@ -89,7 +89,7 @@ rewritten using the
 parameter.
 
 [float]
-=== Default Field
+==== Default Field
 
 When not explicitly specifying the field to search on in the query
 string syntax, the `index.query.default_field` will be used to derive
@@ -99,7 +99,7 @@ So, if `_all` field is disabled, it might make sense to change it to set
 a different default field.
 
 [float]
-=== Multi Field
+==== Multi Field
 
 The `query_string` query can also run against multiple fields. Fields can be
 provided via the `"fields"` parameter (example below).
diff --git a/docs/reference/query-dsl/query-string-syntax.asciidoc b/docs/reference/query-dsl/query-string-syntax.asciidoc
index d1f3be8c0db..17198a1991f 100644
--- a/docs/reference/query-dsl/query-string-syntax.asciidoc
+++ b/docs/reference/query-dsl/query-string-syntax.asciidoc
@@ -1,6 +1,6 @@
 [[query-string-syntax]]
 
-=== Query string syntax
+==== Query string syntax
 
 The query string ``mini-language'' is used by the
 <<query-dsl-query-string-query>> and by the
@@ -14,7 +14,7 @@ phrase, in the same order.
 Operators allow you to customize the search -- the available options are
 explained below.
 
-==== Field names
+===== Field names
 
 As mentioned in <<query-dsl-query-string-query>>, the `default_field` is searched for the
 search terms, but it is possible to specify other fields in the query syntax:
@@ -46,7 +46,7 @@ search terms, but it is possible to specify other fields in the query syntax:
 
     _exists_:title
 
-==== Wildcards
+===== Wildcards
 
 Wildcard searches can be run on individual terms, using `?` to replace
 a single character, and `*` to replace zero or more characters:
@@ -58,12 +58,12 @@ perform very badly -- just think how many terms need to be queried to
 match the query string `"a* b* c*"`.
 
 [WARNING]
-======
+=======
 Allowing a wildcard at the beginning of a word (eg `"*ing"`) is particularly
 heavy, because all terms in the index need to be examined, just in case
 they match.  Leading wildcards can be disabled by setting
 `allow_leading_wildcard` to `false`.
-======
+=======
 
 Wildcarded terms are not analyzed by default -- they are lowercased
 (`lowercase_expanded_terms` defaults to `true`) but no further analysis
@@ -72,7 +72,7 @@ is missing some of its letters.  However, by setting `analyze_wildcard` to
 `true`, an attempt will be made to analyze wildcarded words before searching
 the term list for matching terms.
 
-==== Regular expressions
+===== Regular expressions
 
 Regular expression patterns can be embedded in the query string by
 wrapping them in forward-slashes (`"/"`):
@@ -82,7 +82,7 @@ wrapping them in forward-slashes (`"/"`):
 The supported regular expression syntax is explained in <<regexp-syntax>>.
 
 [WARNING]
-======
+=======
 The `allow_leading_wildcard` parameter does not have any control over
 regular expressions.  A query string such as the following would force
 Elasticsearch to visit every term in the index:
@@ -90,9 +90,9 @@ Elasticsearch to visit every term in the index:
     /.*n/
 
 Use with caution!
-======
+=======
 
-==== Fuzziness
+===== Fuzziness
 
 We can search for terms that are
 similar to, but not exactly like our search terms, using the ``fuzzy''
@@ -112,7 +112,7 @@ sufficient to catch 80% of all human misspellings. It can be specified as:
 
     quikc~1
 
-==== Proximity searches
+===== Proximity searches
 
 While a phrase query (eg `"john smith"`) expects all of the terms in exactly
 the same order, a proximity query allows the specified words to be further
@@ -127,7 +127,7 @@ query string, the more relevant that document is considered to be. When
 compared to the above example query, the phrase `"quick fox"` would be
 considered more relevant than `"quick brown fox"`.
 
-==== Ranges
+===== Ranges
 
 Ranges can be specified for date, numeric or string fields. Inclusive ranges
 are specified with square brackets `[min TO max]` and exclusive ranges with
@@ -168,20 +168,20 @@ Ranges with one side unbounded can use the following syntax:
     age:<=10
 
 [NOTE]
-===================================================================
+====================================================================
 To combine an upper and lower bound with the simplified syntax, you
 would need to join two clauses with an `AND` operator:
 
     age:(>=10 AND <20)
     age:(+>=10 +<20)
 
-===================================================================
+====================================================================
 
 The parsing of ranges in query strings can be complex and error prone. It is
 much more reliable to use an explicit <<query-dsl-range-query,`range` query>>.
 
 
-==== Boosting
+===== Boosting
 
 Use the _boost_ operator `^` to make one term more relevant than another.
 For instance, if we want to find all documents about foxes, but we are
@@ -196,7 +196,7 @@ Boosts can also be applied to phrases or to groups:
 
     "john smith"^2   (foo bar)^4
 
-==== Boolean operators
+===== Boolean operators
 
 By default, all terms are optional, as long as one term matches.  A search
 for `foo bar baz` will find any document that contains one or more of
@@ -256,7 +256,7 @@ would look like this:
 
 ****
 
-==== Grouping
+===== Grouping
 
 Multiple terms or clauses can be grouped together with parentheses, to form
 sub-queries:
@@ -268,7 +268,7 @@ of a sub-query:
 
     status:(active OR pending) title:(full text search)^2
 
-==== Reserved characters
+===== Reserved characters
 
 If you need to use any of the characters which function as operators in your
 query itself (and not as operators), then you should escape them with
@@ -290,7 +290,7 @@ index is actually `"wifi"`.  Escaping the space will protect it from
 being touched by the query string parser: `"wi\ fi"`.
 ****
 
-==== Empty Query
+===== Empty Query
 
 If the query string is empty or only contains whitespaces the query will
 yield an empty result set.
diff --git a/docs/reference/query-dsl/query_filter_context.asciidoc b/docs/reference/query-dsl/query_filter_context.asciidoc
new file mode 100644
index 00000000000..f6c3aa44750
--- /dev/null
+++ b/docs/reference/query-dsl/query_filter_context.asciidoc
@@ -0,0 +1,77 @@
+[[query-filter-context]]
+== Query and filter context
+
+The behaviour of a query clause depends on whether it is used in _query context_ or
+in _filter context_:
+
+Query context::
++
+--
+A query clause used in query context answers the question ``__How well does this
+document match this query clause?__'' Besides deciding whether or not the
+document matches, the query clause also calculated a `_score` representing how
+well the document matches, relative to other documents.
+
+Query context is in effect whenever a query clause is passed to a `query` parameter,
+such as the `query` parameter in the <<search-request-query,`search`>> API.
+--
+
+Filter context::
++
+--
+In _filter_ context, a query clause answers the question ``__Does this document
+match this query clause?__''  The answer is a simple Yes or No -- no scores are
+calculated.  Filter context is mostly used for filtering structured data, e.g.
+
+*  __Does this +timestamp+ fall into the range 2015 to 2016?__
+*  __Is the +status+  field set to ++"published"++__?
+
+Frequently used filters will be cached automatically by Elasticsearch, to
+speed up performance.
+
+Filter context is in effect whenever a query clause is passed to a `filter`
+parameter, such as the `filter` or `must_not` parameters in the
+<<query-dsl-bool-query,`bool`>> query, the `filter` parameter in the
+<<query-dsl-constant-score-query,`constant_score`>> query, or the
+<<search-aggregations-bucket-filter-aggregation,`filter`>> aggregation.
+--
+
+Below is an example of query clauses being used in query and filter context
+in the `search` API.  This query will match documents where all of the following
+conditions are met:
+
+* The `title` field contains the word `search`.
+* The `content` field contains the word `elasticsearch`.
+* The `status` field contains the exact word `published`.
+* The `publish_date` field contains a date from 1 Jan 2015 onwards.
+
+[source,json]
+------------------------------------
+GET _search
+{
+  "query": { <1>
+    "bool": { <2>
+      "must": [
+        { "match": { "title":   "Search"        }}, <2>
+        { "match": { "content": "Elasticsearch" }}  <2>
+      ],
+      "filter": [ <3>
+        { "term":  { "status": "published" }}, <4>
+        { "range": { "publish_date": { "gte": "2015-01-01" }}} <4>
+      ]
+    }
+  }
+}
+------------------------------------
+<1> The `query` parameter indicates query context.
+<2> The `bool` and two `match` clauses are used in query context,
+    which means that they are used to score how well each document
+    matches.
+<3> The `filter` parameter indicates filter context.
+<4> The `term` and `range` clauses are used in filter context.
+    They will filter out documents which do not match, but they will
+    not affect the score for matching documents.
+
+TIP: Use query clauses in query context for conditions which should affect the
+score of matching documents (i.e. how well does the document match), and use
+all other query clauses in filter context.
diff --git a/docs/reference/query-dsl/range-query.asciidoc b/docs/reference/query-dsl/range-query.asciidoc
index ba627129dab..5d5bb6a308d 100644
--- a/docs/reference/query-dsl/range-query.asciidoc
+++ b/docs/reference/query-dsl/range-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-range-query]]
-== Range Query
+=== Range Query
 
 Matches documents with fields that have terms within a certain range.
 The type of the Lucene query depends on the field type, for `string`
@@ -30,7 +30,7 @@ The `range` query accepts the following parameters:
 `boost`:: 	Sets the boost value of the query, defaults to `1.0`
 
 [float]
-=== Date options
+==== Date options
 
 When applied on `date` fields the `range` filter accepts also a `time_zone` parameter.
 The `time_zone` parameter will be applied to your input lower and upper bounds and will
diff --git a/docs/reference/query-dsl/regexp-query.asciidoc b/docs/reference/query-dsl/regexp-query.asciidoc
index d0be5973b6c..692caf43480 100644
--- a/docs/reference/query-dsl/regexp-query.asciidoc
+++ b/docs/reference/query-dsl/regexp-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-regexp-query]]
-== Regexp Query
+=== Regexp Query
 
 The `regexp` query allows you to use regular expression term queries.
 See <<regexp-syntax>> for details of the supported regular expression language.
diff --git a/docs/reference/query-dsl/regexp-syntax.asciidoc b/docs/reference/query-dsl/regexp-syntax.asciidoc
index 51992591ea9..b261d922b98 100644
--- a/docs/reference/query-dsl/regexp-syntax.asciidoc
+++ b/docs/reference/query-dsl/regexp-syntax.asciidoc
@@ -1,17 +1,17 @@
 [[regexp-syntax]]
-=== Regular expression syntax
+==== Regular expression syntax
 
 Regular expression queries are supported by the `regexp` and the `query_string`
 queries.  The Lucene regular expression engine
 is not Perl-compatible but supports a smaller range of operators.
 
 [NOTE]
-====
+=====
 We will not attempt to explain regular expressions, but
 just explain the supported operators.
-====
+=====
 
-==== Standard operators
+===== Standard operators
 
 Anchoring::
 +
@@ -200,7 +200,7 @@ For string `"abcd"`:
 
 --
 
-===== Optional operators
+====== Optional operators
 
 These operators are available by default as the `flags` parameter defaults to `ALL`.
 Different flag combinations (concatened with `"\"`) can be used to enable/disable
diff --git a/docs/reference/query-dsl/script-query.asciidoc b/docs/reference/query-dsl/script-query.asciidoc
index 4c307f2556f..c14e8142f7d 100644
--- a/docs/reference/query-dsl/script-query.asciidoc
+++ b/docs/reference/query-dsl/script-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-script-query]]
-== Script Query
+=== Script Query
 
 A query allowing to define
 <<modules-scripting,scripts>> as filters. For
@@ -20,7 +20,7 @@ example:
 ----------------------------------------------
 
 [float]
-=== Custom Parameters
+==== Custom Parameters
 
 Scripts are compiled and cached for faster execution. If the same script
 can be used, just with different parameters provider, it is preferable
diff --git a/docs/reference/query-dsl/simple-query-string-query.asciidoc b/docs/reference/query-dsl/simple-query-string-query.asciidoc
index 338ee094fc0..092918b59f0 100644
--- a/docs/reference/query-dsl/simple-query-string-query.asciidoc
+++ b/docs/reference/query-dsl/simple-query-string-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-simple-query-string-query]]
-== Simple Query String Query
+=== Simple Query String Query
 
 A query that uses the SimpleQueryParser to parse its context. Unlike the
 regular `query_string` query, the `simple_query_string` query will never
@@ -57,7 +57,7 @@ Defaults to `ROOT`.
 |=======================================================================
 
 [float]
-==== Simple Query String Syntax
+===== Simple Query String Syntax
 The `simple_query_string` supports the following special characters:
 
 * `+` signifies AND operation
@@ -73,7 +73,7 @@ In order to search for any of these special characters, they will need to
 be escaped with `\`.
 
 [float]
-=== Default Field
+==== Default Field
 When not explicitly specifying the field to search on in the query
 string syntax, the `index.query.default_field` will be used to derive
 which field to search on. It defaults to `_all` field.
@@ -82,7 +82,7 @@ So, if `_all` field is disabled, it might make sense to change it to set
 a different default field.
 
 [float]
-=== Multi Field
+==== Multi Field
 The fields parameter can also include pattern based field names,
 allowing to automatically expand to the relevant fields (dynamically
 introduced fields included). For example:
@@ -98,7 +98,7 @@ introduced fields included). For example:
 --------------------------------------------------
 
 [float]
-=== Flags
+==== Flags
 `simple_query_string` support multiple flags to specify which parsing features
 should be enabled. It is specified as a `|`-delimited string with the
 `flags` parameter:
diff --git a/docs/reference/query-dsl/span-containing-query.asciidoc b/docs/reference/query-dsl/span-containing-query.asciidoc
index 3a214858e06..965bf855b6f 100644
--- a/docs/reference/query-dsl/span-containing-query.asciidoc
+++ b/docs/reference/query-dsl/span-containing-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-span-containing-query]]
-== Span Containing Query
+=== Span Containing Query
 
 Returns matches which enclose another span query. The span containing
 query maps to Lucene `SpanContainingQuery`. Here is an example:
diff --git a/docs/reference/query-dsl/span-first-query.asciidoc b/docs/reference/query-dsl/span-first-query.asciidoc
index b01edea691d..74fe7ff88ba 100644
--- a/docs/reference/query-dsl/span-first-query.asciidoc
+++ b/docs/reference/query-dsl/span-first-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-span-first-query]]
-== Span First Query
+=== Span First Query
 
 Matches spans near the beginning of a field. The span first query maps
 to Lucene `SpanFirstQuery`. Here is an example:
diff --git a/docs/reference/query-dsl/span-multi-term-query.asciidoc b/docs/reference/query-dsl/span-multi-term-query.asciidoc
index dfb75bcce61..af3da5cf7dd 100644
--- a/docs/reference/query-dsl/span-multi-term-query.asciidoc
+++ b/docs/reference/query-dsl/span-multi-term-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-span-multi-term-query]]
-== Span Multi Term Query
+=== Span Multi Term Query
 
 The `span_multi` query allows you to wrap a `multi term query` (one of wildcard,
 fuzzy, prefix, term, range or regexp query) as a `span query`, so
diff --git a/docs/reference/query-dsl/span-near-query.asciidoc b/docs/reference/query-dsl/span-near-query.asciidoc
index 2e905fc8870..39982e2ba22 100644
--- a/docs/reference/query-dsl/span-near-query.asciidoc
+++ b/docs/reference/query-dsl/span-near-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-span-near-query]]
-== Span Near Query
+=== Span Near Query
 
 Matches spans which are near one another. One can specify _slop_, the
 maximum number of intervening unmatched positions, as well as whether
diff --git a/docs/reference/query-dsl/span-not-query.asciidoc b/docs/reference/query-dsl/span-not-query.asciidoc
index a23877f1a8b..73186985b0d 100644
--- a/docs/reference/query-dsl/span-not-query.asciidoc
+++ b/docs/reference/query-dsl/span-not-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-span-not-query]]
-== Span Not Query
+=== Span Not Query
 
 Removes matches which overlap with another span query. The span not
 query maps to Lucene `SpanNotQuery`. Here is an example:
diff --git a/docs/reference/query-dsl/span-or-query.asciidoc b/docs/reference/query-dsl/span-or-query.asciidoc
index 10a168e3ac6..72a4ce8724b 100644
--- a/docs/reference/query-dsl/span-or-query.asciidoc
+++ b/docs/reference/query-dsl/span-or-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-span-or-query]]
-== Span Or Query
+=== Span Or Query
 
 Matches the union of its span clauses. The span or query maps to Lucene
 `SpanOrQuery`. Here is an example:
diff --git a/docs/reference/query-dsl/span-queries.asciidoc b/docs/reference/query-dsl/span-queries.asciidoc
new file mode 100644
index 00000000000..63aad48d987
--- /dev/null
+++ b/docs/reference/query-dsl/span-queries.asciidoc
@@ -0,0 +1,65 @@
+[[span-queries]]
+== Span queries
+
+Span queries are low-level positional queries which provide expert control
+over the order and proximity of the specified terms. These are typically used
+to implement very specific queries on legal documents or patents.
+
+Span queries cannot be mixed with non-span queries (with the exception of the `span_multi` query).
+
+The queries in this group are:
+
+<<query-dsl-span-term-query,`span_term` query>>::
+
+The equivalent of the <<query-dsl-term-query,`term` query>> but for use with
+other span queries.
+
+<<query-dsl-span-multi-term-query,`span_multi` query>>::
+
+Wraps a <<query-dsl-term-query,`term`>>, <<query-dsl-range-query,`range`>>,
+<<query-dsl-prefix-query,`prefix`>>, <<query-dsl-wildcard-query,`wildcard`>>,
+<<query-dsl-regexp-query,`regexp`>>, or <<query-dsl-fuzzy-query,`fuzzy`>> query.
+
+<<query-dsl-span-first-query,`span_first` query>>::
+
+Accepts another span query whose matches must appear within the first N
+positions of the field.
+
+<<query-dsl-span-near-query,`span_near` query>>::
+
+Accepts multiple span queries whose matches must be within the specified distance of each other, and possibly in the same order.
+
+<<query-dsl-span-or-query,`span_or` query>>::
+
+Combines multiple span queries -- returns documents which match any of the
+specified queries.
+
+<<query-dsl-span-not-query,`span_not` query>>::
+
+Wraps another span query, and excludes any documents which match that query.
+
+<<query-dsl-span-containing-query,`span_containing` query>>::
+
+Accepts a list of span queries, but only returns those spans which also match a second span query.
+
+<<query-dsl-span-within-query,`span_within` query>>::
+
+The result from a single span query is returned as long is its span falls
+within the spans returned by a list of other span queries.
+
+
+include::span-term-query.asciidoc[]
+
+include::span-multi-term-query.asciidoc[]
+
+include::span-first-query.asciidoc[]
+
+include::span-near-query.asciidoc[]
+
+include::span-or-query.asciidoc[]
+
+include::span-not-query.asciidoc[]
+
+include::span-containing-query.asciidoc[]
+
+include::span-within-query.asciidoc[]
diff --git a/docs/reference/query-dsl/span-term-query.asciidoc b/docs/reference/query-dsl/span-term-query.asciidoc
index 3efe4387efc..9de86d48684 100644
--- a/docs/reference/query-dsl/span-term-query.asciidoc
+++ b/docs/reference/query-dsl/span-term-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-span-term-query]]
-== Span Term Query
+=== Span Term Query
 
 Matches spans containing a term. The span term query maps to Lucene
 `SpanTermQuery`. Here is an example:
diff --git a/docs/reference/query-dsl/span-within-query.asciidoc b/docs/reference/query-dsl/span-within-query.asciidoc
index 24510ac023c..dc5c4bbfdfd 100644
--- a/docs/reference/query-dsl/span-within-query.asciidoc
+++ b/docs/reference/query-dsl/span-within-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-span-within-query]]
-== Span Within Query
+=== Span Within Query
 
 Returns matches which are enclosed inside another span query. The span within
 query maps to Lucene `SpanWithinQuery`. Here is an example:
diff --git a/docs/reference/query-dsl/special-queries.asciidoc b/docs/reference/query-dsl/special-queries.asciidoc
new file mode 100644
index 00000000000..1a2d63d2265
--- /dev/null
+++ b/docs/reference/query-dsl/special-queries.asciidoc
@@ -0,0 +1,29 @@
+[[specialized-queries]]
+
+== Specialized queries
+
+This group contains queries which do not fit into the other groups:
+
+<<query-dsl-mlt-query,`more_like_this` query>>::
+
+This query finds documents which are similar to the specified text, document,
+or collection of documents.
+
+<<query-dsl-template-query,`template` query>>::
+
+The `template` query accepts a Mustache template (either inline, indexed, or
+from a file), and a map of parameters,  and combines the two to generate the
+final query to execute.
+
+<<query-dsl-script-query,`script` query>>::
+
+This query allows a script to act as a filter.  Also see the
+<<query-dsl-function-score-query,`function_score` query>>.
+
+
+include::mlt-query.asciidoc[]
+
+include::template-query.asciidoc[]
+
+include::script-query.asciidoc[]
+
diff --git a/docs/reference/query-dsl/template-query.asciidoc b/docs/reference/query-dsl/template-query.asciidoc
index 31728fe9993..14a439bb3ee 100644
--- a/docs/reference/query-dsl/template-query.asciidoc
+++ b/docs/reference/query-dsl/template-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-template-query]]
-== Template Query
+=== Template Query
 
 A query that accepts a query template and a map of key/value pairs to fill in
 template parameters. Templating is based on Mustache. For simple token substitution all you provide
@@ -56,7 +56,7 @@ GET /_search
 <1> New line characters (`\n`) should be escaped as `\\n` or removed,
     and quotes (`"`) should be escaped as `\\"`.
 
-=== Stored templates
+==== Stored templates
 
 You can register a template by storing it in the `config/scripts` directory, in a file using the `.mustache` extension.
 In order to execute the stored template, reference it by name in the `file`
diff --git a/docs/reference/query-dsl/term-level-queries.asciidoc b/docs/reference/query-dsl/term-level-queries.asciidoc
new file mode 100644
index 00000000000..7e9f5e5ca3e
--- /dev/null
+++ b/docs/reference/query-dsl/term-level-queries.asciidoc
@@ -0,0 +1,93 @@
+[[term-level-queries]]
+== Term level queries
+
+While the <<full-text-queries,full text queries>> will analyze the query
+string before executing, the _term-level queries_ operate on the exact terms
+that are stored in the inverted index.
+
+These queries are usually used for structured data like numbers, dates, and
+enums, rather than full text fields.  Alternatively, they allow you to craft
+low-level queries, foregoing the analysis process.
+
+The queries in this group are:
+
+<<query-dsl-term-query,`term` query>>::
+
+    Find documents which contain the exact term specified in the field
+    specified.
+
+<<query-dsl-terms-query,`terms` query>>::
+
+    Find documents which contain any of the exact terms specified in the field
+    specified.
+
+<<query-dsl-range-query,`range` query>>::
+
+    Find documents where the field specified contains values (dates, numbers,
+    or strings) in the range specified.
+
+<<query-dsl-exists-query,`exists` query>>::
+
+    Find documents where the field specified contains any non-null value.
+
+<<query-dsl-missing-query,`missing` query>>::
+
+    Find documents where the field specified does is missing or contains only
+    `null` values.
+
+<<query-dsl-prefix-query,`prefix` query>>::
+
+    Find documents where the field specified contains terms which being with
+    the exact prefix specified.
+
+<<query-dsl-wildcard-query,`wildcard` query>>::
+
+    Find documents where the field specified contains terms which match the
+    pattern specified, where the pattern supports single character wildcards
+    (`?`) and multi-character wildcards (`*`)
+
+<<query-dsl-regexp-query,`regexp` query>>::
+
+    Find documents where the field specified contains terms which match the
+    <<regexp-syntax,regular expression>> specified.
+
+<<query-dsl-fuzzy-query,`fuzzy` query>>::
+
+    Find documents where the field specified contains terms which are fuzzily
+    similar to the specified term.  Fuzziness is measured as a
+    http://en.wikipedia.org/wiki/Damerau%E2%80%93Levenshtein_distance[Levenshtein edit distance]
+    of 1 or 2.
+
+<<query-dsl-type-query,`type` query>>::
+
+    Find documents of the specified type.
+
+<<query-dsl-ids-query,`ids` query>>::
+
+    Find documents with the specified type and IDs.
+
+
+include::term-query.asciidoc[]
+
+include::terms-query.asciidoc[]
+
+include::range-query.asciidoc[]
+
+include::exists-query.asciidoc[]
+
+include::missing-query.asciidoc[]
+
+include::prefix-query.asciidoc[]
+
+include::wildcard-query.asciidoc[]
+
+include::regexp-query.asciidoc[]
+
+include::fuzzy-query.asciidoc[]
+
+include::type-query.asciidoc[]
+
+include::ids-query.asciidoc[]
+
+
+
diff --git a/docs/reference/query-dsl/term-query.asciidoc b/docs/reference/query-dsl/term-query.asciidoc
index ed81870bfdd..a34ae5b0a68 100644
--- a/docs/reference/query-dsl/term-query.asciidoc
+++ b/docs/reference/query-dsl/term-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-term-query]]
-== Term Query
+=== Term Query
 
 The `term` query finds documents that contain the *exact* term specified
 in the inverted index.  For instance:
diff --git a/docs/reference/query-dsl/terms-query.asciidoc b/docs/reference/query-dsl/terms-query.asciidoc
index 52092f17655..58b0ba5d85b 100644
--- a/docs/reference/query-dsl/terms-query.asciidoc
+++ b/docs/reference/query-dsl/terms-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-terms-query]]
-== Terms Query
+=== Terms Query
 
 Filters documents that have fields that match any of the provided terms
 (*not analyzed*). For example:
@@ -19,7 +19,8 @@ The `terms` query is also aliased with `in` as the filter name for
 simpler usage.
 
 [float]
-==== Terms lookup mechanism
+[[query-dsl-terms-lookup]]
+===== Terms lookup mechanism
 
 When it's needed to specify a `terms` filter with a lot of terms it can
 be beneficial to fetch those term values from a document in an index. A
@@ -31,21 +32,21 @@ lookup mechanism.
 The terms lookup mechanism supports the following options:
 
 [horizontal]
-`index`:: 
+`index`::
     The index to fetch the term values from. Defaults to the
     current index.
 
-`type`:: 
+`type`::
     The type to fetch the term values from.
 
-`id`:: 
+`id`::
     The id of the document to fetch the term values from.
 
-`path`:: 
+`path`::
     The field specified as path to fetch the actual values for the
     `terms` filter.
 
-`routing`:: 
+`routing`::
     A custom routing value to be used when retrieving the
     external terms doc.
 
@@ -61,7 +62,7 @@ terms filter will prefer to execute the get request on a local node if
 possible, reducing the need for networking.
 
 [float]
-==== Terms lookup twitter example
+===== Terms lookup twitter example
 
 [source,js]
 --------------------------------------------------
diff --git a/docs/reference/query-dsl/type-query.asciidoc b/docs/reference/query-dsl/type-query.asciidoc
index 3aa932e5670..d3ef1a30fb1 100644
--- a/docs/reference/query-dsl/type-query.asciidoc
+++ b/docs/reference/query-dsl/type-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-type-query]]
-== Type Query
+=== Type Query
 
 Filters documents matching the provided document / mapping type.
 
diff --git a/docs/reference/query-dsl/wildcard-query.asciidoc b/docs/reference/query-dsl/wildcard-query.asciidoc
index 9d4bc759f3d..d72dbec2481 100644
--- a/docs/reference/query-dsl/wildcard-query.asciidoc
+++ b/docs/reference/query-dsl/wildcard-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-wildcard-query]]
-== Wildcard Query
+=== Wildcard Query
 
 Matches documents that have fields matching a wildcard expression (*not
 analyzed*). Supported wildcards are `*`, which matches any character

From a522ddb4acf712dd3d9104ea48c8844fcb06785b Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Thu, 4 Jun 2015 12:29:17 +0200
Subject: [PATCH 117/123] [TEST] Add more logging to allocation decision

---
 .../java/org/elasticsearch/cluster/MinimumMasterNodesTests.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java b/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java
index 68d682ddf7b..2034dc41b81 100644
--- a/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java
+++ b/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java
@@ -31,6 +31,7 @@ import org.elasticsearch.discovery.zen.elect.ElectMasterService;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope;
+import org.elasticsearch.test.junit.annotations.TestLogging;
 import org.junit.Test;
 
 import java.util.concurrent.ExecutionException;
@@ -163,6 +164,7 @@ public class MinimumMasterNodesTests extends ElasticsearchIntegrationTest {
     }
 
     @Test @Slow
+    @TestLogging("cluster.routing.allocation.allocator:TRACE")
     public void multipleNodesShutdownNonMasterNodes() throws Exception {
         Settings settings = settingsBuilder()
                 .put("discovery.type", "zen")

From f85a17ff1a01c4494a15a5337b1ddd083d44b34b Mon Sep 17 00:00:00 2001
From: Clinton Gormley <clint@traveljury.com>
Date: Thu, 4 Jun 2015 13:16:32 +0200
Subject: [PATCH 118/123] Docs: Fixed heading level for in query DSL docs

---
 .../query-dsl/function-score-query.asciidoc   | 24 +++++++++----------
 .../query-dsl/geo-shape-query.asciidoc        | 10 ++++----
 docs/reference/query-dsl/match-query.asciidoc |  2 +-
 .../query-dsl/regexp-syntax.asciidoc          |  2 +-
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/docs/reference/query-dsl/function-score-query.asciidoc b/docs/reference/query-dsl/function-score-query.asciidoc
index 5d1ee98f83a..5bf501a8dc9 100644
--- a/docs/reference/query-dsl/function-score-query.asciidoc
+++ b/docs/reference/query-dsl/function-score-query.asciidoc
@@ -89,11 +89,9 @@ query. The parameter `boost_mode` defines how:
 By default, modifying the score does not change which documents match. To exclude
 documents that do not meet a certain score threshold the `min_score` parameter can be set to the desired score threshold.
 
-==== Score functions
-
 The `function_score` query provides several types of score functions.
 
-====== Script score
+==== Script score
 
 The `script_score` function allows you to wrap another query and customize
 the scoring of it optionally with a computation derived from other numeric
@@ -133,7 +131,7 @@ Note that unlike the `custom_score` query, the
 score of the query is multiplied with the result of the script scoring. If
 you wish to inhibit this, set `"boost_mode": "replace"`
 
-====== Weight
+==== Weight
 
 The `weight` score allows you to multiply the score by the provided
 `weight`. This can sometimes be desired since boost value set on
@@ -145,7 +143,7 @@ not.
 "weight" : number
 --------------------------------------------------
 
-====== Random
+==== Random
 
 The `random_score` generates scores using a hash of the `_uid` field,
 with a `seed` for variation. If `seed` is not specified, the current
@@ -161,7 +159,7 @@ be a memory intensive operation since the values are unique.
 }
 --------------------------------------------------
 
-====== Field Value factor
+==== Field Value factor
 
 The `field_value_factor` function allows you to use a field from a document to
 influence the score. It's similar to using the `script_score` function, however,
@@ -205,7 +203,7 @@ is an illegal operation, and an exception will be thrown. Be sure to limit the
 values of the field with a range filter to avoid this, or use `log1p` and
 `ln1p`.
 
-====== Decay functions
+==== Decay functions
 
 Decay functions score a document with a function that decays depending
 on the distance of a numeric field value of the document from a user
@@ -332,7 +330,7 @@ For single functions the three decay functions together with their parameters ca
 
 image:images/decay_2d.png[width=600]
 
-====== Multiple values:
+===== Multiple values:
 
 If a field used for computing the decay contains multiple values, per default the value closest to the origin is chosen for determining the distance.
 This can be changed by setting `multi_value_mode`.
@@ -448,7 +446,7 @@ curl 'localhost:9200/hotels/_search/' -d '{
 Next, we show how the computed score looks like for each of the three
 possible decay functions.
 
-====== Normal decay, keyword `gauss`
+===== Normal decay, keyword `gauss`
 
 When choosing `gauss` as the decay function in the above example, the
 contour and surface plot of the multiplier looks like this:
@@ -469,7 +467,7 @@ of 0.56. "BnB Bellevue" and "Backback Nap" are both pretty close to the
 defined location but "BnB Bellevue" is cheaper, so it gets a multiplier
 of 0.86 whereas "Backpack Nap" gets a value of 0.66.
 
-====== Exponential decay, keyword `exp`
+===== Exponential decay, keyword `exp`
 
 When choosing `exp` as the decay function in the above example, the
 contour and surface plot of the multiplier looks like this:
@@ -478,7 +476,7 @@ image::https://f.cloud.github.com/assets/4320215/768161/082975c0-e899-11e2-86f7-
 
 image::https://f.cloud.github.com/assets/4320215/768162/0b606884-e899-11e2-907b-aefc77eefef6.png[width="700px"]
 
-====== Linear' decay, keyword `linear`
+===== Linear decay, keyword `linear`
 
 When choosing `linear` as the decay function in the above example, the
 contour and surface plot of the multiplier looks like this:
@@ -487,12 +485,12 @@ image::https://f.cloud.github.com/assets/4320215/768164/1775b0ca-e899-11e2-9f4a-
 
 image::https://f.cloud.github.com/assets/4320215/768165/19d8b1aa-e899-11e2-91bc-6b0553e8d722.png[width="700px"]
 
-===== Supported fields for decay functions
+==== Supported fields for decay functions
 
 Only single valued numeric fields, including time and geo locations,
 are supported.
 
-===== What if a field is missing?
+==== What if a field is missing?
 
 If the numeric field is missing in the document, the function will
 return 1.
diff --git a/docs/reference/query-dsl/geo-shape-query.asciidoc b/docs/reference/query-dsl/geo-shape-query.asciidoc
index 94c085c0902..7a11677f0b1 100644
--- a/docs/reference/query-dsl/geo-shape-query.asciidoc
+++ b/docs/reference/query-dsl/geo-shape-query.asciidoc
@@ -1,5 +1,5 @@
 [[query-dsl-geo-shape-query]]
-=== GeoShape Filter
+=== GeoShape Query
 
 Filter documents indexed using the `geo_shape` type.
 
@@ -10,14 +10,12 @@ geo_shape mapping to find documents that have a shape that intersects
 with the query shape. It will also use the same PrefixTree configuration
 as defined for the field mapping.
 
-==== Filter Format
-
-The Filter supports two ways of defining the Filter shape, either by
+The query supports two ways of defining the query shape, either by
 providing a whole shape definition, or by referencing the name of a shape
 pre-indexed in another index. Both formats are defined below with
 examples.
 
-====== Provided Shape Definition
+==== Inline Shape Definition
 
 Similar to the `geo_shape` type, the `geo_shape` Filter uses
 http://www.geojson.org[GeoJSON] to represent shapes.
@@ -61,7 +59,7 @@ The following query will find the point using the Elasticsearch's
 }
 --------------------------------------------------
 
-===== Pre-Indexed Shape
+==== Pre-Indexed Shape
 
 The Filter also supports using a shape which has already been indexed in
 another index and/or index type. This is particularly useful for when
diff --git a/docs/reference/query-dsl/match-query.asciidoc b/docs/reference/query-dsl/match-query.asciidoc
index e06f2e92a5a..26029e0bb17 100644
--- a/docs/reference/query-dsl/match-query.asciidoc
+++ b/docs/reference/query-dsl/match-query.asciidoc
@@ -38,7 +38,7 @@ data-type mismatches,  such as trying to query a numeric field with a text
 query string. Defaults to `false`.
 
 [[query-dsl-match-query-fuzziness]]
-====== Fuzziness
+===== Fuzziness
 
 `fuzziness` allows _fuzzy matching_ based on the type of field being queried.
 See <<fuzziness>> for allowed settings.
diff --git a/docs/reference/query-dsl/regexp-syntax.asciidoc b/docs/reference/query-dsl/regexp-syntax.asciidoc
index b261d922b98..e57d0e1c779 100644
--- a/docs/reference/query-dsl/regexp-syntax.asciidoc
+++ b/docs/reference/query-dsl/regexp-syntax.asciidoc
@@ -200,7 +200,7 @@ For string `"abcd"`:
 
 --
 
-====== Optional operators
+===== Optional operators
 
 These operators are available by default as the `flags` parameter defaults to `ALL`.
 Different flag combinations (concatened with `"\"`) can be used to enable/disable

From 39a20c3b5b68578a0c9b93d8bbd62a8c81e227cf Mon Sep 17 00:00:00 2001
From: Colin Goodheart-Smithe <colings86@users.noreply.github.com>
Date: Wed, 3 Jun 2015 13:46:56 +0100
Subject: [PATCH 119/123] Aggregations: Allow aggregation_binary to build and
 parse

Previously AggregationBuilder would wrap binary_aggregations in an aggregations object which would break parsing. This has been fixed so that for normally specified aggregations there are wrapped in an `aggregations` object, for binary aggregation which have the same XContentType as the builder it will use an `aggregations` field name and use the aggregationsBinary as the value (this will render the same as normal aggregations), and for binary aggregation with a different ContentType from the builder we use an `aggregations_binary` field name and add the aggregationsBinary as a binary value.

Additionally the logic in AggregationParsers needed to be changed as it previously did not parse `aggregations_binary` fields in sub-aggregations. A check has been added for the `aggregations_binary` field name and the binaryValue of this field is used to create a new parser and create the correct AggregatorFactories.

Close #11457
---
 .../aggregations/AggregationBuilder.java      |   4 +-
 .../aggregations/AggregatorParsers.java       |  58 ++++---
 .../aggregations/AggregationsBinaryTests.java | 142 ++++++++++++++++++
 3 files changed, 184 insertions(+), 20 deletions(-)
 create mode 100644 src/test/java/org/elasticsearch/search/aggregations/AggregationsBinaryTests.java

diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java b/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java
index d41daa7363f..b94f657de94 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/AggregationBuilder.java
@@ -122,12 +122,13 @@ public abstract class AggregationBuilder<B extends AggregationBuilder<B>> extend
         internalXContent(builder, params);
 
         if (aggregations != null || aggregationsBinary != null) {
-            builder.startObject("aggregations");
 
             if (aggregations != null) {
+                builder.startObject("aggregations");
                 for (AbstractAggregationBuilder subAgg : aggregations) {
                     subAgg.toXContent(builder, params);
                 }
+                builder.endObject();
             }
 
             if (aggregationsBinary != null) {
@@ -138,7 +139,6 @@ public abstract class AggregationBuilder<B extends AggregationBuilder<B>> extend
                 }
             }
 
-            builder.endObject();
         }
 
         return builder.endObject();
diff --git a/src/main/java/org/elasticsearch/search/aggregations/AggregatorParsers.java b/src/main/java/org/elasticsearch/search/aggregations/AggregatorParsers.java
index d299b099b9d..105f46187de 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/AggregatorParsers.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/AggregatorParsers.java
@@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableMap;
 
 import org.elasticsearch.common.collect.MapBuilder;
 import org.elasticsearch.common.inject.Inject;
+import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.search.SearchParseException;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
@@ -140,45 +141,66 @@ public class AggregatorParsers {
                 final String fieldName = parser.currentName();
 
                 token = parser.nextToken();
-                if (token != XContentParser.Token.START_OBJECT) {
-                    throw new SearchParseException(context, "Expected [" + XContentParser.Token.START_OBJECT + "] under [" + fieldName
-                            + "], but got a [" + token + "] in [" + aggregationName + "]", parser.getTokenLocation());
-                }
-
-                switch (fieldName) {
+                if ("aggregations_binary".equals(fieldName)) {
+                    if (subFactories != null) {
+                        throw new SearchParseException(context, "Found two sub aggregation definitions under [" + aggregationName + "]",
+                                parser.getTokenLocation());
+                    }
+                    XContentParser binaryParser = null;
+                    if (token == XContentParser.Token.VALUE_STRING || token == XContentParser.Token.VALUE_EMBEDDED_OBJECT) {
+                        byte[] source = parser.binaryValue();
+                        binaryParser = XContentFactory.xContent(source).createParser(source);
+                    } else {
+                        throw new SearchParseException(context, "Expected [" + XContentParser.Token.VALUE_STRING + " or "
+                                + XContentParser.Token.VALUE_EMBEDDED_OBJECT + "] for [" + fieldName + "], but got a [" + token + "] in ["
+                                + aggregationName + "]", parser.getTokenLocation());
+                    }
+                    XContentParser.Token binaryToken = binaryParser.nextToken();
+                    if (binaryToken != XContentParser.Token.START_OBJECT) {
+                        throw new SearchParseException(context, "Expected [" + XContentParser.Token.START_OBJECT
+                                + "] as first token when parsing [" + fieldName + "], but got a [" + binaryToken + "] in ["
+                                + aggregationName + "]", parser.getTokenLocation());
+                    }
+                    subFactories = parseAggregators(binaryParser, context, level + 1);
+                } else if (token == XContentParser.Token.START_OBJECT) {
+                    switch (fieldName) {
                     case "meta":
                         metaData = parser.map();
                         break;
                     case "aggregations":
                     case "aggs":
                         if (subFactories != null) {
-                        throw new SearchParseException(context, "Found two sub aggregation definitions under [" + aggregationName + "]",
-                                parser.getTokenLocation());
+                            throw new SearchParseException(context,
+                                    "Found two sub aggregation definitions under [" + aggregationName + "]", parser.getTokenLocation());
                         }
-                        subFactories = parseAggregators(parser, context, level+1);
+                        subFactories = parseAggregators(parser, context, level + 1);
                         break;
                     default:
                         if (aggFactory != null) {
-                            throw new SearchParseException(context, "Found two aggregation type definitions in [" + aggregationName + "]: ["
-                                + aggFactory.type + "] and [" + fieldName + "]", parser.getTokenLocation());
+                            throw new SearchParseException(context, "Found two aggregation type definitions in [" + aggregationName
+                                    + "]: [" + aggFactory.type + "] and [" + fieldName + "]", parser.getTokenLocation());
                         }
-                    if (pipelineAggregatorFactory != null) {
-                        throw new SearchParseException(context, "Found two aggregation type definitions in [" + aggregationName + "]: ["
-                                + pipelineAggregatorFactory + "] and [" + fieldName + "]", parser.getTokenLocation());
+                        if (pipelineAggregatorFactory != null) {
+                            throw new SearchParseException(context, "Found two aggregation type definitions in [" + aggregationName
+                                    + "]: [" + pipelineAggregatorFactory + "] and [" + fieldName + "]", parser.getTokenLocation());
                         }
 
                         Aggregator.Parser aggregatorParser = parser(fieldName);
                         if (aggregatorParser == null) {
-                        PipelineAggregator.Parser pipelineAggregatorParser = pipelineAggregator(fieldName);
-                        if (pipelineAggregatorParser == null) {
+                            PipelineAggregator.Parser pipelineAggregatorParser = pipelineAggregator(fieldName);
+                            if (pipelineAggregatorParser == null) {
                                 throw new SearchParseException(context, "Could not find aggregator type [" + fieldName + "] in ["
-                                    + aggregationName + "]", parser.getTokenLocation());
+                                        + aggregationName + "]", parser.getTokenLocation());
                             } else {
-                            pipelineAggregatorFactory = pipelineAggregatorParser.parse(aggregationName, parser, context);
+                                pipelineAggregatorFactory = pipelineAggregatorParser.parse(aggregationName, parser, context);
                             }
                         } else {
                             aggFactory = aggregatorParser.parse(aggregationName, parser, context);
                         }
+                    }
+                } else {
+                    throw new SearchParseException(context, "Expected [" + XContentParser.Token.START_OBJECT + "] under [" + fieldName
+                            + "], but got a [" + token + "] in [" + aggregationName + "]", parser.getTokenLocation());
                 }
             }
 
diff --git a/src/test/java/org/elasticsearch/search/aggregations/AggregationsBinaryTests.java b/src/test/java/org/elasticsearch/search/aggregations/AggregationsBinaryTests.java
new file mode 100644
index 00000000000..2e27c683046
--- /dev/null
+++ b/src/test/java/org/elasticsearch/search/aggregations/AggregationsBinaryTests.java
@@ -0,0 +1,142 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.search.aggregations;
+
+import org.elasticsearch.action.index.IndexRequestBuilder;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.client.Requests;
+import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.common.xcontent.json.JsonXContent;
+import org.elasticsearch.search.aggregations.bucket.terms.Terms;
+import org.elasticsearch.search.aggregations.bucket.terms.Terms.Bucket;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
+import org.elasticsearch.test.ElasticsearchIntegrationTest;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.core.IsNull.notNullValue;
+
+@ElasticsearchIntegrationTest.SuiteScopeTest
+public class AggregationsBinaryTests extends ElasticsearchIntegrationTest {
+
+    private static final String STRING_FIELD_NAME = "s_value";
+    private static final String INT_FIELD_NAME = "i_value";
+
+    @Override
+    public void setupSuiteScopeCluster() throws Exception {
+        createIndex("idx");
+        List<IndexRequestBuilder> builders = new ArrayList<>();
+        for (int i = 0; i < 5; i++) {
+            builders.add(client().prepareIndex("idx", "type").setSource(
+                    jsonBuilder().startObject().field(STRING_FIELD_NAME, "val" + i).field(INT_FIELD_NAME, i).endObject()));
+        }
+        indexRandom(true, builders);
+        ensureSearchable();
+    }
+
+    @Test
+    public void testAggregationsBinary() throws Exception {
+        TermsBuilder termsBuilder = AggregationBuilders.terms("terms").field(STRING_FIELD_NAME);
+        TermsBuilder subTerm = AggregationBuilders.terms("subterms").field(INT_FIELD_NAME);
+
+        // Create an XContentBuilder from sub aggregation
+        XContentBuilder subTermContentBuilder = JsonXContent.contentBuilder().startObject();
+        subTerm.toXContent(subTermContentBuilder, ToXContent.EMPTY_PARAMS);
+        subTermContentBuilder.endObject();
+
+        // Add sub aggregation as a XContentBuilder (binary_aggregation)
+        termsBuilder.subAggregation(subTermContentBuilder);
+
+        SearchResponse response = client().prepareSearch("idx").setTypes("type").addAggregation(termsBuilder).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(5));
+
+        for (int i = 0; i < 5; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("val" + i);
+            assertThat(bucket, notNullValue());
+            assertThat(bucket.getKeyAsString(), equalTo("val" + i));
+            assertThat(bucket.getDocCount(), equalTo(1l));
+            Aggregations subAggs = bucket.getAggregations();
+            assertThat(subAggs, notNullValue());
+            assertThat(subAggs.asList().size(), equalTo(1));
+            Terms subTerms = subAggs.get("subterms");
+            assertThat(subTerms, notNullValue());
+            List<Bucket> subTermsBuckets = subTerms.getBuckets();
+            assertThat(subTermsBuckets, notNullValue());
+            assertThat(subTermsBuckets.size(), equalTo(1));
+            assertThat(((Number) subTermsBuckets.get(0).getKey()).intValue(), equalTo(i));
+            assertThat(subTermsBuckets.get(0).getDocCount(), equalTo(1l));
+        }
+    }
+
+    @Test
+    public void testAggregationsBinarySameContentType() throws Exception {
+        TermsBuilder termsBuilder = AggregationBuilders.terms("terms").field(STRING_FIELD_NAME);
+        TermsBuilder subTerm = AggregationBuilders.terms("subterms").field(INT_FIELD_NAME);
+
+        // Create an XContentBuilder from sub aggregation
+
+        XContentBuilder subTermContentBuilder = XContentFactory.contentBuilder(Requests.CONTENT_TYPE);
+        subTermContentBuilder.startObject();
+        subTerm.toXContent(subTermContentBuilder, ToXContent.EMPTY_PARAMS);
+        subTermContentBuilder.endObject();
+
+        // Add sub aggregation as a XContentBuilder (binary_aggregation)
+        termsBuilder.subAggregation(subTermContentBuilder);
+
+        SearchResponse response = client().prepareSearch("idx").setTypes("type").addAggregation(termsBuilder).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        Terms terms = response.getAggregations().get("terms");
+        assertThat(terms, notNullValue());
+        assertThat(terms.getName(), equalTo("terms"));
+        assertThat(terms.getBuckets().size(), equalTo(5));
+
+        for (int i = 0; i < 5; i++) {
+            Terms.Bucket bucket = terms.getBucketByKey("val" + i);
+            assertThat(bucket, notNullValue());
+            assertThat(bucket.getKeyAsString(), equalTo("val" + i));
+            assertThat(bucket.getDocCount(), equalTo(1l));
+            Aggregations subAggs = bucket.getAggregations();
+            assertThat(subAggs, notNullValue());
+            assertThat(subAggs.asList().size(), equalTo(1));
+            Terms subTerms = subAggs.get("subterms");
+            assertThat(subTerms, notNullValue());
+            List<Bucket> subTermsBuckets = subTerms.getBuckets();
+            assertThat(subTermsBuckets, notNullValue());
+            assertThat(subTermsBuckets.size(), equalTo(1));
+            assertThat(((Number) subTermsBuckets.get(0).getKey()).intValue(), equalTo(i));
+            assertThat(subTermsBuckets.get(0).getDocCount(), equalTo(1l));
+        }
+    }
+}

From 708320446e058e84d3f3917facc994bd71f5a406 Mon Sep 17 00:00:00 2001
From: Boaz Leskes <b.leskes@gmail.com>
Date: Thu, 4 Jun 2015 15:42:55 +0200
Subject: [PATCH 120/123] Doc: Minor typo fix in query_filter_context.asciidoc

---
 docs/reference/query-dsl/query_filter_context.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/reference/query-dsl/query_filter_context.asciidoc b/docs/reference/query-dsl/query_filter_context.asciidoc
index f6c3aa44750..7ed16959056 100644
--- a/docs/reference/query-dsl/query_filter_context.asciidoc
+++ b/docs/reference/query-dsl/query_filter_context.asciidoc
@@ -9,7 +9,7 @@ Query context::
 --
 A query clause used in query context answers the question ``__How well does this
 document match this query clause?__'' Besides deciding whether or not the
-document matches, the query clause also calculated a `_score` representing how
+document matches, the query clause also calculates a `_score` representing how
 well the document matches, relative to other documents.
 
 Query context is in effect whenever a query clause is passed to a `query` parameter,

From d435fae06787c0e9b648004275a2d8d808ba318e Mon Sep 17 00:00:00 2001
From: Zachary Tong <zacharyjtong@gmail.com>
Date: Tue, 2 Jun 2015 22:39:20 -0400
Subject: [PATCH 121/123] Fix bug where predictions append to the previous
 prediction

Fixes #11454
---
 .../movavg/MovAvgPipelineAggregator.java      |  69 +++++---
 .../pipeline/moving/avg/MovAvgTests.java      | 151 +++++++++++++++---
 2 files changed, 176 insertions(+), 44 deletions(-)

diff --git a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java
index af2db718846..122ac90d409 100644
--- a/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java
+++ b/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/MovAvgPipelineAggregator.java
@@ -47,9 +47,7 @@ import org.elasticsearch.search.aggregations.support.format.ValueFormatterStream
 import org.joda.time.DateTime;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static org.elasticsearch.search.aggregations.pipeline.BucketHelpers.resolveBucketValue;
 
@@ -110,12 +108,12 @@ public class MovAvgPipelineAggregator extends PipelineAggregator {
         List newBuckets = new ArrayList<>();
         EvictingQueue<Double> values = EvictingQueue.create(this.window);
 
-        long lastKey = 0;
-        Object currentKey;
+        long lastValidKey = 0;
+        int lastValidPosition = 0;
+        int counter = 0;
 
         for (InternalHistogram.Bucket bucket : buckets) {
             Double thisBucketValue = resolveBucketValue(histo, bucket, bucketsPaths()[0], gapPolicy);
-            currentKey = bucket.getKey();
 
             // Default is to reuse existing bucket.  Simplifies the rest of the logic,
             // since we only change newBucket if we can add to it
@@ -130,22 +128,23 @@ public class MovAvgPipelineAggregator extends PipelineAggregator {
 
                     List<InternalAggregation> aggs = new ArrayList<>(Lists.transform(bucket.getAggregations().asList(), AGGREGATION_TRANFORM_FUNCTION));
                     aggs.add(new InternalSimpleValue(name(), movavg, formatter, new ArrayList<PipelineAggregator>(), metaData()));
-                    newBucket = factory.createBucket(currentKey, bucket.getDocCount(), new InternalAggregations(
+                    newBucket = factory.createBucket(bucket.getKey(), bucket.getDocCount(), new InternalAggregations(
                             aggs), bucket.getKeyed(), bucket.getFormatter());
                 }
-            }
 
-            newBuckets.add(newBucket);
-
-            if (predict > 0) {
-                if (currentKey instanceof Number) {
-                    lastKey  = ((Number) bucket.getKey()).longValue();
-                } else if (currentKey instanceof DateTime) {
-                    lastKey = ((DateTime) bucket.getKey()).getMillis();
-                } else {
-                    throw new AggregationExecutionException("Expected key of type Number or DateTime but got [" + currentKey + "]");
+                if (predict > 0) {
+                    if (bucket.getKey() instanceof Number) {
+                        lastValidKey  = ((Number) bucket.getKey()).longValue();
+                    } else if (bucket.getKey() instanceof DateTime) {
+                        lastValidKey = ((DateTime) bucket.getKey()).getMillis();
+                    } else {
+                        throw new AggregationExecutionException("Expected key of type Number or DateTime but got [" + lastValidKey + "]");
+                    }
+                    lastValidPosition = counter;
                 }
             }
+            counter += 1;
+            newBuckets.add(newBucket);
 
         }
 
@@ -158,13 +157,35 @@ public class MovAvgPipelineAggregator extends PipelineAggregator {
 
             double[] predictions = model.predict(values, predict);
             for (int i = 0; i < predictions.length; i++) {
-                List<InternalAggregation> aggs = new ArrayList<>();
-                aggs.add(new InternalSimpleValue(name(), predictions[i], formatter, new ArrayList<PipelineAggregator>(), metaData()));
-                long newKey = histo.getRounding().nextRoundingValue(lastKey);
-                InternalHistogram.Bucket newBucket = factory.createBucket(newKey, 0, new InternalAggregations(
-                        aggs), keyed, formatter);
-                newBuckets.add(newBucket);
-                lastKey = newKey;
+
+                List<InternalAggregation> aggs;
+                long newKey = histo.getRounding().nextRoundingValue(lastValidKey);
+
+                if (lastValidPosition + i + 1 < newBuckets.size()) {
+                    InternalHistogram.Bucket bucket = (InternalHistogram.Bucket) newBuckets.get(lastValidPosition + i + 1);
+
+                    // Get the existing aggs in the bucket so we don't clobber data
+                    aggs = new ArrayList<>(Lists.transform(bucket.getAggregations().asList(), AGGREGATION_TRANFORM_FUNCTION));
+                    aggs.add(new InternalSimpleValue(name(), predictions[i], formatter, new ArrayList<PipelineAggregator>(), metaData()));
+
+                    InternalHistogram.Bucket newBucket = factory.createBucket(newKey, 0, new InternalAggregations(
+                            aggs), keyed, formatter);
+
+                    // Overwrite the existing bucket with the new version
+                    newBuckets.set(lastValidPosition + i + 1, newBucket);
+
+                } else {
+                    // Not seen before, create fresh
+                    aggs = new ArrayList<>();
+                    aggs.add(new InternalSimpleValue(name(), predictions[i], formatter, new ArrayList<PipelineAggregator>(), metaData()));
+
+                    InternalHistogram.Bucket newBucket = factory.createBucket(newKey, 0, new InternalAggregations(
+                            aggs), keyed, formatter);
+
+                    // Since this is a new bucket, simply append it
+                    newBuckets.add(newBucket);
+                }
+                lastValidKey = newKey;
             }
         }
 
diff --git a/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java b/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java
index 3db9531a537..9e92c69f7e2 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgTests.java
@@ -35,6 +35,7 @@ import org.elasticsearch.search.aggregations.metrics.avg.Avg;
 import org.elasticsearch.search.aggregations.pipeline.BucketHelpers;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregationHelperTests;
 import org.elasticsearch.search.aggregations.pipeline.SimpleValue;
+import org.elasticsearch.search.aggregations.pipeline.derivative.Derivative;
 import org.elasticsearch.search.aggregations.pipeline.movavg.models.*;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.hamcrest.Matchers;
@@ -49,6 +50,7 @@ import static org.elasticsearch.search.aggregations.AggregationBuilders.histogra
 import static org.elasticsearch.search.aggregations.AggregationBuilders.max;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.min;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.range;
+import static org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorBuilders.derivative;
 import static org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorBuilders.movingAvg;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
 import static org.hamcrest.Matchers.closeTo;
@@ -160,6 +162,11 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
                     jsonBuilder().startObject().field(INTERVAL_FIELD, i).field(VALUE_FIELD, 10).endObject()));
         }
 
+        for (int i = 0; i < 12; i++) {
+            builders.add(client().prepareIndex("double_predict", "type").setSource(
+                    jsonBuilder().startObject().field(INTERVAL_FIELD, i).field(VALUE_FIELD, 10).endObject()));
+        }
+
         indexRandom(true, builders);
         ensureSearchable();
     }
@@ -957,8 +964,10 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
         assertThat(histo, notNullValue());
         assertThat(histo.getName(), equalTo("histo"));
         List<? extends Bucket> buckets = histo.getBuckets();
+
         assertThat("Size of buckets array is not correct.", buckets.size(), equalTo(50 + numPredictions));
 
+
         double lastValue = ((SimpleValue)(buckets.get(0).getAggregations().get("movavg_values"))).value();
         assertThat(Double.compare(lastValue, 0.0d), greaterThanOrEqualTo(0));
 
@@ -1073,8 +1082,10 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
         assertThat(histo, notNullValue());
         assertThat(histo.getName(), equalTo("histo"));
         List<? extends Bucket> buckets = histo.getBuckets();
+
         assertThat("Size of buckets array is not correct.", buckets.size(), equalTo(50 + numPredictions));
 
+
         double lastValue = 0;
 
         double currentValue;
@@ -1099,8 +1110,7 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
 
     /**
      * This test filters the "gap" data so that the last doc is excluded.  This leaves a long stretch of empty
-     * buckets after the first bucket.  The moving avg should be one at the beginning, then zero for the rest
-     * regardless of mov avg type or gap policy.
+     * buckets after the first bucket.
      */
     @Test
     public void testRightGap() {
@@ -1176,32 +1186,39 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
         assertThat(histo, notNullValue());
         assertThat(histo.getName(), equalTo("histo"));
         List<? extends Bucket> buckets = histo.getBuckets();
-        assertThat("Size of buckets array is not correct.", buckets.size(), equalTo(50 + numPredictions));
 
+        // If we are skipping, there will only be predictions at the very beginning and won't append any new buckets
+        if (gapPolicy.equals(BucketHelpers.GapPolicy.SKIP)) {
+            assertThat("Size of buckets array is not correct.", buckets.size(), equalTo(50));
+        } else {
+            assertThat("Size of buckets array is not correct.", buckets.size(), equalTo(50 + numPredictions));
+        }
 
+        // Unlike left-gap tests, we cannot check the slope of prediction for right-gap. E.g. linear will
+        // converge on zero, but holt-linear may trend upwards based on the first value
+        // Just check for non-nullness
         SimpleValue current = buckets.get(0).getAggregations().get("movavg_values");
         assertThat(current, notNullValue());
 
-        double lastValue = current.value();
-
-        double currentValue;
-        for (int i = 1; i < 50; i++) {
-            current = buckets.get(i).getAggregations().get("movavg_values");
-            if (current != null) {
-                currentValue = current.value();
-
-                assertThat(Double.compare(lastValue, currentValue), greaterThanOrEqualTo(0));
-                lastValue = currentValue;
+        // If we are skipping, there will only be predictions at the very beginning and won't append any new buckets
+        if (gapPolicy.equals(BucketHelpers.GapPolicy.SKIP)) {
+            // Now check predictions
+            for (int i = 1; i < 1 + numPredictions; i++) {
+                // Unclear at this point which direction the predictions will go, just verify they are
+                // not null
+                assertThat(buckets.get(i).getDocCount(), equalTo(0L));
+                assertThat((buckets.get(i).getAggregations().get("movavg_values")), notNullValue());
+            }
+        } else {
+            // Otherwise we'll have some predictions at the end
+            for (int i = 50; i < 50 + numPredictions; i++) {
+                // Unclear at this point which direction the predictions will go, just verify they are
+                // not null
+                assertThat(buckets.get(i).getDocCount(), equalTo(0L));
+                assertThat((buckets.get(i).getAggregations().get("movavg_values")), notNullValue());
             }
         }
 
-        // Now check predictions
-        for (int i = 50; i < 50 + numPredictions; i++) {
-            // Unclear at this point which direction the predictions will go, just verify they are
-            // not null, and that we don't have the_metric anymore
-            assertThat((buckets.get(i).getAggregations().get("movavg_values")), notNullValue());
-            assertThat((buckets.get(i).getAggregations().get("the_metric")), nullValue());
-        }
     }
 
     @Test
@@ -1232,6 +1249,100 @@ public class MovAvgTests extends ElasticsearchIntegrationTest {
 
     }
 
+    @Test
+    public void testTwoMovAvgsWithPredictions() {
+
+        SearchResponse response = client()
+                .prepareSearch("double_predict")
+                .setTypes("type")
+                .addAggregation(
+                        histogram("histo")
+                                .field(INTERVAL_FIELD)
+                                .interval(1)
+                                .subAggregation(avg("avg").field(VALUE_FIELD))
+                                .subAggregation(derivative("deriv")
+                                        .setBucketsPaths("avg").gapPolicy(gapPolicy))
+                                .subAggregation(
+                                        movingAvg("avg_movavg").window(windowSize).modelBuilder(new SimpleModel.SimpleModelBuilder())
+                                                .gapPolicy(gapPolicy).predict(12).setBucketsPaths("avg"))
+                                .subAggregation(
+                                        movingAvg("deriv_movavg").window(windowSize).modelBuilder(new SimpleModel.SimpleModelBuilder())
+                                                .gapPolicy(gapPolicy).predict(12).setBucketsPaths("deriv"))
+                ).execute().actionGet();
+
+        assertSearchResponse(response);
+
+        InternalHistogram<Bucket> histo = response.getAggregations().get("histo");
+        assertThat(histo, notNullValue());
+        assertThat(histo.getName(), equalTo("histo"));
+        List<? extends Bucket> buckets = histo.getBuckets();
+        assertThat("Size of buckets array is not correct.", buckets.size(), equalTo(24));
+
+        Bucket bucket = buckets.get(0);
+        assertThat(bucket, notNullValue());
+        assertThat((long) bucket.getKey(), equalTo((long) 0));
+        assertThat(bucket.getDocCount(), equalTo(1l));
+
+        Avg avgAgg = bucket.getAggregations().get("avg");
+        assertThat(avgAgg, notNullValue());
+        assertThat(avgAgg.value(), equalTo(10d));
+
+        SimpleValue movAvgAgg = bucket.getAggregations().get("avg_movavg");
+        assertThat(movAvgAgg, notNullValue());
+        assertThat(movAvgAgg.value(), equalTo(10d));
+
+        Derivative deriv = bucket.getAggregations().get("deriv");
+        assertThat(deriv, nullValue());
+
+        SimpleValue derivMovAvg = bucket.getAggregations().get("deriv_movavg");
+        assertThat(derivMovAvg, nullValue());
+
+        for (int i = 1; i < 12; i++) {
+            bucket = buckets.get(i);
+            assertThat(bucket, notNullValue());
+            assertThat((long) bucket.getKey(), equalTo((long) i));
+            assertThat(bucket.getDocCount(), equalTo(1l));
+
+            avgAgg = bucket.getAggregations().get("avg");
+            assertThat(avgAgg, notNullValue());
+            assertThat(avgAgg.value(), equalTo(10d));
+
+            deriv = bucket.getAggregations().get("deriv");
+            assertThat(deriv, notNullValue());
+            assertThat(deriv.value(), equalTo(0d));
+
+            movAvgAgg = bucket.getAggregations().get("avg_movavg");
+            assertThat(movAvgAgg, notNullValue());
+            assertThat(movAvgAgg.value(), equalTo(10d));
+
+            derivMovAvg = bucket.getAggregations().get("deriv_movavg");
+            assertThat(derivMovAvg, notNullValue());
+            assertThat(derivMovAvg.value(), equalTo(0d));
+        }
+
+        // Predictions
+        for (int i = 12; i < 24; i++) {
+            bucket = buckets.get(i);
+            assertThat(bucket, notNullValue());
+            assertThat((long) bucket.getKey(), equalTo((long) i));
+            assertThat(bucket.getDocCount(), equalTo(0l));
+
+            avgAgg = bucket.getAggregations().get("avg");
+            assertThat(avgAgg, nullValue());
+
+            deriv = bucket.getAggregations().get("deriv");
+            assertThat(deriv, nullValue());
+
+            movAvgAgg = bucket.getAggregations().get("avg_movavg");
+            assertThat(movAvgAgg, notNullValue());
+            assertThat(movAvgAgg.value(), equalTo(10d));
+
+            derivMovAvg = bucket.getAggregations().get("deriv_movavg");
+            assertThat(derivMovAvg, notNullValue());
+            assertThat(derivMovAvg.value(), equalTo(0d));
+        }
+    }
+
     @Test
     public void testBadModelParams() {
         try {

From 65f43970da55da48519d3fbf45167139da977b6c Mon Sep 17 00:00:00 2001
From: Lee Hinman <lee@writequit.org>
Date: Wed, 3 Jun 2015 12:21:12 -0600
Subject: [PATCH 122/123] Default to binding to loopback address

Binds to the address returned by `InetAddress.getLoopbackAddress()`.

Closes #11300
---
 docs/reference/migration/migrate_2_0.asciidoc |  7 +++++-
 docs/reference/modules/network.asciidoc       | 15 ++++++-------
 .../common/network/MulticastChannel.java      | 22 +++++++++++++++----
 .../common/network/NetworkService.java        |  5 +++--
 .../zen/ping/multicast/MulticastZenPing.java  |  6 ++++-
 5 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/docs/reference/migration/migrate_2_0.asciidoc b/docs/reference/migration/migrate_2_0.asciidoc
index d45242b573f..0e3c582ba2b 100644
--- a/docs/reference/migration/migrate_2_0.asciidoc
+++ b/docs/reference/migration/migrate_2_0.asciidoc
@@ -4,6 +4,11 @@
 This section discusses the changes that you need to be aware of when migrating
 your application to Elasticsearch 2.0.
 
+=== Networking
+
+Elasticsearch now binds to the loopback interface by default (usually 127.0.0.1
+or ::1), the setting `network.host` can be specified to change this behavior.
+
 === Indices API
 
 The <<alias-retrieving, get alias api>> will, by default produce an error response
@@ -641,4 +646,4 @@ The following breaks in backwards compatability have been made on indices with t
 created on or after clusters with version 2.0:
 * The `type` option on the `_parent` field can only point to a parent type that doesn't exist yet,
   so this means that an existing type/mapping can no longer become a parent type.
-* The `has_child` and `has_parent` queries can no longer be use in alias filters.
\ No newline at end of file
+* The `has_child` and `has_parent` queries can no longer be use in alias filters.
diff --git a/docs/reference/modules/network.asciidoc b/docs/reference/modules/network.asciidoc
index cc232512c21..955b3f129ca 100644
--- a/docs/reference/modules/network.asciidoc
+++ b/docs/reference/modules/network.asciidoc
@@ -8,15 +8,14 @@ configuration, for example, the
 network settings allows to set common settings that will be shared among
 all network based modules (unless explicitly overridden in each module).
 
-The `network.bind_host` setting allows to control the host different
-network components will bind on. By default, the bind host will be
-`anyLocalAddress` (typically `0.0.0.0` or `::0`).
+The `network.bind_host` setting allows to control the host different network
+components will bind on. By default, the bind host will be `anyLoopbackAddress`
+(typically `127.0.0.1` or `::1`).
 
-The `network.publish_host` setting allows to control the host the node
-will publish itself within the cluster so other nodes will be able to
-connect to it. Of course, this can't be the `anyLocalAddress`, and by
-default, it will be the first non loopback address (if possible), or the
-local address.
+The `network.publish_host` setting allows to control the host the node will
+publish itself within the cluster so other nodes will be able to connect to it.
+Of course, this can't be the `anyLocalAddress`, and by default, it will be the
+first loopback address (if possible), or the local address.
 
 The `network.host` setting is a simple setting to automatically set both
 `network.bind_host` and `network.publish_host` to the same host value.
diff --git a/src/main/java/org/elasticsearch/common/network/MulticastChannel.java b/src/main/java/org/elasticsearch/common/network/MulticastChannel.java
index 076d65e5bea..73d4e305ab9 100644
--- a/src/main/java/org/elasticsearch/common/network/MulticastChannel.java
+++ b/src/main/java/org/elasticsearch/common/network/MulticastChannel.java
@@ -61,13 +61,16 @@ public abstract class MulticastChannel implements Closeable {
         public final int bufferSize;
         public final int ttl;
         public final InetAddress multicastInterface;
+        public final boolean deferToInterface;
 
-        public Config(int port, String group, int bufferSize, int ttl, InetAddress multicastInterface) {
+        public Config(int port, String group, int bufferSize, int ttl,
+                      InetAddress multicastInterface, boolean deferToInterface) {
             this.port = port;
             this.group = group;
             this.bufferSize = bufferSize;
             this.ttl = ttl;
             this.multicastInterface = multicastInterface;
+            this.deferToInterface = deferToInterface;
         }
 
         @Override
@@ -281,12 +284,23 @@ public abstract class MulticastChannel implements Closeable {
         }
 
         private MulticastSocket buildMulticastSocket(Config config) throws Exception {
+            SocketAddress addr = new InetSocketAddress(InetAddress.getByName(config.group), config.port);
             MulticastSocket multicastSocket = new MulticastSocket(config.port);
             try {
                 multicastSocket.setTimeToLive(config.ttl);
-                // set the send interface
-                multicastSocket.setInterface(config.multicastInterface);
-                multicastSocket.joinGroup(InetAddress.getByName(config.group));
+                // OSX is not smart enough to tell that a socket bound to the
+                // 'lo0' interface needs to make sure to send the UDP packet
+                // out of the lo0 interface, so we need to do some special
+                // workarounds to fix it.
+                if (config.deferToInterface) {
+                    // 'null' here tells the socket to deter to the interface set
+                    // with .setInterface
+                    multicastSocket.joinGroup(addr, null);
+                    multicastSocket.setInterface(config.multicastInterface);
+                } else {
+                    multicastSocket.setInterface(config.multicastInterface);
+                    multicastSocket.joinGroup(InetAddress.getByName(config.group));
+                }
                 multicastSocket.setReceiveBufferSize(config.bufferSize);
                 multicastSocket.setSendBufferSize(config.bufferSize);
                 multicastSocket.setSoTimeout(60000);
diff --git a/src/main/java/org/elasticsearch/common/network/NetworkService.java b/src/main/java/org/elasticsearch/common/network/NetworkService.java
index 067241fc899..bd45987f05c 100644
--- a/src/main/java/org/elasticsearch/common/network/NetworkService.java
+++ b/src/main/java/org/elasticsearch/common/network/NetworkService.java
@@ -96,7 +96,7 @@ public class NetworkService extends AbstractComponent {
 
 
     public InetAddress resolveBindHostAddress(String bindHost) throws IOException {
-        return resolveBindHostAddress(bindHost, null);
+        return resolveBindHostAddress(bindHost, InetAddress.getLoopbackAddress().getHostAddress());
     }
 
     public InetAddress resolveBindHostAddress(String bindHost, String defaultValue2) throws IOException {
@@ -104,7 +104,8 @@ public class NetworkService extends AbstractComponent {
     }
 
     public InetAddress resolvePublishHostAddress(String publishHost) throws IOException {
-        InetAddress address = resolvePublishHostAddress(publishHost, null);
+        InetAddress address = resolvePublishHostAddress(publishHost,
+                InetAddress.getLoopbackAddress().getHostAddress());
         // verify that its not a local address
         if (address == null || address.isAnyLocalAddress()) {
             address = NetworkUtils.getFirstNonLoopbackAddress(NetworkUtils.StackType.IPv4);
diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java b/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java
index 22f3acfff95..7cf14ad91e1 100644
--- a/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java
+++ b/src/main/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPing.java
@@ -126,8 +126,12 @@ public class MulticastZenPing extends AbstractLifecycleComponent<ZenPing> implem
             // we know OSX has bugs in the JVM when creating multiple instances of multicast sockets
             // causing for "socket close" exceptions when receive and/or crashes
             boolean shared = settings.getAsBoolean("discovery.zen.ping.multicast.shared", Constants.MAC_OS_X);
+            // OSX does not correctly send multicasts FROM the right interface
+            boolean deferToInterface = settings.getAsBoolean("discovery.zen.ping.multicast.defer_group_to_set_interface", Constants.MAC_OS_X);
             multicastChannel = MulticastChannel.getChannel(nodeName(), shared,
-                    new MulticastChannel.Config(port, group, bufferSize, ttl, networkService.resolvePublishHostAddress(address)),
+                    new MulticastChannel.Config(port, group, bufferSize, ttl,
+                            networkService.resolvePublishHostAddress(address),
+                            deferToInterface),
                     new Receiver());
         } catch (Throwable t) {
             String msg = "multicast failed to start [{}], disabling. Consider using IPv4 only (by defining env. variable `ES_USE_IPV4`)";

From a138f627bef2fbb2e207d559611f5ec770ee7d4a Mon Sep 17 00:00:00 2001
From: Clinton Gormley <clint@traveljury.com>
Date: Thu, 4 Jun 2015 19:31:28 +0200
Subject: [PATCH 123/123] Docs: removed the unused query_dsl/index.asciidoc

---
 docs/reference/query-dsl/index.asciidoc | 101 ------------------------
 1 file changed, 101 deletions(-)
 delete mode 100644 docs/reference/query-dsl/index.asciidoc

diff --git a/docs/reference/query-dsl/index.asciidoc b/docs/reference/query-dsl/index.asciidoc
deleted file mode 100644
index ecb520443bb..00000000000
--- a/docs/reference/query-dsl/index.asciidoc
+++ /dev/null
@@ -1,101 +0,0 @@
-include::query_filter_context.asciidoc[]
-
-include::match-query.asciidoc[]
-
-include::multi-match-query.asciidoc[]
-
-include::and-query.asciidoc[]
-
-include::bool-query.asciidoc[]
-
-include::boosting-query.asciidoc[]
-
-include::common-terms-query.asciidoc[]
-
-include::constant-score-query.asciidoc[]
-
-include::dis-max-query.asciidoc[]
-
-include::exists-query.asciidoc[]
-
-include::filtered-query.asciidoc[]
-
-include::function-score-query.asciidoc[]
-
-include::fuzzy-query.asciidoc[]
-
-include::geo-shape-query.asciidoc[]
-
-include::geo-bounding-box-query.asciidoc[]
-
-include::geo-distance-query.asciidoc[]
-
-include::geo-distance-range-query.asciidoc[]
-
-include::geohash-cell-query.asciidoc[]
-
-include::geo-polygon-query.asciidoc[]
-
-include::has-child-query.asciidoc[]
-
-include::has-parent-query.asciidoc[]
-
-include::ids-query.asciidoc[]
-
-include::indices-query.asciidoc[]
-
-include::limit-query.asciidoc[]
-
-include::match-all-query.asciidoc[]
-
-include::missing-query.asciidoc[]
-
-include::mlt-query.asciidoc[]
-
-include::nested-query.asciidoc[]
-
-include::not-query.asciidoc[]
-
-include::or-query.asciidoc[]
-
-include::prefix-query.asciidoc[]
-
-include::query-string-query.asciidoc[]
-
-include::simple-query-string-query.asciidoc[]
-
-include::range-query.asciidoc[]
-
-include::regexp-query.asciidoc[]
-
-include::span-containing-query.asciidoc[]
-
-include::span-first-query.asciidoc[]
-
-include::span-multi-term-query.asciidoc[]
-
-include::span-near-query.asciidoc[]
-
-include::span-not-query.asciidoc[]
-
-include::span-or-query.asciidoc[]
-
-include::span-term-query.asciidoc[]
-
-include::span-within-query.asciidoc[]
-
-include::term-query.asciidoc[]
-
-include::terms-query.asciidoc[]
-
-include::wildcard-query.asciidoc[]
-
-include::minimum-should-match.asciidoc[]
-
-include::multi-term-rewrite.asciidoc[]
-
-include::script-query.asciidoc[]
-
-include::template-query.asciidoc[]
-
-include::type-query.asciidoc[]