honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change the milliseconds precision to 3 digits for intervals. (#38297)

This commit is contained in:
Andrei Stefan 2019-02-05 12:00:49 +02:00 committed by GitHub
parent 8e2eb39cef
commit cea81b199d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/literal/Intervals.java
View File

@ -332,7 +332,7 @@ public final class Intervals {
int MAX_HOUR = 23; int MAX_HOUR = 23;
int MAX_MINUTE = 59; int MAX_MINUTE = 59;
int MAX_SECOND = 59; int MAX_SECOND = 59;
int MAX_MILLI = 999999999; int MAX_MILLI = 999;
char DOT = '.'; char DOT = '.';
char SPACE = ' '; char SPACE = ' ';

12
x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/literal/IntervalsTests.java
View File

@ -83,7 +83,7 @@ public class IntervalsTests extends ESTestCase {
public void testSecondInterval() throws Exception { public void testSecondInterval() throws Exception {
int randomSeconds = randomNonNegativeInt(); int randomSeconds = randomNonNegativeInt();
int randomMillis = randomBoolean() ? (randomBoolean() ? 0 : 999999999) : randomInt(999999999); int randomMillis = randomBoolean() ? (randomBoolean() ? 0 : 999) : randomInt(999);
String value = format(Locale.ROOT, "%s%d.%d", sign, randomSeconds, randomMillis); String value = format(Locale.ROOT, "%s%d.%d", sign, randomSeconds, randomMillis);
TemporalAmount amount = parseInterval(EMPTY, value, INTERVAL_SECOND); TemporalAmount amount = parseInterval(EMPTY, value, INTERVAL_SECOND);
assertEquals(maybeNegate(sign, Duration.ofSeconds(randomSeconds).plusMillis(randomMillis)), amount); assertEquals(maybeNegate(sign, Duration.ofSeconds(randomSeconds).plusMillis(randomMillis)), amount);
@ -128,7 +128,7 @@ public class IntervalsTests extends ESTestCase {
int randomSecond = randomInt(59); int randomSecond = randomInt(59);
boolean withMillis = randomBoolean(); boolean withMillis = randomBoolean();
int randomMilli = withMillis ? randomInt(999999999) : 0; int randomMilli = withMillis ? randomInt(999) : 0;
String millisString = withMillis ? "." + randomMilli : ""; String millisString = withMillis ? "." + randomMilli : "";
String value = format(Locale.ROOT, "%s%d %d:%d:%d%s", sign, randomDay, randomHour, randomMinute, randomSecond, millisString); String value = format(Locale.ROOT, "%s%d %d:%d:%d%s", sign, randomDay, randomHour, randomMinute, randomSecond, millisString);
@ -151,7 +151,7 @@ public class IntervalsTests extends ESTestCase {
int randomSecond = randomInt(59); int randomSecond = randomInt(59);
boolean withMillis = randomBoolean(); boolean withMillis = randomBoolean();
int randomMilli = withMillis ? randomInt(999999999) : 0; int randomMilli = withMillis ? randomInt(999) : 0;
String millisString = withMillis ? "." + randomMilli : ""; String millisString = withMillis ? "." + randomMilli : "";
String value = format(Locale.ROOT, "%s%d:%d:%d%s", sign, randomHour, randomMinute, randomSecond, millisString); String value = format(Locale.ROOT, "%s%d:%d:%d%s", sign, randomHour, randomMinute, randomSecond, millisString);
@ -165,7 +165,7 @@ public class IntervalsTests extends ESTestCase {
int randomSecond = randomInt(59); int randomSecond = randomInt(59);
boolean withMillis = randomBoolean(); boolean withMillis = randomBoolean();
int randomMilli = withMillis ? randomInt(999999999) : 0; int randomMilli = withMillis ? randomInt(999) : 0;
String millisString = withMillis ? "." + randomMilli : ""; String millisString = withMillis ? "." + randomMilli : "";
String value = format(Locale.ROOT, "%s%d:%d%s", sign, randomMinute, randomSecond, millisString); String value = format(Locale.ROOT, "%s%d:%d%s", sign, randomMinute, randomSecond, millisString);
@ -186,11 +186,11 @@ public class IntervalsTests extends ESTestCase {
public void testMillisTooBig() throws Exception { public void testMillisTooBig() throws Exception {
int randomSeconds = randomNonNegativeInt(); int randomSeconds = randomNonNegativeInt();
int millisTooLarge = 1234567890; int millisTooLarge = 1234;
String value = format(Locale.ROOT, "%s%d.%d", sign, randomSeconds, millisTooLarge); String value = format(Locale.ROOT, "%s%d.%d", sign, randomSeconds, millisTooLarge);
ParsingException pe = expectThrows(ParsingException.class, () -> parseInterval(EMPTY, value, INTERVAL_SECOND)); ParsingException pe = expectThrows(ParsingException.class, () -> parseInterval(EMPTY, value, INTERVAL_SECOND));
assertEquals("line -1:0: Invalid [INTERVAL SECOND] value [" + value + "]: [MILLISECOND] unit has illegal value [" + millisTooLarge assertEquals("line -1:0: Invalid [INTERVAL SECOND] value [" + value + "]: [MILLISECOND] unit has illegal value [" + millisTooLarge
+ "], expected a positive number up to [999999999]", pe.getMessage()); + "], expected a positive number up to [999]", pe.getMessage());
} }
public void testDayToMinuteTooBig() throws Exception { public void testDayToMinuteTooBig() throws Exception {

4
x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/parser/ExpressionTests.java
View File

@ -150,7 +150,7 @@ public class ExpressionTests extends ESTestCase {
int randomHour = randomInt(23); int randomHour = randomInt(23);
int randomMinute = randomInt(59); int randomMinute = randomInt(59);
int randomSecond = randomInt(59); int randomSecond = randomInt(59);
int randomMilli = randomInt(999999999); int randomMilli = randomInt(999);
String value = format(Locale.ROOT, "INTERVAL '%d %d:%d:%d.%d' DAY TO SECOND", randomDay, randomHour, randomMinute, randomSecond, String value = format(Locale.ROOT, "INTERVAL '%d %d:%d:%d.%d' DAY TO SECOND", randomDay, randomHour, randomMinute, randomSecond,
randomMilli); randomMilli);
@ -163,7 +163,7 @@ public class ExpressionTests extends ESTestCase {
int randomHour = randomInt(23); int randomHour = randomInt(23);
int randomMinute = randomInt(59); int randomMinute = randomInt(59);
int randomSecond = randomInt(59); int randomSecond = randomInt(59);
int randomMilli = randomInt(999999999); int randomMilli = randomInt(999);
String value = format(Locale.ROOT, "INTERVAL -'%d %d:%d:%d.%d' DAY TO SECOND", randomDay, randomHour, randomMinute, randomSecond, String value = format(Locale.ROOT, "INTERVAL -'%d %d:%d:%d.%d' DAY TO SECOND", randomDay, randomHour, randomMinute, randomSecond,
randomMilli); randomMilli);