Skip to content

Fix TimeValue comparisons for -1 duration #133677

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 10 commits into from
Sep 3, 2025
+50 −49
Merged

Fix TimeValue comparisons for -1 duration #133677

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bb2687d
Fix TimeValue comparisons for -1 duration
JeremyDahlgren Aug 27, 2025
6d2003f
Merge branch 'main' into timevalue-negative-1-sec-equals-failure
JeremyDahlgren Aug 27, 2025
0617633
Merge branch 'main' into timevalue-negative-1-sec-equals-failure
JeremyDahlgren Aug 27, 2025
853fb90
Revert change to compareTo(), add units in getStringRep()
JeremyDahlgren Aug 28, 2025
47bcf11
Merge branch 'main' into timevalue-negative-1-sec-equals-failure
JeremyDahlgren Aug 28, 2025
c938f60
Keep MINUS_ONE (milliseconds) as "-1"
JeremyDahlgren Aug 29, 2025
e429bf3
Merge branch 'main' into timevalue-negative-1-sec-equals-failure
JeremyDahlgren Aug 29, 2025
c336e77
Fix test using -1 with units
JeremyDahlgren Aug 29, 2025
05c4024
Merge branch 'main' into timevalue-negative-1-sec-equals-failure
JeremyDahlgren Sep 3, 2025
6b8059f
Merge branch 'main' into timevalue-negative-1-sec-equals-failure
JeremyDahlgren Sep 3, 2025
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
3 changes: 0 additions & 3 deletions libs/core/src/main/java/org/elasticsearch/core/TimeValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,6 @@ private static String formatDecimal(double value, int fractionPieces) {
}

public String getStringRep() {
if (duration < 0) {
return Long.toString(duration);
}
return switch (timeUnit) {
case NANOSECONDS -> duration + "nanos";
case MICROSECONDS -> duration + "micros";
Expand Down
3 changes: 2 additions & 1 deletion libs/core/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ public void testRoundTrip() {
assertThat(TimeValue.parseTimeValue(s, null, "test").getStringRep(), equalTo(s));
final TimeValue t = new TimeValue(randomIntBetween(1, 128), randomFrom(TimeUnit.values()));
assertThat(TimeValue.parseTimeValue(t.getStringRep(), null, "test"), equalTo(t));
assertThat(TimeValue.timeValueSeconds(-1), equalTo(TimeValue.parseTimeValue(TimeValue.timeValueSeconds(-1).getStringRep(), "foo")));
}

private static final String FRACTIONAL_TIME_VALUES_ARE_NOT_SUPPORTED = "fractional time values are not supported";
Expand Down Expand Up @@ -165,7 +166,7 @@ public void testNoDotsAllowed() {
}

public void testToStringRep() {
assertEquals("-1", new TimeValue(-1).getStringRep());
assertEquals("-1ms", new TimeValue(-1).getStringRep());
assertEquals("10ms", new TimeValue(10, TimeUnit.MILLISECONDS).getStringRep());
assertEquals("1533ms", new TimeValue(1533, TimeUnit.MILLISECONDS).getStringRep());
assertEquals("90s", new TimeValue(90, TimeUnit.SECONDS).getStringRep());
Expand Down
18 changes: 9 additions & 9 deletions server/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,18 +430,18 @@ public void testSetLevels() {

metadata = newIndexMeta("index", Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current()).build());
settings.updateIndexMetadata(metadata);
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getIndexTraceThreshold());
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getIndexDebugThreshold());
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getIndexInfoThreshold());
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getIndexWarnThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getIndexTraceThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getIndexDebugThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getIndexInfoThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getIndexWarnThreshold());

settings = new IndexSettings(metadata, Settings.EMPTY);
log = new IndexingSlowLog(settings, mock(SlowLogFields.class));

assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getIndexTraceThreshold());
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getIndexDebugThreshold());
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getIndexInfoThreshold());
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getIndexWarnThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getIndexTraceThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getIndexDebugThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getIndexInfoThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getIndexWarnThreshold());
try {
settings.updateIndexMetadata(
newIndexMeta(
Expand Down Expand Up @@ -500,7 +500,7 @@ public void testSetLevels() {
}

private void assertTimeValueException(final IllegalArgumentException e, final String key) {
final String expected = "illegal value can't update [" + key + "] from [-1] to [NOT A TIME VALUE]";
final String expected = "illegal value can't update [" + key + "] from [-1nanos] to [NOT A TIME VALUE]";
assertThat(e, hasToString(containsString(expected)));
assertNotNull(e.getCause());
assertThat(e.getCause(), instanceOf(IllegalArgumentException.class));
Expand Down
34 changes: 17 additions & 17 deletions server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,18 +349,18 @@ public void testSetQueryLevels() {

metadata = newIndexMeta("index", Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current()).build());
settings.updateIndexMetadata(metadata);
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getQueryTraceThreshold());
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getQueryDebugThreshold());
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getQueryInfoThreshold());
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getQueryWarnThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getQueryTraceThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getQueryDebugThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getQueryInfoThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getQueryWarnThreshold());

settings = new IndexSettings(metadata, Settings.EMPTY);
log = new SearchSlowLog(settings, mock(SlowLogFields.class));

assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getQueryTraceThreshold());
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getQueryDebugThreshold());
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getQueryInfoThreshold());
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getQueryWarnThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getQueryTraceThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getQueryDebugThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getQueryInfoThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getQueryWarnThreshold());
try {
settings.updateIndexMetadata(
newIndexMeta(
Expand Down Expand Up @@ -455,18 +455,18 @@ public void testSetFetchLevels() {

metadata = newIndexMeta("index", Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current()).build());
settings.updateIndexMetadata(metadata);
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getFetchTraceThreshold());
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getFetchDebugThreshold());
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getFetchInfoThreshold());
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getFetchWarnThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getFetchTraceThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getFetchDebugThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getFetchInfoThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getFetchWarnThreshold());

settings = new IndexSettings(metadata, Settings.EMPTY);
log = new SearchSlowLog(settings, mock(SlowLogFields.class));

assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getFetchTraceThreshold());
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getFetchDebugThreshold());
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getFetchInfoThreshold());
assertEquals(TimeValue.timeValueMillis(-1).nanos(), log.getFetchWarnThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getFetchTraceThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getFetchDebugThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getFetchInfoThreshold());
assertEquals(TimeValue.timeValueNanos(-1).nanos(), log.getFetchWarnThreshold());
try {
settings.updateIndexMetadata(
newIndexMeta(
Expand Down Expand Up @@ -525,7 +525,7 @@ public void testSetFetchLevels() {
}

private void assertTimeValueException(final IllegalArgumentException e, final String key) {
final String expected = "illegal value can't update [" + key + "] from [-1] to [NOT A TIME VALUE]";
final String expected = "illegal value can't update [" + key + "] from [-1nanos] to [NOT A TIME VALUE]";
assertThat(e, hasToString(containsString(expected)));
assertNotNull(e.getCause());
assertThat(e.getCause(), instanceOf(IllegalArgumentException.class));
Expand Down