Skip to content
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

Fix a regression issue of parsing datetime string with custom time format in Span #3079

Merged
merged 5 commits into from
Nov 1, 2024
+95 −4
Merged

Fix a regression issue of parsing datetime string with custom time format in Span #3079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
620edeb
Parse datetime string with specific time format
LantaoJin Oct 18, 2024
f92970b
Merge remote-tracking branch 'upstream/main' into issues/3078
LantaoJin Oct 24, 2024
70ee912
fix IT
LantaoJin Oct 24, 2024
549bd1a
correct IT
LantaoJin Oct 24, 2024
df64ccd
fix coverage
LantaoJin Oct 25, 2024
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
6 changes: 3 additions & 3 deletions core/src/main/java/org/opensearch/sql/planner/physical/collector/Rounding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ public static Rounding<?> createRounding(SpanExpression span) {
if (DOUBLE.isCompatible(type)) {
return new DoubleRounding(interval);
}
if (type.equals(TIMESTAMP)) {
if (type.equals(TIMESTAMP) || type.typeName().equalsIgnoreCase(TIMESTAMP.typeName())) {
penghuo marked this conversation as resolved.
Show resolved Hide resolved
return new TimestampRounding(interval, span.getUnit().getName());
}
if (type.equals(DATE)) {
if (type.equals(DATE) || type.typeName().equalsIgnoreCase(DATE.typeName())) {
return new DateRounding(interval, span.getUnit().getName());
}
if (type.equals(TIME)) {
if (type.equals(TIME) || type.typeName().equalsIgnoreCase(TIME.typeName())) {
return new TimeRounding(interval, span.getUnit().getName());
}
return new UnknownRounding();
Expand Down
54 changes: 54 additions & 0 deletions core/src/test/java/org/opensearch/sql/planner/physical/collector/RoundingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,18 @@

package org.opensearch.sql.planner.physical.collector;

import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.opensearch.sql.data.type.ExprCoreType.DATE;
import static org.opensearch.sql.data.type.ExprCoreType.STRING;
import static org.opensearch.sql.data.type.ExprCoreType.TIME;
import static org.opensearch.sql.data.type.ExprCoreType.TIMESTAMP;

import org.junit.jupiter.api.Test;
import org.opensearch.sql.data.model.ExprTimeValue;
import org.opensearch.sql.data.model.ExprValueUtils;
import org.opensearch.sql.data.type.ExprType;
import org.opensearch.sql.exception.ExpressionEvaluationException;
import org.opensearch.sql.expression.DSL;
import org.opensearch.sql.expression.span.SpanExpression;
Expand All @@ -26,6 +30,35 @@ void time_rounding_illegal_span() {
ExpressionEvaluationException.class, () -> rounding.round(new ExprTimeValue("23:30:00")));
}

@Test
void datetime_rounding_span() {
SpanExpression dateSpan = DSL.span(DSL.ref("date", DATE), DSL.literal(1), "d");
Rounding rounding = Rounding.createRounding(dateSpan);
assertInstanceOf(Rounding.DateRounding.class, rounding);
SpanExpression timeSpan = DSL.span(DSL.ref("time", TIME), DSL.literal(1), "h");
rounding = Rounding.createRounding(timeSpan);
assertInstanceOf(Rounding.TimeRounding.class, rounding);
SpanExpression timestampSpan = DSL.span(DSL.ref("timestamp", TIMESTAMP), DSL.literal(1), "h");
rounding = Rounding.createRounding(timestampSpan);
assertInstanceOf(Rounding.TimestampRounding.class, rounding);
}

@Test
void datetime_rounding_non_core_type_span() {
SpanExpression dateSpan =
DSL.span(DSL.ref("date", new MockDateExprType()), DSL.literal(1), "d");
Rounding rounding = Rounding.createRounding(dateSpan);
assertInstanceOf(Rounding.DateRounding.class, rounding);
SpanExpression timeSpan =
DSL.span(DSL.ref("time", new MockTimeExprType()), DSL.literal(1), "h");
rounding = Rounding.createRounding(timeSpan);
assertInstanceOf(Rounding.TimeRounding.class, rounding);
SpanExpression timestampSpan =
DSL.span(DSL.ref("timestamp", new MockTimestampExprType()), DSL.literal(1), "h");
rounding = Rounding.createRounding(timestampSpan);
assertInstanceOf(Rounding.TimestampRounding.class, rounding);
}

@Test
void round_unknown_type() {
SpanExpression span = DSL.span(DSL.ref("unknown", STRING), DSL.literal(1), "");
Expand All @@ -41,4 +74,25 @@ void resolve() {
() -> Rounding.DateTimeUnit.resolve(illegalUnit),
"Unable to resolve unit " + illegalUnit);
}

static class MockDateExprType implements ExprType {
@Override
public String typeName() {
return "DATE";
}
}

static class MockTimeExprType implements ExprType {
@Override
public String typeName() {
return "TIME";
}
}

static class MockTimestampExprType implements ExprType {
@Override
public String typeName() {
return "TIMESTAMP";
}
}
}
37 changes: 37 additions & 0 deletions integ-test/src/test/java/org/opensearch/sql/ppl/DateTimeImplementationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
package org.opensearch.sql.ppl;

import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_DATE;
import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_DATE_FORMATS;
import static org.opensearch.sql.util.MatcherUtils.rows;
import static org.opensearch.sql.util.MatcherUtils.schema;
import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
import static org.opensearch.sql.util.MatcherUtils.verifySchema;
import static org.opensearch.sql.util.MatcherUtils.verifySome;

Expand All @@ -20,6 +22,7 @@ public class DateTimeImplementationIT extends PPLIntegTestCase {
@Override
public void init() throws IOException {
loadIndex(Index.DATE);
loadIndex(Index.DATE_FORMATS);
}

@Test
Expand Down Expand Up @@ -176,4 +179,38 @@ public void nullDateTimeInvalidDateValueMonth() throws IOException {
verifySchema(result, schema("f", null, "timestamp"));
verifySome(result.getJSONArray("datarows"), rows(new Object[] {null}));
}

@Test
public void testSpanDatetimeWithCustomFormat() throws IOException {
JSONObject result =
executeQuery(
String.format(
"source=%s | eval a = 1 | stats count() as cnt by span(yyyy-MM-dd, 1d) as span",
TEST_INDEX_DATE_FORMATS));
verifySchema(result, schema("cnt", null, "integer"), schema("span", null, "date"));
verifyDataRows(result, rows(2, "1984-04-12"));
}

@Test
public void testSpanDatetimeWithEpochMillisFormat() throws IOException {
JSONObject result =
executeQuery(
String.format(
"source=%s | eval a = 1 | stats count() as cnt by span(epoch_millis, 1d) as span",
TEST_INDEX_DATE_FORMATS));
verifySchema(result, schema("cnt", null, "integer"), schema("span", null, "timestamp"));
verifyDataRows(result, rows(2, "1984-04-12 00:00:00"));
}

@Test
public void testSpanDatetimeWithDisjunctiveDifferentFormats() throws IOException {
JSONObject result =
executeQuery(
String.format(
"source=%s | eval a = 1 | stats count() as cnt by span(yyyy-MM-dd_OR_epoch_millis,"
+ " 1d) as span",
TEST_INDEX_DATE_FORMATS));
verifySchema(result, schema("cnt", null, "integer"), schema("span", null, "timestamp"));
verifyDataRows(result, rows(2, "1984-04-12 00:00:00"));
}
}
2 changes: 1 addition & 1 deletion ...ch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprValueFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ private static ExprValue createOpenSearchDateType(Content value, ExprType type)
}
} else {
// custom format
return parseDateTimeString(value.stringValue(), dt);
return parseDateTimeString(value.objectValue().toString(), dt);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could u elberate more? value is number value? why objectValue().toString()?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The value is an instance of ObjectContent and isNumber() is true, stringValue() will return the string representation of the object, such as ObjectContent@1234. We should convert it to Java Object then use toString() here. Or value.longValue().toString(). Not sure the value here is a Long type, so value.objectValue().toString() would be best.

}
}
if (value.isString()) {
Expand Down
Loading