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 wh...@apache.org on 2014/12/16 22:26:54 UTC
hadoop git commit: HDFS-7536. Remove unused CryptoCodec in
org.apache.hadoop.fs.Hdfs. Contributed by Haohui Mai.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 ba0969fb0 -> e870851b4
HDFS-7536. Remove unused CryptoCodec in org.apache.hadoop.fs.Hdfs. Contributed by Haohui Mai.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e870851b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e870851b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e870851b
Branch: refs/heads/branch-2
Commit: e870851b4aba31aad599f55d27293979d7ca8511
Parents: ba0969f
Author: Haohui Mai <wh...@apache.org>
Authored: Tue Dec 16 13:26:37 2014 -0800
Committer: Haohui Mai <wh...@apache.org>
Committed: Tue Dec 16 13:26:52 2014 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../hadoop-hdfs/src/main/java/org/apache/hadoop/fs/Hdfs.java | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e870851b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 09d09db..3f5ce25 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -202,6 +202,9 @@ Release 2.7.0 - UNRELEASED
HDFS-7513. HDFS inotify: add defaultBlockSize to CreateEvent (cmccabe)
+ HDFS-7536. Remove unused CryptoCodec in org.apache.hadoop.fs.Hdfs.
+ (Yi Liu via wheat9)
+
OPTIMIZATIONS
HDFS-7454. Reduce memory footprint for AclEntries in NameNode.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e870851b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/fs/Hdfs.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/fs/Hdfs.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/fs/Hdfs.java
index 111630c..1b9f515 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/fs/Hdfs.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/fs/Hdfs.java
@@ -30,7 +30,6 @@ import java.util.NoSuchElementException;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.crypto.CryptoCodec;
import org.apache.hadoop.fs.permission.AclEntry;
import org.apache.hadoop.fs.permission.AclStatus;
import org.apache.hadoop.fs.permission.FsAction;
@@ -61,7 +60,6 @@ import org.apache.hadoop.util.Progressable;
public class Hdfs extends AbstractFileSystem {
DFSClient dfs;
- final CryptoCodec factory;
private boolean verifyChecksum = true;
static {
@@ -88,7 +86,6 @@ public class Hdfs extends AbstractFileSystem {
}
this.dfs = new DFSClient(theUri, conf, getStatistics());
- this.factory = CryptoCodec.getInstance(conf);
}
@Override