Repository: ambari Updated Branches: refs/heads/branch-3.0-ams 522f438c6 -> 7b5679c00
Fixed compile errors from Merge trunk into branch-3.0-ams Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7b5679c0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7b5679c0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7b5679c0 Branch: refs/heads/branch-3.0-ams Commit: 7b5679c00331a998e7409cce3fd70e4dd12e054b Parents: 522f438 Author: Siddharth Wagle <[email protected]> Authored: Tue Sep 26 15:30:09 2017 -0700 Committer: Siddharth Wagle <[email protected]> Committed: Tue Sep 26 15:30:09 2017 -0700 ---------------------------------------------------------------------- .../server/controller/metrics/timeline/MetricsRequestHelper.java | 2 +- .../metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7b5679c0/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java index 3a1405e..5331694 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/MetricsRequestHelper.java @@ -87,7 +87,7 @@ public class MetricsRequestHelper { uriBuilder.setParameter("precision", higherPrecision); String newSpec = uriBuilder.toString(); connection = streamProvider.processURL(newSpec, HttpMethod.GET, (String) null, - Collections.<String, List<String>emptyMap()); + Collections.<String, List<String>>emptyMap()); if (!checkConnectionForPrecisionException(connection)) { throw new IOException("Encountered Precision exception : Higher precision request also failed."); } http://git-wip-us.apache.org/repos/asf/ambari/blob/7b5679c0/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java index ea231f3..baae751 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java @@ -119,7 +119,6 @@ public class TimelineMetricsCacheSizeOfEngine implements SizeOfEngine { timelineMetricPrimitivesApproximation += reflectionSizeOf.sizeOf(metric.getAppId()); timelineMetricPrimitivesApproximation += reflectionSizeOf.sizeOf(metric.getHostName()); timelineMetricPrimitivesApproximation += reflectionSizeOf.sizeOf(metric.getInstanceId()); - timelineMetricPrimitivesApproximation += reflectionSizeOf.sizeOf(metric.getTimestamp()); timelineMetricPrimitivesApproximation += reflectionSizeOf.sizeOf(metric.getStartTime()); timelineMetricPrimitivesApproximation += reflectionSizeOf.sizeOf(metric.getType()); timelineMetricPrimitivesApproximation += 8; // Object overhead
