perfsonar development work

Author: psnc.pikusa
Date: 2011-10-05 18:45:09 +0100 (Wed, 05 Oct 2011)
New Revision: 5867

Modified:
   trunk/perfsonar-java-sql-ma/conf/ibatis-owamp-aggregation.xml
   trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate-owamp.sql
Log:
db name changes

Modified: trunk/perfsonar-java-sql-ma/conf/ibatis-owamp-aggregation.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/conf/ibatis-owamp-aggregation.xml       
2011-10-05 17:44:53 UTC (rev 5866)
+++ trunk/perfsonar-java-sql-ma/conf/ibatis-owamp-aggregation.xml       
2011-10-05 17:45:09 UTC (rev 5867)
@@ -83,7 +83,7 @@
 
        <insert id="setResults" parameterMap="insert-parameters">
     <![CDATA[
-        insert into owamp (metadataId, sender, receiver, sent, loss, 
lostPercent, duplicates, minDelay, medDelay, maxDelay, delayUnits, error, 
errorUnits, jitter, jitterUnits, hops, ts)
+        insert into owamp_agg (metadataId, sender, receiver, sent, loss, 
lostPercent, duplicates, minDelay, medDelay, maxDelay, delayUnits, error, 
errorUnits, jitter, jitterUnits, hops, ts)
         values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, default)
     ]]>
        </insert>

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 17:44:53 UTC (rev 5866)
+++ trunk/perfsonar-java-sql-ma/conf/mysql-sqlma-dbupdate-owamp.sql     
2011-10-05 17:45:09 UTC (rev 5867)
@@ -32,7 +32,7 @@
     VALUES ('owamp-meta1', 1, '15080301494633990766', 1.00483e-06, 1, 
15080301494378967368, 4.81142e-05, 1, 243 ,default);
 
  CREATE TABLE
-               owamp_aggr
+               owamp_agg
                (metadataId VARCHAR(255) NOT NULL,
                sender VARCHAR(255) NOT NULL,
                receiver VARCHAR(255) NOT NULL,
@@ -50,4 +50,7 @@
                jitterUnits VARCHAR(10) NULL,
                hops INT NULL,
                ts TIMESTAMP DEFAULT NOW());
-    
\ No newline at end of file
+
+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);