Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4952 - in trunk/geant2-java-sql-ma: conf samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store

Subject: perfsonar development work

List archive

perfsonar: r4952 - in trunk/geant2-java-sql-ma: conf samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4952 - in trunk/geant2-java-sql-ma: conf samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store
  • Date: Tue, 10 Feb 2009 09:09:17 -0500
Author: roman
Date: 2009-02-10 09:09:17 -0500 (Tue, 10 Feb 2009)
New Revision: 4952

Modified:
trunk/geant2-java-sql-ma/conf/ibatis-iperf.xml
trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbsetup.sql
trunk/geant2-java-sql-ma/conf/psql-sqlma-dbsetup.sql

trunk/geant2-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml

trunk/geant2-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml

trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java

trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
Log:

schema for iperf:datum updated



Modified: trunk/geant2-java-sql-ma/conf/ibatis-iperf.xml
===================================================================
--- trunk/geant2-java-sql-ma/conf/ibatis-iperf.xml 2009-02-09 09:09:37
UTC (rev 4951)
+++ trunk/geant2-java-sql-ma/conf/ibatis-iperf.xml 2009-02-10 14:09:17
UTC (rev 4952)
@@ -23,6 +23,9 @@
<result property="numBytesUnits" column="numBytesUnits" />
<result property="time" column="time" />
<result property="interv" column="interv" />
+ <result property="throughput" column="throughput" />
+ <result property="jitter" column="jitter" />
+ <result property="loss" column="loss" />
</resultMap>


