Changeset 95da4d03b21a3c6dddd17c80da46c7e2b62fd8c0

Timestamp:

10/23/09 21:29:19 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1256333359 +0000

git-parent:

[15e6a4b643a979494b3b34356022cba81433525b]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1256333359 +0000

Message:

one rollup

Files:

• sql/sprocs/stratcon.rollup_metric_numeric.sql (modified) (3 diffs)

sql/sprocs/stratcon.rollup_metric_numeric.sql

@@ -19 +19 @@
-    v_count         INTEGER;
-BEGIN
+    IF in_roll = '5m' THEN
+        PERFORM stratcon.rollup_metric_numeric_5m();
+        RETURN 0;
+    END IF;
+
-    -- Get rollup config based on given name, and fail if its wrong name.
-    SELECT * FROM metric_numeric_rollup_config WHERE rollup = in_roll INTO v_conf;
@@ -82 +87 @@
-            v_offset        := floor( ( extract('epoch' from v_rec.rollup_time) - v_stored_rollup) / v_conf.seconds );
-
-            --v_offset := ( 12*(extract('hour' from v_info.rollup_time))+floor(extract('minute' from v_info.rollup_time)/5) );
-            --v_stored_rollup := v_info.rollup_time::date;
-            -- RAISE NOTICE 'sid %, name %, rollup_time %, offset %', v_rec.sid, v_rec.name, v_stored_rollup, v_offset;
-
-            v_sql := 'SELECT * FROM metric_numeric_rollup_'||in_roll||' WHERE rollup_time = '||quote_literal(v_stored_rollup_tm);
-            v_sql := v_sql ||' and sid='||v_rec.sid||' and name = '|| quote_literal(v_rec.name);
@@ -105 +106 @@
-            IF v_init THEN
-                v_sql := 'INSERT INTO metric_numeric_rollup_'||in_roll||' (sid,name,rollup_time,count_rows,avg_value,counter_dev)
-
-
-
+
+
-                v_init := false;
-            ELSE
-                v_sql := 'UPDATE metric_numeric_rollup_'||in_roll;
-SET (count_rows,avg_value,counter_dev) = ('||v_rec.count_rows||','||v_rec.avg_value||','||v_rec.counter_dev||'
-WHERE rollup_time = '||v_stored_rollup_tm||'  AND sid = '||v_info.sid||'  AND name = '||quote_literal(v_info.name)
-
+ SET (count_rows,avg_value,counter_dev) = ($1,$2,$3
+ WHERE rollup_time = $4  AND sid = $5 AND name = $6'
+ USING v_segment.count_rows, v_segment.avg_value, v_segment.counter_dev, v_stored_rollup_tm, v_segment.sid, v_segment.name
-            END IF;
-