Skip to content

JDBC: Optimize writeEntity calls #1496

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

Merged
eric-maynard merged 2 commits into from
Apr 30, 2025
Merged

JDBC: Optimize writeEntity calls #1496

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
577211c
Remove transaction from atomic writes
singhpk234 Apr 29, 2025
3e4ec1f
remove if-else
singhpk234 Apr 30, 2025
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
23 changes: 15 additions & 8 deletions ...ava/org/apache/polaris/extension/persistence/relational/jdbc/JdbcBasePersistenceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,7 @@ public void writeEntity(
boolean nameOrParentChanged,
PolarisBaseEntity originalEntity) {
try {
datasourceOperations.runWithinTransaction(
statement -> {
persistEntity(callCtx, entity, originalEntity, statement);
return true;
});
persistEntity(callCtx, entity, originalEntity, datasourceOperations);
Comment thread
singhpk234 marked this conversation as resolved.
Outdated
} catch (SQLException e) {
throw new RuntimeException("Error persisting entity", e);
}
Expand Down Expand Up @@ -143,12 +139,12 @@ private void persistEntity(
@Nonnull PolarisCallContext callCtx,
@Nonnull PolarisBaseEntity entity,
PolarisBaseEntity originalEntity,
Statement statement)
Object executor)
throws SQLException {
ModelEntity modelEntity = ModelEntity.fromEntity(entity);
if (originalEntity == null) {
try {
statement.executeUpdate(generateInsertQuery(modelEntity, realmId));
execute(executor, generateInsertQuery(modelEntity, realmId));
} catch (SQLException e) {
if (datasourceOperations.isConstraintViolation(e)) {
PolarisBaseEntity existingEntity =
Expand Down Expand Up @@ -176,7 +172,7 @@ private void persistEntity(
"realm_id",
realmId);
try {
int rowsUpdated = statement.executeUpdate(generateUpdateQuery(modelEntity, params));
int rowsUpdated = execute(executor, generateUpdateQuery(modelEntity, params));
if (rowsUpdated == 0) {
throw new RetryOnConcurrencyException(
"Entity '%s' id '%s' concurrently modified; expected version %s",
Expand All @@ -189,6 +185,17 @@ private void persistEntity(
}
}

private int execute(Object executor, String query) throws SQLException {
if (executor instanceof Statement) {
// used for running in transaction
return ((Statement) executor).executeUpdate(query);
} else if (executor instanceof DatasourceOperations) {
return ((DatasourceOperations) executor).executeUpdate(query);
} else {
throw new IllegalArgumentException("Unsupported executor: " + executor);
}
}
Comment thread
singhpk234 marked this conversation as resolved.
Outdated

@Override
public void writeToGrantRecords(
@Nonnull PolarisCallContext callCtx, @Nonnull PolarisGrantRecord grantRec) {
Expand Down