Changeset dfd06d8bc70524168b54bb26477b5f0a3f3a38fe

Timestamp:

10/20/09 15:34:46 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[bcfd3007c0f115d339be6889e5a1fc27333d0b43]

git-author:

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

Message:

fix up things to work

Files:

• sql/scaffolding.sql (modified) (4 diffs)
• sql/sprocs/stratcon.choose_window.sql (modified) (1 diff)
• sql/sprocs/stratcon.fetch_dataset.sql (modified) (4 diffs)
• sql/sprocs/stratcon.fetch_varset.sql (modified) (2 diffs)
• sql/sprocs/stratcon.window_robust_derive.sql (modified) (1 diff)

sql/scaffolding.sql

@@ -4 +4 @@
-alter user stratcon set search_path to noit,public;
-create user prism with unencrypted password 'prism';
+alter user prism set search_path to noit,public;
-\c reconnoiter reconnoiter;
-begin;
@@ -34 +35 @@
-\i tables/stratcon.storage_node.sql
-\i tables/stratcon.map_uuid_to_sid.sql
+\i tables/prism.graph_templates.sql
-
-\i sprocs/noit.check_archive_log_changes.sql
@@ -52 +54 @@
-\i sprocs/stratcon.window_robust_derive.sql
-\i sprocs/stratcon.update_config.sql
+\i sprocs/prism.add_graph_tags.sql
+\i sprocs/prism.add_tags.sql
+\i sprocs/prism.check_name_saved_graphs.sql
+\i sprocs/prism.remove_graph_tags.sql
+\i sprocs/prism.remove_tags.sql
+\i sprocs/prism.saved_graphs_tsvector.sql
+\i sprocs/prism.trig_update_tsvector_saved_graphs.sql
-
-\i tables/noit.check_archive.sql
@@ -61 +70 @@
-\i tables/noit.metric_tag.sql
-\i tables/noit.metric_text_archive.sql
+\i tables/prism.saved_graphs.sql
+\i tables/prism.saved_graphs_dep.sql
+\i tables/prism.saved_worksheets.sql
+\i tables/prism.saved_worksheets_dep.sql
-
-commit;

sql/sprocs/stratcon.choose_window.sql

@@ -19 +19 @@
-                 ) i,
-                 (   select 5*60 as isec, '5 minutes'::interval as aperiod,
-noit.
+
-                  union all
-                     select 20*60 as isec, '20 minutes'::interval as aperiod,
-noit.
+
-                  union all
-                     select 60*60 as isec, '1 hour'::interval as aperiod,
-noit.
+
-                  union all
-                     select 6*60*60 as isec, '6 hours'::interval as aaperiod,
-noit.
+
-                  union all
-                     select 12*60*60 as isec, '12 hours'::interval as aperiod,
-noit.
+
-                 ) ivs
-         ) b

sql/sprocs/stratcon.fetch_dataset.sql

@@ -12 +12 @@
-  end if;
-
-_
+
-    return next v_record; 
-    end loop;
-
-_
+
-  return;
-end
@@ -24 +24 @@
-GRANT EXECUTE ON FUNCTION stratcon.fetch_dataset(uuid, text, timestamp with time zone, timestamp with time zone, integer, boolean) TO stratcon;
-
-_
+
-  RETURNS SETOF noit.metric_numeric_rollup_5m AS
-$BODY$declare
@@ -68 +68 @@
-             ' from generate_series(1,' || v_target.nperiods || ') t) s ' ||
-           'left join ' ||
-noit.
+
-           ' where sid = ' || v_sid ||
-             ' and name = ' || quote_literal(in_name) ||
@@ -99 +99 @@
-$BODY$
-  LANGUAGE 'plpgsql' SECURITY DEFINER;
-_
+
- 

sql/sprocs/stratcon.fetch_varset.sql

@@ -56 +56 @@
-           extract('epoch' from v_target.period)) || ' seconds') ::interval as whence,
-           name, value
-noit.
+
-     where sid = v_sid
-       and name = in_name
@@ -79 +79 @@
-           extract('epoch' from v_target.period)) || ' seconds') ::interval as whence,
-           coalesce(value, '[unset]') as value
-noit.
+
-     where sid = v_sid
-       and name = in_name

sql/sprocs/stratcon.window_robust_derive.sql

@@ -23 +23 @@
-                   (whence > in_start_time - '5 minutes'::interval) as in_window,
-                   value
-noit.
+
-             WHERE whence <= in_start_time
-               AND whence > in_start_time - ('5 minutes'::interval * 2)