github-advanced-security[bot] commented on code in PR #17964:
URL: https://github.com/apache/druid/pull/17964#discussion_r2068734925
##########
server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java:
##########
@@ -2194,54 +2193,58 @@
Hashing.sha1().hashBytes(newCommitMetadataBytes).asBytes()
);
- final SegmentPublishResult retVal;
+ final SegmentPublishResult publishResult;
if (oldCommitMetadataBytesFromDb == null) {
// SELECT -> INSERT can fail due to races; callers must be prepared to
retry.
- final int numRows = transaction.getHandle().createStatement(
- StringUtils.format(
- "INSERT INTO %s (dataSource, created_date,
commit_metadata_payload, commit_metadata_sha1) "
- + "VALUES (:dataSource, :created_date, :commit_metadata_payload,
:commit_metadata_sha1)",
- dbTables.getDataSourceTable()
- )
- )
- .bind("dataSource", dataSource)
- .bind("created_date",
DateTimes.nowUtc().toString())
- .bind("commit_metadata_payload",
newCommitMetadataBytes)
- .bind("commit_metadata_sha1",
newCommitMetadataSha1)
- .execute();
-
- retVal = numRows == 1
+ final String insertSql = StringUtils.format(
+ "INSERT INTO %s (dataSource, created_date, commit_metadata_payload,
commit_metadata_sha1) "
+ + "VALUES (:dataSource, :created_date, :commit_metadata_payload,
:commit_metadata_sha1)",
+ dbTables.getDataSourceTable()
+ );
+ final int numRows = transaction.getHandle().createStatement(insertSql)
+ .bind("dataSource", dataSource)
+ .bind("created_date",
DateTimes.nowUtc().toString())
+ .bind("commit_metadata_payload",
newCommitMetadataBytes)
+ .bind("commit_metadata_sha1",
newCommitMetadataSha1)
+ .execute();
+
+ publishResult = numRows == 1
? SegmentPublishResult.ok(Set.of())
- : SegmentPublishResult.retryableFailure("Failed to insert metadata
for datasource[%s]", dataSource);
+ : SegmentPublishResult.retryableFailure("Insert failed", dataSource);
Review Comment:
## Unused format argument
This format call refers to 0 argument(s) but supplies 1 argument(s).
[Show more
details](https://github.com/apache/druid/security/code-scanning/9149)
##########
server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java:
##########
@@ -2194,54 +2193,58 @@
Hashing.sha1().hashBytes(newCommitMetadataBytes).asBytes()
);
- final SegmentPublishResult retVal;
+ final SegmentPublishResult publishResult;
if (oldCommitMetadataBytesFromDb == null) {
// SELECT -> INSERT can fail due to races; callers must be prepared to
retry.
- final int numRows = transaction.getHandle().createStatement(
- StringUtils.format(
- "INSERT INTO %s (dataSource, created_date,
commit_metadata_payload, commit_metadata_sha1) "
- + "VALUES (:dataSource, :created_date, :commit_metadata_payload,
:commit_metadata_sha1)",
- dbTables.getDataSourceTable()
- )
- )
- .bind("dataSource", dataSource)
- .bind("created_date",
DateTimes.nowUtc().toString())
- .bind("commit_metadata_payload",
newCommitMetadataBytes)
- .bind("commit_metadata_sha1",
newCommitMetadataSha1)
- .execute();
-
- retVal = numRows == 1
+ final String insertSql = StringUtils.format(
+ "INSERT INTO %s (dataSource, created_date, commit_metadata_payload,
commit_metadata_sha1) "
+ + "VALUES (:dataSource, :created_date, :commit_metadata_payload,
:commit_metadata_sha1)",
+ dbTables.getDataSourceTable()
+ );
+ final int numRows = transaction.getHandle().createStatement(insertSql)
+ .bind("dataSource", dataSource)
+ .bind("created_date",
DateTimes.nowUtc().toString())
+ .bind("commit_metadata_payload",
newCommitMetadataBytes)
+ .bind("commit_metadata_sha1",
newCommitMetadataSha1)
+ .execute();
+
+ publishResult = numRows == 1
? SegmentPublishResult.ok(Set.of())
- : SegmentPublishResult.retryableFailure("Failed to insert metadata
for datasource[%s]", dataSource);
+ : SegmentPublishResult.retryableFailure("Insert failed", dataSource);
} else {
// Expecting a particular old metadata; use the SHA1 in a
compare-and-swap UPDATE
- final int numRows = transaction.getHandle().createStatement(
- StringUtils.format(
- "UPDATE %s SET "
- + "commit_metadata_payload = :new_commit_metadata_payload, "
- + "commit_metadata_sha1 = :new_commit_metadata_sha1 "
- + "WHERE dataSource = :dataSource AND commit_metadata_sha1 =
:old_commit_metadata_sha1",
- dbTables.getDataSourceTable()
- )
- )
- .bind("dataSource", dataSource)
- .bind("old_commit_metadata_sha1",
oldCommitMetadataSha1FromDb)
- .bind("new_commit_metadata_payload",
newCommitMetadataBytes)
- .bind("new_commit_metadata_sha1",
newCommitMetadataSha1)
- .execute();
-
- retVal = numRows == 1
+ final String updateSql = StringUtils.format(
+ "UPDATE %s SET "
+ + "commit_metadata_payload = :new_commit_metadata_payload, "
+ + "commit_metadata_sha1 = :new_commit_metadata_sha1 "
+ + "WHERE dataSource = :dataSource AND commit_metadata_sha1 =
:old_commit_metadata_sha1",
+ dbTables.getDataSourceTable()
+ );
+ final int numRows = transaction.getHandle().createStatement(updateSql)
+ .bind("dataSource", dataSource)
+ .bind("old_commit_metadata_sha1",
oldCommitMetadataSha1FromDb)
+ .bind("new_commit_metadata_payload",
newCommitMetadataBytes)
+ .bind("new_commit_metadata_sha1",
newCommitMetadataSha1)
+ .execute();
+
+ publishResult = numRows == 1
? SegmentPublishResult.ok(Set.of())
- : SegmentPublishResult.retryableFailure("Failed to update metadata
for datasource[%s]", dataSource);
+ : SegmentPublishResult.retryableFailure("Compare-and-swap update
failed", dataSource);
Review Comment:
## Unused format argument
This format call refers to 0 argument(s) but supplies 1 argument(s).
[Show more
details](https://github.com/apache/druid/security/code-scanning/9150)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
