Skip to content

Small Fix for Cassandra bulk e2e test #2137

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
VardhanThigle merged 1 commit into from
Jan 17, 2025
Merged

Small Fix for Cassandra bulk e2e test #2137

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
6 changes: 5 additions & 1 deletion .../java/com/google/cloud/teleport/v2/source/reader/io/jdbc/iowrapper/config/SQLDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,13 @@
* <ul>
* <lI>MYSQL
* <lI>POSTGRESQL
* <LI>CASSANDRA
* </ul>
*
* TODO(b/390535694): move this to non-jdbc package.
*/
public enum SQLDialect {
MYSQL,
POSTGRESQL
POSTGRESQL,
CASSANDRA
}
16 changes: 8 additions & 8 deletions ...java/com/google/cloud/teleport/v2/spanner/migrations/avro/GenericRecordTypeConvertor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,9 +537,9 @@ static String handleRecordFieldType(String fieldName, GenericRecord element, Sch
} else if (fieldSchema.getName().equals("intervalNano")) {
Period period =
Period.ZERO
.plusYears(getOrDefault(element, "years", 0L))
.plusMonths(getOrDefault(element, "months", 0L))
.plusDays(getOrDefault(element, "days", 0L));
.plusYears(((Number) getOrDefault(element, "years", 0L)).longValue())
.plusMonths(((Number) getOrDefault(element, "months", 0L)).longValue())
.plusDays(((Number) getOrDefault(element, "days", 0L)).longValue());
/*
* Convert the period to a ISO-8601 period formatted String, such as P6Y3M1D.
* A zero period will be represented as zero days, 'P0D'.
Expand All @@ -548,10 +548,10 @@ static String handleRecordFieldType(String fieldName, GenericRecord element, Sch
String periodIso8061 = period.toString();
java.time.Duration duration =
java.time.Duration.ZERO
.plusHours(getOrDefault(element, "hours", 0L))
.plusMinutes(getOrDefault(element, "minutes", 0L))
.plusSeconds(getOrDefault(element, "seconds", 0L))
.plusNanos(getOrDefault(element, "nanos", 0L));
.plusHours(((Number) getOrDefault(element, "hours", 0L)).longValue())
.plusMinutes(((Number) getOrDefault(element, "minutes", 0L)).longValue())
.plusSeconds(((Number) getOrDefault(element, "seconds", 0L)).longValue())
.plusNanos(((Number) getOrDefault(element, "nanos", 0L)).longValue());
/*
* Convert the duration to a ISO-8601 period formatted String, such as PT8H6M12.345S
* refer to javadoc for Duration#toString.
Expand All @@ -572,7 +572,7 @@ static String handleRecordFieldType(String fieldName, GenericRecord element, Sch
}

private static <T> T getOrDefault(GenericRecord element, String name, T def) {
if (element.get(name) == null) {
if ((T) element.get(name) == null) {
return def;
}
return (T) element.get(name);
Expand Down
Loading