You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2022/08/19 21:34:26 UTC
[ozone] branch master updated: HDDS-7135. ofs file input stream should support StreamCapabilities interface (#3694)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 38c767fa5f HDDS-7135. ofs file input stream should support StreamCapabilities interface (#3694)
38c767fa5f is described below
commit 38c767fa5fb6273cac23e23984a782a80eb73670
Author: Wei-Chiu Chuang <we...@apache.org>
AuthorDate: Sat Aug 20 05:34:21 2022 +0800
HDDS-7135. ofs file input stream should support StreamCapabilities interface (#3694)
---
.../hadoop/fs/ozone/TestRootedOzoneFileSystem.java | 17 +++++++++++++++++
.../hadoop/fs/ozone/BasicRootedOzoneFileSystem.java | 8 ++++++--
.../apache/hadoop/fs/ozone/RootedOzoneFileSystem.java | 6 ++++++
.../apache/hadoop/fs/ozone/RootedOzoneFileSystem.java | 6 ++++++
4 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java
index ae6b851d55..9ff481b4b4 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedOzoneFileSystem.java
@@ -21,12 +21,14 @@ package org.apache.hadoop.fs.ozone;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+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.InvalidPathException;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathIsNotEmptyDirectoryException;
+import org.apache.hadoop.fs.StreamCapabilities;
import org.apache.hadoop.fs.Trash;
import org.apache.hadoop.fs.TrashPolicy;
import org.apache.hadoop.fs.contract.ContractTestUtils;
@@ -1721,6 +1723,21 @@ public class TestRootedOzoneFileSystem {
key.getReplicationConfig().getReplicationType().name());
}
+ @Test
+ public void testUnbuffer() throws IOException {
+ String testKeyName = "testKey2";
+ Path path = new Path(bucketPath, testKeyName);
+ try (FSDataOutputStream stream = fs.create(path)) {
+ stream.write(1);
+ }
+
+ try (FSDataInputStream stream = fs.open(path)) {
+ assertTrue(stream.hasCapability(StreamCapabilities.UNBUFFER));
+ stream.unbuffer();
+ }
+
+ }
+
public void testNonPrivilegedUserMkdirCreateBucket() throws IOException {
// This test is only meaningful when ACL is enabled
Assume.assumeTrue("ACL is not enabled. Skipping this test as it requires " +
diff --git a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneFileSystem.java b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneFileSystem.java
index 99e2140fc6..b1f019374a 100644
--- a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneFileSystem.java
+++ b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneFileSystem.java
@@ -54,6 +54,7 @@ import org.slf4j.LoggerFactory;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
@@ -194,8 +195,11 @@ public class BasicRootedOzoneFileSystem extends FileSystem {
statistics.incrementReadOps(1);
LOG.trace("open() path: {}", path);
final String key = pathToKey(path);
- return new FSDataInputStream(
- new OzoneFSInputStream(adapter.readFile(key), statistics));
+ return new FSDataInputStream(createFSInputStream(adapter.readFile(key)));
+ }
+
+ protected InputStream createFSInputStream(InputStream inputStream) {
+ return new OzoneFSInputStream(inputStream, statistics);
}
protected void incrementCounter(Statistic statistic) {
diff --git a/hadoop-ozone/ozonefs-hadoop3/src/main/java/org/apache/hadoop/fs/ozone/RootedOzoneFileSystem.java b/hadoop-ozone/ozonefs-hadoop3/src/main/java/org/apache/hadoop/fs/ozone/RootedOzoneFileSystem.java
index 6d48ead5ad..cf88703b9d 100644
--- a/hadoop-ozone/ozonefs-hadoop3/src/main/java/org/apache/hadoop/fs/ozone/RootedOzoneFileSystem.java
+++ b/hadoop-ozone/ozonefs-hadoop3/src/main/java/org/apache/hadoop/fs/ozone/RootedOzoneFileSystem.java
@@ -28,6 +28,7 @@ import org.apache.hadoop.fs.StorageStatistics;
import org.apache.hadoop.security.token.DelegationTokenIssuer;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URI;
/**
@@ -92,4 +93,9 @@ public class RootedOzoneFileSystem extends BasicRootedOzoneFileSystem
return new RootedOzoneClientAdapterImpl(omHost, omPort, conf,
storageStatistics);
}
+
+ @Override
+ protected InputStream createFSInputStream(InputStream inputStream) {
+ return new CapableOzoneFSInputStream(inputStream, statistics);
+ }
}
diff --git a/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/RootedOzoneFileSystem.java b/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/RootedOzoneFileSystem.java
index 6d48ead5ad..cf88703b9d 100644
--- a/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/RootedOzoneFileSystem.java
+++ b/hadoop-ozone/ozonefs/src/main/java/org/apache/hadoop/fs/ozone/RootedOzoneFileSystem.java
@@ -28,6 +28,7 @@ import org.apache.hadoop.fs.StorageStatistics;
import org.apache.hadoop.security.token.DelegationTokenIssuer;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URI;
/**
@@ -92,4 +93,9 @@ public class RootedOzoneFileSystem extends BasicRootedOzoneFileSystem
return new RootedOzoneClientAdapterImpl(omHost, omPort, conf,
storageStatistics);
}
+
+ @Override
+ protected InputStream createFSInputStream(InputStream inputStream) {
+ return new CapableOzoneFSInputStream(inputStream, statistics);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org