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

fix(new schema): fix duplicate key exception for aspect table #490

Merged
merged 2 commits into from
Dec 18, 2024
Merged

fix(new schema): fix duplicate key exception for aspect table #490

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9129472
fix(new schema): fix duplicate key exception for aspect table
Dec 18, 2024
63766bb
add result is null check
Dec 18, 2024
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
24 changes: 10 additions & 14 deletions dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/EbeanLocalDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,24 +759,18 @@ private <ASPECT extends RecordTemplate> EbeanMetadataAspect buildMetadataAspectB
// metadata_aspect schema and we don't take this route here to keep this change backward compatible.
private static final String OPTIMISTIC_LOCKING_UPDATE_SQL = "UPDATE metadata_aspect "
+ "SET urn = :urn, aspect = :aspect, version = :version, metadata = :metadata, createdOn = :createdOn, createdBy = :createdBy "
+ "WHERE urn = :urn and aspect = :aspect and version = :version";
+ "WHERE urn = :urn and aspect = :aspect and version = :version and createdOn = :oldTimestamp";

/**
* Assembly SQL UPDATE script for old Schema.
* @param aspect {@link EbeanMetadataAspect}
* @param oldTimestamp old timestamp. If provided, the generated SQL will use optimistic locking and do compare-and-set
* @param oldTimestamp old timestamp.The generated SQL will use optimistic locking and do compare-and-set
* with oldTimestamp during the update.
* @return {@link SqlUpdate} for SQL update execution
*/
private SqlUpdate assembleOldSchemaSqlUpdate(@Nonnull EbeanMetadataAspect aspect, @Nullable Timestamp oldTimestamp) {

final SqlUpdate oldSchemaSqlUpdate;
if (oldTimestamp == null) {
oldSchemaSqlUpdate = _server.createSqlUpdate(OPTIMISTIC_LOCKING_UPDATE_SQL);
} else {
oldSchemaSqlUpdate = _server.createSqlUpdate(OPTIMISTIC_LOCKING_UPDATE_SQL + " and createdOn = :oldTimestamp");
oldSchemaSqlUpdate.setParameter("oldTimestamp", oldTimestamp);
}
private SqlUpdate assembleOldSchemaSqlUpdate(@Nonnull EbeanMetadataAspect aspect, @Nonnull Timestamp oldTimestamp) {
final SqlUpdate oldSchemaSqlUpdate = _server.createSqlUpdate(OPTIMISTIC_LOCKING_UPDATE_SQL);
oldSchemaSqlUpdate.setParameter("oldTimestamp", oldTimestamp);
oldSchemaSqlUpdate.setParameter("urn", aspect.getKey().getUrn());
oldSchemaSqlUpdate.setParameter("aspect", aspect.getKey().getAspect());
oldSchemaSqlUpdate.setParameter("version", aspect.getKey().getVersion());
Expand Down Expand Up @@ -806,9 +800,11 @@ protected <ASPECT extends RecordTemplate> void updateWithOptimisticLocking(@Nonn
final SqlUpdate oldSchemaSqlUpdate;
if (_schemaConfig == SchemaConfig.NEW_SCHEMA_ONLY) {
// In NEW_SCHEMA, the entity table is the SOT and getLatest (oldTimestamp) reads from the entity
// table. Therefore, we will apply compare-and-set with oldTimestamp on entity table (addWithOptimisticLocking)
// aspect table will apply regular update over (urn, aspect, version) primary key combination.
oldSchemaSqlUpdate = assembleOldSchemaSqlUpdate(aspect, null);
// table. Therefore, we will apply compare-and-set with oldTimestamp on entity table (addWithOptimisticLocking).
// We will also apply an optimistic locking update over (urn, aspect, version) primary key combination to avoid duplicate
// key exceptions when the primary key includes createdon.
EbeanMetadataAspect result = findLatestMetadataAspect(_server, urn, aspectClass);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if the urn and aspect does not exist? What does this return?

oldSchemaSqlUpdate = assembleOldSchemaSqlUpdate(aspect, result.getCreatedOn());
numOfUpdatedRows = runInTransactionWithRetry(() -> {
// DUAL WRITE: 1) update aspect table, 2) update entity table.
// Note: when cold-archive is enabled, this method: updateWithOptimisticLocking will not be called.
Expand Down
Loading