You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/07/01 15:24:42 UTC
git commit: AMBARI-6280 - MySQL metrics sink breaks SCOM SQL Server
metrics sink
Repository: ambari
Updated Branches:
refs/heads/trunk c28adbad7 -> 4e27c5a3f
AMBARI-6280 - MySQL metrics sink breaks SCOM SQL Server metrics sink
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4e27c5a3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4e27c5a3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4e27c5a3
Branch: refs/heads/trunk
Commit: 4e27c5a3f271aa3826d2b500f450e280ececdfff
Parents: c28adba
Author: Artem Baranchuk <ab...@hortonworks.com>
Authored: Thu Jun 26 01:55:13 2014 +0300
Committer: Artem Baranchuk <ab...@hortonworks.com>
Committed: Tue Jul 1 16:23:08 2014 +0300
----------------------------------------------------------------------
.../metrics-sink/db/Hadoop-Metrics-SQLServer-CREATE.ddl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4e27c5a3/contrib/ambari-scom/metrics-sink/db/Hadoop-Metrics-SQLServer-CREATE.ddl
----------------------------------------------------------------------
diff --git a/contrib/ambari-scom/metrics-sink/db/Hadoop-Metrics-SQLServer-CREATE.ddl b/contrib/ambari-scom/metrics-sink/db/Hadoop-Metrics-SQLServer-CREATE.ddl
index 7561960..1abf3fa 100644
--- a/contrib/ambari-scom/metrics-sink/db/Hadoop-Metrics-SQLServer-CREATE.ddl
+++ b/contrib/ambari-scom/metrics-sink/db/Hadoop-Metrics-SQLServer-CREATE.ddl
@@ -550,10 +550,10 @@ BEGIN
SELECT @recordIDCutoff = MIN(RecordID) FROM MetricRecord WHERE RecordID IN (SELECT TOP 60000 RecordID FROM MetricRecord WHERE NodeID = @nodeID ORDER BY RecordDate DESC);
IF @recordIDCutoff IS NOT NULL
BEGIN
- DELETE FROM MetricPair WHERE RecordID IN (
- SELECT RecordID FROM MetricPair as mp
+ DELETE FROM MetricPair
+ FROM MetricPair as mp
JOIN MetricRecord as mr ON mp.RecordID = mr.RecordID
- WHERE mr.RecordID < @recordIDCutoff AND mr.NodeID = @nodeID);
+ WHERE mr.RecordID < @recordIDCutoff AND mr.NodeID = @nodeID;
DELETE FROM MetricRecord
WHERE RecordID < @recordIDCutoff AND NodeID = @nodeID;