这是indexloc提供的服务，不要输入任何密码
Skip to content

fix: update PCU request building logic to properly clear crc32c and md5 #3323

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
merged 1 commit into from
Oct 3, 2025
Merged

fix: update PCU request building logic to properly clear crc32c and md5 #3323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion ...src/main/java/com/google/cloud/storage/ParallelCompositeUploadBlobWriteSessionConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,9 @@ private ParallelCompositeUploadWriterFactory(
@Override
public WritableByteChannelSession<?, BlobInfo> writeSession(
StorageInternal s, BlobInfo info, Opts<ObjectTargetOpt> opts) {
return new PCUSession(s, info, opts);
// if crc32cMatch or md5Match were specified, they will already be in opts
BlobInfo trimmed = info.toBuilder().clearCrc32c().clearMd5().build();
return new PCUSession(s, trimmed, opts);
}

private final class PCUSession
Expand Down
2 changes: 1 addition & 1 deletion ...ge/src/main/java/com/google/cloud/storage/ParallelCompositeUploadWritableByteChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ private ApiFuture<BlobInfo> cleanupParts(BlobInfo finalInfo) {

private BlobInfo definePart(BlobInfo ultimateObject, PartRange partRange, long offset) {
BlobId id = ultimateObject.getBlobId();
BlobInfo.Builder b = ultimateObject.toBuilder();
BlobInfo.Builder b = ultimateObject.toBuilder().clearCrc32c().clearMd5();
String partName = partNamingStrategy.fmtName(id.getName(), partRange);
b.setBlobId(BlobId.of(id.getBucket(), partName));
ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
Expand Down
36 changes: 36 additions & 0 deletions ...rc/test/java/com/google/cloud/storage/ParallelCompositeUploadWritableByteChannelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import com.google.cloud.storage.UnifiedOpts.ObjectSourceOpt;
import com.google.cloud.storage.UnifiedOpts.ObjectTargetOpt;
import com.google.cloud.storage.UnifiedOpts.Opts;
import com.google.cloud.storage.it.ChecksummedTestContent;
import com.google.cloud.storage.spi.v1.StorageRpc;
import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
Expand Down Expand Up @@ -810,6 +811,41 @@ public BlobInfo internalDirectUpload(
pcu.close();
}

@Test
public void partDoesNotSpecifyAnyChecksum() throws IOException {
FakeStorageInternal storageInternal =
new FakeStorageInternal() {
@Override
public BlobInfo compose(ComposeRequest composeRequest) {
BlobInfo target = composeRequest.getTarget();
if (target.getBlobId().getName().startsWith(partNamingStrategy.prefix)) {
assertThat(target.getCrc32c()).isNull();
assertThat(target.getMd5()).isNull();
}
return super.compose(composeRequest);
}
};
ChecksummedTestContent content = ChecksummedTestContent.gen(bufferCapacity * 3 - 1);
ParallelCompositeUploadWritableByteChannel pcu =
new ParallelCompositeUploadWritableByteChannel(
bufferHandlePool,
MoreExecutors.directExecutor(),
partNamingStrategy,
PartCleanupStrategy.always(),
2,
b -> b,
finalObject,
storageInternal,
info.toBuilder()
.setCrc32c(content.getCrc32cBase64())
.setMd5(content.getMd5Base64())
.build(),
opts);
pcu.write(content.asByteBuffer());

pcu.close();
}

@NonNull
private ParallelCompositeUploadWritableByteChannel defaultPcu(int maxElementsPerCompact) {
return new ParallelCompositeUploadWritableByteChannel(
Expand Down