Skip to content

Commit 33373f4

Browse files
seanzhougoogleseanzhougoogle
committed
fix compilation error due to API change
1 parent d573f9f commit 33373f4

4 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎mysql-delta-plugins/src/main/java/io/cdap/delta/mysql/MySqlRecordConsumer.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ private void handleDML(StructuredRecord source, StructuredRecord val, Offset rec
200200
DMLEvent.Builder builder = DMLEvent.builder()
201201
.setOffset(recordOffset)
202202
.setOperationType(op)
203-
.setDatabase(databaseName)
204-
.setTable(tableName)
203+
.setDatabaseName(databaseName)
204+
.setTableName(tableName)
205205
.setTransactionId(transactionId)
206206
.setIngestTimestamp(ingestTime)
207207
.setSnapshot(isSnapshot);
@@ -221,14 +221,14 @@ private void handleDDL(String ddlStatement, Offset recordOffset,
221221
ddlParser.getDdlChanges().reset();
222222
ddlParser.parse(ddlStatement, tables);
223223
AtomicReference<InterruptedException> interrupted = new AtomicReference<>();
224-
ddlParser.getDdlChanges().groupEventsByDatabase((database, events) -> {
224+
ddlParser.getDdlChanges().groupEventsByDatabase((databaseName, events) -> {
225225
if (interrupted.get() != null) {
226226
return;
227227
}
228228
for (DdlParserListener.Event event : events) {
229229
DDLEvent.Builder builder = DDLEvent.builder()
230230
.setOffset(recordOffset)
231-
.setDatabase(database)
231+
.setDatabaseName(databaseName)
232232
.setSnapshot(isSnapshot);
233233
DDLEvent ddlEvent = null;
234234
// since current ddl blacklist implementation is bind with table level, we will only do the ddl blacklist
@@ -239,18 +239,18 @@ private void handleDDL(String ddlStatement, Offset recordOffset,
239239
DdlParserListener.TableAlteredEvent alteredEvent = (DdlParserListener.TableAlteredEvent) event;
240240
TableId tableId = alteredEvent.tableId();
241241
Table table = tables.forTable(tableId);
242-
SourceTable sourceTable = getSourceTable(database, tableId.table());
242+
SourceTable sourceTable = getSourceTable(databaseName, tableId.table());
243243
DDLOperation.Type ddlOp;
244244
if (alteredEvent.previousTableId() != null) {
245245
ddlOp = DDLOperation.Type.RENAME_TABLE;
246-
builder.setPrevTable(alteredEvent.previousTableId().table());
246+
builder.setPrevTableName(alteredEvent.previousTableId().table());
247247
} else {
248248
ddlOp = DDLOperation.Type.ALTER_TABLE;
249249
}
250250

251251
if (shouldEmitDdlEventForOperation(readAllTables, sourceTable, ddlOp)) {
252252
ddlEvent = builder.setOperation(ddlOp)
253-
.setTable(tableId.table())
253+
.setTableName(tableId.table())
254254
.setSchema(readAllTables ? Records.getSchema(table, mySqlValueConverters) :
255255
Records.getSchema(table, mySqlValueConverters, sourceTable.getColumns()))
256256
.setPrimaryKey(table.primaryKeyColumnNames())
@@ -259,21 +259,21 @@ private void handleDDL(String ddlStatement, Offset recordOffset,
259259
break;
260260
case DROP_TABLE:
261261
DdlParserListener.TableDroppedEvent droppedEvent = (DdlParserListener.TableDroppedEvent) event;
262-
sourceTable = getSourceTable(database, droppedEvent.tableId().table());
262+
sourceTable = getSourceTable(databaseName, droppedEvent.tableId().table());
263263
if (shouldEmitDdlEventForOperation(readAllTables, sourceTable, DDLOperation.Type.DROP_TABLE)) {
264264
ddlEvent = builder.setOperation(DDLOperation.Type.DROP_TABLE)
265-
.setTable(droppedEvent.tableId().table())
265+
.setTableName(droppedEvent.tableId().table())
266266
.build();
267267
}
268268
break;
269269
case CREATE_TABLE:
270270
DdlParserListener.TableCreatedEvent createdEvent = (DdlParserListener.TableCreatedEvent) event;
271271
tableId = createdEvent.tableId();
272272
table = tables.forTable(tableId);
273-
sourceTable = getSourceTable(database, tableId.table());
273+
sourceTable = getSourceTable(databaseName, tableId.table());
274274
if (shouldEmitDdlEventForOperation(readAllTables, sourceTable, DDLOperation.Type.CREATE_TABLE)) {
275275
ddlEvent = builder.setOperation(DDLOperation.Type.CREATE_TABLE)
276-
.setTable(tableId.table())
276+
.setTableName(tableId.table())
277277
.setSchema(readAllTables ? Records.getSchema(table, mySqlValueConverters) :
278278
Records.getSchema(table, mySqlValueConverters, sourceTable.getColumns()))
279279
.setPrimaryKey(table.primaryKeyColumnNames())
@@ -296,10 +296,10 @@ private void handleDDL(String ddlStatement, Offset recordOffset,
296296
case TRUNCATE_TABLE:
297297
DdlParserListener.TableTruncatedEvent truncatedEvent =
298298
(DdlParserListener.TableTruncatedEvent) event;
299-
sourceTable = getSourceTable(database, truncatedEvent.tableId().table());
299+
sourceTable = getSourceTable(databaseName, truncatedEvent.tableId().table());
300300
if (shouldEmitDdlEventForOperation(readAllTables, sourceTable, DDLOperation.Type.TRUNCATE_TABLE)) {
301301
ddlEvent = builder.setOperation(DDLOperation.Type.TRUNCATE_TABLE)
302-
.setTable(truncatedEvent.tableId().table())
302+
.setTableName(truncatedEvent.tableId().table())
303303
.build();
304304
}
305305
break;

‎mysql-delta-plugins/src/test/java/io/cdap/delta/mysql/MySqlEventReaderIntegrationTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,27 +154,27 @@ public void test() throws InterruptedException {
154154

155155
DDLEvent ddlEvent = eventEmitter.getDdlEvents().get(0);
156156
Assert.assertEquals(DDLOperation.Type.DROP_TABLE, ddlEvent.getOperation().getType());
157-
Assert.assertEquals(DB, ddlEvent.getDatabase());
157+
Assert.assertEquals(DB, ddlEvent.getOperation().getDatabaseName());
158158
Assert.assertEquals(CUSTOMERS_TABLE, ddlEvent.getOperation().getTableName());
159159

160160
ddlEvent = eventEmitter.getDdlEvents().get(1);
161161
Assert.assertEquals(DDLOperation.Type.DROP_DATABASE, ddlEvent.getOperation().getType());
162-
Assert.assertEquals(DB, ddlEvent.getDatabase());
162+
Assert.assertEquals(DB, ddlEvent.getOperation().getDatabaseName());
163163

164164
ddlEvent = eventEmitter.getDdlEvents().get(2);
165165
Assert.assertEquals(DDLOperation.Type.CREATE_DATABASE, ddlEvent.getOperation().getType());
166-
Assert.assertEquals(DB, ddlEvent.getDatabase());
166+
Assert.assertEquals(DB, ddlEvent.getOperation().getDatabaseName());
167167

168168
ddlEvent = eventEmitter.getDdlEvents().get(3);
169169
Assert.assertEquals(DDLOperation.Type.CREATE_TABLE, ddlEvent.getOperation().getType());
170-
Assert.assertEquals(DB, ddlEvent.getDatabase());
170+
Assert.assertEquals(DB, ddlEvent.getOperation().getDatabaseName());
171171
Assert.assertEquals(CUSTOMERS_TABLE, ddlEvent.getOperation().getTableName());
172172
Assert.assertEquals(Collections.singletonList("id"), ddlEvent.getPrimaryKey());
173173
Assert.assertEquals(CUSTOMERS_SCHEMA, ddlEvent.getSchema());
174174

175175
DMLEvent dmlEvent = eventEmitter.getDmlEvents().get(0);
176176
Assert.assertEquals(DMLOperation.Type.INSERT, dmlEvent.getOperation().getType());
177-
Assert.assertEquals(DB, dmlEvent.getDatabase());
177+
Assert.assertEquals(DB, dmlEvent.getOperation().getDatabaseName());
178178
Assert.assertEquals(CUSTOMERS_TABLE, dmlEvent.getOperation().getTableName());
179179
StructuredRecord row = dmlEvent.getRow();
180180
StructuredRecord expected = StructuredRecord.builder(CUSTOMERS_SCHEMA)
@@ -186,7 +186,7 @@ public void test() throws InterruptedException {
186186

187187
dmlEvent = eventEmitter.getDmlEvents().get(1);
188188
Assert.assertEquals(DMLOperation.Type.INSERT, dmlEvent.getOperation().getType());
189-
Assert.assertEquals(DB, dmlEvent.getDatabase());
189+
Assert.assertEquals(DB, dmlEvent.getOperation().getDatabaseName());
190190
Assert.assertEquals(CUSTOMERS_TABLE, dmlEvent.getOperation().getTableName());
191191
row = dmlEvent.getRow();
192192
expected = StructuredRecord.builder(CUSTOMERS_SCHEMA)
@@ -198,7 +198,7 @@ public void test() throws InterruptedException {
198198

199199
dmlEvent = eventEmitter.getDmlEvents().get(2);
200200
Assert.assertEquals(DMLOperation.Type.INSERT, dmlEvent.getOperation().getType());
201-
Assert.assertEquals(DB, dmlEvent.getDatabase());
201+
Assert.assertEquals(DB, dmlEvent.getOperation().getDatabaseName());
202202
Assert.assertEquals(CUSTOMERS_TABLE, dmlEvent.getOperation().getTableName());
203203
row = dmlEvent.getRow();
204204
expected = StructuredRecord.builder(CUSTOMERS_SCHEMA)

‎sqlserver-delta-plugins/src/main/java/io/cdap/delta/sqlserver/SqlServerRecordConsumer.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void accept(SourceRecord sourceRecord) {
129129
}
130130

131131
DDLEvent.Builder builder = DDLEvent.builder()
132-
.setDatabase(databaseName)
132+
.setDatabaseName(databaseName)
133133
.setSnapshot(isSnapshot);
134134

135135
Schema schema = value.getSchema();
@@ -149,14 +149,14 @@ public void accept(SourceRecord sourceRecord) {
149149
try {
150150
// try to always drop the table before snapshot the schema.
151151
emitter.emit(builder.setOperation(DDLOperation.Type.DROP_TABLE)
152-
.setTable(tableName)
152+
.setTableName(tableName)
153153
.build());
154154

155155
// try to emit create database event before create table event
156156
emitter.emit(builder.setOperation(DDLOperation.Type.CREATE_DATABASE).build());
157157

158158
emitter.emit(builder.setOperation(DDLOperation.Type.CREATE_TABLE)
159-
.setTable(tableName)
159+
.setTableName(tableName)
160160
.setSchema(schema)
161161
.setPrimaryKey(primaryFields)
162162
.build());
@@ -176,8 +176,8 @@ public void accept(SourceRecord sourceRecord) {
176176
DMLEvent.Builder dmlBuilder = DMLEvent.builder()
177177
.setOffset(recordOffset)
178178
.setOperationType(op)
179-
.setDatabase(databaseName)
180-
.setTable(tableName)
179+
.setDatabaseName(databaseName)
180+
.setTableName(tableName)
181181
.setRow(value)
182182
.setSnapshot(isSnapshot)
183183
.setTransactionId(null)

‎sqlserver-delta-plugins/src/test/java/io.cdap.delta.sqlserver/SqlServerEventReaderIntegrationTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,23 +162,23 @@ public void test() throws InterruptedException {
162162

163163
DDLEvent ddlEvent = eventEmitter.getDdlEvents().get(0);
164164
Assert.assertEquals(DDLOperation.Type.DROP_TABLE, ddlEvent.getOperation().getType());
165-
Assert.assertEquals(DB, ddlEvent.getDatabase());
165+
Assert.assertEquals(DB, ddlEvent.getOperation().getDatabaseName());
166166
Assert.assertEquals(CUSTOMERS_TABLE, ddlEvent.getOperation().getTableName());
167167

168168
ddlEvent = eventEmitter.getDdlEvents().get(1);
169169
Assert.assertEquals(DDLOperation.Type.CREATE_DATABASE, ddlEvent.getOperation().getType());
170-
Assert.assertEquals(DB, ddlEvent.getDatabase());
170+
Assert.assertEquals(DB, ddlEvent.getOperation().getDatabaseName());
171171

172172
ddlEvent = eventEmitter.getDdlEvents().get(2);
173173
Assert.assertEquals(DDLOperation.Type.CREATE_TABLE, ddlEvent.getOperation().getType());
174-
Assert.assertEquals(DB, ddlEvent.getDatabase());
174+
Assert.assertEquals(DB, ddlEvent.getOperation().getDatabaseName());
175175
Assert.assertEquals(CUSTOMERS_TABLE, ddlEvent.getOperation().getTableName());
176176
Assert.assertEquals(Collections.singletonList("id"), ddlEvent.getPrimaryKey());
177177
Assert.assertEquals(CUSTOMERS_SCHEMA, ddlEvent.getSchema());
178178

179179
DMLEvent dmlEvent = eventEmitter.getDmlEvents().get(0);
180180
Assert.assertEquals(DMLOperation.Type.INSERT, dmlEvent.getOperation().getType());
181-
Assert.assertEquals(DB, dmlEvent.getDatabase());
181+
Assert.assertEquals(DB, dmlEvent.getOperation().getDatabaseName());
182182
Assert.assertEquals(CUSTOMERS_TABLE, dmlEvent.getOperation().getTableName());
183183
StructuredRecord row = dmlEvent.getRow();
184184
StructuredRecord expected = StructuredRecord.builder(CUSTOMERS_SCHEMA)
@@ -190,7 +190,7 @@ public void test() throws InterruptedException {
190190

191191
dmlEvent = eventEmitter.getDmlEvents().get(1);
192192
Assert.assertEquals(DMLOperation.Type.INSERT, dmlEvent.getOperation().getType());
193-
Assert.assertEquals(DB, dmlEvent.getDatabase());
193+
Assert.assertEquals(DB, dmlEvent.getOperation().getDatabaseName());
194194
Assert.assertEquals(CUSTOMERS_TABLE, dmlEvent.getOperation().getTableName());
195195
row = dmlEvent.getRow();
196196
expected = StructuredRecord.builder(CUSTOMERS_SCHEMA)
@@ -202,7 +202,7 @@ public void test() throws InterruptedException {
202202

203203
dmlEvent = eventEmitter.getDmlEvents().get(2);
204204
Assert.assertEquals(DMLOperation.Type.INSERT, dmlEvent.getOperation().getType());
205-
Assert.assertEquals(DB, dmlEvent.getDatabase());
205+
Assert.assertEquals(DB, dmlEvent.getOperation().getDatabaseName());
206206
Assert.assertEquals(CUSTOMERS_TABLE, dmlEvent.getOperation().getTableName());
207207
row = dmlEvent.getRow();
208208
expected = StructuredRecord.builder(CUSTOMERS_SCHEMA)

0 commit comments

Comments
 (0)