perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r5871 - trunk/perfsonar-java-sql-ma/conf
Subject: perfsonar development work
List archive
- From:
- To:
- Subject: [pS-dev] [GEANT/SA2/ps-java-services] r5871 - trunk/perfsonar-java-sql-ma/conf
- Date: Wed, 5 Oct 2011 21:19:57 +0100 (BST)
Author: psnc.pikusa
Date: 2011-10-05 21:19:57 +0100 (Wed, 05 Oct 2011)
New Revision: 5871
Modified:
trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbsetup.sql
trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate-owamp.sql
Log:
changes in db script
Modified: trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbsetup.sql
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbsetup.sql 2011-10-05
20:19:32 UTC (rev 5870)
+++ trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbsetup.sql 2011-10-05
20:19:57 UTC (rev 5871)
@@ -111,47 +111,7 @@
-# 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);
Modified: trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate-owamp.sql
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate-owamp.sql
2011-10-05 20:19:32 UTC (rev 5870)
+++ trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate-owamp.sql
2011-10-05 20:19:57 UTC (rev 5871)
@@ -13,15 +13,15 @@
# 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,
+ (metadataId VARCHAR(255) NOT NULL ,
+ receiveSynchronized INT(1) NULL DEFAULT -1,
+ receiveTime VARCHAR(21) NOT NULL DEFAULT '-1',
+ receiveTimeError FLOAT NULL DEFAULT -1.0,
+ sendSynchronized INT(1) NULL DEFAULT -1,
+ sendTime VARCHAR(21) NOT NULL DEFAULT '-1',
+ sendTimeError FLOAT NULL DEFAULT -1.0,
+ seqNum INTEGER NULL DEFAULT -1,
+ ttl SMALLINT NULL DEFAULT -1,
ts TIMESTAMP DEFAULT NOW());
INSERT
@@ -34,21 +34,21 @@
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,
+ sender VARCHAR(255) NOT NULL DEFAULT '-1',
+ receiver VARCHAR(255) NOT NULL DEFAULT '-1',
+ sent INT NULL DEFAULT -1,
+ loss INT NULL DEFAULT -1,
+ lostPercent FLOAT NULL DEFAULT -1.0,
+ duplicates INT NULL DEFAULT -1,
+ minDelay FLOAT NULL DEFAULT -1.0,
+ medDelay FLOAT NULL DEFAULT -1.0,
+ maxDelay FLOAT NULL DEFAULT -1.0,
+ delayUnits VARCHAR(10) NULL DEFAULT '-1',
+ error FLOAT NULL DEFAULT -1.0,
+ errorUnits VARCHAR (10) NULL DEFAULT '-1',
+ jitter FLOAT NULL DEFAULT -1.0,
+ jitterUnits VARCHAR(10) NULL DEFAULT '-1',
+ hops INT NULL DEFAULT -1,
ts TIMESTAMP DEFAULT NOW());
INSERT
- [pS-dev] [GEANT/SA2/ps-java-services] r5871 - trunk/perfsonar-java-sql-ma/conf, svn-noreply, 10/05/2011
Archive powered by MHonArc 2.6.16.