DBZ-588 Typo fix and additional method comment

This commit is contained in:
Gunnar Morling 2018-02-09 14:16:53 +01:00
parent 2710094d11
commit e8fa7b887e
2 changed files with 19 additions and 10 deletions

View File

@ -639,12 +639,18 @@ protected void handleUpdateTableMetadata(Event event) {
TableId tableId = new TableId(databaseName, null, tableName);
if (recordMakers.assign(tableNumber, tableId)) {
logger.debug("Received update table metadata event: {}", event);
} else {
eventNotToBeRecorded(event, tableId, "update table metadata");
}
else {
informAboutUnknownTableIfRequired(event, tableId, "update table metadata");
}
}
private void eventNotToBeRecorded(Event event, TableId tableId, String typeToLog) {
/**
* If we receive an event for a table that is monitored but whose metadata we
* don't know, either ignore that event or raise a warning or error as per the
* {@link MySqlConnectorConfig#INCONSISTENT_SCHEMA_HANDLING_MODE} configuration.
*/
private void informAboutUnknownTableIfRequired(Event event, TableId tableId, String typeToLog) {
if (tableId != null && context.dbSchema().isTableMonitored(tableId)) {
EventHeaderV4 eventHeader = event.getHeader();
@ -736,8 +742,9 @@ protected void handleInsert(Event event) throws InterruptedException {
// All rows were previously processed ...
logger.debug("Skipping previously processed insert event: {}", event);
}
} else {
eventNotToBeRecorded(event, recordMakers.getTableIfFromTableNumber(tableNumber), "insert row");
}
else {
informAboutUnknownTableIfRequired(event, recordMakers.getTableIdFromTableNumber(tableNumber), "insert row");
}
startingRowNumber = 0;
}
@ -787,8 +794,9 @@ protected void handleUpdate(Event event) throws InterruptedException {
// All rows were previously processed ...
logger.debug("Skipping previously processed update event: {}", event);
}
} else {
eventNotToBeRecorded(event, recordMakers.getTableIfFromTableNumber(tableNumber), "update row");
}
else {
informAboutUnknownTableIfRequired(event, recordMakers.getTableIdFromTableNumber(tableNumber), "update row");
}
startingRowNumber = 0;
}
@ -834,8 +842,9 @@ protected void handleDelete(Event event) throws InterruptedException {
// All rows were previously processed ...
logger.debug("Skipping previously processed delete event: {}", event);
}
} else {
eventNotToBeRecorded(event, recordMakers.getTableIfFromTableNumber(tableNumber), "delete row");
}
else {
informAboutUnknownTableIfRequired(event, recordMakers.getTableIdFromTableNumber(tableNumber), "delete row");
}
startingRowNumber = 0;
}

View File

@ -482,7 +482,7 @@ public int delete(Object[] row, long ts, int rowNumber, int numberOfRows) throws
* @param tableNumber
* @return the table id or null for unknown tables
*/
public TableId getTableIfFromTableNumber(long tableNumber) {
public TableId getTableIdFromTableNumber(long tableNumber) {
return tableIdsByTableNumber.get(tableNumber);
}
}