hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject svn commit: r1590903 - in /hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common: ./ src/main/java/org/apache/hadoop/fs/shell/ src/test/java/org/apache/hadoop/fs/shell/
Date Tue, 29 Apr 2014 07:56:36 GMT
Author: wang
Date: Tue Apr 29 07:56:36 2014
New Revision: 1590903

URL: http://svn.apache.org/r1590903
Log:
HADOOP-10521. FsShell commands for extended attributes. Contributed by Yi Liu.

Added:
    hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
  (with props)
    hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestXAttrCommands.java
  (with props)
Modified:
    hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/CHANGES-HDFS-2006.txt
    hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java

Modified: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/CHANGES-HDFS-2006.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/CHANGES-HDFS-2006.txt?rev=1590903&r1=1590902&r2=1590903&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/CHANGES-HDFS-2006.txt
(original)
+++ hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/CHANGES-HDFS-2006.txt
Tue Apr 29 07:56:36 2014
@@ -14,6 +14,8 @@ HDFS-2006 (Unreleased)
   HADOOP-10546. Javadoc and other small fixes for extended attributes in
   hadoop-common. (Charles Lamb via wang)
 
+  HADOOP-10521. FsShell commands for extended attributes. (Yi Liu via wang)
+
   OPTIMIZATIONS
 
   BUG FIXES

Modified: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java?rev=1590903&r1=1590902&r2=1590903&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java
(original)
+++ hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java
Tue Apr 29 07:56:36 2014
@@ -59,6 +59,7 @@ abstract public class FsCommand extends 
     factory.registerCommands(Test.class);
     factory.registerCommands(Touch.class);
     factory.registerCommands(SnapshotCommands.class);
+    factory.registerCommands(XAttrCommands.class);
   }
 
   protected FsCommand() {}

