Rename BYTES ValuesSourceType to reflect intended usage (#66762)

elastic · Dec 30, 2020 · e26c9bb · e26c9bb
1 parent 0f50732
commit e26c9bb
Show file tree

Hide file tree

Showing 56 changed files with 82 additions and 82 deletions.
diff --git a/...level/src/main/java/org/elasticsearch/client/analytics/StringStatsAggregationBuilder.java b/...level/src/main/java/org/elasticsearch/client/analytics/StringStatsAggregationBuilder.java
@@ -72,7 +72,7 @@ public StringStatsAggregationBuilder showDistribution(boolean showDistribution)
 
     @Override
     protected ValuesSourceType defaultValueSourceType() {
-        return CoreValuesSourceType.BYTES;
+        return CoreValuesSourceType.KEYWORD;
     }
 
     @Override

diff --git a/...on/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/NodeRestUsageIT.java b/...on/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/NodeRestUsageIT.java
@@ -185,7 +185,7 @@ public void testAggregationUsage() throws IOException {
 
         assertDiff(beforeCombinedAggsUsage, afterCombinedAggsUsage, "terms", "numeric", 1L);
         assertDiff(beforeCombinedAggsUsage, afterCombinedAggsUsage, "terms", "date", 1L);
-        assertDiff(beforeCombinedAggsUsage, afterCombinedAggsUsage, "terms", "bytes", 2L);
+        assertDiff(beforeCombinedAggsUsage, afterCombinedAggsUsage, "terms", "keyword", 2L);
         assertDiff(beforeCombinedAggsUsage, afterCombinedAggsUsage, "avg", "numeric", 3L);
     }
 

diff --git a/...va/org/elasticsearch/search/aggregations/support/ArrayValuesSourceAggregationBuilder.java b/...va/org/elasticsearch/search/aggregations/support/ArrayValuesSourceAggregationBuilder.java
@@ -200,7 +200,7 @@ protected Map<String, ValuesSourceConfig> resolveConfig(AggregationContext conte
         HashMap<String, ValuesSourceConfig> configs = new HashMap<>();
         for (String field : fields) {
             ValuesSourceConfig config = ValuesSourceConfig.resolveUnregistered(context, userValueTypeHint, field, null,
-                missingMap.get(field), null, format, CoreValuesSourceType.BYTES);
+                missingMap.get(field), null, format, CoreValuesSourceType.KEYWORD);
             configs.put(field, config);
         }
         return configs;

diff --git a/.../src/main/java/org/elasticsearch/search/aggregations/support/ArrayValuesSourceParser.java b/.../src/main/java/org/elasticsearch/search/aggregations/support/ArrayValuesSourceParser.java
@@ -45,7 +45,7 @@ protected NumericValuesSourceParser(boolean formattable) {
     public abstract static class BytesValuesSourceParser extends ArrayValuesSourceParser<ValuesSource.Bytes> {
 
         protected BytesValuesSourceParser(boolean formattable) {
-            super(formattable, CoreValuesSourceType.BYTES, ValueType.STRING);
+            super(formattable, CoreValuesSourceType.KEYWORD, ValueType.STRING);
         }
     }
 

diff --git a/...nt-join/src/main/java/org/elasticsearch/join/aggregations/ChildrenAggregationBuilder.java b/...nt-join/src/main/java/org/elasticsearch/join/aggregations/ChildrenAggregationBuilder.java
@@ -74,7 +74,7 @@ protected ChildrenAggregationBuilder(ChildrenAggregationBuilder clone,
 
     @Override
     protected ValuesSourceType defaultValueSourceType() {
-        return CoreValuesSourceType.BYTES;
+        return CoreValuesSourceType.KEYWORD;
     }
 
     @Override

diff --git a/...rent-join/src/main/java/org/elasticsearch/join/aggregations/ParentAggregationBuilder.java b/...rent-join/src/main/java/org/elasticsearch/join/aggregations/ParentAggregationBuilder.java
@@ -74,7 +74,7 @@ protected ParentAggregationBuilder(ParentAggregationBuilder clone,
 
     @Override
     protected ValuesSourceType defaultValueSourceType() {
-        return CoreValuesSourceType.BYTES;
+        return CoreValuesSourceType.KEYWORD;
     }
 
     @Override

diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentIdFieldMapper.java b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentIdFieldMapper.java
@@ -71,7 +71,7 @@ public String typeName() {
         @Override
         public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, Supplier<SearchLookup> searchLookup) {
             failIfNoDocValues();
-            return new SortedSetOrdinalsIndexFieldData.Builder(name(), CoreValuesSourceType.BYTES);
+            return new SortedSetOrdinalsIndexFieldData.Builder(name(), CoreValuesSourceType.KEYWORD);
         }
 
         @Override

diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java
@@ -158,7 +158,7 @@ public String typeName() {
 
         @Override
         public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, Supplier<SearchLookup> searchLookup) {
-            return new SortedSetOrdinalsIndexFieldData.Builder(name(), CoreValuesSourceType.BYTES);
+            return new SortedSetOrdinalsIndexFieldData.Builder(name(), CoreValuesSourceType.KEYWORD);
         }
 
         @Override

diff --git a/modules/percolator/src/test/java/org/elasticsearch/percolator/QueryBuilderStoreTests.java b/modules/percolator/src/test/java/org/elasticsearch/percolator/QueryBuilderStoreTests.java
@@ -92,7 +92,7 @@ public void testStoringQueryBuilders() throws IOException {
             when(queryShardContext.getWriteableRegistry()).thenReturn(writableRegistry());
             when(queryShardContext.getXContentRegistry()).thenReturn(xContentRegistry());
             when(queryShardContext.getForField(fieldMapper.fieldType()))
-                .thenReturn(new BytesBinaryIndexFieldData(fieldMapper.name(), CoreValuesSourceType.BYTES));
+                .thenReturn(new BytesBinaryIndexFieldData(fieldMapper.name(), CoreValuesSourceType.KEYWORD));
             when(queryShardContext.getFieldType(Mockito.anyString())).thenAnswer(invocation -> {
                 final String fieldName = (String) invocation.getArguments()[0];
                 return new KeywordFieldMapper.KeywordFieldType(fieldName);

diff --git a/...ysis-icu/src/main/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapper.java b/...ysis-icu/src/main/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapper.java
@@ -101,7 +101,7 @@ protected String parseSourceValue(Object value) {
         @Override
         public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, Supplier<SearchLookup> searchLookup) {
             failIfNoDocValues();
-            return new SortedSetOrdinalsIndexFieldData.Builder(name(), CoreValuesSourceType.BYTES);
+            return new SortedSetOrdinalsIndexFieldData.Builder(name(), CoreValuesSourceType.KEYWORD);
         }
 
         @Override

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java
@@ -128,7 +128,7 @@ public BytesReference valueForDisplay(Object value) {
         @Override
         public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, Supplier<SearchLookup> searchLookup) {
             failIfNoDocValues();
-            return new BytesBinaryIndexFieldData.Builder(name(), CoreValuesSourceType.BYTES);
+            return new BytesBinaryIndexFieldData.Builder(name(), CoreValuesSourceType.KEYWORD);
         }
 
         @Override

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java
@@ -158,7 +158,7 @@ public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, S
                 TextFieldMapper.Defaults.FIELDDATA_MIN_FREQUENCY,
                 TextFieldMapper.Defaults.FIELDDATA_MAX_FREQUENCY,
                 TextFieldMapper.Defaults.FIELDDATA_MIN_SEGMENT_SIZE,
-                CoreValuesSourceType.BYTES);
+                CoreValuesSourceType.KEYWORD);
             return new IndexFieldData.Builder() {
                 @Override
                 public IndexFieldData<?> build(

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java
@@ -69,7 +69,7 @@ public Query existsQuery(QueryShardContext context) {
 
         @Override
         public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, Supplier<SearchLookup> searchLookup) {
-            return new ConstantIndexFieldData.Builder(fullyQualifiedIndexName, name(), CoreValuesSourceType.BYTES);
+            return new ConstantIndexFieldData.Builder(fullyQualifiedIndexName, name(), CoreValuesSourceType.KEYWORD);
         }
 
         @Override

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
@@ -235,7 +235,7 @@ NamedAnalyzer normalizer() {
         @Override
         public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, Supplier<SearchLookup> searchLookup) {
             failIfNoDocValues();
-            return new SortedSetOrdinalsIndexFieldData.Builder(name(), CoreValuesSourceType.BYTES);
+            return new SortedSetOrdinalsIndexFieldData.Builder(name(), CoreValuesSourceType.KEYWORD);
         }
 
         @Override

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java
@@ -777,7 +777,7 @@ public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, S
                 filter.minFreq,
                 filter.maxFreq,
                 filter.minSegmentSize,
-                CoreValuesSourceType.BYTES
+                CoreValuesSourceType.KEYWORD
             );
         }
 

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TypeFieldType.java b/server/src/main/java/org/elasticsearch/index/mapper/TypeFieldType.java
@@ -72,7 +72,7 @@ public Query existsQuery(QueryShardContext context) {
     @Override
     public IndexFieldData.Builder fielddataBuilder(String fullyQualifiedIndexName, Supplier<SearchLookup> searchLookup) {
         deprecationLogger.deprecate("typefieldtype", TYPES_V7_DEPRECATION_MESSAGE);
-        return new ConstantIndexFieldData.Builder(type, name(), CoreValuesSourceType.BYTES);
+        return new ConstantIndexFieldData.Builder(type, name(), CoreValuesSourceType.KEYWORD);
     }
 
     @Override

diff --git a/...java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java b/...java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java
@@ -154,7 +154,7 @@ static void register(ValuesSourceRegistry.Builder builder) {
 
         builder.register(
             REGISTRY_KEY,
-            List.of(CoreValuesSourceType.BYTES, CoreValuesSourceType.IP),
+            List.of(CoreValuesSourceType.KEYWORD, CoreValuesSourceType.IP),
             (valuesSourceConfig, name, hasScript, format, missingBucket, order) -> new CompositeValuesSourceConfig(
                 name,
                 valuesSourceConfig.fieldType(),
@@ -202,7 +202,7 @@ static void register(ValuesSourceRegistry.Builder builder) {
 
     @Override
     protected ValuesSourceType getDefaultValuesSourceType() {
-        return CoreValuesSourceType.BYTES;
+        return CoreValuesSourceType.KEYWORD;
     }
 
     @Override

diff --git a/.../java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregationBuilder.java b/.../java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregationBuilder.java
@@ -67,7 +67,7 @@ protected MissingAggregationBuilder(MissingAggregationBuilder clone,
 
     @Override
     protected ValuesSourceType defaultValueSourceType() {
-        return CoreValuesSourceType.BYTES;
+        return CoreValuesSourceType.KEYWORD;
     }
 
     @Override

diff --git a/...a/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilder.java b/...a/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregationBuilder.java
@@ -75,7 +75,7 @@ protected DiversifiedAggregationBuilder(DiversifiedAggregationBuilder clone, Bui
 
     @Override
     protected ValuesSourceType defaultValueSourceType() {
-        return CoreValuesSourceType.BYTES;
+        return CoreValuesSourceType.KEYWORD;
     }
 
     @Override

diff --git a/...va/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregatorFactory.java b/...va/org/elasticsearch/search/aggregations/bucket/sampler/DiversifiedAggregatorFactory.java
@@ -65,7 +65,7 @@ public static void registerAggregators(ValuesSourceRegistry.Builder builder) {
 
         builder.register(
             DiversifiedAggregationBuilder.REGISTRY_KEY,
-            CoreValuesSourceType.BYTES,
+            CoreValuesSourceType.KEYWORD,
             (
                 String name,
                 int shardSize,

diff --git a/.../java/org/elasticsearch/search/aggregations/bucket/terms/RareTermsAggregationBuilder.java b/.../java/org/elasticsearch/search/aggregations/bucket/terms/RareTermsAggregationBuilder.java
@@ -84,7 +84,7 @@ private RareTermsAggregationBuilder(RareTermsAggregationBuilder clone,
 
     @Override
     protected ValuesSourceType defaultValueSourceType() {
-        return CoreValuesSourceType.BYTES;
+        return CoreValuesSourceType.KEYWORD;
     }
 
     @Override

diff --git a/...n/java/org/elasticsearch/search/aggregations/bucket/terms/RareTermsAggregatorFactory.java b/...n/java/org/elasticsearch/search/aggregations/bucket/terms/RareTermsAggregatorFactory.java
@@ -48,7 +48,7 @@ public class RareTermsAggregatorFactory extends ValuesSourceAggregatorFactory {
 
     static void registerAggregators(ValuesSourceRegistry.Builder builder) {
         builder.register(RareTermsAggregationBuilder.REGISTRY_KEY,
-            List.of(CoreValuesSourceType.BYTES, CoreValuesSourceType.IP),
+            List.of(CoreValuesSourceType.KEYWORD, CoreValuesSourceType.IP),
             RareTermsAggregatorFactory.bytesSupplier(), true);
 
         builder.register(RareTermsAggregationBuilder.REGISTRY_KEY,

diff --git a/...rg/elasticsearch/search/aggregations/bucket/terms/SignificantTermsAggregationBuilder.java b/...rg/elasticsearch/search/aggregations/bucket/terms/SignificantTermsAggregationBuilder.java
@@ -129,7 +129,7 @@ protected SignificantTermsAggregationBuilder(SignificantTermsAggregationBuilder
 
     @Override
     protected ValuesSourceType defaultValueSourceType() {
-        return CoreValuesSourceType.BYTES;
+        return CoreValuesSourceType.KEYWORD;
     }
 
     @Override

diff --git a/...org/elasticsearch/search/aggregations/bucket/terms/SignificantTermsAggregatorFactory.java b/...org/elasticsearch/search/aggregations/bucket/terms/SignificantTermsAggregatorFactory.java
@@ -49,7 +49,7 @@ public class SignificantTermsAggregatorFactory extends ValuesSourceAggregatorFac
 
     static void registerAggregators(ValuesSourceRegistry.Builder builder) {
         builder.register(SignificantTermsAggregationBuilder.REGISTRY_KEY,
-            List.of(CoreValuesSourceType.BYTES, CoreValuesSourceType.IP),
+            List.of(CoreValuesSourceType.KEYWORD, CoreValuesSourceType.IP),
             SignificantTermsAggregatorFactory.bytesSupplier(), true);
 
         builder.register(SignificantTermsAggregationBuilder.REGISTRY_KEY,

diff --git a/...main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java b/...main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java
@@ -126,7 +126,7 @@ protected TermsAggregationBuilder(TermsAggregationBuilder clone,
 
     @Override
     protected ValuesSourceType defaultValueSourceType() {
-        return CoreValuesSourceType.BYTES;
+        return CoreValuesSourceType.KEYWORD;
     }
 
     @Override

diff --git a/.../main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java b/.../main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java
@@ -53,7 +53,7 @@ public class TermsAggregatorFactory extends ValuesSourceAggregatorFactory {
 
     static void registerAggregators(ValuesSourceRegistry.Builder builder) {
         builder.register(TermsAggregationBuilder.REGISTRY_KEY,
-            List.of(CoreValuesSourceType.BYTES, CoreValuesSourceType.IP),
+            List.of(CoreValuesSourceType.KEYWORD, CoreValuesSourceType.IP),
             TermsAggregatorFactory.bytesSupplier(), true);
 
         builder.register(TermsAggregationBuilder.REGISTRY_KEY,

diff --git a/...ain/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregationBuilder.java b/...ain/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregationBuilder.java
@@ -77,7 +77,7 @@ public CardinalityAggregationBuilder(CardinalityAggregationBuilder clone,
 
     @Override
     protected ValuesSourceType defaultValueSourceType() {
-        return CoreValuesSourceType.BYTES;
+        return CoreValuesSourceType.KEYWORD;
     }
 
     /**

diff --git a/...main/java/org/elasticsearch/search/aggregations/metrics/ValueCountAggregationBuilder.java b/...main/java/org/elasticsearch/search/aggregations/metrics/ValueCountAggregationBuilder.java
@@ -66,7 +66,7 @@ protected ValueCountAggregationBuilder(ValueCountAggregationBuilder clone,
 
     @Override
     protected ValuesSourceType defaultValueSourceType() {
-        return CoreValuesSourceType.BYTES;
+        return CoreValuesSourceType.KEYWORD;
     }
 
     @Override

diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/CoreValuesSourceType.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/CoreValuesSourceType.java
@@ -105,7 +105,7 @@ public DocValueFormat getFormatter(String format, ZoneId tz) {
 
         }
     },
-    BYTES() {
+    KEYWORD() {
         @Override
         public ValuesSource getEmpty() {
             return ValuesSource.Bytes.WithOrdinals.EMPTY;
@@ -208,23 +208,23 @@ public ValuesSource replaceMissing(ValuesSource valuesSource, Object rawMissing,
     IP() {
         @Override
         public ValuesSource getEmpty() {
-            return BYTES.getEmpty();
+            return KEYWORD.getEmpty();
         }
 
         @Override
         public ValuesSource getScript(AggregationScript.LeafFactory script, ValueType scriptValueType) {
-            return BYTES.getScript(script, scriptValueType);
+            return KEYWORD.getScript(script, scriptValueType);
         }
 
         @Override
         public ValuesSource getField(FieldContext fieldContext, AggregationScript.LeafFactory script, AggregationContext context) {
-            return BYTES.getField(fieldContext, script, context);
+            return KEYWORD.getField(fieldContext, script, context);
         }
 
         @Override
         public ValuesSource replaceMissing(ValuesSource valuesSource, Object rawMissing, DocValueFormat docValueFormat,
                                            AggregationContext context) {
-            return BYTES.replaceMissing(valuesSource, rawMissing, docValueFormat, context);
+            return KEYWORD.replaceMissing(valuesSource, rawMissing, docValueFormat, context);
         }
 
         @Override

diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValueType.java
@@ -38,7 +38,7 @@
 @Deprecated
 public enum ValueType implements Writeable {
 
-    STRING((byte) 1, "string", "string", CoreValuesSourceType.BYTES,
+    STRING((byte) 1, "string", "string", CoreValuesSourceType.KEYWORD,
         DocValueFormat.RAW),
 
     LONG((byte) 2, "byte|short|integer|long", "long", CoreValuesSourceType.NUMERIC, DocValueFormat.RAW),

diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java
@@ -85,14 +85,14 @@ public void testLoadGlobal_neverCacheIfFieldIsMissing() throws Exception {
     }
 
     private SortedSetOrdinalsIndexFieldData createSortedDV(String fieldName, IndexFieldDataCache indexFieldDataCache) {
-        return new SortedSetOrdinalsIndexFieldData(indexFieldDataCache, fieldName, CoreValuesSourceType.BYTES,
+        return new SortedSetOrdinalsIndexFieldData(indexFieldDataCache, fieldName, CoreValuesSourceType.KEYWORD,
             new NoneCircuitBreakerService(), AbstractLeafOrdinalsFieldData.DEFAULT_SCRIPT_FUNCTION);
     }
 
     private PagedBytesIndexFieldData createPagedBytes(String fieldName, IndexFieldDataCache indexFieldDataCache) {
         return new PagedBytesIndexFieldData(
             fieldName,
-            CoreValuesSourceType.BYTES,
+            CoreValuesSourceType.KEYWORD,
             indexFieldDataCache,
             new NoneCircuitBreakerService(),
             TextFieldMapper.Defaults.FIELDDATA_MIN_FREQUENCY,

diff --git a/server/src/test/java/org/elasticsearch/search/SearchModuleTests.java b/server/src/test/java/org/elasticsearch/search/SearchModuleTests.java
@@ -369,7 +369,7 @@ protected TestAggregationBuilder(TestAggregationBuilder clone,
 
         @Override
         protected ValuesSourceType defaultValueSourceType() {
-            return CoreValuesSourceType.BYTES;
+            return CoreValuesSourceType.KEYWORD;
         }
 
         @Override

diff --git a/...est/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java b/...est/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java
@@ -417,7 +417,7 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy
     protected List<ValuesSourceType> getSupportedValuesSourceTypes() {
         return List.of(
             CoreValuesSourceType.NUMERIC,
-            CoreValuesSourceType.BYTES,
+            CoreValuesSourceType.KEYWORD,
             CoreValuesSourceType.GEOPOINT,
             CoreValuesSourceType.RANGE,
             CoreValuesSourceType.IP,

diff --git a/...a/org/elasticsearch/search/aggregations/bucket/terms/SignificantTermsAggregatorTests.java b/...a/org/elasticsearch/search/aggregations/bucket/terms/SignificantTermsAggregatorTests.java
@@ -70,7 +70,7 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy
     @Override
     protected List<ValuesSourceType> getSupportedValuesSourceTypes() {
         return List.of(CoreValuesSourceType.NUMERIC,
-            CoreValuesSourceType.BYTES,
+            CoreValuesSourceType.KEYWORD,
             CoreValuesSourceType.BOOLEAN,
             CoreValuesSourceType.DATE,
             CoreValuesSourceType.IP);

diff --git a/...va/org/elasticsearch/search/aggregations/bucket/terms/SignificantTextAggregatorTests.java b/...va/org/elasticsearch/search/aggregations/bucket/terms/SignificantTextAggregatorTests.java
@@ -67,7 +67,7 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy
     protected List<ValuesSourceType> getSupportedValuesSourceTypes() {
         return List.of(
             CoreValuesSourceType.BOOLEAN,
-            CoreValuesSourceType.BYTES
+            CoreValuesSourceType.KEYWORD
         );
     }
 

diff --git a/...rc/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java b/...rc/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java
@@ -166,7 +166,7 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy
     @Override
     protected List<ValuesSourceType> getSupportedValuesSourceTypes() {
         return List.of(CoreValuesSourceType.NUMERIC,
-            CoreValuesSourceType.BYTES,
+            CoreValuesSourceType.KEYWORD,
             CoreValuesSourceType.IP,
             CoreValuesSourceType.DATE,
             CoreValuesSourceType.BOOLEAN);

diff --git a/...rc/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountAggregatorTests.java b/...rc/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountAggregatorTests.java
@@ -87,7 +87,7 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy
     protected List<ValuesSourceType> getSupportedValuesSourceTypes() {
         return List.of(
             CoreValuesSourceType.NUMERIC,
-            CoreValuesSourceType.BYTES,
+            CoreValuesSourceType.KEYWORD,
             CoreValuesSourceType.GEOPOINT,
             CoreValuesSourceType.RANGE,
             CoreValuesSourceType.BOOLEAN,

diff --git a/...rc/test/java/org/elasticsearch/search/aggregations/support/CoreValuesSourceTypeTests.java b/...rc/test/java/org/elasticsearch/search/aggregations/support/CoreValuesSourceTypeTests.java
@@ -37,7 +37,7 @@ public class CoreValuesSourceTypeTests extends MapperServiceTestCase {
 
     public void testFromString() {
         assertThat(CoreValuesSourceType.fromString("numeric"), equalTo(CoreValuesSourceType.NUMERIC));
-        assertThat(CoreValuesSourceType.fromString("bytes"), equalTo(CoreValuesSourceType.BYTES));
+        assertThat(CoreValuesSourceType.fromString("keyword"), equalTo(CoreValuesSourceType.KEYWORD));
         assertThat(CoreValuesSourceType.fromString("geopoint"), equalTo(CoreValuesSourceType.GEOPOINT));
         assertThat(CoreValuesSourceType.fromString("range"), equalTo(CoreValuesSourceType.RANGE));
         IllegalArgumentException e = expectThrows(IllegalArgumentException.class,