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 cm...@apache.org on 2014/10/10 22:04:25 UTC
git commit: HDFS-7198. Fix "unchecked conversion" warning in
DFSClient#getPathTraceScope (cmccabe) (cherry picked from commit
1ceb3269337e321e352b7cd9f946c5c52dcfddfa)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 8ef83a948 -> 4c0bc4597
HDFS-7198. Fix "unchecked conversion" warning in DFSClient#getPathTraceScope (cmccabe)
(cherry picked from commit 1ceb3269337e321e352b7cd9f946c5c52dcfddfa)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4c0bc459
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4c0bc459
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4c0bc459
Branch: refs/heads/branch-2
Commit: 4c0bc459788c681c5387ada2096bd071a4c2e0ac
Parents: 8ef83a9
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Fri Oct 10 13:03:29 2014 -0700
Committer: Colin Patrick Mccabe <cm...@cloudera.com>
Committed: Fri Oct 10 13:04:16 2014 -0700
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/tracing/TraceSamplerFactory.java | 2 +-
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/hdfs/DFSClient.java | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c0bc459/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tracing/TraceSamplerFactory.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tracing/TraceSamplerFactory.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tracing/TraceSamplerFactory.java
index 0de7d3e..54bcb81 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tracing/TraceSamplerFactory.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/tracing/TraceSamplerFactory.java
@@ -30,7 +30,7 @@ public class TraceSamplerFactory {
private static final Logger LOG =
LoggerFactory.getLogger(TraceSamplerFactory.class);
- public static Sampler createSampler(Configuration conf) {
+ public static Sampler<?> createSampler(Configuration conf) {
String samplerStr = conf.get(CommonConfigurationKeys.HADOOP_TRACE_SAMPLER,
CommonConfigurationKeys.HADOOP_TRACE_SAMPLER_DEFAULT);
if (samplerStr.equals("NeverSampler")) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c0bc459/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 0fcf10c..6db43b1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -26,6 +26,9 @@ Release 2.7.0 - UNRELEASED
HDFS-7194. Fix findbugs "inefficient new String constructor" warning in
DFSClient#PATH (yzhang via cmccabe)
+ HDFS-7198. Fix or suppress findbugs "unchecked conversion" warning in
+ DFSClient#getPathTraceScope (cmccabe)
+
Release 2.6.0 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4c0bc459/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
index 94a68e2..8a7c8eb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
@@ -277,7 +277,7 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory,
@VisibleForTesting
KeyProvider provider;
private final SpanReceiverHost spanReceiverHost;
- private final Sampler traceSampler;
+ private final Sampler<?> traceSampler;
/**
* DFSClient configuration