Navigation

← Previous Changeset
Next Changeset →

Changeset b354e99dbd9c5a7fed905a1de2014ea0ed2dc507

Timestamp:

10/23/09 21:12:50 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[66acead9783cbb25309f4bbf73e2fed9462863f3]

git-author:

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

Message:

sweep

Files:

sql/scaffolding.sql (modified) (1 diff)
sql/sprocs/stratcon.rollup_metric_numeric.sql (modified) (6 diffs)
sql/sprocs/stratcon.rollup_metric_numeric_5m.sql (modified) (4 diffs)
sql/sprocs/stratcon.unroll_metric_numeric.sql (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

sql/scaffolding.sql

rbe9e0d3	rb354e99
55	55	\i sprocs/stratcon.fetch_varset.sql
56	56	\i sprocs/stratcon.get_storage_node_for_sid.sql
57		\i sprocs/stratcon.init_metric_numeric_rollup~~_5m~~.sql
	57	\i sprocs/stratcon.init_metric_numeric_rollup.sql
58	58	\i sprocs/stratcon.map_uuid_to_sid.sql
59	59	\i sprocs/stratcon.update_config.sql
60	60	\i sprocs/stratcon.rollup_metric_numeric_5m.sql
61	61	\i sprocs/stratcon.metric_name_summary_compile_fts_data.sql
62		\i sprocs/stratcon.rollup_metric_numeric~~_generic~~.sql
	62	\i sprocs/stratcon.rollup_metric_numeric.sql
63	63
64	64	\i sprocs/prism.add_graph_tags.sql

sql/sprocs/stratcon.rollup_metric_numeric.sql

r2946c90	rb354e99
11	11	v_locked BOOLEAN;
12	12	v_this_roll TEXT;
13		v_stored_rollup TIMESTAMPTZ;
	13	v_stored_rollup INTEGER;
	14	v_stored_rollup_tm TIMESTAMPTZ;
14	15	v_offset INTEGER;
15	16	v_init BOOLEAN := FALSE;
…	…
70	71	END LOOP;
71	72
72		v_sql := 'SELECT sid, name, $2 as rollup_time, SUM(1) as count_rows, (SUM(avg_value1)/SUM(1)) as avg_value, (SUM(counter_dev1)/SUM(1)) as counter_dev
73		FROM stratcon.unroll_metric_numeric( $~~2, $1~~, $3)
	73	v_sql := 'SELECT sid, name, $1 as rollup_time, SUM(1) as count_rows, (SUM(avg_value1)/SUM(1)) as avg_value, (SUM(counter_dev1)/SUM(1)) as counter_dev
	74	FROM stratcon.unroll_metric_numeric( $1, $2, $3)
74	75	GROUP BY sid, name';
75		RAISE NOTICE 'v_sql was (%)',v_sql;
76		FOR v_rec IN EXECUTE v_sql USING v_min_whence - v_conf.seconds * '1 second'::INTERVAL, v_min_whence, v_conf.dependent_on LOOP
77		v_stored_rollup := floor( extract('epoch' from v_rec.rollup_time) / v_conf.span ) + v_conf.window;
	76	RAISE NOTICE 'v_sql was (%), %, %, %',v_sql,v_min_whence, v_min_whence + (v_conf.seconds - 1) * '1 second'::interval, v_conf.dependent_on;
	77	FOR v_rec IN EXECUTE v_sql USING v_min_whence,
	78	v_min_whence + (v_conf.seconds - 1) * '1 second'::interval,
	79	v_conf.dependent_on LOOP
	80	v_stored_rollup := floor( extract('epoch' from v_rec.rollup_time) / v_conf.span ) * v_conf.span;
	81	v_stored_rollup_tm := 'epoch'::timestamptz + v_stored_rollup * '1 second'::interval;
78	82	v_offset := floor( ( extract('epoch' from v_rec.rollup_time) - v_stored_rollup) / v_conf.seconds );
79	83
…	…
82	86	-- RAISE NOTICE 'sid %, name %, rollup_time %, offset %', v_rec.sid, v_rec.name, v_stored_rollup, v_offset;
83	87
84		v_sql := 'SELECT * FROM metric_numeric_rollup_'\|\|in_roll\|\|' WHERE rollup_time = '\|\|quote_literal(v_stored_rollup);
	88	v_sql := 'SELECT * FROM metric_numeric_rollup_'\|\|in_roll\|\|' WHERE rollup_time = '\|\|quote_literal(v_stored_rollup_tm);
85	89	v_sql := v_sql \|\|' and sid='\|\|v_rec.sid\|\|' and name = '\|\| quote_literal(v_rec.name);
86	90
…	…
88	92	GET DIAGNOSTICS v_count = ROW_COUNT;
89	93	IF v_count = 0 THEN
90		v_segment := stratcon.init_metric_numeric_rollup~~_segment~~( in_roll );
	94	v_segment := stratcon.init_metric_numeric_rollup( in_roll );
91	95	v_init := true;
92		RAISE NOTICE 'didnt find sid %, name %, rollup_time %, offset %', v_rec.sid, v_rec.name, v_stored_rollup, v_offset;
	96	RAISE NOTICE 'didnt find sid %, name %, rollup_time %, offset %', v_rec.sid, v_rec.name, v_stored_rollup_tm, v_offset;
93	97	END IF;
94	98
…	…
101	105	IF v_init THEN
102	106	v_sql := 'INSERT INTO metric_numeric_rollup_'\|\|in_roll\|\|' (sid,name,rollup_time,count_rows,avg_value,counter_dev)
103		VALUES ('\|\| v_segment.sid\|\|','\|\|quote_literal(v_segment.name)\|\|','\|\|quote_literal(v_stored_rollup)\|\|','\|\|v_segment.count_rows
	107	VALUES ('\|\| v_segment.sid\|\|','\|\|quote_literal(v_segment.name)\|\|','\|\|quote_literal(v_stored_rollup_tm)\|\|','\|\|v_segment.count_rows
104	108	\|\|','\|\|v_segment.avg_value\|\|','\|\|v_segment.counter_dev\|\|')';
105	109	EXECUTE v_sql;
…	…
108	112	v_sql := 'UPDATE metric_numeric_rollup_'\|\|in_roll;
109	113	v_sql := v_sql \|\| 'SET (count_rows,avg_value,counter_dev) = ('\|\|v_rec.count_rows\|\|','\|\|v_rec.avg_value\|\|','\|\|v_rec.counter_dev\|\|')';
110		v_sql := v_sql \|\| 'WHERE rollup_time = '\|\|v_stored_rollup\|\|' AND sid = '\|\|v_info.sid\|\|' AND name = '\|\|quote_literal(v_info.name);
	114	v_sql := v_sql \|\| 'WHERE rollup_time = '\|\|v_stored_rollup_tm\|\|' AND sid = '\|\|v_info.sid\|\|' AND name = '\|\|quote_literal(v_info.name);
111	115	EXECUTE v_sql;
112	116	END IF;

sql/sprocs/stratcon.rollup_metric_numeric_5m.sql

r3d4ceaf	rb354e99
31	31	END IF;
32	32
33		FOR whenceint IN SELECT * FROM metric_numeric_rollup_queue WHERE interval='5 ~~minutes~~' LOOP
	33	FOR whenceint IN SELECT * FROM metric_numeric_rollup_queue WHERE interval='5m' LOOP
34	34
35		SELECT MIN(whence) FROM metric_numeric_rollup_queue WHERE interval='5 ~~minutes~~'
	35	SELECT MIN(whence) FROM metric_numeric_rollup_queue WHERE interval='5m'
36	36	INTO v_min_whence;
37	37
…	…
42	42
43	43	SELECT whence FROM metric_numeric_rollup_queue
44		WHERE whence=date_trunc('H',v_min_whence) + (round(extract('minute' from v_min_whence)/20)20) '1 minute'::interval and interval='20 ~~minutes~~'
	44	WHERE whence=date_trunc('H',v_min_whence) + (round(extract('minute' from v_min_whence)/20)20) '1 minute'::interval and interval='20m'
45	45	INTO v_whence;
46	46	IF NOT FOUND THEN
47	47	INSERT INTO metric_numeric_rollup_queue
48		VALUES(date_trunc('H',v_min_whence) + (round(extract('minute' from v_min_whence)/20)20) '1 minute'::interval,'20 ~~minutes~~');
	48	VALUES(date_trunc('H',v_min_whence) + (round(extract('minute' from v_min_whence)/20)20) '1 minute'::interval,'20m');
49	49	END IF;
50	50
…	…
63	63	SELECT * FROM metric_numeric_rollup_5m WHERE rollup_time = v_info.rollup_time AND sid=v_info.sid AND name=v_info.name INTO v_rec;
64	64	IF NOT FOUND THEN
65		SELECT * FROM stratcon.init_metric_numeric_rollup~~_5m(~~) INTO v_rec;
	65	SELECT * FROM stratcon.init_metric_numeric_rollup('5m') INTO v_rec;
66	66	v_init := true;
67	67	END IF;
…	…
86	86
87	87	-- Delete from whence log table
88		DELETE FROM metric_numeric_rollup_queue WHERE WHENCE=v_min_whence AND INTERVAL='5 ~~minutes~~';
	88	DELETE FROM metric_numeric_rollup_queue WHERE WHENCE=v_min_whence AND INTERVAL='5m';
89	89
90	90	v_min_whence:= NULL;

sql/sprocs/stratcon.unroll_metric_numeric.sql

r31d5dd7	rb354e99
17	17	temprec RECORD;
18	18	BEGIN
	19	IF in_start IS NULL OR in_end IS NULL THEN
	20	RAISE EXCEPTION 'start and end must be not null (%,%)', in_start, in_end;
	21	END IF;
19	22	SELECT * FROM metric_numeric_rollup_config WHERE rollup = in_roll INTO v_conf;
20	23	IF NOT FOUND THEN