Skip to content

Replaced URI.openStream with HTTPClient/HttpRequest so that user-agen… #93

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

Open
subkanthi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replaced URI.openStream with HTTPClient/HttpRequest so that user-agen… #93

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
43 changes: 36 additions & 7 deletions ice/src/main/java/com/altinity/ice/cli/internal/iceberg/io/Input.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
import com.altinity.ice.internal.strings.Strings;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
Expand Down Expand Up @@ -87,12 +89,8 @@ case String s when (s.startsWith("http:") || s.startsWith("https:")) -> {
Path dst = Paths.get(httpCachePath, name);
if (!Files.exists(dst)) {
createParentDirs(dst.toFile());
String tempName = name + "~";
Path tmp = Paths.get(httpCachePath, tempName);
try (InputStream in = URI.create(s).toURL().openStream()) {
// FIXME: race with another copy
Files.copy(in, tmp);
}
Path tmp = Paths.get(httpCachePath, name + "~");
downloadFile(s, tmp);
Files.move(tmp, dst);
}
yield org.apache.iceberg.Files.localInput(dst.toFile());
Expand All @@ -115,6 +113,37 @@ case String s when (s.startsWith("http:") || s.startsWith("https:")) -> {
};
}

private static void downloadFile(String url, Path destination) throws IOException {
try (HttpClient client =
HttpClient.newBuilder().followRedirects(HttpClient.Redirect.NORMAL).build()) {
HttpRequest request =
HttpRequest.newBuilder()
.uri(URI.create(url))
.header("User-Agent", "ice-cli/1.0")
.GET()
.build();

HttpResponse<Path> response;
try {
response = client.send(request, HttpResponse.BodyHandlers.ofFile(destination));
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw new IOException("Download interrupted: " + url, e);
}

if (response.statusCode() != 200) {
Files.deleteIfExists(destination);
throw new IOException("HTTP " + response.statusCode() + " downloading: " + url);
}

long size = Files.size(destination);
if (size == 0) {
Files.deleteIfExists(destination);
throw new IOException("Downloaded file is empty (0 bytes): " + url);
}
}
}

// TODO: just use guava
private static void createParentDirs(File file) throws IOException {
File parent = file.getCanonicalFile().getParentFile();
Expand Down