Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-12344. LocatedFileStatus regression: no longer accepting null FSPermission. 

Contributed by Ewan Higgs
This commit is contained in:
Steve Loughran 2017-08-24 16:17:30 +01:00
parent de0cba700b
commit 8196a07c32
No known key found for this signature in database
GPG Key ID: 950CC3E032B79CA2
2 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/LocatedFileStatus.java
View File

@ -84,8 +84,10 @@ public class LocatedFileStatus extends FileStatus {
Path symlink, Path path, BlockLocation[] locations) {
this(length, isdir, block_replication, blocksize, modification_time,
access_time, permission, owner, group, symlink, path,
permission.getAclBit(), permission.getEncryptedBit(),
permission.getErasureCodedBit(), locations);
permission == null ? false : permission.getAclBit(),
permission == null ? false : permission.getEncryptedBit(),
permission == null ? false : permission.getErasureCodedBit(),
locations);
}
/**

52
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocatedFileStatus.java Normal file
View File

@ -0,0 +1,52 @@
/**
* 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;
import org.apache.hadoop.fs.permission.FsPermission;
import org.junit.Test;
import java.io.IOException;
import static org.mockito.Mockito.mock;
/**
* This class tests the LocatedFileStatus class.
*/
public class TestLocatedFileStatus {
@Test
public void testDeprecatedConstruction() throws IOException {
BlockLocation[] locs = new BlockLocation[] {mock(BlockLocation.class)};
final boolean isDir = false;
final int repl = 3;
final long blocksize = 64 * 1024 * 1024;
final long modificationTime = 0;
final long accessTime = 0;
// We should be able to pass null for the permission.
LocatedFileStatus lfsNullPerm = new LocatedFileStatus(1, isDir,
repl, blocksize, modificationTime, accessTime, null, null, null,
null, new Path("/some-file.txt"), locs);
FsPermission permission = mock(FsPermission.class);
// We should also be able to pass a permission or the permission.
LocatedFileStatus lfsNonNullPerm = new LocatedFileStatus(1, isDir,
repl, blocksize, modificationTime, accessTime, permission, null,
null, null, new Path("/some-file.txt"), locs);
}
}