Skip to content

Commit af79eea

Browse files
authored
Update target Beam version to 2.73.0 (#3760)
* Update target Beam version to 2.73.0 * follow validation PR change * try fixing date logical type string * attempt 2 * gemini suggestion * spotless + regen
1 parent b2215d1 commit af79eea

11 files changed

Lines changed: 1575 additions & 854 deletions

File tree

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
<jacoco.version>0.8.13</jacoco.version>
5252

5353
<!-- Beam and linked versions -->
54-
<beam.version>2.72.0</beam.version>
55-
<beam-python.version>2.72.0</beam-python.version>
54+
<beam.version>2.73.0</beam.version>
55+
<beam-python.version>2.73.0</beam-python.version>
5656
<beam-maven-repo></beam-maven-repo>
5757

5858
<!-- Common dependency versions -->

python/src/main/python/job-builder-server/requirements.txt

Lines changed: 179 additions & 97 deletions
Large diffs are not rendered by default.

python/src/main/python/word-count-python/requirements.txt

Lines changed: 122 additions & 51 deletions
Large diffs are not rendered by default.

python/src/main/python/yaml-template/requirements.txt

Lines changed: 179 additions & 97 deletions
Large diffs are not rendered by default.

v2/googlecloud-and-mongodb/src/main/resources/requirements.txt

Lines changed: 179 additions & 97 deletions
Large diffs are not rendered by default.

v2/googlecloud-to-elasticsearch/src/main/resources/requirements.txt

Lines changed: 179 additions & 97 deletions
Large diffs are not rendered by default.

v2/googlecloud-to-googlecloud/src/main/resources/requirements.txt

Lines changed: 179 additions & 97 deletions
Large diffs are not rendered by default.

v2/googlecloud-to-neo4j/src/main/java/com/google/cloud/teleport/v2/neo4j/utils/DataCastingUtils.java

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -139,31 +139,25 @@ public static List<Object> sourceTextToTargetObjects(
139139
}
140140
case LOGICAL_TYPE:
141141
{
142-
switch (type.getLogicalType().getIdentifier()) {
143-
case NanosDuration.IDENTIFIER:
144-
castVals.add(asDuration(objVal));
145-
break;
146-
case org.apache.beam.sdk.schemas.logicaltypes.Date.IDENTIFIER:
147-
castVals.add(asDate(objVal));
148-
break;
149-
case org.apache.beam.sdk.schemas.logicaltypes.DateTime.IDENTIFIER:
150-
castVals.add(asDateTime(objVal, LocalDateTime::from));
151-
break;
152-
case IsoDateTime.IDENTIFIER:
153-
castVals.add(asDateTime(objVal));
154-
break;
155-
case Time.IDENTIFIER:
156-
castVals.add(asTime(objVal));
157-
break;
158-
default:
159-
{
160-
var message =
161-
String.format(
162-
"Mapping '%s' types from text sources is not supported.", typeName);
163-
LOG.warn(message);
164-
castVals.add(null);
165-
break;
166-
}
142+
String identifier = type.getLogicalType().getIdentifier();
143+
if (NanosDuration.IDENTIFIER.equals(identifier)) {
144+
castVals.add(asDuration(objVal));
145+
} else if (org.apache.beam.sdk.schemas.logicaltypes.Date.IDENTIFIER.equals(
146+
identifier)) {
147+
castVals.add(asDate(objVal));
148+
} else if (org.apache.beam.sdk.schemas.logicaltypes.DateTime.IDENTIFIER.equals(
149+
identifier)) {
150+
castVals.add(asDateTime(objVal, LocalDateTime::from));
151+
} else if (IsoDateTime.IDENTIFIER.equals(identifier)) {
152+
castVals.add(asDateTime(objVal));
153+
} else if (Time.IDENTIFIER.equals(identifier)) {
154+
castVals.add(asTime(objVal));
155+
} else {
156+
var message =
157+
String.format(
158+
"Mapping '%s' types from text sources is not supported.", typeName);
159+
LOG.warn(message);
160+
castVals.add(null);
167161
}
168162

169163
break;

v2/googlecloud-to-splunk/src/main/resources/requirements.txt

Lines changed: 179 additions & 97 deletions
Large diffs are not rendered by default.

v2/pubsub-binary-to-bigquery/src/main/resources/requirements.txt

Lines changed: 179 additions & 97 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)