Repository: hive Updated Branches: refs/heads/master 477a47d3b -> 9629c6ef1
HIVE-14293: PerfLogger.openScopes should be transient (Daniel Dai, reviewed by Prasanth Jayachandran) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/9629c6ef Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/9629c6ef Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/9629c6ef Branch: refs/heads/master Commit: 9629c6ef174c9123dc09ff8eb42b67347779f726 Parents: 477a47d Author: Daniel Dai <da...@hortonworks.com> Authored: Wed Jul 27 15:06:36 2016 -0700 Committer: Daniel Dai <da...@hortonworks.com> Committed: Wed Jul 27 15:06:36 2016 -0700 ---------------------------------------------------------------------- common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java | 2 +- ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/9629c6ef/common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java b/common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java index 63d96be..6a5d22f 100644 --- a/common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java +++ b/common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java @@ -220,7 +220,7 @@ public class PerfLogger { } //Methods for metrics integration. Each thread-local PerfLogger will open/close scope during each perf-log method. - Map<String, MetricsScope> openScopes = new HashMap<String, MetricsScope>(); + transient Map<String, MetricsScope> openScopes = new HashMap<String, MetricsScope>(); private void beginMetrics(String method) { Metrics metrics = MetricsFactory.getInstance(); http://git-wip-us.apache.org/repos/asf/hive/blob/9629c6ef/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java index 690c718..99cdaa0 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java @@ -80,7 +80,7 @@ public class MapJoinOperator extends AbstractMapJoinOperator<MapJoinDesc> implem private static final long serialVersionUID = 1L; private static final Logger LOG = LoggerFactory.getLogger(MapJoinOperator.class.getName()); private static final String CLASS_NAME = MapJoinOperator.class.getName(); - private final PerfLogger perfLogger = SessionState.getPerfLogger(); + private transient final PerfLogger perfLogger = SessionState.getPerfLogger(); private transient String cacheKey; private transient ObjectCache cache;