Skip to content

Optimize dotCount in expanding dot parser #135263

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
ChrisHegarty merged 9 commits into from
Sep 24, 2025
Merged

Optimize dotCount in expanding dot parser #135263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4d57882
Optimize dotCount in expanding dot parser
ChrisHegarty Sep 23, 2025
051b495
Merge branch 'main' into dotCount
ChrisHegarty Sep 23, 2025
b32289b
Merge branch 'main' into dotCount
ChrisHegarty Sep 23, 2025
3e32da8
Update docs/changelog/135263.yaml
ChrisHegarty Sep 23, 2025
090cccb
Update 135263.yaml
ChrisHegarty Sep 23, 2025
5115cb8
Update FieldTypeLookupTests.java
ChrisHegarty Sep 23, 2025
1e0c88e
Merge branch 'main' into dotCount
ChrisHegarty Sep 23, 2025
fade6c1
Update FieldTypeLookupTests.java
ChrisHegarty Sep 23, 2025
ca91a77
Merge branch 'main' into dotCount
ChrisHegarty Sep 23, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/135263.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 135263
summary: Optimize `dotCount` in expanding dot parser
area: "Mapping"
type: enhancement
issues: []
7 changes: 3 additions & 4 deletions server/src/main/java/org/elasticsearch/index/mapper/FieldTypeLookup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,9 @@ final class FieldTypeLookup {

public static int dotCount(String path) {
int dotCount = 0;
for (int i = 0; i < path.length(); i++) {
if (path.charAt(i) == '.') {
dotCount++;
}
int index = -1;
while ((index = path.indexOf('.', index + 1)) != -1) {
dotCount++;
}
return dotCount;
}
Expand Down
26 changes: 26 additions & 0 deletions server/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.elasticsearch.test.ESTestCase;
import org.hamcrest.Matchers;

import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand Down Expand Up @@ -522,6 +523,31 @@ public void testNoRootAliasForPassThroughFieldOnConflictingField() {
assertEquals(foo.fieldType(), lookup.get("foo"));
}

public void testDotCount() {
assertEquals(0, FieldTypeLookup.dotCount(""));
assertEquals(1, FieldTypeLookup.dotCount("."));
assertEquals(2, FieldTypeLookup.dotCount(".."));
assertEquals(3, FieldTypeLookup.dotCount("..."));
assertEquals(4, FieldTypeLookup.dotCount("...."));
assertEquals(0, FieldTypeLookup.dotCount("foo"));
assertEquals(1, FieldTypeLookup.dotCount("foo.bar"));
assertEquals(2, FieldTypeLookup.dotCount("foo.bar.baz"));
assertEquals(3, FieldTypeLookup.dotCount("foo.bar.baz.bob"));
assertEquals(4, FieldTypeLookup.dotCount("foo.bar.baz.bob."));
assertEquals(4, FieldTypeLookup.dotCount("foo..bar.baz.bob"));
assertEquals(5, FieldTypeLookup.dotCount("foo..bar..baz.bob"));
assertEquals(6, FieldTypeLookup.dotCount("foo..bar..baz.bob."));

int times = atLeast(50);
for (int i = 0; i < times; i++) {
byte[] bytes = new byte[randomInt(1024)];
random().nextBytes(bytes);
String s = new String(bytes, StandardCharsets.UTF_8);
int expected = s.chars().map(c -> c == '.' ? 1 : 0).sum();
assertEquals(expected, FieldTypeLookup.dotCount(s));
}
}

@SafeVarargs
@SuppressWarnings("varargs")
static <T> List<T> randomizedList(T... values) {
Expand Down