tejaswini-imply commented on a change in pull request #12215:
URL: https://github.com/apache/druid/pull/12215#discussion_r797288046
##########
File path: core/src/main/java/org/apache/druid/data/input/impl/HttpEntity.java
##########
@@ -80,23 +80,30 @@ protected String getPath()
return t -> t instanceof IOException;
}
- public static InputStream openInputStream(URI object, String userName,
PasswordProvider passwordProvider, long offset)
- throws IOException
- {
- final URLConnection urlConnection = object.toURL().openConnection();
+ private static void addAuthHeader(URLConnection urlConnection, String
userName, PasswordProvider passwordProvider){
if (!Strings.isNullOrEmpty(userName) && passwordProvider != null) {
String userPass = userName + ":" + passwordProvider.getPassword();
String basicAuthString = "Basic " +
Base64.getEncoder().encodeToString(StringUtils.toUtf8(userPass));
urlConnection.setRequestProperty("Authorization", basicAuthString);
}
+ }
+
+ public static InputStream openInputStream(URI object, String userName,
PasswordProvider passwordProvider, long offset)
+ throws IOException
+ {
+ final URLConnection urlConnection = object.toURL().openConnection();
+ addAuthHeader(urlConnection, userName, passwordProvider);
final String acceptRanges =
urlConnection.getHeaderField(HttpHeaders.ACCEPT_RANGES);
final boolean withRanges = "bytes".equalsIgnoreCase(acceptRanges);
if (withRanges && offset > 0) {
// Set header for range request.
// Since we need to set only the start offset, the header is
"bytes=<range-start>-".
// See https://tools.ietf.org/html/rfc7233#section-2.1
- urlConnection.addRequestProperty(HttpHeaders.RANGE,
StringUtils.format("bytes=%d-", offset));
- return urlConnection.getInputStream();
+ urlConnection.getInputStream().close();
Review comment:
@kfaraz Previously, since new connection approach is deemed to be
appropriate the old connection was closed before opening new one. Like Abhishek
mentioned `Content-Range` header is more reliable than `Accept-Ranges` as per
https://datatracker.ietf.org/doc/html/rfc7233#section-4, using this we need
only single request to fetch content and decide whether it is partial or not.
--
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]
