perfsonar development work

Author: roman
Date: 2007-08-24 06:05:37 -0400 (Fri, 24 Aug 2007)
New Revision: 2715

Modified:
   
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbremove.sql
   
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbsetup.sql
   
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbremove.sql
   branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbsetup.sql
Log:

sql statements to create/delete/populate errors table have been added




Modified: 
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbremove.sql
===================================================================
--- 
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbremove.sql 
      2007-08-24 09:21:46 UTC (rev 2714)
+++ 
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbremove.sql 
      2007-08-24 10:05:37 UTC (rev 2715)
@@ -22,6 +22,10 @@
 
 
 DROP TABLE
+    perfsonar_errors;
+
+
+DROP TABLE
     domain_link;
 
 

Modified: 
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbsetup.sql
===================================================================
--- 
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbsetup.sql  
      2007-08-24 09:21:46 UTC (rev 2714)
+++ 
branches/new-structure/trunk/geant2_java-sql-ma/conf/mysql-sqlma-dbsetup.sql  
      2007-08-24 10:05:37 UTC (rev 2715)
@@ -41,6 +41,15 @@
 
 
 CREATE TABLE
+    perfsonar_errors
+        (metadataId VARCHAR(30) NOT NULL,
+         value FLOAT (16,4) NOT NULL,
+         valueUnits VARCHAR(30) NULL,
+         timeValue INT NOT NULL,
+         ts TIMESTAMP DEFAULT NOW());
+
+
+CREATE TABLE
     domain_link
         (id VARCHAR(255) NOT NULL,
          time TIMESTAMP DEFAULT NOW(),
@@ -83,25 +92,48 @@
 
 INSERT
     INTO perfsonar_utilization
-    VALUES ('meta1-test', 2, 'bps', 1143034705, default);
+    VALUES ('meta1-test', 2, 'Bps', 1143034705, default);
 
 INSERT
     INTO
     perfsonar_utilization
-    VALUES ('meta2-test', 3, 'bps', 1143034706, default);
+    VALUES ('meta2-test', 3, 'Bps', 1143034706, default);
 
 INSERT
     INTO
     perfsonar_utilization
-    VALUES ('meta3-test', 4, 'bps', 1143034707, default);
+    VALUES ('meta3-test', 4, 'Bps', 1143034707, default);
 
 INSERT
     INTO
     perfsonar_utilization
-    VALUES ('meta4-test', 5, 'bps', 1143034709, default);
+    VALUES ('meta4-test', 5, 'Bps', 1143034709, default);
 
 
 
+# insert statements for testing perfsonar_errors table
+
+INSERT
+    INTO perfsonar_errors
+    VALUES ('meta1-errors-test', 1, 'Eps', 1187948870, default);
+
+INSERT
+    INTO
+    perfsonar_errors
+    VALUES ('meta2-errors-test', 0, 'Eps', 1187948875, default);
+
+INSERT
+    INTO
+    perfsonar_errors
+    VALUES ('meta3-errors-test', 4, 'Eps', 1187948882, default);
+
+INSERT
+    INTO
+    perfsonar_errors
+    VALUES ('meta4-errors-test', 2, 'Eps', 1187948888, default);
+
+
+
 # insert statements for testing domain_link table
 
 INSERT

Modified: 
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbremove.sql
===================================================================
--- 
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbremove.sql  
      2007-08-24 09:21:46 UTC (rev 2714)
+++ 
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbremove.sql  
      2007-08-24 10:05:37 UTC (rev 2715)
@@ -19,6 +19,8 @@
 
 drop table perfsonar_utilization;
 
+drop table perfsonar_errors;
+
 drop table domain_link;
 
 drop table interdomain_link;

Modified: 
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbsetup.sql
===================================================================
--- 
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbsetup.sql 
2007-08-24 09:21:46 UTC (rev 2714)
+++ 
branches/new-structure/trunk/geant2_java-sql-ma/conf/psql-sqlma-dbsetup.sql 
2007-08-24 10:05:37 UTC (rev 2715)
@@ -55,6 +55,15 @@
         );
 
 create table
+    perfsonar_errors
+        (metadataId varchar(30) not null,
+         value double precision not null,
+         valueUnits varchar(30) null,
+         timeValue integer not null,
+         ts timestamp default now()
+        );
+
+create table
     domain_link
         (id varchar(255) not null,
          time timestamp default now(),
@@ -78,21 +87,40 @@
 
 insert
     into perfsonar_utilization
-    values ('meta1-test', 2, 'bps', 1143034705);
+    values ('meta1-test', 2, 'Bps', 1143034705);
 
 insert
     into perfsonar_utilization
-    values ('meta2-test', 3, 'bps', 1143034706);
+    values ('meta2-test', 3, 'Bps', 1143034706);
 
 insert
     into perfsonar_utilization
-    values ('meta3-test', 4, 'bps', 1143034707);
+    values ('meta3-test', 4, 'Bps', 1143034707);
 
 insert
     into perfsonar_utilization
-    values ('meta4-test', 5, 'bps', 1143034709);
+    values ('meta4-test', 5, 'Bps', 1143034709);
 
 
+-- insert statements for testing perfsonar_errors table
+
+insert
+    into perfsonar_errors
+    values ('meta1-errors-test', 1, 'Eps', 1187948870);
+
+insert
+    into perfsonar_errors
+    values ('meta2-errors-test', 0, 'Eps', 1187948875);
+
+insert
+    into perfsonar_errors
+    values ('meta3--errors-test', 4, 'Eps', 1187948882);
+
+insert
+    into perfsonar_errors
+    values ('meta4-errors-test', 2, 'Eps', 1187948888);
+
+
 -- insert statements for testing domain_link table
 
 insert