Skip to content

Drop explicit check for file existence while creating GCS blobs #21105

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
Mar 17, 2024
Merged

Drop explicit check for file existence while creating GCS blobs #21105

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
7 changes: 0 additions & 7 deletions lib/trino-filesystem-gcs/src/main/java/io/trino/filesystem/gcs/GcsOutputFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import java.nio.file.FileAlreadyExistsException;

import static com.google.common.base.Preconditions.checkArgument;
import static io.trino.filesystem.gcs.GcsUtils.getBlob;
import static io.trino.filesystem.gcs.GcsUtils.handleGcsException;
import static java.net.HttpURLConnection.HTTP_PRECON_FAILED;
import static java.util.Objects.requireNonNull;
Expand Down Expand Up @@ -65,9 +64,6 @@ public void createExclusive(byte[] data)
throws IOException
{
try {
if (getBlob(storage, location).isPresent()) {
throw new FileAlreadyExistsException("File %s already exists".formatted(location));
}
storage.create(blobInfo(), data, BlobTargetOption.doesNotExist());
}
catch (RuntimeException e) {
Expand All @@ -81,9 +77,6 @@ public OutputStream create(AggregatedMemoryContext memoryContext)
throws IOException
{
try {
if (getBlob(storage, location).isPresent()) {
throw new FileAlreadyExistsException("File %s already exists".formatted(location));
}
WriteChannel writeChannel = storage.writer(blobInfo(), BlobWriteOption.doesNotExist());
return new GcsOutputStream(location, writeChannel, memoryContext, writeBlockSizeBytes);
}
Expand Down
8 changes: 8 additions & 0 deletions lib/trino-filesystem-gcs/src/main/java/io/trino/filesystem/gcs/GcsOutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,19 @@
package io.trino.filesystem.gcs;

import com.google.cloud.WriteChannel;
import com.google.cloud.storage.StorageException;
import com.google.common.primitives.Ints;
import io.trino.memory.context.AggregatedMemoryContext;
import io.trino.memory.context.LocalMemoryContext;

import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.nio.file.FileAlreadyExistsException;

import static com.google.common.base.Preconditions.checkArgument;
import static java.lang.Math.min;
import static java.net.HttpURLConnection.HTTP_PRECON_FAILED;
import static java.util.Objects.requireNonNull;

public class GcsOutputStream
Expand Down Expand Up @@ -134,6 +137,11 @@ public void close()
try {
writeChannel.close();
}
catch (StorageException e) {
if (e.getCode() == HTTP_PRECON_FAILED) {
throw new FileAlreadyExistsException(location.toString());
}
}
catch (IOException e) {
throw new IOException("Error closing file: " + location, e);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/trino-filesystem/src/test/java/io/trino/filesystem/AbstractTestTrinoFileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ void testOutputFile()

if (isCreateExclusive()) {
// re-create without overwrite is an error
assertThatThrownBy(outputFile::create)
assertThatThrownBy(() -> outputFile.create().close())
.isInstanceOf(FileAlreadyExistsException.class)
.hasMessageContaining(tempBlob.location().toString());

Expand Down