You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by tm...@apache.org on 2018/08/23 21:10:50 UTC
hadoop git commit: HADOOP 15688. ABFS: InputStream wrapped in
FSDataInputStream twice. Contributed by Sean Mackrory.
Repository: hadoop
Updated Branches:
refs/heads/HADOOP-15407 e70e15689 -> c05963b14
HADOOP 15688. ABFS: InputStream wrapped in FSDataInputStream twice.
Contributed by Sean Mackrory.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c05963b1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c05963b1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c05963b1
Branch: refs/heads/HADOOP-15407
Commit: c05963b14a7bf991f90293d6f90eab28fda1df16
Parents: e70e156
Author: Thomas Marquardt <tm...@microsoft.com>
Authored: Thu Aug 23 20:43:52 2018 +0000
Committer: Thomas Marquardt <tm...@microsoft.com>
Committed: Thu Aug 23 20:43:52 2018 +0000
----------------------------------------------------------------------
.../fs/azurebfs/AzureBlobFileSystemStore.java | 34 +++++++++-----------
1 file changed, 16 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c05963b1/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java
index 58df914..fc60127 100644
--- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java
+++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java
@@ -19,7 +19,6 @@ package org.apache.hadoop.fs.azurebfs;
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URI;
@@ -50,8 +49,6 @@ import com.google.common.base.Preconditions;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FSDataInputStream;
-import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -251,11 +248,12 @@ public class AzureBlobFileSystemStore {
isNamespaceEnabled ? getOctalNotation(permission) : null,
isNamespaceEnabled ? getOctalNotation(umask) : null);
- final OutputStream outputStream;
- outputStream = new FSDataOutputStream(
- new AbfsOutputStream(client, AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path), 0,
- abfsConfiguration.getWriteBufferSize(), abfsConfiguration.isFlushEnabled()), null);
- return outputStream;
+ return new AbfsOutputStream(
+ client,
+ AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path),
+ 0,
+ abfsConfiguration.getWriteBufferSize(),
+ abfsConfiguration.isFlushEnabled());
}
public void createDirectory(final Path path, final FsPermission permission, final FsPermission umask)
@@ -273,7 +271,7 @@ public class AzureBlobFileSystemStore {
isNamespaceEnabled ? getOctalNotation(umask) : null);
}
- public InputStream openFileForRead(final Path path, final FileSystem.Statistics statistics)
+ public AbfsInputStream openFileForRead(final Path path, final FileSystem.Statistics statistics)
throws AzureBlobFileSystemException {
LOG.debug("openFileForRead filesystem: {} path: {}",
client.getFileSystem(),
@@ -294,10 +292,9 @@ public class AzureBlobFileSystemStore {
}
// Add statistics for InputStream
- return new FSDataInputStream(
- new AbfsInputStream(client, statistics,
- AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path), contentLength,
- abfsConfiguration.getReadBufferSize(), abfsConfiguration.getReadAheadQueueDepth(), eTag));
+ return new AbfsInputStream(client, statistics,
+ AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path), contentLength,
+ abfsConfiguration.getReadBufferSize(), abfsConfiguration.getReadAheadQueueDepth(), eTag);
}
public OutputStream openFileForWrite(final Path path, final boolean overwrite) throws
@@ -322,11 +319,12 @@ public class AzureBlobFileSystemStore {
final long offset = overwrite ? 0 : contentLength;
- final OutputStream outputStream;
- outputStream = new FSDataOutputStream(
- new AbfsOutputStream(client, AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path),
- offset, abfsConfiguration.getWriteBufferSize(), abfsConfiguration.isFlushEnabled()), null);
- return outputStream;
+ return new AbfsOutputStream(
+ client,
+ AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path),
+ offset,
+ abfsConfiguration.getWriteBufferSize(),
+ abfsConfiguration.isFlushEnabled());
}
public void rename(final Path source, final Path destination) throws
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org