Skip to content

Fix typo in ValuesSourceConfig method name #136171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 8, 2025
+20 −20
Merged

Fix typo in ValuesSourceConfig method name #136171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ public static FromFilters<?> adaptIntoFiltersOrNull(
CardinalityUpperBound cardinality,
Map<String, Object> metadata
) throws IOException {
if (false == valuesSourceConfig.alignesWithSearchIndex()) {
if (false == valuesSourceConfig.alignsWithSearchIndex()) {
return null;
}
if (averageDocsPerRange < DOCS_PER_RANGE_TO_USE_FILTERS) {
Expand Down
2 changes: 1 addition & 1 deletion .../org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregatorFromFilters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ static StringTermsAggregatorFromFilters adaptIntoFiltersOrNull(
LongPredicate acceptedOrds,
CheckedSupplier<SortedSetDocValues, IOException> valuesSupplier
) throws IOException {
if (false == valuesSourceConfig.alignesWithSearchIndex()) {
if (false == valuesSourceConfig.alignsWithSearchIndex()) {
return null;
}
FilterByFilterAggregator.AdapterBuilder<StringTermsAggregatorFromFilters> filterByFilterBuilder =
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ public boolean hasOrdinals() {
*/
@Nullable
public Function<byte[], Number> getPointReaderOrNull() {
return alignesWithSearchIndex() ? fieldType().pointReaderIfPossible() : null;
return alignsWithSearchIndex() ? fieldType().pointReaderIfPossible() : null;
}

/**
Expand All @@ -428,7 +428,7 @@ public Function<byte[], Number> 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();
}

Expand Down
30 changes: 15 additions & 15 deletions .../src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,15 +241,15 @@ 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();
values = valuesSource.bytesValues(ctx);
assertTrue(values.advanceExact(0));
assertEquals(1, values.docValueCount());
assertEquals(new BytesRef("abc"), values.nextValue());
assertFalse(config.alignesWithSearchIndex());
assertFalse(config.alignsWithSearchIndex());
});
}

Expand All @@ -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();
Expand All @@ -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());
});
}

Expand All @@ -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());
});
}

Expand All @@ -298,15 +298,15 @@ 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();
values = valuesSource.longValues(ctx);
assertTrue(values.advanceExact(0));
assertEquals(1, values.docValueCount());
assertEquals(42, values.nextValue());
assertFalse(config.alignesWithSearchIndex());
assertFalse(config.alignsWithSearchIndex());
});
}

Expand All @@ -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();
Expand All @@ -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());
});
}

Expand All @@ -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());
});
}

Expand All @@ -355,15 +355,15 @@ 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();
values = valuesSource.longValues(ctx);
assertTrue(values.advanceExact(0));
assertEquals(1, values.docValueCount());
assertEquals(1, values.nextValue());
assertFalse(config.alignesWithSearchIndex());
assertFalse(config.alignsWithSearchIndex());
});
}

Expand All @@ -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();
Expand All @@ -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());
});
}

Expand All @@ -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());
});
}

Expand Down