Added: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java?rev=1590903&view=auto
==============================================================================
--- hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
(added)
+++ hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
Tue Apr 29 07:56:36 2014
@@ -0,0 +1,234 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.fs.shell;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.hadoop.HadoopIllegalArgumentException;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.util.StringUtils;
+
+/**
+ * XAttr related operations
+ */
+@InterfaceAudience.Private
+@InterfaceStability.Evolving
+class XAttrCommands extends FsCommand {
+  private static String GET_FATTR = "getfattr";
+  private static String SET_FATTR = "setfattr";
+
+  public static void registerCommands(CommandFactory factory) {
+    factory.addClass(GetfattrCommand.class, "-" + GET_FATTR);
+    factory.addClass(SetfattrCommand.class, "-" + SET_FATTR);
+  }
+
+  private static enum ENCODE {
+    TEXT,
+    HEX,
+    BASE64;
+  }
+
+  private static final String ENCODE_HEX = "0x";
+  private static final String ENCODE_BASE64 = "0s";
+
+  private static String convert(String name, byte[] value, ENCODE encode)
+      throws IOException {
+    StringBuilder buffer = new StringBuilder();
+    buffer.append(name);
+    if (value != null && value.length != 0) {
+      buffer.append("=");
+      if (encode == ENCODE.TEXT) {
+        buffer.append("\"").append(new String(value, "utf-8")).append("\"");
+      } else if (encode == ENCODE.HEX) {
+        buffer.append(ENCODE_HEX).append(Hex.encodeHexString(value));
+      } else if (encode == ENCODE.BASE64) {
+        buffer.append(ENCODE_BASE64).append(Base64.encodeBase64String(value));
+      }
+    }
+    return buffer.toString();
+  }
+
+  private static byte[] convert(String value) throws IOException {
+    byte[] result = null;
+    if (value != null) {
+      if (value.length() >= 2) {
+        String en = value.substring(0,2);
+        if (value.startsWith("\"") && value.endsWith("\"")) {
+          value = value.substring(1, value.length()-1);
+          result = value.getBytes("utf-8");
+        } else if (en.equalsIgnoreCase(ENCODE_HEX)) {
+          value = value.substring(2, value.length());
+          try {
+            result = Hex.decodeHex(value.toCharArray());
+          } catch (DecoderException e) {
+            throw new IOException(e);
+          }
+        } else if (en.equalsIgnoreCase(ENCODE_BASE64)) {
+          value = value.substring(2, value.length());
+          result = Base64.decodeBase64(value);
+        }
+      }
+      if (result == null) {
+        result = value.getBytes("utf-8");
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Implementing the '-getfattr' command for the the FsShell.
+   */
+  public static class GetfattrCommand extends FsCommand {
+    public static String NAME = GET_FATTR;
+    public static String USAGE = "[-R] {-n name | -d} [-e en] <path>";
+    public static String DESCRIPTION =
+        "Displays the file name, and the set of extended attribute names " +
+        "(and optionally values) which are associated with that file or " +
+        "directory.\n" +
+        "-R: List the attributes of all files and directories recursively.\n" +
+        "-n name: Dump the value of the named extended attribute.\n" +
+        "-d: Dump the values of all extended attributes associated with " +
+        "pathname.\n" +
+        "-e en: Encode values after retrieving them. Valid values of en " +
+        "are \"text\", \"hex\", and \"base64\". Values encoded as text " +
+        "strings are enclosed in double quotes (\"), while strings encoded" +
+        " as hexadecimal and base64 are prefixed with 0x and 0s, respectively.\n" +
+        "<path>: File or directory to list.\n";
+    private static final String NAME_OPT = "-n";
+    private static final String ENCODE_OPT = "-e";
+    CommandFormat cf = new CommandFormat(0, Integer.MAX_VALUE, "d", "R");
+
+    private String name = null;
+    private boolean dump = false;
+    private ENCODE encode = ENCODE.TEXT;
+    @Override
+    protected void processOptions(LinkedList<String> args) throws IOException {
+      name = StringUtils.popOptionWithArgument(NAME_OPT, args);
+      String en = StringUtils.popOptionWithArgument(ENCODE_OPT, args);
+      if (en != null) {
+        encode = ENCODE.valueOf(en.toUpperCase());
+      }
+
+      cf.parse(args);
+      setRecursive(cf.getOpt("R"));
+      dump = cf.getOpt("d");
+
+      if (!dump && name == null) {
+        throw new HadoopIllegalArgumentException(
+            "Must specify '-n name' or '-d' option.");
+      }
+
+      if (args.isEmpty()) {
+        throw new HadoopIllegalArgumentException("<path> is missing");
+      }
+      if (args.size() > 1) {
+        throw new HadoopIllegalArgumentException("Too many arguments");
+      }
+    }
+
+    @Override
+    protected void processPath(PathData item) throws IOException {
+      out.println("# file: " + item);
+      if (dump) {
+        Map<String, byte[]> xattrs = item.fs.getXAttrs(item.path);
+        if (xattrs != null) {
+          Iterator<Entry<String, byte[]>> iter = xattrs.entrySet().iterator();
+          while(iter.hasNext()) {
+            Entry<String, byte[]> entry = iter.next();
+            out.println(convert(entry.getKey(), entry.getValue(), encode));
+          }
+        }
+      } else {
+        byte[] value = item.fs.getXAttr(item.path, name);
+        if (value != null) {
+          out.println(convert(name, value, encode));
+        }
+      }
+    }
+  }
+
+  /**
+   * Implementing the '-setfattr' command for the the FsShell.
+   */
+  public static class SetfattrCommand extends FsCommand {
+    public static String NAME = SET_FATTR;
+    public static String USAGE = "{-n name [-v value] | -x name} <path>";
+    public static String DESCRIPTION =
+        "Associates a new value with an extended attribute name for file or " +
+        "directory.\n" +
+        "-n name: Specifies the name of the extended attribute to set.\n" +
+        "-v value: Specifies the new value of the extended attribute. There " +
+        "are three methods available for encoding the value. If the given " +
+        "string is enclosed in double quotes, the inner string is treated " +
+        "as text. If the given string begins with 0x or 0X, it expresses " +
+        "a hexadecimal number. If the given string begins with 0s or 0S, " +
+        "base64 encoding is expected.\n" +
+        "-x name: Remove the named extended attribute entirely.\n" +
+        "<path>: File or directory to list.\n";
+    private static final String NAME_OPT = "-n";
+    private static final String VALUE_OPT = "-v";
+    private static final String REMOVE_OPT = "-x";
+
+    private String name = null;
+    private byte[] value = null;
+    private String xname = null;
+
+    @Override
+    protected void processOptions(LinkedList<String> args) throws IOException {
+      name = StringUtils.popOptionWithArgument(NAME_OPT, args);
+      String v = StringUtils.popOptionWithArgument(VALUE_OPT, args);
+      if (v != null) {
+        value = convert(v);
+      }
+      xname = StringUtils.popOptionWithArgument(REMOVE_OPT, args);
+
+      if (name != null && xname != null) {
+        throw new HadoopIllegalArgumentException(
+            "Can not specify both '-n name' and '-x name' option.");
+      }
+      if (name == null && xname == null) {
+        throw new HadoopIllegalArgumentException(
+            "Must specify '-n name' or '-x name' option.");
+      }
+
+      if (args.isEmpty()) {
+        throw new HadoopIllegalArgumentException("<path> is missing");
+      }
+      if (args.size() > 1) {
+        throw new HadoopIllegalArgumentException("Too many arguments");
+      }
+    }
+
+    @Override
+    protected void processPath(PathData item) throws IOException {
+      if (name != null) {
+        item.fs.setXAttr(item.path, name, value);
+      } else if (xname != null) {
+        item.fs.removeXAttr(item.path, xname);
+      }
+    }
+  }
+}

Propchange: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestXAttrCommands.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestXAttrCommands.java?rev=1590903&view=auto
==============================================================================
--- hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestXAttrCommands.java
(added)
+++ hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestXAttrCommands.java
Tue Apr 29 07:56:36 2014
@@ -0,0 +1,63 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.fs.shell;
+
+import static org.junit.Assert.assertFalse;
+
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FsShell;
+import org.apache.hadoop.util.ToolRunner;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestXAttrCommands {
+
+  private Configuration conf = null;
+
+  @Before
+  public void setup() throws IOException {
+    conf = new Configuration();
+  }
+
+  @Test
+  public void testGetfattrValidations() throws Exception {
+    assertFalse("getfattr should fail without path",
+        0 == runCommand(new String[] { "-getfattr" }));
+    assertFalse("getfattr should fail with extra argument",
+        0 == runCommand(new String[] { "-getfattr", "extra", "/test"}));
+    assertFalse("getfattr should fail without \"-n name\" or \"-d\"",
+        0 == runCommand(new String[] { "-getfattr", "/test"}));
+  }
+
+  @Test
+  public void testSetfattrValidations() throws Exception {
+    assertFalse("setfattr should fail without path",
+        0 == runCommand(new String[] { "-setfattr" }));
+    assertFalse("setfacl should fail with extra arguments",
+        0 == runCommand(new String[] { "-setfattr", "extra", "/test"}));
+    assertFalse("setfattr should fail without \"-n name\" or \"-x name\"",
+        0 == runCommand(new String[] { "-setfattr", "/test"}));
+  }
+
+  private int runCommand(String[] commands) throws Exception {
+    return ToolRunner.run(conf, new FsShell(), commands);
+  }
+
+}

Propchange: hadoop/common/branches/HDFS-2006/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestXAttrCommands.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message