move to field.data package

modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCache.java

@@ -22,8 +22,8 @@ package org.elasticsearch.index.cache;
 import org.apache.lucene.index.IndexReader;
 import org.elasticsearch.index.AbstractIndexComponent;
 import org.elasticsearch.index.Index;
-import org.elasticsearch.index.cache.field.FieldDataCache;
-import org.elasticsearch.index.cache.field.none.NoneFieldDataCache;
+import org.elasticsearch.index.cache.field.data.FieldDataCache;
+import org.elasticsearch.index.cache.field.data.none.NoneFieldDataCache;
 import org.elasticsearch.index.cache.filter.FilterCache;
 import org.elasticsearch.index.cache.filter.none.NoneFilterCache;
 import org.elasticsearch.index.settings.IndexSettings;

modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java

@@ -19,7 +19,7 @@
 
 package org.elasticsearch.index.cache;
 
-import org.elasticsearch.index.cache.field.FieldDataCacheModule;
+import org.elasticsearch.index.cache.field.data.FieldDataCacheModule;
 import org.elasticsearch.index.cache.filter.FilterCacheModule;
 import org.elasticsearch.util.inject.AbstractModule;
 import org.elasticsearch.util.settings.Settings;

modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/FieldDataCache.java

@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.elasticsearch.index.cache.field;
+package org.elasticsearch.index.cache.field.data;
 
 import org.apache.lucene.index.IndexReader;
-import org.elasticsearch.index.field.FieldData;
-import org.elasticsearch.index.field.FieldDataOptions;
+import org.elasticsearch.index.field.data.FieldData;
+import org.elasticsearch.index.field.data.FieldDataOptions;
 import org.elasticsearch.util.component.CloseableComponent;
 
 import java.io.IOException;

modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/FieldDataCacheModule.java

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.index.cache.field;
+package org.elasticsearch.index.cache.field.data;
 
-import org.elasticsearch.index.cache.field.weak.WeakFieldDataCache;
+import org.elasticsearch.index.cache.field.data.weak.WeakFieldDataCache;
 import org.elasticsearch.util.inject.AbstractModule;
 import org.elasticsearch.util.inject.Scopes;
 import org.elasticsearch.util.settings.Settings;

modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/none/NoneFieldDataCache.java

@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.elasticsearch.index.cache.field.none;
+package org.elasticsearch.index.cache.field.data.none;
 
 import org.apache.lucene.index.IndexReader;
 import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.index.AbstractIndexComponent;
 import org.elasticsearch.index.Index;
-import org.elasticsearch.index.cache.field.FieldDataCache;
-import org.elasticsearch.index.field.FieldData;
-import org.elasticsearch.index.field.FieldDataOptions;
+import org.elasticsearch.index.cache.field.data.FieldDataCache;
+import org.elasticsearch.index.field.data.FieldData;
+import org.elasticsearch.index.field.data.FieldDataOptions;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.util.inject.Inject;
 import org.elasticsearch.util.settings.Settings;

modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/soft/SoftFieldDataCache.java

@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.elasticsearch.index.cache.field.soft;
+package org.elasticsearch.index.cache.field.data.soft;
 
 import org.elasticsearch.index.Index;
-import org.elasticsearch.index.cache.field.support.AbstractConcurrentMapFieldDataCache;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.cache.field.data.support.AbstractConcurrentMapFieldDataCache;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.util.collect.MapMaker;
 import org.elasticsearch.util.inject.Inject;

modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/support/AbstractConcurrentMapFieldDataCache.java

@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.elasticsearch.index.cache.field.support;
+package org.elasticsearch.index.cache.field.data.support;
 
 import org.apache.lucene.index.IndexReader;
 import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.index.AbstractIndexComponent;
 import org.elasticsearch.index.Index;
-import org.elasticsearch.index.cache.field.FieldDataCache;
-import org.elasticsearch.index.field.FieldData;
-import org.elasticsearch.index.field.FieldDataOptions;
+import org.elasticsearch.index.cache.field.data.FieldDataCache;
+import org.elasticsearch.index.field.data.FieldData;
+import org.elasticsearch.index.field.data.FieldDataOptions;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.util.concurrent.ConcurrentCollections;
 import org.elasticsearch.util.settings.Settings;

modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/field/data/weak/WeakFieldDataCache.java

@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package org.elasticsearch.index.cache.field.weak;
+package org.elasticsearch.index.cache.field.data.weak;
 
 import org.elasticsearch.index.Index;
-import org.elasticsearch.index.cache.field.support.AbstractConcurrentMapFieldDataCache;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.cache.field.data.support.AbstractConcurrentMapFieldDataCache;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.util.collect.MapMaker;
 import org.elasticsearch.util.inject.Inject;

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/DocFieldData.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field;
+package org.elasticsearch.index.field.data;
 
 /**
  * @author kimchy (shay.banon)

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/FieldData.java

@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field;
+package org.elasticsearch.index.field.data;
 
 import org.apache.lucene.index.IndexReader;
 import org.elasticsearch.ElasticSearchIllegalArgumentException;
-import org.elasticsearch.index.field.doubles.DoubleFieldData;
-import org.elasticsearch.index.field.floats.FloatFieldData;
-import org.elasticsearch.index.field.ints.IntFieldData;
-import org.elasticsearch.index.field.longs.LongFieldData;
-import org.elasticsearch.index.field.shorts.ShortFieldData;
-import org.elasticsearch.index.field.strings.StringFieldData;
+import org.elasticsearch.index.field.data.doubles.DoubleFieldData;
+import org.elasticsearch.index.field.data.floats.FloatFieldData;
+import org.elasticsearch.index.field.data.ints.IntFieldData;
+import org.elasticsearch.index.field.data.longs.LongFieldData;
+import org.elasticsearch.index.field.data.shorts.ShortFieldData;
+import org.elasticsearch.index.field.data.strings.StringFieldData;
 import org.elasticsearch.util.ThreadLocals;
 
 import java.io.IOException;

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/FieldDataOptions.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field;
+package org.elasticsearch.index.field.data;
 
 /**
  * @author kimchy (Shay Banon)

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/NumericDocFieldData.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field;
+package org.elasticsearch.index.field.data;
 
 /**
  * @author kimchy (shay.banon)

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/NumericFieldData.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field;
+package org.elasticsearch.index.field.data;
 
 /**
  * @author kimchy (shay.banon)

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleDocFieldData.java

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.doubles;
+package org.elasticsearch.index.field.data.doubles;
 
-import org.elasticsearch.index.field.NumericDocFieldData;
+import org.elasticsearch.index.field.data.NumericDocFieldData;
 
 /**
  * @author kimchy (shay.banon)

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/DoubleFieldData.java

@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.doubles;
+package org.elasticsearch.index.field.data.doubles;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.FieldCache;
-import org.elasticsearch.index.field.FieldDataOptions;
-import org.elasticsearch.index.field.NumericFieldData;
-import org.elasticsearch.index.field.support.FieldDataLoader;
+import org.elasticsearch.index.field.data.FieldDataOptions;
+import org.elasticsearch.index.field.data.NumericFieldData;
+import org.elasticsearch.index.field.data.support.FieldDataLoader;
 import org.elasticsearch.util.gnu.trove.TDoubleArrayList;
 
 import java.io.IOException;

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/MultiValueDoubleFieldData.java

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.doubles;
+package org.elasticsearch.index.field.data.doubles;
 
-import org.elasticsearch.index.field.FieldDataOptions;
+import org.elasticsearch.index.field.data.FieldDataOptions;
 import org.elasticsearch.util.ThreadLocals;
 
 /**

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/doubles/SingleValueDoubleFieldData.java

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.doubles;
+package org.elasticsearch.index.field.data.doubles;
 
-import org.elasticsearch.index.field.FieldDataOptions;
+import org.elasticsearch.index.field.data.FieldDataOptions;
 
 /**
  * @author kimchy (shay.banon)

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatDocFieldData.java

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.floats;
+package org.elasticsearch.index.field.data.floats;
 
-import org.elasticsearch.index.field.NumericDocFieldData;
+import org.elasticsearch.index.field.data.NumericDocFieldData;
 
 /**
  * @author kimchy (shay.banon)

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/FloatFieldData.java

@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.floats;
+package org.elasticsearch.index.field.data.floats;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.FieldCache;
-import org.elasticsearch.index.field.FieldDataOptions;
-import org.elasticsearch.index.field.NumericFieldData;
-import org.elasticsearch.index.field.support.FieldDataLoader;
+import org.elasticsearch.index.field.data.FieldDataOptions;
+import org.elasticsearch.index.field.data.NumericFieldData;
+import org.elasticsearch.index.field.data.support.FieldDataLoader;
 import org.elasticsearch.util.gnu.trove.TFloatArrayList;
 
 import java.io.IOException;

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/MultiValueFloatFieldData.java

@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.floats;
+package org.elasticsearch.index.field.data.floats;
 
-import org.elasticsearch.index.field.FieldDataOptions;
-import org.elasticsearch.index.field.doubles.DoubleFieldData;
+import org.elasticsearch.index.field.data.FieldDataOptions;
+import org.elasticsearch.index.field.data.doubles.DoubleFieldData;
 import org.elasticsearch.util.ThreadLocals;
 
 /**

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/floats/SingleValueFloatFieldData.java

@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.floats;
+package org.elasticsearch.index.field.data.floats;
 
-import org.elasticsearch.index.field.FieldDataOptions;
-import org.elasticsearch.index.field.doubles.DoubleFieldData;
+import org.elasticsearch.index.field.data.FieldDataOptions;
+import org.elasticsearch.index.field.data.doubles.DoubleFieldData;
 
 /**
  * @author kimchy (shay.banon)

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntDocFieldData.java

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.ints;
+package org.elasticsearch.index.field.data.ints;
 
-import org.elasticsearch.index.field.NumericDocFieldData;
+import org.elasticsearch.index.field.data.NumericDocFieldData;
 
 /**
  * @author kimchy (shay.banon)

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/IntFieldData.java

@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.ints;
+package org.elasticsearch.index.field.data.ints;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.FieldCache;
-import org.elasticsearch.index.field.FieldDataOptions;
-import org.elasticsearch.index.field.NumericFieldData;
-import org.elasticsearch.index.field.support.FieldDataLoader;
+import org.elasticsearch.index.field.data.FieldDataOptions;
+import org.elasticsearch.index.field.data.NumericFieldData;
+import org.elasticsearch.index.field.data.support.FieldDataLoader;
 import org.elasticsearch.util.gnu.trove.TIntArrayList;
 
 import java.io.IOException;

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/MultiValueIntFieldData.java

@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.ints;
+package org.elasticsearch.index.field.data.ints;
 
-import org.elasticsearch.index.field.FieldDataOptions;
-import org.elasticsearch.index.field.doubles.DoubleFieldData;
+import org.elasticsearch.index.field.data.FieldDataOptions;
+import org.elasticsearch.index.field.data.doubles.DoubleFieldData;
 import org.elasticsearch.util.ThreadLocals;
 
 /**

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/ints/SingleValueIntFieldData.java

@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.ints;
+package org.elasticsearch.index.field.data.ints;
 
-import org.elasticsearch.index.field.FieldDataOptions;
-import org.elasticsearch.index.field.doubles.DoubleFieldData;
+import org.elasticsearch.index.field.data.FieldDataOptions;
+import org.elasticsearch.index.field.data.doubles.DoubleFieldData;
 
 /**
  * @author kimchy (shay.banon)

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongDocFieldData.java

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.longs;
+package org.elasticsearch.index.field.data.longs;
 
-import org.elasticsearch.index.field.NumericDocFieldData;
+import org.elasticsearch.index.field.data.NumericDocFieldData;
 
 /**
  * @author kimchy (shay.banon)

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/LongFieldData.java

@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.longs;
+package org.elasticsearch.index.field.data.longs;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.FieldCache;
-import org.elasticsearch.index.field.FieldDataOptions;
-import org.elasticsearch.index.field.NumericFieldData;
-import org.elasticsearch.index.field.support.FieldDataLoader;
+import org.elasticsearch.index.field.data.FieldDataOptions;
+import org.elasticsearch.index.field.data.NumericFieldData;
+import org.elasticsearch.index.field.data.support.FieldDataLoader;
 import org.elasticsearch.util.gnu.trove.TLongArrayList;
 
 import java.io.IOException;

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/MultiValueLongFieldData.java

@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.longs;
+package org.elasticsearch.index.field.data.longs;
 
-import org.elasticsearch.index.field.FieldDataOptions;
-import org.elasticsearch.index.field.doubles.DoubleFieldData;
+import org.elasticsearch.index.field.data.FieldDataOptions;
+import org.elasticsearch.index.field.data.doubles.DoubleFieldData;
 import org.elasticsearch.util.ThreadLocals;
 
 /**

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/longs/SingleValueLongFieldData.java

@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.longs;
+package org.elasticsearch.index.field.data.longs;
 
-import org.elasticsearch.index.field.FieldDataOptions;
-import org.elasticsearch.index.field.doubles.DoubleFieldData;
+import org.elasticsearch.index.field.data.FieldDataOptions;
+import org.elasticsearch.index.field.data.doubles.DoubleFieldData;
 
 /**
  * @author kimchy (shay.banon)

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/MultiValueShortFieldData.java

@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.shorts;
+package org.elasticsearch.index.field.data.shorts;
 
-import org.elasticsearch.index.field.FieldDataOptions;
-import org.elasticsearch.index.field.doubles.DoubleFieldData;
+import org.elasticsearch.index.field.data.FieldDataOptions;
+import org.elasticsearch.index.field.data.doubles.DoubleFieldData;
 import org.elasticsearch.util.ThreadLocals;
 
 /**

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortDocFieldData.java

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.shorts;
+package org.elasticsearch.index.field.data.shorts;
 
-import org.elasticsearch.index.field.NumericDocFieldData;
+import org.elasticsearch.index.field.data.NumericDocFieldData;
 
 /**
  * @author kimchy (shay.banon)

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/ShortFieldData.java

@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.shorts;
+package org.elasticsearch.index.field.data.shorts;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.FieldCache;
-import org.elasticsearch.index.field.FieldDataOptions;
-import org.elasticsearch.index.field.NumericFieldData;
-import org.elasticsearch.index.field.support.FieldDataLoader;
+import org.elasticsearch.index.field.data.FieldDataOptions;
+import org.elasticsearch.index.field.data.NumericFieldData;
+import org.elasticsearch.index.field.data.support.FieldDataLoader;
 import org.elasticsearch.util.gnu.trove.TShortArrayList;
 
 import java.io.IOException;

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/shorts/SingleValueShortFieldData.java

@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.shorts;
+package org.elasticsearch.index.field.data.shorts;
 
-import org.elasticsearch.index.field.FieldDataOptions;
-import org.elasticsearch.index.field.doubles.DoubleFieldData;
+import org.elasticsearch.index.field.data.FieldDataOptions;
+import org.elasticsearch.index.field.data.doubles.DoubleFieldData;
 
 /**
  * @author kimchy (shay.banon)

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/MultiValueStringFieldData.java

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.strings;
+package org.elasticsearch.index.field.data.strings;
 
-import org.elasticsearch.index.field.FieldDataOptions;
+import org.elasticsearch.index.field.data.FieldDataOptions;
 import org.elasticsearch.util.Strings;
 import org.elasticsearch.util.ThreadLocals;
 

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/SingleValueStringFieldData.java

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.strings;
+package org.elasticsearch.index.field.data.strings;
 
-import org.elasticsearch.index.field.FieldDataOptions;
+import org.elasticsearch.index.field.data.FieldDataOptions;
 import org.elasticsearch.util.Strings;
 
 /**

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringDocFieldData.java

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.strings;
+package org.elasticsearch.index.field.data.strings;
 
-import org.elasticsearch.index.field.DocFieldData;
+import org.elasticsearch.index.field.data.DocFieldData;
 
 /**
  * @author kimchy (shay.banon)

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/strings/StringFieldData.java

@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.strings;
+package org.elasticsearch.index.field.data.strings;
 
 import org.apache.lucene.index.IndexReader;
-import org.elasticsearch.index.field.FieldData;
-import org.elasticsearch.index.field.FieldDataOptions;
-import org.elasticsearch.index.field.support.FieldDataLoader;
+import org.elasticsearch.index.field.data.FieldData;
+import org.elasticsearch.index.field.data.FieldDataOptions;
+import org.elasticsearch.index.field.data.support.FieldDataLoader;
 
 import java.io.IOException;
 import java.util.ArrayList;

modules/elasticsearch/src/main/java/org/elasticsearch/index/field/data/support/FieldDataLoader.java

@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.support;
+package org.elasticsearch.index.field.data.support;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.index.TermDocs;
 import org.apache.lucene.index.TermEnum;
 import org.apache.lucene.util.StringHelper;
-import org.elasticsearch.index.field.FieldData;
-import org.elasticsearch.index.field.FieldDataOptions;
+import org.elasticsearch.index.field.data.FieldData;
+import org.elasticsearch.index.field.data.FieldDataOptions;
 import org.elasticsearch.util.gnu.trove.TIntArrayList;
 
 import java.io.IOException;

modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java

@@ -25,7 +25,7 @@ import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.Filter;
 import org.apache.lucene.search.Query;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.util.concurrent.Immutable;
 import org.elasticsearch.util.concurrent.ThreadSafe;
 

modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentBoostFieldMapper.java

@@ -25,7 +25,7 @@ import org.apache.lucene.search.*;
 import org.apache.lucene.util.NumericUtils;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.analysis.NumericFloatAnalyzer;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.index.mapper.BoostFieldMapper;
 import org.elasticsearch.index.mapper.MergeMappingException;
 import org.elasticsearch.util.Numbers;

modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDateFieldMapper.java

@@ -25,7 +25,7 @@ import org.apache.lucene.search.*;
 import org.apache.lucene.util.NumericUtils;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.analysis.NumericDateAnalyzer;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.util.Numbers;
 import org.elasticsearch.util.Strings;

modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentDoubleFieldMapper.java

@@ -25,7 +25,7 @@ import org.apache.lucene.search.*;
 import org.apache.lucene.util.NumericUtils;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.analysis.NumericDoubleAnalyzer;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.util.Numbers;
 import org.elasticsearch.util.xcontent.XContentParser;

modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentFieldMapper.java

@@ -25,7 +25,7 @@ import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.*;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.FieldMapperListener;
 import org.elasticsearch.index.mapper.MergeMappingException;

modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentFloatFieldMapper.java

@@ -25,7 +25,7 @@ import org.apache.lucene.search.*;
 import org.apache.lucene.util.NumericUtils;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.analysis.NumericFloatAnalyzer;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.util.Numbers;
 import org.elasticsearch.util.Strings;

modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentIntegerFieldMapper.java

@@ -25,7 +25,7 @@ import org.apache.lucene.search.*;
 import org.apache.lucene.util.NumericUtils;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.analysis.NumericIntegerAnalyzer;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.util.Numbers;
 import org.elasticsearch.util.Strings;

modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentLongFieldMapper.java

@@ -25,7 +25,7 @@ import org.apache.lucene.search.*;
 import org.apache.lucene.util.NumericUtils;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.analysis.NumericLongAnalyzer;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.util.Numbers;
 import org.elasticsearch.util.Strings;

modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentNumberFieldMapper.java

@@ -27,7 +27,7 @@ import org.apache.lucene.search.Filter;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.util.NumericUtils;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.util.ThreadLocals;
 import org.elasticsearch.util.gnu.trove.TIntObjectHashMap;
 import org.elasticsearch.util.xcontent.builder.XContentBuilder;

modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentShortFieldMapper.java

@@ -25,7 +25,7 @@ import org.apache.lucene.search.*;
 import org.apache.lucene.util.NumericUtils;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.index.analysis.NumericIntegerAnalyzer;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.util.Numbers;
 import org.elasticsearch.util.Strings;

modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/histogram/HistogramFacetCollector.java

@@ -20,9 +20,9 @@
 package org.elasticsearch.search.facets.histogram;
 
 import org.apache.lucene.index.IndexReader;
-import org.elasticsearch.index.cache.field.FieldDataCache;
-import org.elasticsearch.index.field.FieldData;
-import org.elasticsearch.index.field.NumericFieldData;
+import org.elasticsearch.index.cache.field.data.FieldDataCache;
+import org.elasticsearch.index.field.data.FieldData;
+import org.elasticsearch.index.field.data.NumericFieldData;
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.search.facets.Facet;
@@ -33,7 +33,7 @@ import org.elasticsearch.util.gnu.trove.TLongLongHashMap;
 
 import java.io.IOException;
 
-import static org.elasticsearch.index.field.FieldDataOptions.*;
+import static org.elasticsearch.index.field.data.FieldDataOptions.*;
 
 /**
  * A histogram facet collector that uses the same field as the key as well as the

modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/histogram/KeyValueHistogramFacetCollector.java

@@ -20,9 +20,9 @@
 package org.elasticsearch.search.facets.histogram;
 
 import org.apache.lucene.index.IndexReader;
-import org.elasticsearch.index.cache.field.FieldDataCache;
-import org.elasticsearch.index.field.FieldData;
-import org.elasticsearch.index.field.NumericFieldData;
+import org.elasticsearch.index.cache.field.data.FieldDataCache;
+import org.elasticsearch.index.field.data.FieldData;
+import org.elasticsearch.index.field.data.NumericFieldData;
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.search.facets.Facet;
@@ -33,7 +33,7 @@ import org.elasticsearch.util.gnu.trove.TLongLongHashMap;
 
 import java.io.IOException;
 
-import static org.elasticsearch.index.field.FieldDataOptions.*;
+import static org.elasticsearch.index.field.data.FieldDataOptions.*;
 
 /**
  * A histogram facet collector that uses different fields for the key and the value.

modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/statistical/StatisticalFacetCollector.java

@@ -20,9 +20,9 @@
 package org.elasticsearch.search.facets.statistical;
 
 import org.apache.lucene.index.IndexReader;
-import org.elasticsearch.index.cache.field.FieldDataCache;
-import org.elasticsearch.index.field.FieldData;
-import org.elasticsearch.index.field.NumericFieldData;
+import org.elasticsearch.index.cache.field.data.FieldDataCache;
+import org.elasticsearch.index.field.data.FieldData;
+import org.elasticsearch.index.field.data.NumericFieldData;
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.search.facets.Facet;
@@ -31,7 +31,7 @@ import org.elasticsearch.search.facets.support.AbstractFacetCollector;
 
 import java.io.IOException;
 
-import static org.elasticsearch.index.field.FieldDataOptions.*;
+import static org.elasticsearch.index.field.data.FieldDataOptions.*;
 
 /**
  * @author kimchy (shay.banon)

modules/elasticsearch/src/main/java/org/elasticsearch/search/facets/terms/TermsFacetCollector.java

@@ -20,8 +20,8 @@
 package org.elasticsearch.search.facets.terms;
 
 import org.apache.lucene.index.IndexReader;
-import org.elasticsearch.index.cache.field.FieldDataCache;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.cache.field.data.FieldDataCache;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.search.facets.Facet;
@@ -36,7 +36,7 @@ import java.io.IOException;
 import java.util.ArrayDeque;
 import java.util.Deque;
 
-import static org.elasticsearch.index.field.FieldDataOptions.*;
+import static org.elasticsearch.index.field.data.FieldDataOptions.*;
 
 /**
  * @author kimchy (shay.banon)

modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java

@@ -23,7 +23,7 @@ import org.apache.lucene.search.Query;
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.store.AlreadyClosedException;
 import org.elasticsearch.ElasticSearchException;
-import org.elasticsearch.index.cache.field.FieldDataCache;
+import org.elasticsearch.index.cache.field.data.FieldDataCache;
 import org.elasticsearch.index.cache.filter.FilterCache;
 import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.mapper.MapperService;

modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/doubles/DoubleFieldDataTests.java

@@ -17,21 +17,21 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.doubles;
+package org.elasticsearch.index.field.data.doubles;
 
 import org.apache.lucene.document.NumericField;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.RAMDirectory;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.util.Tuple;
 import org.elasticsearch.util.lucene.Lucene;
 import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 
-import static org.elasticsearch.index.field.FieldDataOptions.*;
+import static org.elasticsearch.index.field.data.FieldDataOptions.*;
 import static org.elasticsearch.util.Tuple.*;
 import static org.elasticsearch.util.lucene.DocumentBuilder.*;
 import static org.hamcrest.MatcherAssert.*;

modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/floats/FloatFieldDataTests.java

@@ -17,21 +17,21 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.floats;
+package org.elasticsearch.index.field.data.floats;
 
 import org.apache.lucene.document.NumericField;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.RAMDirectory;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.util.Tuple;
 import org.elasticsearch.util.lucene.Lucene;
 import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 
-import static org.elasticsearch.index.field.FieldDataOptions.*;
+import static org.elasticsearch.index.field.data.FieldDataOptions.*;
 import static org.elasticsearch.util.Tuple.*;
 import static org.elasticsearch.util.lucene.DocumentBuilder.*;
 import static org.hamcrest.MatcherAssert.*;

modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/ints/IntFieldDataTests.java

@@ -17,21 +17,21 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.ints;
+package org.elasticsearch.index.field.data.ints;
 
 import org.apache.lucene.document.NumericField;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.RAMDirectory;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.util.Tuple;
 import org.elasticsearch.util.lucene.Lucene;
 import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 
-import static org.elasticsearch.index.field.FieldDataOptions.*;
+import static org.elasticsearch.index.field.data.FieldDataOptions.*;
 import static org.elasticsearch.util.Tuple.*;
 import static org.elasticsearch.util.lucene.DocumentBuilder.*;
 import static org.hamcrest.MatcherAssert.*;

modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/longs/LongFieldDataTests.java

@@ -17,21 +17,21 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.longs;
+package org.elasticsearch.index.field.data.longs;
 
 import org.apache.lucene.document.NumericField;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.RAMDirectory;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.util.Tuple;
 import org.elasticsearch.util.lucene.Lucene;
 import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 
-import static org.elasticsearch.index.field.FieldDataOptions.*;
+import static org.elasticsearch.index.field.data.FieldDataOptions.*;
 import static org.elasticsearch.util.Tuple.*;
 import static org.elasticsearch.util.lucene.DocumentBuilder.*;
 import static org.hamcrest.MatcherAssert.*;

modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/shorts/ShortFieldDataTests.java

@@ -17,21 +17,21 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.shorts;
+package org.elasticsearch.index.field.data.shorts;
 
 import org.apache.lucene.document.NumericField;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.RAMDirectory;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.util.Tuple;
 import org.elasticsearch.util.lucene.Lucene;
 import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 
-import static org.elasticsearch.index.field.FieldDataOptions.*;
+import static org.elasticsearch.index.field.data.FieldDataOptions.*;
 import static org.elasticsearch.util.Tuple.*;
 import static org.elasticsearch.util.lucene.DocumentBuilder.*;
 import static org.hamcrest.MatcherAssert.*;

modules/elasticsearch/src/test/java/org/elasticsearch/index/field/data/strings/StringFieldDataTests.java

@@ -17,20 +17,20 @@
  * under the License.
  */
 
-package org.elasticsearch.index.field.strings;
+package org.elasticsearch.index.field.data.strings;
 
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.RAMDirectory;
-import org.elasticsearch.index.field.FieldData;
+import org.elasticsearch.index.field.data.FieldData;
 import org.elasticsearch.util.Tuple;
 import org.elasticsearch.util.lucene.Lucene;
 import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 
-import static org.elasticsearch.index.field.FieldDataOptions.*;
+import static org.elasticsearch.index.field.data.FieldDataOptions.*;
 import static org.elasticsearch.util.Tuple.*;
 import static org.elasticsearch.util.lucene.DocumentBuilder.*;
 import static org.hamcrest.MatcherAssert.*;