Skip to content

Commit 4ad6b28

Browse files
romseygeekromseygeek
authored
Fix typo in ValuesSourceConfig method name (#136171)
1 parent 9536c9a commit 4ad6b28

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

‎server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ public static FromFilters<?> adaptIntoFiltersOrNull(
367367
CardinalityUpperBound cardinality,
368368
Map<String, Object> metadata
369369
) throws IOException {
370-
if (false == valuesSourceConfig.alignesWithSearchIndex()) {
370+
if (false == valuesSourceConfig.alignsWithSearchIndex()) {
371371
return null;
372372
}
373373
if (averageDocsPerRange < DOCS_PER_RANGE_TO_USE_FILTERS) {

‎server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsAggregatorFromFilters.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ static StringTermsAggregatorFromFilters adaptIntoFiltersOrNull(
6666
LongPredicate acceptedOrds,
6767
CheckedSupplier<SortedSetDocValues, IOException> valuesSupplier
6868
) throws IOException {
69-
if (false == valuesSourceConfig.alignesWithSearchIndex()) {
69+
if (false == valuesSourceConfig.alignsWithSearchIndex()) {
7070
return null;
7171
}
7272
FilterByFilterAggregator.AdapterBuilder<StringTermsAggregatorFromFilters> filterByFilterBuilder =

‎server/src/main/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregatorFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public static void registerAggregators(ValuesSourceRegistry.Builder builder) {
161161
if (valuesSourceConfig.getValuesSource() instanceof final ValuesSource.Bytes.WithOrdinals source) {
162162
if (executionMode.useGlobalOrdinals(context, source, precision)) {
163163
final String field;
164-
if (valuesSourceConfig.alignesWithSearchIndex()) {
164+
if (valuesSourceConfig.alignsWithSearchIndex()) {
165165
field = valuesSourceConfig.fieldType().name();
166166
} else {
167167
field = null;

‎server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ public boolean hasOrdinals() {
419419
*/
420420
@Nullable
421421
public Function<byte[], Number> getPointReaderOrNull() {
422-
return alignesWithSearchIndex() ? fieldType().pointReaderIfPossible() : null;
422+
return alignsWithSearchIndex() ? fieldType().pointReaderIfPossible() : null;
423423
}
424424

425425
/**
@@ -428,7 +428,7 @@ public Function<byte[], Number> getPointReaderOrNull() {
428428
* is searchable and there aren't missing values or a script to confuse
429429
* the ordering.
430430
*/
431-
public boolean alignesWithSearchIndex() {
431+
public boolean alignsWithSearchIndex() {
432432
return script() == null && missing() == null && fieldType() != null && fieldType().indexType().supportsSortShortcuts();
433433
}
434434

‎server/src/test/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfigTests.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -241,15 +241,15 @@ public void testEmptyKeyword() throws Exception {
241241
LeafReaderContext ctx = context.searcher().getIndexReader().leaves().get(0);
242242
SortedBinaryDocValues values = valuesSource.bytesValues(ctx);
243243
assertFalse(values.advanceExact(0));
244-
assertTrue(config.alignesWithSearchIndex());
244+
assertTrue(config.alignsWithSearchIndex());
245245

246246
config = ValuesSourceConfig.resolve(context, null, "field", null, "abc", null, null, CoreValuesSourceType.KEYWORD);
247247
valuesSource = (ValuesSource.Bytes) config.getValuesSource();
248248
values = valuesSource.bytesValues(ctx);
249249
assertTrue(values.advanceExact(0));
250250
assertEquals(1, values.docValueCount());
251251
assertEquals(new BytesRef("abc"), values.nextValue());
252-
assertFalse(config.alignesWithSearchIndex());
252+
assertFalse(config.alignsWithSearchIndex());
253253
});
254254
}
255255

@@ -261,7 +261,7 @@ public void testUnmappedKeyword() throws Exception {
261261
ValuesSource.Bytes valuesSource = (ValuesSource.Bytes) config.getValuesSource();
262262
assertNotNull(valuesSource);
263263
assertFalse(config.hasValues());
264-
assertFalse(config.alignesWithSearchIndex());
264+
assertFalse(config.alignsWithSearchIndex());
265265

266266
config = ValuesSourceConfig.resolve(context, ValueType.STRING, "field", null, "abc", null, null, CoreValuesSourceType.KEYWORD);
267267
valuesSource = (ValuesSource.Bytes) config.getValuesSource();
@@ -270,7 +270,7 @@ public void testUnmappedKeyword() throws Exception {
270270
assertTrue(values.advanceExact(0));
271271
assertEquals(1, values.docValueCount());
272272
assertEquals(new BytesRef("abc"), values.nextValue());
273-
assertFalse(config.alignesWithSearchIndex());
273+
assertFalse(config.alignsWithSearchIndex());
274274
});
275275
}
276276

@@ -285,7 +285,7 @@ public void testLong() throws Exception {
285285
assertTrue(values.advanceExact(0));
286286
assertEquals(1, values.docValueCount());
287287
assertEquals(42, values.nextValue());
288-
assertTrue(config.alignesWithSearchIndex());
288+
assertTrue(config.alignsWithSearchIndex());
289289
});
290290
}
291291

@@ -298,15 +298,15 @@ public void testEmptyLong() throws Exception {
298298
LeafReaderContext ctx = context.searcher().getIndexReader().leaves().get(0);
299299
SortedNumericDocValues values = valuesSource.longValues(ctx);
300300
assertFalse(values.advanceExact(0));
301-
assertTrue(config.alignesWithSearchIndex());
301+
assertTrue(config.alignsWithSearchIndex());
302302

303303
config = ValuesSourceConfig.resolve(context, null, "field", null, 42, null, null, CoreValuesSourceType.KEYWORD);
304304
valuesSource = (ValuesSource.Numeric) config.getValuesSource();
305305
values = valuesSource.longValues(ctx);
306306
assertTrue(values.advanceExact(0));
307307
assertEquals(1, values.docValueCount());
308308
assertEquals(42, values.nextValue());
309-
assertFalse(config.alignesWithSearchIndex());
309+
assertFalse(config.alignsWithSearchIndex());
310310
});
311311
}
312312

@@ -318,7 +318,7 @@ public void testUnmappedLong() throws Exception {
318318
ValuesSource.Numeric valuesSource = (ValuesSource.Numeric) config.getValuesSource();
319319
assertNotNull(valuesSource);
320320
assertFalse(config.hasValues());
321-
assertFalse(config.alignesWithSearchIndex());
321+
assertFalse(config.alignsWithSearchIndex());
322322

323323
config = ValuesSourceConfig.resolve(context, ValueType.NUMBER, "field", null, 42, null, null, CoreValuesSourceType.KEYWORD);
324324
valuesSource = (ValuesSource.Numeric) config.getValuesSource();
@@ -327,7 +327,7 @@ public void testUnmappedLong() throws Exception {
327327
assertTrue(values.advanceExact(0));
328328
assertEquals(1, values.docValueCount());
329329
assertEquals(42, values.nextValue());
330-
assertFalse(config.alignesWithSearchIndex());
330+
assertFalse(config.alignsWithSearchIndex());
331331
});
332332
}
333333

@@ -342,7 +342,7 @@ public void testBoolean() throws Exception {
342342
assertTrue(values.advanceExact(0));
343343
assertEquals(1, values.docValueCount());
344344
assertEquals(1, values.nextValue());
345-
assertTrue(config.alignesWithSearchIndex());
345+
assertTrue(config.alignsWithSearchIndex());
346346
});
347347
}
348348

@@ -355,15 +355,15 @@ public void testEmptyBoolean() throws Exception {
355355
LeafReaderContext ctx = context.searcher().getIndexReader().leaves().get(0);
356356
SortedNumericDocValues values = valuesSource.longValues(ctx);
357357
assertFalse(values.advanceExact(0));
358-
assertTrue(config.alignesWithSearchIndex());
358+
assertTrue(config.alignsWithSearchIndex());
359359

360360
config = ValuesSourceConfig.resolve(context, null, "field", null, true, null, null, CoreValuesSourceType.KEYWORD);
361361
valuesSource = (ValuesSource.Numeric) config.getValuesSource();
362362
values = valuesSource.longValues(ctx);
363363
assertTrue(values.advanceExact(0));
364364
assertEquals(1, values.docValueCount());
365365
assertEquals(1, values.nextValue());
366-
assertFalse(config.alignesWithSearchIndex());
366+
assertFalse(config.alignsWithSearchIndex());
367367
});
368368
}
369369

@@ -375,7 +375,7 @@ public void testUnmappedBoolean() throws Exception {
375375
ValuesSource.Numeric valuesSource = (ValuesSource.Numeric) config.getValuesSource();
376376
assertNotNull(valuesSource);
377377
assertFalse(config.hasValues());
378-
assertFalse(config.alignesWithSearchIndex());
378+
assertFalse(config.alignsWithSearchIndex());
379379

380380
config = ValuesSourceConfig.resolve(context, ValueType.BOOLEAN, "field", null, true, null, null, CoreValuesSourceType.KEYWORD);
381381
valuesSource = (ValuesSource.Numeric) config.getValuesSource();
@@ -384,7 +384,7 @@ public void testUnmappedBoolean() throws Exception {
384384
assertTrue(values.advanceExact(0));
385385
assertEquals(1, values.docValueCount());
386386
assertEquals(1, values.nextValue());
387-
assertFalse(config.alignesWithSearchIndex());
387+
assertFalse(config.alignsWithSearchIndex());
388388
});
389389
}
390390

@@ -403,7 +403,7 @@ public void testFieldAlias() throws Exception {
403403
assertTrue(values.advanceExact(0));
404404
assertEquals(1, values.docValueCount());
405405
assertEquals(new BytesRef("value"), values.nextValue());
406-
assertTrue(config.alignesWithSearchIndex());
406+
assertTrue(config.alignsWithSearchIndex());
407407
});
408408
}
409409

0 commit comments

Comments
 (0)