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 st...@apache.org on 2019/03/08 13:53:54 UTC
[hadoop] branch trunk updated: HADOOP-16169. ABFS: Bug fix for
getPathProperties.
This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new e026041 HADOOP-16169. ABFS: Bug fix for getPathProperties.
e026041 is described below
commit e0260417ade5568ae37dcc3753aea0d1e0fd701b
Author: Da Zhou <da...@microsoft.com>
AuthorDate: Fri Mar 8 13:53:08 2019 +0000
HADOOP-16169. ABFS: Bug fix for getPathProperties.
Author: Da Zhou <da...@microsoft.com>
---
.../apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java | 12 ++++++------
.../org/apache/hadoop/fs/azurebfs/services/AbfsClient.java | 4 ++--
.../apache/hadoop/fs/azurebfs/ITestFileSystemProperties.java | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
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 f836043..a8e0ed3 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
@@ -284,13 +284,13 @@ public class AzureBlobFileSystemStore implements Closeable {
client.setFilesystemProperties(commaSeparatedProperties);
}
- public Hashtable<String, String> getPathProperties(final Path path) throws AzureBlobFileSystemException {
- LOG.debug("getPathProperties for filesystem: {} path: {}",
+ public Hashtable<String, String> getPathStatus(final Path path) throws AzureBlobFileSystemException {
+ LOG.debug("getPathStatus for filesystem: {} path: {}",
client.getFileSystem(),
path);
final Hashtable<String, String> parsedXmsProperties;
- final AbfsRestOperation op = client.getPathProperties(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path), isNamespaceEnabled);
+ final AbfsRestOperation op = client.getPathStatus(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path));
final String xMsProperties = op.getResult().getResponseHeader(HttpHeaderConfigurations.X_MS_PROPERTIES);
@@ -372,7 +372,7 @@ public class AzureBlobFileSystemStore implements Closeable {
client.getFileSystem(),
path);
- final AbfsRestOperation op = client.getPathProperties(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path), isNamespaceEnabled);
+ final AbfsRestOperation op = client.getPathStatus(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path));
final String resourceType = op.getResult().getResponseHeader(HttpHeaderConfigurations.X_MS_RESOURCE_TYPE);
final long contentLength = Long.parseLong(op.getResult().getResponseHeader(HttpHeaderConfigurations.CONTENT_LENGTH));
@@ -400,7 +400,7 @@ public class AzureBlobFileSystemStore implements Closeable {
path,
overwrite);
- final AbfsRestOperation op = client.getPathProperties(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path), isNamespaceEnabled);
+ final AbfsRestOperation op = client.getPathStatus(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path));
final String resourceType = op.getResult().getResponseHeader(HttpHeaderConfigurations.X_MS_RESOURCE_TYPE);
final Long contentLength = Long.valueOf(op.getResult().getResponseHeader(HttpHeaderConfigurations.CONTENT_LENGTH));
@@ -476,7 +476,7 @@ public class AzureBlobFileSystemStore implements Closeable {
? client.getAclStatus(AbfsHttpConstants.FORWARD_SLASH + AbfsHttpConstants.ROOT_PATH)
: client.getFilesystemProperties();
} else {
- op = client.getPathProperties(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path), isNamespaceEnabled);
+ op = client.getPathStatus(AbfsHttpConstants.FORWARD_SLASH + getRelativePath(path));
}
final long blockSize = abfsConfiguration.getAzureBlockSize();
diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java
index ea665bd..c634c35 100644
--- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java
+++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java
@@ -348,7 +348,7 @@ public class AbfsClient implements Closeable {
return op;
}
- public AbfsRestOperation getPathProperties(final String path, boolean isNameSpaceEnabled) throws AzureBlobFileSystemException {
+ public AbfsRestOperation getPathStatus(final String path) throws AzureBlobFileSystemException {
final List<AbfsHttpHeader> requestHeaders = createDefaultHeaders();
final AbfsUriQueryBuilder abfsUriQueryBuilder = createDefaultUriQueryBuilder();
@@ -356,7 +356,7 @@ public class AbfsClient implements Closeable {
final URL url = createRequestUrl(path, abfsUriQueryBuilder.toString());
final AbfsRestOperation op = new AbfsRestOperation(
- isNameSpaceEnabled ? AbfsRestOperationType.GetPathProperties : AbfsRestOperationType.GetPathStatus,
+ AbfsRestOperationType.GetPathStatus,
this,
HTTP_METHOD_HEAD,
url,
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestFileSystemProperties.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestFileSystemProperties.java
index e6b45c8..ba9b639 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestFileSystemProperties.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestFileSystemProperties.java
@@ -78,7 +78,7 @@ public class ITestFileSystemProperties extends AbstractAbfsIntegrationTest {
touch(TEST_PATH);
fs.getAbfsStore().setPathProperties(TEST_PATH, properties);
Hashtable<String, String> fetchedProperties =
- fs.getAbfsStore().getPathProperties(TEST_PATH);
+ fs.getAbfsStore().getPathStatus(TEST_PATH);
assertEquals(properties, fetchedProperties);
}
@@ -101,7 +101,7 @@ public class ITestFileSystemProperties extends AbstractAbfsIntegrationTest {
properties.put("key", "{ value: valueTestå…© }");
touch(TEST_PATH);
fs.getAbfsStore().setPathProperties(TEST_PATH, properties);
- Hashtable<String, String> fetchedProperties = fs.getAbfsStore().getPathProperties(TEST_PATH);
+ Hashtable<String, String> fetchedProperties = fs.getAbfsStore().getPathStatus(TEST_PATH);
assertEquals(properties, fetchedProperties);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org