Skip to content
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

Jump to bottom

Feature/jiucheng/tmp 002 #880

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/jiucheng/tmp 002 #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe9e5ed
跳过无主键表数据同步报错
atjiucheng Dec 5, 2019
80d2630
跳过删除表时目标库无此表报错
atjiucheng Dec 5, 2019
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
9 changes: 8 additions & 1 deletion node/etl/src/main/java/com/alibaba/otter/node/etl/load/loader/db/DbLoadAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,14 @@ public Boolean doInStatement(Statement stmt) throws SQLException, DataAccessExce
// 解决当数据库名称为关键字如"Order"的时候,会报错,无法同步
result &= stmt.execute("use `" + data.getDdlSchemaName() + "`");
}
result &= stmt.execute(data.getSql());
// 跳过删除表时目标库无此表报错
String sql = data.getSql();
if (dbDialect instanceof MysqlDialect) {
if (sql.startsWith("DROP TABLE `")) {
sql = "DROP TABLE IF EXISTS" + sql.substring(10);
}
}
result &= stmt.execute(sql);
return result;
}
});
Expand Down
8 changes: 6 additions & 2 deletions node/etl/src/main/java/com/alibaba/otter/node/etl/select/selector/MessageParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,8 +588,12 @@ private EventData internParse(Pipeline pipeline, Entry entry, RowChange rowChang
// eventData.setKeys(columns);
// }
} else {
throw new SelectException("this rowdata has no pks , entry: " + entry.toString() + " and rowData: "
+ rowData);
// throw new SelectException("this rowdata has no pks , entry: " + entry.toString() + " and rowData: "
// + rowData);
if (logger.isWarnEnabled()) {
logger.warn("this rowdata has no pks ,schemaName={},tableName={}", eventData.getSchemaName(), eventData.getTableName());
}
return null;
}

return eventData;
Expand Down