Skip to content

[BEAM-10611] Simplification: Use new ZetaSQL API to get/create Values #12536

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
robinyqiu merged 1 commit into from
Aug 12, 2020
Merged

[BEAM-10611] Simplification: Use new ZetaSQL API to get/create Values #12536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 2 deletions ...s/sql/zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/DateTimeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
*/
package org.apache.beam.sdk.extensions.sql.zetasql;

import com.google.zetasql.CivilTimeEncoder;
import com.google.zetasql.Value;
import io.grpc.Status;
import java.time.LocalTime;
Expand Down Expand Up @@ -166,7 +165,7 @@ public static Value parseDateToValue(String dateString) {

public static Value parseTimeToValue(String timeString) {
LocalTime localTime = LocalTime.parse(timeString);
return Value.createTimeValue(CivilTimeEncoder.encodePacked64TimeNanos(localTime));
return Value.createTimeValue(localTime);
}

public static Value parseTimestampWithTZToValue(String timestampString) {
Expand Down
21 changes: 9 additions & 12 deletions ...src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSqlBeamTranslationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import com.google.protobuf.ByteString;
import com.google.zetasql.ArrayType;
import com.google.zetasql.CivilTimeEncoder;
import com.google.zetasql.StructType;
import com.google.zetasql.StructType.StructField;
import com.google.zetasql.Type;
Expand Down Expand Up @@ -132,16 +131,16 @@ public static Value toZetaSqlValue(Object object, FieldType fieldType) {
if (object instanceof Long) { // base type
return Value.createDateValue(((Long) object).intValue());
} else { // input type
return Value.createDateValue((int) ((LocalDate) object).toEpochDay());
return Value.createDateValue((LocalDate) object);
}
} else if (SqlTypes.TIME.getIdentifier().equals(identifier)) {
LocalTime localTime;
if (object instanceof Long) { // base type
return Value.createTimeValue(
CivilTimeEncoder.encodePacked64TimeNanos(LocalTime.ofNanoOfDay((Long) object)));
localTime = LocalTime.ofNanoOfDay((Long) object);
} else { // input type
return Value.createTimeValue(
CivilTimeEncoder.encodePacked64TimeNanos((LocalTime) object));
localTime = (LocalTime) object;
}
return Value.createTimeValue(localTime);
} else if (SqlTypes.DATETIME.getIdentifier().equals(identifier)) {
LocalDateTime datetime;
if (object instanceof Row) { // base type
Expand All @@ -152,9 +151,7 @@ public static Value toZetaSqlValue(Object object, FieldType fieldType) {
} else { // input type
datetime = (LocalDateTime) object;
}
// TODO[BEAM-10611]: Create ZetaSQL Value.createDatetimeValue(LocalDateTime) function
return Value.createDatetimeValue(
CivilTimeEncoder.encodePacked64DatetimeSeconds(datetime), datetime.getNano());
return Value.createDatetimeValue(datetime);
} else {
throw new UnsupportedOperationException("Unknown Beam logical type: " + identifier);
}
Expand Down Expand Up @@ -254,11 +251,11 @@ public static Object toBeamObject(Value value, FieldType fieldType, boolean veri
case LOGICAL_TYPE:
String identifier = fieldType.getLogicalType().getIdentifier();
if (SqlTypes.DATE.getIdentifier().equals(identifier)) {
return LocalDate.ofEpochDay(value.getDateValue());
return value.getLocalDateValue();
} else if (SqlTypes.TIME.getIdentifier().equals(identifier)) {
return CivilTimeEncoder.decodePacked64TimeNanosAsJavaTime(value.getTimeValue());
return value.getLocalTimeValue();
} else if (SqlTypes.DATETIME.getIdentifier().equals(identifier)) {
return CivilTimeEncoder.decodePacked96DatetimeNanosAsJavaTime(value.getDatetimeValue());
return value.getLocalDateTimeValue();
} else {
throw new UnsupportedOperationException("Unknown Beam logical type: " + identifier);
}
Expand Down
8 changes: 3 additions & 5 deletions .../main/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSqlCalciteTranslationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
*/
package org.apache.beam.sdk.extensions.sql.zetasql;

import com.google.zetasql.CivilTimeEncoder;
import com.google.zetasql.StructType;
import com.google.zetasql.StructType.StructField;
import com.google.zetasql.Type;
Expand Down Expand Up @@ -184,7 +183,7 @@ private static List<String> getFieldNameList(List<StructField> fields) {
for (int i = 0; i < fields.size(); i++) {
String name = fields.get(i).getName();
if ("".equals(name)) {
name = "$col" + i; // empty field name is not allowed, generate an index-based name for it
name = "$col" + i; // avoid empty field names because Beam does not allow duplicate names
}
b.add(name);
}
Expand Down Expand Up @@ -318,14 +317,13 @@ private static DateString dateValueToDateString(Value value) {
}

private static TimeString timeValueToTimeString(Value value) {
LocalTime localTime = CivilTimeEncoder.decodePacked64TimeNanosAsJavaTime(value.getTimeValue());
LocalTime localTime = value.getLocalTimeValue();
return new TimeString(localTime.getHour(), localTime.getMinute(), localTime.getSecond())
.withNanos(localTime.getNano());
}

private static TimestampString datetimeValueToTimestampString(Value value) {
LocalDateTime dateTime =
CivilTimeEncoder.decodePacked96DatetimeNanosAsJavaTime(value.getDatetimeValue());
LocalDateTime dateTime = value.getLocalDateTimeValue();
return new TimestampString(
dateTime.getYear(),
dateTime.getMonthValue(),
Expand Down
14 changes: 5 additions & 9 deletions ...test/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSqlBeamTranslationUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

import com.google.protobuf.ByteString;
import com.google.zetasql.ArrayType;
import com.google.zetasql.CivilTimeEncoder;
import com.google.zetasql.StructType;
import com.google.zetasql.StructType.StructField;
import com.google.zetasql.TypeFactory;
Expand Down Expand Up @@ -100,8 +99,8 @@ public class ZetaSqlBeamTranslationUtilsTest {
.addValue("Hello")
.addValue(new byte[] {0x11, 0x22})
.addValue(LocalDate.of(2020, 6, 4))
.addValue(LocalDateTime.of(2008, 12, 25, 15, 30, 0))
.addValue(LocalTime.of(15, 30, 45))
.addValue(LocalDateTime.of(2008, 12, 25, 15, 30, 0).withNano(123456000))
.addValue(LocalTime.of(15, 30, 45).withNano(123456000))
.addValue(Instant.ofEpochMilli(12345678L))
.addArray(3.0, 6.5)
.addValue(Row.withSchema(TEST_INNER_SCHEMA).addValues(0L, "world").build())
Expand All @@ -118,13 +117,10 @@ public class ZetaSqlBeamTranslationUtilsTest {
Value.createBoolValue(false),
Value.createStringValue("Hello"),
Value.createBytesValue(ByteString.copyFrom(new byte[] {0x11, 0x22})),
Value.createDateValue((int) LocalDate.of(2020, 6, 4).toEpochDay()),
Value.createDateValue(LocalDate.of(2020, 6, 4)),
Value.createDatetimeValue(
CivilTimeEncoder.encodePacked64DatetimeSeconds(
LocalDateTime.of(2008, 12, 25, 15, 30, 0)),
LocalDateTime.of(2008, 12, 25, 15, 30, 0).getNano()),
Value.createTimeValue(
CivilTimeEncoder.encodePacked64TimeNanos(LocalTime.of(15, 30, 45))),
LocalDateTime.of(2008, 12, 25, 15, 30, 0).withNano(123456000)),
Value.createTimeValue(LocalTime.of(15, 30, 45).withNano(123456000)),
Value.createTimestampValueFromUnixMicros(12345678000L),
Value.createArrayValue(
TEST_INNER_ARRAY_TYPE,
Expand Down
9 changes: 3 additions & 6 deletions ...ql/src/test/java/org/apache/beam/sdk/extensions/sql/zetasql/ZetaSqlTimeFunctionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import static org.apache.beam.sdk.extensions.sql.zetasql.DateTimeUtils.parseTimestampWithTimeZone;
import static org.apache.beam.sdk.extensions.sql.zetasql.DateTimeUtils.parseTimestampWithUTCTimeZone;

import com.google.zetasql.CivilTimeEncoder;
import com.google.zetasql.Value;
import com.google.zetasql.ZetaSQLType.TypeKind;
import java.time.LocalDate;
Expand Down Expand Up @@ -1049,12 +1048,10 @@ public void testDateTimeAdd() {
public void testDateTimeAddWithParameter() {
String sql = "SELECT DATETIME_ADD(@p0, INTERVAL @p1 HOUR)";

LocalDateTime datetime = LocalDateTime.of(2008, 12, 25, 15, 30, 00).withNano(123456000);
LocalDateTime datetime = LocalDateTime.of(2008, 12, 25, 15, 30, 0).withNano(123456000);
ImmutableMap<String, Value> params =
ImmutableMap.of(
"p0",
Value.createDatetimeValue(
CivilTimeEncoder.encodePacked64DatetimeSeconds(datetime), datetime.getNano()),
"p0", Value.createDatetimeValue(datetime),
"p1", Value.createInt64Value(3L));

ZetaSQLQueryPlanner zetaSQLQueryPlanner = new ZetaSQLQueryPlanner(config);
Expand All @@ -1065,7 +1062,7 @@ public void testDateTimeAddWithParameter() {
.containsInAnyOrder(
Row.withSchema(
Schema.builder().addLogicalTypeField("f_datetime", SqlTypes.DATETIME).build())
.addValues(LocalDateTime.of(2008, 12, 25, 18, 30, 00).withNano(123456000))
.addValues(LocalDateTime.of(2008, 12, 25, 18, 30, 0).withNano(123456000))
.build());
pipeline.run().waitUntilFinish(Duration.standardMinutes(PIPELINE_EXECUTION_WAITTIME_MINUTES));
}
Expand Down