Skip to content

Commit ccdab08

Browse files
author
Aditya Bharadwaj
committed
reverted constants back to datastream constants
1 parent 2c564ad commit ccdab08

5 files changed

Lines changed: 34 additions & 17 deletions

File tree

‎v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/source/oracle/OracleChangeEventSequence.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ public static OracleChangeEventSequence createFromShadowTable(
8686

8787
String timestampColName =
8888
changeEventContext.getSafeShadowColumn(DatastreamConstants.ORACLE_TIMESTAMP_KEY);
89-
String scnColName = changeEventContext.getSafeShadowColumn(DatastreamConstants.ORACLE_SCN_KEY);
89+
String scnColName =
90+
changeEventContext.getSafeShadowColumn(DatastreamConstants.ORACLE_SCN_KEY);
9091

9192
if (useSqlStatements) {
9293
// Read sequence information from shadow table using SQL statement

‎v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/source/postgresql/PostgresChangeEventSequence.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ public static PostgresChangeEventSequence createFromShadowTable(
8989

9090
String timestampColName =
9191
changeEventContext.getSafeShadowColumn(DatastreamConstants.POSTGRES_TIMESTAMP_KEY);
92-
String lsnColName = changeEventContext.getSafeShadowColumn(DatastreamConstants.POSTGRES_LSN_KEY);
92+
String lsnColName =
93+
changeEventContext.getSafeShadowColumn(DatastreamConstants.POSTGRES_LSN_KEY);
9394

9495
if (useSqlStatements) {
9596
// Read sequence information from shadow table using SQL statement

‎v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/source/mysql/MySqlChangeEventContextTest.java‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ public void canGenerateShadowTableMutation() throws Exception {
6969
changeEvent.put(DatastreamConstants.MYSQL_TIMESTAMP_KEY, eventTimestamp);
7070
changeEvent.put(DatastreamConstants.MYSQL_LOGFILE_KEY, "file1.log");
7171
changeEvent.put(DatastreamConstants.MYSQL_LOGPOSITION_KEY, 1L);
72-
changeEvent.put(DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.MYSQL_SOURCE_TYPE);
72+
changeEvent.put(
73+
DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.MYSQL_SOURCE_TYPE);
7374

7475
ChangeEventContext changeEventContext =
7576
new MySqlSourceConnector()
@@ -80,8 +81,10 @@ public void canGenerateShadowTableMutation() throws Exception {
8081
// Expected result
8182
Map<String, Value> expected =
8283
ChangeEventConvertorTest.getExpectedMapForTestChangeEventWithoutJsonField();
83-
expected.put(DatastreamConstants.MYSQL_TIMESTAMP_SHADOW_INFO.getLeft(), Value.int64(eventTimestamp));
84-
expected.put(DatastreamConstants.MYSQL_LOGFILE_SHADOW_INFO.getLeft(), Value.string("file1.log"));
84+
expected.put(
85+
DatastreamConstants.MYSQL_TIMESTAMP_SHADOW_INFO.getLeft(), Value.int64(eventTimestamp));
86+
expected.put(
87+
DatastreamConstants.MYSQL_LOGFILE_SHADOW_INFO.getLeft(), Value.string("file1.log"));
8588
expected.put(DatastreamConstants.MYSQL_LOGPOSITION_SHADOW_INFO.getLeft(), Value.int64(1));
8689

8790
// Verify if MySqlChangeEventContext was actually created.
@@ -105,7 +108,8 @@ public void canGenerateShadowTableMutationForBackfillEvents() throws Exception {
105108
changeEvent.put(DatastreamConstants.MYSQL_TIMESTAMP_KEY, eventTimestamp);
106109
changeEvent.put(DatastreamConstants.MYSQL_LOGFILE_KEY, JSONObject.NULL);
107110
changeEvent.put(DatastreamConstants.MYSQL_LOGPOSITION_KEY, JSONObject.NULL);
108-
changeEvent.put(DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.MYSQL_SOURCE_TYPE);
111+
changeEvent.put(
112+
DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.MYSQL_SOURCE_TYPE);
109113

110114
ChangeEventContext changeEventContext =
111115
new MySqlSourceConnector()
@@ -116,7 +120,8 @@ public void canGenerateShadowTableMutationForBackfillEvents() throws Exception {
116120
// Expected result
117121
Map<String, Value> expected =
118122
ChangeEventConvertorTest.getExpectedMapForTestChangeEventWithoutJsonField();
119-
expected.put(DatastreamConstants.MYSQL_TIMESTAMP_SHADOW_INFO.getLeft(), Value.int64(eventTimestamp));
123+
expected.put(
124+
DatastreamConstants.MYSQL_TIMESTAMP_SHADOW_INFO.getLeft(), Value.int64(eventTimestamp));
120125
expected.put(DatastreamConstants.MYSQL_LOGFILE_SHADOW_INFO.getLeft(), Value.string(""));
121126
expected.put(DatastreamConstants.MYSQL_LOGPOSITION_SHADOW_INFO.getLeft(), Value.int64(-1));
122127

@@ -140,7 +145,8 @@ public void canGenerateShadowTableMutationForBackfillEventsWithMissingSortOrderK
140145
// Test Change Event which does not contain sort order fields like log file and log position.
141146
JSONObject changeEvent = ChangeEventConvertorTest.getTestChangeEvent("Users2");
142147
changeEvent.put(DatastreamConstants.MYSQL_TIMESTAMP_KEY, eventTimestamp);
143-
changeEvent.put(DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.MYSQL_SOURCE_TYPE);
148+
changeEvent.put(
149+
DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.MYSQL_SOURCE_TYPE);
144150

145151
ChangeEventContext changeEventContext =
146152
new MySqlSourceConnector()
@@ -151,7 +157,8 @@ public void canGenerateShadowTableMutationForBackfillEventsWithMissingSortOrderK
151157
// Expected result
152158
Map<String, Value> expected =
153159
ChangeEventConvertorTest.getExpectedMapForTestChangeEventWithoutJsonField();
154-
expected.put(DatastreamConstants.MYSQL_TIMESTAMP_SHADOW_INFO.getLeft(), Value.int64(eventTimestamp));
160+
expected.put(
161+
DatastreamConstants.MYSQL_TIMESTAMP_SHADOW_INFO.getLeft(), Value.int64(eventTimestamp));
155162
expected.put(DatastreamConstants.MYSQL_LOGFILE_SHADOW_INFO.getLeft(), Value.string(""));
156163
expected.put(DatastreamConstants.MYSQL_LOGPOSITION_SHADOW_INFO.getLeft(), Value.int64(-1));
157164

@@ -205,7 +212,8 @@ public void canGenerateShadowTableMutationWithCollision() throws Exception {
205212
JSONObject changeEvent = new JSONObject();
206213
changeEvent.put("log_file", 3);
207214
changeEvent.put(DatastreamConstants.EVENT_TABLE_NAME_KEY, "MyTable");
208-
changeEvent.put(DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.MYSQL_SOURCE_TYPE);
215+
changeEvent.put(
216+
DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.MYSQL_SOURCE_TYPE);
209217
changeEvent.put(DatastreamConstants.MYSQL_TIMESTAMP_KEY, eventTimestamp);
210218
changeEvent.put(DatastreamConstants.MYSQL_LOGFILE_KEY, "mysql-bin.00001");
211219
changeEvent.put(DatastreamConstants.MYSQL_LOGPOSITION_KEY, 100L);
@@ -232,7 +240,8 @@ public void testReadDataTable() throws Exception {
232240
Ddl ddl = ChangeEventConvertorTest.getTestDdl();
233241
JSONObject changeEvent = ChangeEventConvertorTest.getTestChangeEvent("Users");
234242
changeEvent.put(DatastreamConstants.MYSQL_TIMESTAMP_KEY, eventTimestamp);
235-
changeEvent.put(DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.MYSQL_SOURCE_TYPE);
243+
changeEvent.put(
244+
DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.MYSQL_SOURCE_TYPE);
236245

237246
ChangeEventContext context =
238247
new MySqlSourceConnector()
@@ -317,7 +326,8 @@ public void testCanGenerateDataDmlStatement() throws Exception {
317326
JSONObject changeEvent = new JSONObject();
318327
changeEvent.put(DatastreamConstants.EVENT_TABLE_NAME_KEY, "Users");
319328
changeEvent.put(DatastreamConstants.EVENT_CHANGE_TYPE_KEY, DatastreamConstants.DELETE_EVENT);
320-
changeEvent.put(DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.MYSQL_SOURCE_TYPE);
329+
changeEvent.put(
330+
DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.MYSQL_SOURCE_TYPE);
321331
changeEvent.put(DatastreamConstants.MYSQL_TIMESTAMP_KEY, eventTimestamp);
322332
// Source keys (mapped to non-generated columns in Spanner)
323333
changeEvent.put("first_name", "John");

‎v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/source/mysql/MySqlChangeEventSequenceTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ public void testCreateFromShadowTableWithUseSqlStatements() throws Exception {
134134
when(mockContext.getPrimaryKey()).thenReturn(Key.of(1L));
135135
when(mockContext.getSafeShadowColumn(DatastreamConstants.MYSQL_TIMESTAMP_KEY))
136136
.thenReturn("shadow_timestamp");
137-
when(mockContext.getSafeShadowColumn(DatastreamConstants.MYSQL_LOGFILE_KEY)).thenReturn("log_file");
137+
when(mockContext.getSafeShadowColumn(DatastreamConstants.MYSQL_LOGFILE_KEY))
138+
.thenReturn("log_file");
138139
when(mockContext.getSafeShadowColumn(DatastreamConstants.MYSQL_LOGPOSITION_KEY))
139140
.thenReturn("log_position");
140141

‎v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/datastream/source/oracle/OracleChangeEventContextTest.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ public void canGenerateShadowTableMutation() throws Exception {
5858
JSONObject changeEvent = ChangeEventConvertorTest.getTestChangeEvent("Users2");
5959
changeEvent.put(DatastreamConstants.ORACLE_TIMESTAMP_KEY, eventTimestamp);
6060
changeEvent.put(DatastreamConstants.ORACLE_SCN_KEY, "1");
61-
changeEvent.put(DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.ORACLE_SOURCE_TYPE);
61+
changeEvent.put(
62+
DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.ORACLE_SOURCE_TYPE);
6263

6364
ChangeEventContext changeEventContext =
6465
new OracleSourceConnector()
@@ -91,7 +92,8 @@ public void canGenerateShadowTableMutationForBackfillEvent() throws Exception {
9192
JSONObject changeEvent = ChangeEventConvertorTest.getTestChangeEvent("Users2");
9293
changeEvent.put(DatastreamConstants.ORACLE_TIMESTAMP_KEY, eventTimestamp);
9394
changeEvent.put(DatastreamConstants.ORACLE_SCN_KEY, JSONObject.NULL);
94-
changeEvent.put(DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.ORACLE_SOURCE_TYPE);
95+
changeEvent.put(
96+
DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.ORACLE_SOURCE_TYPE);
9597

9698
ChangeEventContext changeEventContext =
9799
new OracleSourceConnector()
@@ -123,7 +125,8 @@ public void canGenerateShadowTableMutationForBackfillEventWithMissingKeys() thro
123125
// Test Change Event
124126
JSONObject changeEvent = ChangeEventConvertorTest.getTestChangeEvent("Users2");
125127
changeEvent.put(DatastreamConstants.ORACLE_TIMESTAMP_KEY, eventTimestamp);
126-
changeEvent.put(DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.ORACLE_SOURCE_TYPE);
128+
changeEvent.put(
129+
DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.ORACLE_SOURCE_TYPE);
127130

128131
ChangeEventContext changeEventContext =
129132
new OracleSourceConnector()
@@ -187,7 +190,8 @@ public void canGenerateShadowTableMutationWithCollision() throws Exception {
187190
JSONObject changeEvent = new JSONObject();
188191
changeEvent.put("scn", "scn_string");
189192
changeEvent.put(DatastreamConstants.EVENT_TABLE_NAME_KEY, "MyTable");
190-
changeEvent.put(DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.ORACLE_SOURCE_TYPE);
193+
changeEvent.put(
194+
DatastreamConstants.EVENT_SOURCE_TYPE_KEY, DatastreamConstants.ORACLE_SOURCE_TYPE);
191195
changeEvent.put(DatastreamConstants.ORACLE_TIMESTAMP_KEY, eventTimestamp);
192196
changeEvent.put(DatastreamConstants.ORACLE_SCN_KEY, 999L);
193197

0 commit comments

Comments
 (0)