@@ -36,7 +39,7 @@
<select id="getResults1"
parameterMap="select-parameters1" resultMap="select-results">
<![CDATA[
- select value, valueUnits, numBytes, numBytesUnits, time, interv
+ select value, valueUnits, numBytes, numBytesUnits, time, interv,
throughput, jitter, loss
from perfsonar_iperf
where metadataId = ?
and time >= ?
@@ -56,7 +59,7 @@
<select id="getResults2"
parameterMap="select-parameters2" resultMap="select-results">
<![CDATA[
- select value, valueUnits, numBytes, numBytesUnits, time, interv
+ select value, valueUnits, numBytes, numBytesUnits, time, interv,
throughput, jitter, loss
from perfsonar_iperf
where metadataId = ?
and time = (select MAX(time) from perfsonar_iperf where metadataId =
?)
@@ -77,14 +80,17 @@
<parameter property="numBytesUnits" />
<parameter property="time" />
<parameter property="interv" />
+ <parameter property="throughput" />
+ <parameter property="jitter" />
+ <parameter property="loss" />
</parameterMap>


<insert id="setResults"
parameterMap="insert-parameters">
<![CDATA[
- insert into perfsonar_iperf (metadataId, value, valueUnits,
numBytes, numBytesUnits, time, interv, ts)
- values (?, ?, ?, ?, ?, ?, ?, default)
+ insert into perfsonar_iperf (metadataId, value, valueUnits,
numBytes, numBytesUnits, time, interv, throughput, jitter, loss, ts)
+ values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, default)
]]>
</insert>


Modified: trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbsetup.sql
===================================================================
--- trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbsetup.sql 2009-02-09
09:09:37 UTC (rev 4951)
+++ trunk/geant2-java-sql-ma/conf/mysql-sqlma-dbsetup.sql 2009-02-10
14:09:17 UTC (rev 4952)
@@ -90,13 +90,16 @@
CREATE TABLE
perfsonar_iperf
(metadataId VARCHAR(30) NOT NULL,
- value FLOAT (16,4) NOT NULL,
+ value FLOAT (16,4) NULL,
valueUnits VARCHAR(30) NULL,
+ throughput FLOAT (16,4) NULL,
+ jitter FLOAT (16,4) NULL,
+ loss VARCHAR(15) NULL,
numBytes INT NULL,
numBytesUnits VARCHAR(15) NULL,
+ interv VARCHAR(30) NULL,
time INT NOT NULL,
format VARCHAR(30) NULL,
- interv VARCHAR(30) NULL,
protocol VARCHAR(10) NULL,
bufferLength INT NULL,
windowSize INT NULL,
@@ -274,11 +277,11 @@

INSERT
INTO perfsonar_iperf
- VALUES ('meta1-iperf-test', 93938560, 'bits/sec', 23484640, 'Bytes',
1197642642, NULL, NULL, 'TCP', NULL, NULL, NULL, NULL, NULL, NULL, default);
+ VALUES ('meta1-iperf-test', NULL, 'bits/sec', 2.88, 1.830, '0/837',
23484640, 'Bytes', NULL, 1197642642, NULL, 'TCP', NULL, NULL, NULL, NULL,
NULL, NULL, default);

INSERT
INTO perfsonar_iperf
- VALUES ('meta2-iperf-test', 93938560, 'bits/sec', 23484640, 'Bytes',
1197642662, NULL, NULL, 'UDP', NULL, NULL, NULL, NULL, NULL, NULL, default);
+ VALUES ('meta2-iperf-test', NULL, 'bits/sec', 1.45, 1.806, '5/851',
23484640, 'Bytes', NULL, 1197642662, NULL, 'UDP', NULL, NULL, NULL, NULL,
NULL, NULL, default);




Modified: trunk/geant2-java-sql-ma/conf/psql-sqlma-dbsetup.sql
===================================================================
--- trunk/geant2-java-sql-ma/conf/psql-sqlma-dbsetup.sql 2009-02-09
09:09:37 UTC (rev 4951)
+++ trunk/geant2-java-sql-ma/conf/psql-sqlma-dbsetup.sql 2009-02-10
14:09:17 UTC (rev 4952)
@@ -105,13 +105,16 @@
create table
perfsonar_iperf
(metadataId varchar(30) not null,
- value double precision not null,
+ value double precision null,
valueUnits varchar(30) null,
+ throughput double precision null,
+ jitter double precision null,
+ loss varchar(15) null,
numBytes integer null,
numBytesUnits varchar(15) null,
+ interv varchar(30) null,
time integer not null,
format varchar(30) null,
- interv varchar(30) null,
protocol varchar(10) null,
bufferLength integer null,
windowSize integer null,
@@ -220,11 +223,11 @@

insert
into perfsonar_iperf
- values ('meta1-iperf-test', 93938560, 'bits/sec', 23484640, 'Bytes',
1197642642, null, null, 'TCP', null, null, null, null, null, null, default);
+ values ('meta1-iperf-test', null, 'bits/sec', 2.88, 1.830, '0/837',
23484640, 'Bytes', null, 1197642642, null, 'TCP', null, null, null, null,
null, null, default);

insert
into perfsonar_iperf
- values ('meta2-iperf-test', 93938560, 'bits/sec', 23484640, 'Bytes',
1197642662, null, null, 'UDP', null, null, null, null, null, null, default);
+ values ('meta2-iperf-test', null, 'bits/sec', 1.45, 1.806, '5/851',
23484640, 'Bytes', null, 1197642662, null, 'UDP', null, null, null, null,
null, null, default);


-- insert statements for testing clmp_ping table

Modified:
trunk/geant2-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml
===================================================================
---
trunk/geant2-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml
2009-02-09 09:09:37 UTC (rev 4951)
+++
trunk/geant2-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-1.xml
2009-02-10 14:09:17 UTC (rev 4952)
@@ -38,9 +38,9 @@


<nmwg:data id="1" metadataIdRef="iperf-metadata">
- <iperf:datum numBytesUnits="Bytes" timeValue="1233919273"
numBytes="23484640" value="93938560" valueUnits="bits/sec"/>
- <iperf:datum numBytesUnits="Bytes" timeValue="1233919274"
numBytes="23525896" value="94103581" valueUnits="bits/sec"/>
- <iperf:datum numBytesUnits="Bytes" timeValue="1233919275"
numBytes="58851328" value="93840272" valueUnits="bits/sec"/>
+ <iperf:datum throughput="1.03" jitter="1.23" loss="0/837"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273826" valueUnits="bits/sec"/>
+ <iperf:datum throughput="4.46" jitter="1.11" loss="3/835"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273836" valueUnits="bits/sec"/>
+ <iperf:datum throughput="3.22" jitter="1.42" loss="5/855"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273846" valueUnits="bits/sec"/>
</nmwg:data>



Modified:
trunk/geant2-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml
===================================================================
---
trunk/geant2-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml
2009-02-09 09:09:37 UTC (rev 4951)
+++
trunk/geant2-java-sql-ma/samples/requests/MeasurementArchiveStoreRequest-bwctl-iperf-2.xml
2009-02-10 14:09:17 UTC (rev 4952)
@@ -17,9 +17,9 @@
</nmwg:metadata>

<nmwg:data id="d1" metadataIdRef="m1">
- <iperf:datum numBytesUnits="Bytes" timeValue="1233919574"
numBytes="23484640" value="93938565" valueUnits="bits/sec"/>
- <iperf:datum numBytesUnits="Bytes" timeValue="1233919575"
numBytes="23525896" value="94103586" valueUnits="bits/sec"/>
- <iperf:datum numBytesUnits="Bytes" timeValue="1233919576"
numBytes="58851328" value="93840277" valueUnits="bits/sec"/>
+ <iperf:datum throughput="1.03" jitter="1.23" loss="0/837"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273826" valueUnits="bits/sec"/>
+ <iperf:datum throughput="4.46" jitter="1.11" loss="3/835"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273836" valueUnits="bits/sec"/>
+ <iperf:datum throughput="3.22" jitter="1.42" loss="5/855"
numBytes="23484640" numBytesUnits="Bytes" timeType="unix"
timeValue="1234273846" valueUnits="bits/sec"/>
</nmwg:data>



Modified:
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
===================================================================
---
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
2009-02-09 09:09:37 UTC (rev 4951)
+++
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
2009-02-10 14:09:17 UTC (rev 4952)
@@ -87,6 +87,12 @@
datum.addAttr("timeType", "unix", null);
} else if (column.equals("interv"))
datum.addAttr("interval", strValue, null);
+ else if (column.equals("throughput"))
+ datum.addAttr("throughput", strValue, null);
+ else if (column.equals("jitter"))
+ datum.addAttr("jitter", strValue, null);
+ else if (column.equals("loss"))
+ datum.addAttr("loss", strValue, null);

//logger.debug("IperfResponseGenerator.getResponse: "
// + "column: " + column + ", value: " + strValue );

Modified:
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
===================================================================
---
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
2009-02-09 09:09:37 UTC (rev 4951)
+++
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
2009-02-10 14:09:17 UTC (rev 4952)
@@ -45,27 +45,46 @@
String numBytes = ((Datum)datum).getNumBytes();
String numBytesUnits = ((Datum)datum).getNumBytesUnits();
String interval = ((Datum)datum).getInterval();
+ String throughput = ((Datum)datum).getThroughput();
+ String jitter = ((Datum)datum).getJitter();
+ String loss = ((Datum)datum).getLoss();

if (valueUnits.trim().equals("")) valueUnits = null;
if (numBytes.trim().equals("")) numBytes = null;
if (numBytesUnits.trim().equals("")) numBytesUnits = null;
if (interval.trim().equals("")) interval = null;
+ if (loss.trim().equals("")) loss = null;

ibatisParams.put("valueUnits", valueUnits);
ibatisParams.put("time", Integer.parseInt(timeValue));
ibatisParams.put("numBytes", numBytes);
ibatisParams.put("numBytesUnits", numBytesUnits);
ibatisParams.put("interv", interval);
+ ibatisParams.put("loss", loss);

try {
- // or a float
ibatisParams.put("value", Float.parseFloat(strValue));
} catch (Exception ex) {
//logger.debug("IperfStoreRequestProcess.store: " +
ex.toString());
// value is a string ...
- ibatisParams.put("value", strValue);
+ //ibatisParams.put("value", strValue);
+ ibatisParams.put("value", null);
}

+ try {
+ ibatisParams.put("throughput", Float.parseFloat(throughput));
+ } catch (Exception ex) {
+ //logger.debug("IperfStoreRequestProcess.store: " +
ex.toString());
+ ibatisParams.put("throughput", null);
+ }
+
+ try {
+ ibatisParams.put("jitter", Float.parseFloat(jitter));
+ } catch (Exception ex) {
+ //logger.debug("IperfStoreRequestProcess.store: " +
ex.toString());
+ ibatisParams.put("jitter", null);
+ }
+
return ibatisParams;

}


  • perfsonar: r4952 - in trunk/geant2-java-sql-ma: conf samples/requests src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch src/main/java/org/perfsonar/service/measurementArchive/sqlType/store, svnlog, 02/10/2009

Archive powered by MHonArc 2.6.16.

Top of Page