Skip to content

Fix method names of casts to/from varchar #13010

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
findepi merged 2 commits into from
Jun 28, 2022
Merged

Fix method names of casts to/from varchar #13010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f49a0d0
Fix method names of casts to/from varchar
findepi Jun 28, 2022
d94f48d
Use checked conversion in date cast to varchar
findepi Jun 28, 2022
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
7 changes: 4 additions & 3 deletions core/trino-main/src/main/java/io/trino/type/DateOperators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import static io.trino.spi.function.OperatorType.CAST;
import static io.trino.util.DateTimeUtils.parseDate;
import static io.trino.util.DateTimeUtils.printDate;
import static java.lang.Math.toIntExact;
import static java.lang.String.format;

public final class DateOperators
Expand All @@ -37,9 +38,9 @@ private DateOperators() {}
@ScalarOperator(CAST)
@LiteralParameters("x")
@SqlType("varchar(x)")
public static Slice castToSlice(@LiteralParameter("x") long x, @SqlType(StandardTypes.DATE) long value)
public static Slice castToVarchar(@LiteralParameter("x") long x, @SqlType(StandardTypes.DATE) long value)
{
String stringValue = printDate((int) value);
String stringValue = printDate(toIntExact(value));
// String is all-ASCII, so String.length() here returns actual code points count
if (stringValue.length() <= x) {
return utf8Slice(stringValue);
Expand All @@ -52,7 +53,7 @@ public static Slice castToSlice(@LiteralParameter("x") long x, @SqlType(Standard
@ScalarOperator(CAST)
@LiteralParameters("x")
@SqlType(StandardTypes.DATE)
public static long castFromSlice(@SqlType("varchar(x)") Slice value)
public static long castFromVarchar(@SqlType("varchar(x)") Slice value)
{
try {
return parseDate(trim(value).toStringUtf8());
Expand Down
2 changes: 1 addition & 1 deletion core/trino-main/src/main/java/io/trino/type/IntervalDayTimeOperators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public static long negate(@SqlType(StandardTypes.INTERVAL_DAY_TO_SECOND) long va
@ScalarOperator(CAST)
@LiteralParameters("x")
@SqlType("varchar(x)")
public static Slice castToSlice(@SqlType(StandardTypes.INTERVAL_DAY_TO_SECOND) long value)
public static Slice castToVarchar(@SqlType(StandardTypes.INTERVAL_DAY_TO_SECOND) long value)
{
return utf8Slice(formatMillis(value));
}
Expand Down
2 changes: 1 addition & 1 deletion core/trino-main/src/main/java/io/trino/type/IntervalYearMonthOperators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public static long negate(@SqlType(StandardTypes.INTERVAL_YEAR_TO_MONTH) long va
@ScalarOperator(CAST)
@LiteralParameters("x")
@SqlType("varchar(x)")
public static Slice castToSlice(@SqlType(StandardTypes.INTERVAL_YEAR_TO_MONTH) long value)
public static Slice castToVarchar(@SqlType(StandardTypes.INTERVAL_YEAR_TO_MONTH) long value)
{
return utf8Slice(IntervalYearMonth.formatMonths(toIntExact(value)));
}
Expand Down
4 changes: 2 additions & 2 deletions core/trino-main/src/test/java/io/trino/type/TestDate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,13 @@ public void testCastToTimestampWithTimeZone()
}

@Test
public void testCastToSlice()
public void testCastToVarchar()
{
assertFunction("cast(DATE '2001-1-22' as varchar)", VARCHAR, "2001-01-22");
}

@Test
public void testCastFromSlice()
public void testCastFromVarchar()
{
assertFunction("cast('2001-1-22' as date) = Date '2001-1-22'", BOOLEAN, true);
assertFunction("cast('\n\t 2001-1-22' as date) = Date '2001-1-22'", BOOLEAN, true);
Expand Down
2 changes: 1 addition & 1 deletion core/trino-main/src/test/java/io/trino/type/TestIntervalDayTime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public void testBetween()
}

@Test
public void testCastToSlice()
public void testCastToVarchar()
{
assertFunction("cast(INTERVAL '12 10:45:32.123' DAY TO SECOND as varchar)", VARCHAR, "12 10:45:32.123");
assertFunction("cast(INTERVAL '12 10:45:32.123' DAY TO SECOND as varchar)", VARCHAR, new SqlIntervalDayTime(12, 10, 45, 32, 123).toString());
Expand Down
2 changes: 1 addition & 1 deletion core/trino-main/src/test/java/io/trino/type/TestIntervalYearMonth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public void testBetween()
}

@Test
public void testCastToSlice()
public void testCastToVarchar()
{
assertFunction("cast(INTERVAL '124-30' YEAR TO MONTH as varchar)", VARCHAR, "126-6");
assertFunction("cast(INTERVAL '124-30' YEAR TO MONTH as varchar)", VARCHAR, new SqlIntervalYearMonth(124, 30).toString());
Expand Down
4 changes: 2 additions & 2 deletions core/trino-main/src/test/java/io/trino/type/TestTime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,15 @@ public void testBetween()
}

@Test
public void testCastToSlice()
public void testCastToVarchar()
{
assertFunction("cast(TIME '03:04:05.321' as varchar)", VARCHAR, "03:04:05.321");
assertFunction("cast(TIME '03:04:05' as varchar)", VARCHAR, "03:04:05");
assertFunction("cast(TIME '03:04' as varchar)", VARCHAR, "03:04:00");
}

@Test
public void testCastFromSlice()
public void testCastFromVarchar()
{
assertFunction("cast('03:04:05.321' as time) = TIME '03:04:05.321'", BOOLEAN, true);
assertFunction("cast('03:04:05' as time) = TIME '03:04:05.000'", BOOLEAN, true);
Expand Down
4 changes: 2 additions & 2 deletions core/trino-main/src/test/java/io/trino/type/TestTimestamp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ public void testCastToTimestampWithTimeZone()
}

@Test
public void testCastToSlice()
public void testCastToVarchar()
{
assertFunction("cast(TIMESTAMP '2001-1-22 03:04:05.321' as varchar)", VARCHAR, "2001-01-22 03:04:05.321");
assertFunction("cast(TIMESTAMP '2001-1-22 03:04:05' as varchar)", VARCHAR, "2001-01-22 03:04:05");
Expand All @@ -258,7 +258,7 @@ public void testCastToJson()
}

@Test
public void testCastFromSlice()
public void testCastFromVarchar()
{
assertFunction("cast('2001-1-22 03:04:05.321' as timestamp)",
TIMESTAMP_MILLIS,
Expand Down
4 changes: 2 additions & 2 deletions core/trino-main/src/test/java/io/trino/type/TestTimestampWithTimeZone.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ public void testCastToTimestamp()
}

@Test
public void testCastToSlice()
public void testCastToVarchar()
{
assertFunction("cast(TIMESTAMP '2001-1-22 03:04:05.321 +07:09' as varchar)", VARCHAR, "2001-01-22 03:04:05.321 +07:09");
assertFunction("cast(TIMESTAMP '2001-1-22 03:04:05 +07:09' as varchar)", VARCHAR, "2001-01-22 03:04:05 +07:09");
Expand All @@ -302,7 +302,7 @@ public void testCastToSlice()
}

@Test
public void testCastFromSlice()
public void testCastFromVarchar()
{
assertFunction("cast('2001-1-22 03:04:05.321' as timestamp with time zone)",
TIMESTAMP_TZ_MILLIS,
Expand Down