perfsonar development work

Author: psnc.pikusa
Date: 2011-10-05 18:54:51 +0100 (Wed, 05 Oct 2011)
New Revision: 5869

Modified:
   trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbsetup.sql
Log:
Added OWAMP tables to basic dbsetup

Modified: trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbsetup.sql
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbsetup.sql    2011-10-05 
17:50:04 UTC (rev 5868)
+++ trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbsetup.sql    2011-10-05 
17:54:51 UTC (rev 5869)
@@ -110,25 +110,54 @@
          ts TIMESTAMP DEFAULT NOW());
 
 
-############### Create table for OWAMP data ################
-#
-#CREATE TABLE
-#        clmp_owamp
-#           (metadataId VARCHAR(255)  NOT NULL,
-#            receiveSynchronized INT(1)  NULL DEFAULT 0,
-#            receiveTime VARCHAR(21) NOT NULL,
-#            receiveTimeError FLOAT  NULL DEFAULT 0,
-#            sendSynchronized INT(1)  NULL DEFAULT 0,
-#            sendTime VARCHAR(21)  NOT NULL,
-#            sendTimeError FLOAT  NULL DEFAULT 0,
-#            seqNum INTEGER  NULL DEFAULT 0,
-#            timeType VARCHAR(4)  NULL,
-#            timeValue LONG  NOT NULL,
-#            ttl SMALLINT(6)  NULL DEFAULT 0,
-#            ts TIMESTAMP DEFAULT NOW());
-#
-############################################################
 
+# Create table for OWAMP data
+CREATE TABLE
+        owamp
+           (metadataId VARCHAR(255)  NOT NULL,
+            receiveSynchronized INT(1)  NULL ,
+            receiveTime VARCHAR(21) NOT NULL,
+            receiveTimeError FLOAT  NULL ,
+            sendSynchronized INT(1)  NULL ,
+            sendTime VARCHAR(21)  NOT NULL,
+            sendTimeError FLOAT  NULL ,
+            seqNum INTEGER  NULL ,
+            ttl SMALLINT NULL,
+            ts TIMESTAMP DEFAULT NOW());
+            
+INSERT
+    INTO owamp
+    VALUES ('owamp-meta1', 1, '15080301494633990766', 1.00583e-06, 1, 
15080301494378967368, 4.91142e-05, 0, 243 ,default);
+INSERT
+    INTO owamp
+    VALUES ('owamp-meta1', 1, '15080301494633990766', 1.00483e-06, 1, 
15080301494378967368, 4.81142e-05, 1, 243 ,default);
+
+ CREATE TABLE
+               owamp_agg
+               (metadataId VARCHAR(255) NOT NULL,
+               sender VARCHAR(255) NOT NULL,
+               receiver VARCHAR(255) NOT NULL,
+               sent INT NULL,
+               loss INT NULL,
+               lostPercent FLOAT NULL,
+               duplicates INT NULL,
+               minDelay FLOAT NULL,
+               medDelay FLOAT NULL,
+               maxDelay FLOAT NULL,
+               delayUnits VARCHAR(10) NULL,
+               error FLOAT NULL,
+               errorUnits VARCHAR (10) NULL,
+               jitter FLOAT NULL,
+               jitterUnits VARCHAR(10) NULL,
+               hops INT NULL,
+               ts TIMESTAMP DEFAULT NOW());
+
+INSERT
+    INTO owamp_agg
+    VALUES ('owamp-meta2',  'host1', 'host2', 1,  1, '10.0', 2, '1.0', 
'2.0', '1.5', 'ms', '1.0', 'ms', '0.1', 'ms', 12, default); 
+
+
+
 ############### Create table for BWCTL data ################
 #CREATE TABLE `clmp_bwctl` (
 #  `metadataId` varchar(255) NOT NULL,