aajisaka commented on code in PR #8259: URL: https://github.com/apache/hadoop/pull/8259#discussion_r3371027367
########## hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/find/Perm.java: ########## @@ -0,0 +1,217 @@ +/** + * 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.find; + +import java.io.IOException; +import java.util.Deque; + +import org.apache.hadoop.fs.permission.FsPermission; +import org.apache.hadoop.fs.shell.PathData; + +/** + * Implements the -perm expression for the {@link org.apache.hadoop.fs.shell.find.Find} command. + */ +final class Perm extends BaseExpression { + /** + * Registers this expression with the specified factory. + */ + public static void registerExpression(ExpressionFactory factory) throws IOException { + factory.addClass(Perm.class, "-perm"); + } + + private static final String[] USAGE = {"-perm [-]mode", "-perm [-]onum"}; + private static final String[] HELP = {"Evaluates as true if the file permissions match that", + "specified. If the hyphen is specified then the expression", + "shall evaluate as true if at least the bits specified", + "match, otherwise an exact match is required.", + "The mode may be specified using either symbolic notation,", + "eg 'u=rwx,g+x+w' or as an octal number."}; + + private int permission = 0; + private boolean mask = false; + + Perm() { + super(); + setUsage(USAGE); + setHelp(HELP); + } + + @Override + public void prepare() throws IOException { + parseArgument(getArgument(1)); + } + + /** + * Parse an argument string to build the permission mask. + * + * @param argument String to be parsed + * @throws IllegalArgumentException if the argument is invalid + */ + private void parseArgument(String argument) throws IllegalArgumentException { + String arg = argument; + if (arg == null) { + throw new IllegalArgumentException("Invalid null argument"); + } + if (arg.isEmpty()) { + throw new IllegalArgumentException("Invalid empty argument"); + } + if (arg.startsWith("-")) { + mask = true; + arg = arg.substring(1); + } + if (Character.isDigit(arg.charAt(0))) { + // the argument is a numeric mode + permission = new FsPermission(arg).toShort(); + } else { + // the argument is a symbolic mode + int shift; + Operator operator = null; + int value = 0; Review Comment: Would you initialize the operator and value in the for-loop below? Otherwise `u=rwx,g` would be equivalent to `u=rwx,g=rwx`. ########## hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml: ########## @@ -17617,6 +17617,475 @@ $</expected-output> <expected-output>^/findtest/item1/item1a /findtest/item1/item1a/item1aa /findtest/item4/item4a +$</expected-output> + </comparator> + </comparators> + </test> + <test> <!-- TESTED --> + <description>find: -atime </description> + <test-commands> + <command>-fs NAMENODE -mkdir /findtest</command> + <command>-fs NAMENODE -mkdir /findtest/item1</command> + <command>-fs NAMENODE -mkdir /findtest/item1/item1a</command> + <command>-fs NAMENODE -touchz /findtest/item1/item1a/item1aa</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item1/item1b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item2</command> + <command>-fs NAMENODE -mkdir /findtest/item3</command> + <command>-fs NAMENODE -mkdir /findtest/item4</command> + <command>-fs NAMENODE -mkdir /findtest/item4/item4a</command> + <command>-fs NAMENODE -put CLITEST_DATA/data120bytes /findtest/item4/item4b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data1k /findtest/item5</command> + <command>-fs NAMENODE -touch -a /findtest</command> + <command>-fs NAMENODE -touch -a /findtest/item1</command> + <command>-fs NAMENODE -touch -a /findtest/item1/item1a</command> + <command>-fs NAMENODE -touch -a /findtest/item1/item1a/item1aa</command> + <command>-fs NAMENODE -touch -a -t 20060401:195000 /findtest/item1/item1b</command> + <command>-fs NAMENODE -touch -a /findtest/item2</command> + <command>-fs NAMENODE -touch -a /findtest/item3</command> + <command>-fs NAMENODE -touch -a /findtest/item4</command> + <command>-fs NAMENODE -touch -a /findtest/item4/item4a</command> + <command>-fs NAMENODE -touch -a /findtest/item4/item4b</command> + <command>-fs NAMENODE -touch -a -t 20060401:195000 /findtest/item5</command> + <command>-fs NAMENODE -find /findtest -atime +1</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /findtest</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpAcrossOutputComparator</type> + <expected-output>^/findtest/item1/item1b +/findtest/item5 +$</expected-output> + </comparator> + </comparators> + </test> + <test> <!-- TESTED --> + <description>find: -amin </description> + <test-commands> + <command>-fs NAMENODE -mkdir /findtest</command> + <command>-fs NAMENODE -mkdir /findtest/item1</command> + <command>-fs NAMENODE -mkdir /findtest/item1/item1a</command> + <command>-fs NAMENODE -touchz /findtest/item1/item1a/item1aa</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item1/item1b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item2</command> + <command>-fs NAMENODE -mkdir /findtest/item3</command> + <command>-fs NAMENODE -mkdir /findtest/item4</command> + <command>-fs NAMENODE -mkdir /findtest/item4/item4a</command> + <command>-fs NAMENODE -put CLITEST_DATA/data120bytes /findtest/item4/item4b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data1k /findtest/item5</command> + <command>-fs NAMENODE -touch -a /findtest</command> + <command>-fs NAMENODE -touch -a /findtest/item1</command> + <command>-fs NAMENODE -touch -a /findtest/item1/item1a</command> + <command>-fs NAMENODE -touch -a /findtest/item1/item1a/item1aa</command> + <command>-fs NAMENODE -touch -a -t 20060401:195000 /findtest/item1/item1b</command> + <command>-fs NAMENODE -touch -a /findtest/item2</command> + <command>-fs NAMENODE -touch -a /findtest/item3</command> + <command>-fs NAMENODE -touch -a /findtest/item4</command> + <command>-fs NAMENODE -touch -a /findtest/item4/item4a</command> + <command>-fs NAMENODE -touch -a /findtest/item4/item4b</command> + <command>-fs NAMENODE -touch -a -t 20060401:195000 /findtest/item5</command> + <command>-fs NAMENODE -find /findtest -amin +1</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /findtest</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpAcrossOutputComparator</type> + <expected-output>^/findtest/item1/item1b +/findtest/item5 +$</expected-output> + </comparator> + </comparators> + </test> + <test> <!-- TESTED --> + <description>find: -blocksize </description> + <test-commands> + <command>-fs NAMENODE -mkdir /findtest</command> + <command>-fs NAMENODE -mkdir /findtest/item1</command> + <command>-fs NAMENODE -mkdir /findtest/item1/item1a</command> + <command>-fs NAMENODE -Ddfs.blocksize=268435456 -touchz /findtest/item1/item1a/item1aa</command> + <command>-fs NAMENODE -Ddfs.blocksize=134217728 -put CLITEST_DATA/data60bytes /findtest/item1/item1b</command> + <command>-fs NAMENODE -Ddfs.blocksize=268435456 -put CLITEST_DATA/data60bytes /findtest/item2</command> + <command>-fs NAMENODE -mkdir /findtest/item3</command> + <command>-fs NAMENODE -mkdir /findtest/item4</command> + <command>-fs NAMENODE -mkdir /findtest/item4/item4a</command> + <command>-fs NAMENODE -Ddfs.blocksize=268435456 -put CLITEST_DATA/data120bytes /findtest/item4/item4b</command> + <command>-fs NAMENODE -Ddfs.blocksize=134217728 -put CLITEST_DATA/data1k /findtest/item5</command> + <command>-fs NAMENODE -stat /findtest/item5</command> + <command>-fs NAMENODE -find /findtest -blocksize 268435456</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /findtest</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpAcrossOutputComparator</type> + <expected-output>^/findtest/item1/item1a/item1aa +/findtest/item2 +/findtest/item4/item4b +$</expected-output> + </comparator> + </comparators> + </test> + <test> <!-- TESTED --> + <description>find: -empty </description> + <test-commands> + <command>-fs NAMENODE -mkdir /findtest</command> + <command>-fs NAMENODE -mkdir /findtest/item1</command> + <command>-fs NAMENODE -mkdir /findtest/item1/item1a</command> + <command>-fs NAMENODE -touchz /findtest/item1/item1a/item1aa</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item1/item1b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item2</command> + <command>-fs NAMENODE -mkdir /findtest/item3</command> + <command>-fs NAMENODE -mkdir /findtest/item4</command> + <command>-fs NAMENODE -mkdir /findtest/item4/item4a</command> + <command>-fs NAMENODE -put CLITEST_DATA/data120bytes /findtest/item4/item4b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data1k /findtest/item5</command> + <command>-fs NAMENODE -find /findtest -empty</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /findtest</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpAcrossOutputComparator</type> + <expected-output>^/findtest/item1/item1a/item1aa +/findtest/item3 +/findtest/item4/item4a +$</expected-output> + </comparator> + </comparators> + </test> + <test> <!-- TESTED --> + <description>find: -user </description> + <test-commands> + <command>-fs NAMENODE -mkdir /findtest</command> + <command>-fs NAMENODE -mkdir /findtest/item1</command> + <command>-fs NAMENODE -mkdir /findtest/item1/item1a</command> + <command>-fs NAMENODE -touchz /findtest/item1/item1a/item1aa</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item1/item1b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item2</command> + <command>-fs NAMENODE -mkdir /findtest/item3</command> + <command>-fs NAMENODE -mkdir /findtest/item4</command> + <command>-fs NAMENODE -mkdir /findtest/item4/item4a</command> + <command>-fs NAMENODE -put CLITEST_DATA/data120bytes /findtest/item4/item4b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data1k /findtest/item5</command> + <command>-fs NAMENODE -chown newowner:newgroup /findtest/item1/item1b</command> + <command>-fs NAMENODE -chown newowner:newgroup /findtest/item4/item4a</command> + <command>-fs NAMENODE -find /findtest -user newowner</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /findtest</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpAcrossOutputComparator</type> + <expected-output>^/findtest/item1/item1b +/findtest/item4/item4a +$</expected-output> + </comparator> + </comparators> + </test> + <test> <!-- TESTED --> + <description>find: -group </description> + <test-commands> + <command>-fs NAMENODE -mkdir /findtest</command> + <command>-fs NAMENODE -mkdir /findtest/item1</command> + <command>-fs NAMENODE -mkdir /findtest/item1/item1a</command> + <command>-fs NAMENODE -touchz /findtest/item1/item1a/item1aa</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item1/item1b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item2</command> + <command>-fs NAMENODE -mkdir /findtest/item3</command> + <command>-fs NAMENODE -mkdir /findtest/item4</command> + <command>-fs NAMENODE -mkdir /findtest/item4/item4a</command> + <command>-fs NAMENODE -put CLITEST_DATA/data120bytes /findtest/item4/item4b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data1k /findtest/item5</command> + <command>-fs NAMENODE -chown newowner:newgroup /findtest/item1/item1b</command> + <command>-fs NAMENODE -chown newowner:newgroup /findtest/item4/item4a</command> + <command>-fs NAMENODE -find /findtest -group newgroup</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /findtest</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpAcrossOutputComparator</type> + <expected-output>^/findtest/item1/item1b +/findtest/item4/item4a +$</expected-output> + </comparator> + </comparators> + </test> + <test> <!-- TESTED --> + <description>find: -mtime </description> + <test-commands> + <command>-fs NAMENODE -mkdir /findtest</command> + <command>-fs NAMENODE -mkdir /findtest/item1</command> + <command>-fs NAMENODE -mkdir /findtest/item1/item1a</command> + <command>-fs NAMENODE -touchz /findtest/item1/item1a/item1aa</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item1/item1b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item2</command> + <command>-fs NAMENODE -mkdir /findtest/item3</command> + <command>-fs NAMENODE -mkdir /findtest/item4</command> + <command>-fs NAMENODE -mkdir /findtest/item4/item4a</command> + <command>-fs NAMENODE -put CLITEST_DATA/data120bytes /findtest/item4/item4b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data1k /findtest/item5</command> + <command>-fs NAMENODE -touch -m -t 20060401:195000 /findtest/item1/item1b</command> + <command>-fs NAMENODE -touch -m -t 20060401:195000 /findtest/item5</command> + <command>-fs NAMENODE -find /findtest -mtime +1</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /findtest</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpAcrossOutputComparator</type> + <expected-output>^/findtest/item1/item1b +/findtest/item5 +$</expected-output> + </comparator> + </comparators> + </test> + <test> <!-- TESTED --> + <description>find: -mmin </description> + <test-commands> + <command>-fs NAMENODE -mkdir /findtest</command> + <command>-fs NAMENODE -mkdir /findtest/item1</command> + <command>-fs NAMENODE -mkdir /findtest/item1/item1a</command> + <command>-fs NAMENODE -touchz /findtest/item1/item1a/item1aa</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item1/item1b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item2</command> + <command>-fs NAMENODE -mkdir /findtest/item3</command> + <command>-fs NAMENODE -mkdir /findtest/item4</command> + <command>-fs NAMENODE -mkdir /findtest/item4/item4a</command> + <command>-fs NAMENODE -put CLITEST_DATA/data120bytes /findtest/item4/item4b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data1k /findtest/item5</command> + <command>-fs NAMENODE -touch -m -t 20060401:195000 /findtest/item1/item1b</command> + <command>-fs NAMENODE -touch -m -t 20060401:195000 /findtest/item5</command> + <command>-fs NAMENODE -find /findtest -mmin +1</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /findtest</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpAcrossOutputComparator</type> + <expected-output>^/findtest/item1/item1b +/findtest/item5 +$</expected-output> + </comparator> + </comparators> + </test> + <test> <!-- TESTED --> + <description>find: -newer </description> + <test-commands> + <command>-fs NAMENODE -mkdir /findtest</command> + <command>-fs NAMENODE -mkdir /findtest/item1</command> + <command>-fs NAMENODE -mkdir /findtest/item1/item1a</command> + <command>-fs NAMENODE -touchz /findtest/item1/item1a/item1aa</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item1/item1b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item2</command> + <command>-fs NAMENODE -mkdir /findtest/item3</command> + <command>-fs NAMENODE -mkdir /findtest/item4</command> + <command>-fs NAMENODE -mkdir /findtest/item4/item4a</command> + <command>-fs NAMENODE -put CLITEST_DATA/data120bytes /findtest/item4/item4b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data1k /findtest/item5</command> + <command>-fs NAMENODE -find /findtest -newer /findtest/item4/item4a</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /findtest</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpAcrossOutputComparator</type> + <expected-output>^/findtest +/findtest/item4 +/findtest/item4/item4b +/findtest/item5 +$</expected-output> + </comparator> + </comparators> + </test> + <test> <!-- TESTED --> + <description>find: -perm </description> + <test-commands> + <command>-fs NAMENODE -mkdir /findtest</command> + <command>-fs NAMENODE -mkdir /findtest/item1</command> + <command>-fs NAMENODE -mkdir /findtest/item1/item1a</command> + <command>-fs NAMENODE -touchz /findtest/item1/item1a/item1aa</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item1/item1b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item2</command> + <command>-fs NAMENODE -mkdir /findtest/item3</command> + <command>-fs NAMENODE -mkdir /findtest/item4</command> + <command>-fs NAMENODE -mkdir /findtest/item4/item4a</command> + <command>-fs NAMENODE -put CLITEST_DATA/data120bytes /findtest/item4/item4b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data1k /findtest/item5</command> + <command>-fs NAMENODE -chmod 700 /findtest/item1/item1a/item1aa</command> + <command>-fs NAMENODE -chmod 600 /findtest/item4/item4b</command> + <command>-fs NAMENODE -chmod 400 /findtest/item5</command> + <command>-fs NAMENODE -find /findtest -perm 600</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /findtest</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpAcrossOutputComparator</type> + <expected-output>^/findtest/item4/item4b +$</expected-output> + </comparator> + </comparators> + </test> + <test> <!-- TESTED --> + <description>find: -replicas </description> + <test-commands> + <command>-fs NAMENODE -mkdir /findtest</command> + <command>-fs NAMENODE -mkdir /findtest/item1</command> + <command>-fs NAMENODE -mkdir /findtest/item1/item1a</command> + <command>-fs NAMENODE -touchz /findtest/item1/item1a/item1aa</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item1/item1b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item2</command> + <command>-fs NAMENODE -mkdir /findtest/item3</command> + <command>-fs NAMENODE -mkdir /findtest/item4</command> + <command>-fs NAMENODE -mkdir /findtest/item4/item4a</command> + <command>-fs NAMENODE -put CLITEST_DATA/data120bytes /findtest/item4/item4b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data1k /findtest/item5</command> + <command>-fs NAMENODE -setrep 3 /findtest/item1/item1a/item1aa</command> + <command>-fs NAMENODE -setrep 3 /findtest/item4/item4b</command> + <command>-fs NAMENODE -setrep 2 /findtest/item5</command> + <command>-fs NAMENODE -find /findtest -replicas 3</command> + </test-commands> + <cleanup-commands> + <command>-fs NAMENODE -rm -r /findtest</command> + </cleanup-commands> + <comparators> + <comparator> + <type>RegexpAcrossOutputComparator</type> + <expected-output>^/findtest/item1/item1a/item1aa +/findtest/item4/item4b +$</expected-output> + </comparator> + </comparators> + </test> + <test> <!-- TESTED --> + <description>find: -size </description> + <test-commands> + <command>-fs NAMENODE -mkdir /findtest</command> + <command>-fs NAMENODE -mkdir /findtest/item1</command> + <command>-fs NAMENODE -mkdir /findtest/item1/item1a</command> + <command>-fs NAMENODE -touchz /findtest/item1/item1a/item1aa</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item1/item1b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /findtest/item2</command> + <command>-fs NAMENODE -mkdir /findtest/item3</command> + <command>-fs NAMENODE -mkdir /findtest/item4</command> + <command>-fs NAMENODE -mkdir /findtest/item4/item4a</command> + <command>-fs NAMENODE -put CLITEST_DATA/data120bytes /findtest/item4/item4b</command> + <command>-fs NAMENODE -put CLITEST_DATA/data1k /findtest/item5</command> + <command>-fs NAMENODE -find /findtest -size +60c -size -1</command> Review Comment: Now the test is failing due to the round up calculation. Would you fix the test case? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
