diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java index 860b272699b79..6b8c3f7ae86e7 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java @@ -367,7 +367,7 @@ public static FromFilters adaptIntoFiltersOrNull( CardinalityUpperBound cardinality, Map metadata ) throws IOException { - if (false == valuesSourceConfig.alignesWithSearchIndex()) { + if (false == valuesSourceConfig.alignsWithSearchIndex()) { return null; } if (averageDocsPerRange < DOCS_PER_RANGE_TO_USE_FILTERS) { diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregatorFromFilters.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregatorFromFilters.java index ec3bdb742440e..e260fa582a3bb 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregatorFromFilters.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregatorFromFilters.java @@ -66,7 +66,7 @@ static StringTermsAggregatorFromFilters adaptIntoFiltersOrNull( LongPredicate acceptedOrds, CheckedSupplier valuesSupplier ) throws IOException { - if (false == valuesSourceConfig.alignesWithSearchIndex()) { + if (false == valuesSourceConfig.alignsWithSearchIndex()) { return null; } FilterByFilterAggregator.AdapterBuilder filterByFilterBuilder = diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregatorFactory.java index 5f5662e0aa050..f0813bdae0ab4 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregatorFactory.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregatorFactory.java @@ -161,7 +161,7 @@ public static void registerAggregators(ValuesSourceRegistry.Builder builder) { if (valuesSourceConfig.getValuesSource() instanceof final ValuesSource.Bytes.WithOrdinals source) { if (executionMode.useGlobalOrdinals(context, source, precision)) { final String field; - if (valuesSourceConfig.alignesWithSearchIndex()) { + if (valuesSourceConfig.alignsWithSearchIndex()) { field = valuesSourceConfig.fieldType().name(); } else { field = null; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java index 957999d2eae63..cff972b18df9d 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java @@ -419,7 +419,7 @@ public boolean hasOrdinals() { */ @Nullable public Function getPointReaderOrNull() { - return alignesWithSearchIndex() ? fieldType().pointReaderIfPossible() : null; + return alignsWithSearchIndex() ? fieldType().pointReaderIfPossible() : null; } /** @@ -428,7 +428,7 @@ public Function getPointReaderOrNull() { * is searchable and there aren't missing values or a script to confuse * the ordering. */ - public boolean alignesWithSearchIndex() { + public boolean alignsWithSearchIndex() { return script() == null && missing() == null && fieldType() != null && fieldType().indexType().supportsSortShortcuts(); } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java index fbdf1fe1332da..65a41aade2494 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java @@ -241,7 +241,7 @@ public void testEmptyKeyword() throws Exception { LeafReaderContext ctx = context.searcher().getIndexReader().leaves().get(0); SortedBinaryDocValues values = valuesSource.bytesValues(ctx); assertFalse(values.advanceExact(0)); - assertTrue(config.alignesWithSearchIndex()); + assertTrue(config.alignsWithSearchIndex()); config = ValuesSourceConfig.resolve(context, null, "field", null, "abc", null, null, CoreValuesSourceType.KEYWORD); valuesSource = (ValuesSource.Bytes) config.getValuesSource(); @@ -249,7 +249,7 @@ public void testEmptyKeyword() throws Exception { assertTrue(values.advanceExact(0)); assertEquals(1, values.docValueCount()); assertEquals(new BytesRef("abc"), values.nextValue()); - assertFalse(config.alignesWithSearchIndex()); + assertFalse(config.alignsWithSearchIndex()); }); } @@ -261,7 +261,7 @@ public void testUnmappedKeyword() throws Exception { ValuesSource.Bytes valuesSource = (ValuesSource.Bytes) config.getValuesSource(); assertNotNull(valuesSource); assertFalse(config.hasValues()); - assertFalse(config.alignesWithSearchIndex()); + assertFalse(config.alignsWithSearchIndex()); config = ValuesSourceConfig.resolve(context, ValueType.STRING, "field", null, "abc", null, null, CoreValuesSourceType.KEYWORD); valuesSource = (ValuesSource.Bytes) config.getValuesSource(); @@ -270,7 +270,7 @@ public void testUnmappedKeyword() throws Exception { assertTrue(values.advanceExact(0)); assertEquals(1, values.docValueCount()); assertEquals(new BytesRef("abc"), values.nextValue()); - assertFalse(config.alignesWithSearchIndex()); + assertFalse(config.alignsWithSearchIndex()); }); } @@ -285,7 +285,7 @@ public void testLong() throws Exception { assertTrue(values.advanceExact(0)); assertEquals(1, values.docValueCount()); assertEquals(42, values.nextValue()); - assertTrue(config.alignesWithSearchIndex()); + assertTrue(config.alignsWithSearchIndex()); }); } @@ -298,7 +298,7 @@ public void testEmptyLong() throws Exception { LeafReaderContext ctx = context.searcher().getIndexReader().leaves().get(0); SortedNumericDocValues values = valuesSource.longValues(ctx); assertFalse(values.advanceExact(0)); - assertTrue(config.alignesWithSearchIndex()); + assertTrue(config.alignsWithSearchIndex()); config = ValuesSourceConfig.resolve(context, null, "field", null, 42, null, null, CoreValuesSourceType.KEYWORD); valuesSource = (ValuesSource.Numeric) config.getValuesSource(); @@ -306,7 +306,7 @@ public void testEmptyLong() throws Exception { assertTrue(values.advanceExact(0)); assertEquals(1, values.docValueCount()); assertEquals(42, values.nextValue()); - assertFalse(config.alignesWithSearchIndex()); + assertFalse(config.alignsWithSearchIndex()); }); } @@ -318,7 +318,7 @@ public void testUnmappedLong() throws Exception { ValuesSource.Numeric valuesSource = (ValuesSource.Numeric) config.getValuesSource(); assertNotNull(valuesSource); assertFalse(config.hasValues()); - assertFalse(config.alignesWithSearchIndex()); + assertFalse(config.alignsWithSearchIndex()); config = ValuesSourceConfig.resolve(context, ValueType.NUMBER, "field", null, 42, null, null, CoreValuesSourceType.KEYWORD); valuesSource = (ValuesSource.Numeric) config.getValuesSource(); @@ -327,7 +327,7 @@ public void testUnmappedLong() throws Exception { assertTrue(values.advanceExact(0)); assertEquals(1, values.docValueCount()); assertEquals(42, values.nextValue()); - assertFalse(config.alignesWithSearchIndex()); + assertFalse(config.alignsWithSearchIndex()); }); } @@ -342,7 +342,7 @@ public void testBoolean() throws Exception { assertTrue(values.advanceExact(0)); assertEquals(1, values.docValueCount()); assertEquals(1, values.nextValue()); - assertTrue(config.alignesWithSearchIndex()); + assertTrue(config.alignsWithSearchIndex()); }); } @@ -355,7 +355,7 @@ public void testEmptyBoolean() throws Exception { LeafReaderContext ctx = context.searcher().getIndexReader().leaves().get(0); SortedNumericDocValues values = valuesSource.longValues(ctx); assertFalse(values.advanceExact(0)); - assertTrue(config.alignesWithSearchIndex()); + assertTrue(config.alignsWithSearchIndex()); config = ValuesSourceConfig.resolve(context, null, "field", null, true, null, null, CoreValuesSourceType.KEYWORD); valuesSource = (ValuesSource.Numeric) config.getValuesSource(); @@ -363,7 +363,7 @@ public void testEmptyBoolean() throws Exception { assertTrue(values.advanceExact(0)); assertEquals(1, values.docValueCount()); assertEquals(1, values.nextValue()); - assertFalse(config.alignesWithSearchIndex()); + assertFalse(config.alignsWithSearchIndex()); }); } @@ -375,7 +375,7 @@ public void testUnmappedBoolean() throws Exception { ValuesSource.Numeric valuesSource = (ValuesSource.Numeric) config.getValuesSource(); assertNotNull(valuesSource); assertFalse(config.hasValues()); - assertFalse(config.alignesWithSearchIndex()); + assertFalse(config.alignsWithSearchIndex()); config = ValuesSourceConfig.resolve(context, ValueType.BOOLEAN, "field", null, true, null, null, CoreValuesSourceType.KEYWORD); valuesSource = (ValuesSource.Numeric) config.getValuesSource(); @@ -384,7 +384,7 @@ public void testUnmappedBoolean() throws Exception { assertTrue(values.advanceExact(0)); assertEquals(1, values.docValueCount()); assertEquals(1, values.nextValue()); - assertFalse(config.alignesWithSearchIndex()); + assertFalse(config.alignsWithSearchIndex()); }); } @@ -403,7 +403,7 @@ public void testFieldAlias() throws Exception { assertTrue(values.advanceExact(0)); assertEquals(1, values.docValueCount()); assertEquals(new BytesRef("value"), values.nextValue()); - assertTrue(config.alignesWithSearchIndex()); + assertTrue(config.alignsWithSearchIndex()); }); }