From dff3efd19245b5d259d44d230567b7f16840f9c6 Mon Sep 17 00:00:00 2001 From: Bharat Viswanadham Date: Fri, 30 Oct 2020 11:02:50 -0700 Subject: [PATCH] HDDS-4391. UnixPath.toUri() is expensive. --- .../main/java/org/apache/hadoop/ozone/OmUtils.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java index 676eb90a73c3..a95eabc36b6d 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java @@ -22,8 +22,6 @@ import java.io.IOException; import java.net.InetSocketAddress; import java.nio.charset.StandardCharsets; -import java.nio.file.Path; -import java.nio.file.Paths; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; @@ -37,6 +35,7 @@ import java.util.OptionalInt; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdds.conf.ConfigurationSource; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.scm.client.HddsClientUtils; @@ -608,7 +607,7 @@ public static boolean isAccessControlException(Exception ex) { } /** - * Normalize the key name. This method used {@link Path#normalize()} to + * Normalize the key name. This method used {@link Path} to * normalize the key name. * @param keyName * @param preserveTrailingSlash - if True preserves trailing slash, else @@ -623,10 +622,10 @@ public static String normalizeKey(String keyName, if (!StringUtils.isBlank(keyName)) { String normalizedKeyName; if (keyName.startsWith(OM_KEY_PREFIX)) { - normalizedKeyName = Paths.get(keyName).toUri().normalize().getPath(); + normalizedKeyName = new Path(keyName).toUri().getPath(); } else { - normalizedKeyName = Paths.get(OM_KEY_PREFIX, keyName).toUri() - .normalize().getPath(); + normalizedKeyName = new Path(OM_KEY_PREFIX + keyName) + .toUri().getPath(); } if (!keyName.equals(normalizedKeyName)) { LOG.debug("Normalized key {} to {} ", keyName,