perfsonar-dev - perfsonar: r4926 - in trunk/geant2-java-sql-ma: conf src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/store
Subject: perfsonar development work
List archive
perfsonar: r4926 - in trunk/geant2-java-sql-ma: conf src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/store
Chronological Thread
- From:
- To:
- Subject: perfsonar: r4926 - in trunk/geant2-java-sql-ma: conf src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/store
- Date: Mon, 2 Feb 2009 07:36:51 -0500
Author: roman
Date: 2009-02-02 07:36:51 -0500 (Mon, 02 Feb 2009)
New Revision: 4926
Added:
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
Modified:
trunk/geant2-java-sql-ma/conf/eventType-map.xml
trunk/geant2-java-sql-ma/conf/ibatis-iperf.xml
trunk/geant2-java-sql-ma/conf/sql-database_TEST.xml
trunk/geant2-java-sql-ma/conf/sql-database_iperf_TEST.xml
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
Log:
store functionality for iperf data added
Modified: trunk/geant2-java-sql-ma/conf/eventType-map.xml
===================================================================
--- trunk/geant2-java-sql-ma/conf/eventType-map.xml 2009-01-30 14:33:10
UTC (rev 4925)
+++ trunk/geant2-java-sql-ma/conf/eventType-map.xml 2009-02-02 12:36:51
UTC (rev 4926)
@@ -79,9 +79,8 @@
<name>http://ggf.org/ns/nmwg/tools/iperf/2.0</name>
<metadataQueryGenerator>org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator.IperfQueryGenerator</metadataQueryGenerator>
<responseGenerator>org.perfsonar.service.measurementArchive.sqlType.fetch.IperfResponseGenerator</responseGenerator>
- <!--
<storeRequestProcess>org.perfsonar.service.measurementArchive.sqlType.store.IperfStoreRequestProcess</storeRequestProcess>
- -->
+ <ibatisConfig>ibatis-SqlMapConfig-iperf.xml</ibatisConfig>
</eventType>
Modified: trunk/geant2-java-sql-ma/conf/ibatis-iperf.xml
===================================================================
--- trunk/geant2-java-sql-ma/conf/ibatis-iperf.xml 2009-01-30 14:33:10
UTC (rev 4925)
+++ trunk/geant2-java-sql-ma/conf/ibatis-iperf.xml 2009-02-02 12:36:51
UTC (rev 4926)
@@ -84,7 +84,7 @@
parameterMap="insert-parameters">
<![CDATA[
insert into perfsonar_iperf (metadataId, value, valueUnits,
numBytes, numBytesUnits, time, interv, ts)
- values (?, ?, ?, ?, ?, ?, ? default)
+ values (?, ?, ?, ?, ?, ?, ?, default)
]]>
</insert>
Modified: trunk/geant2-java-sql-ma/conf/sql-database_TEST.xml
===================================================================
--- trunk/geant2-java-sql-ma/conf/sql-database_TEST.xml 2009-01-30 14:33:10
UTC (rev 4925)
+++ trunk/geant2-java-sql-ma/conf/sql-database_TEST.xml 2009-02-02 12:36:51
UTC (rev 4926)
@@ -364,7 +364,6 @@
-
<nmwg:metadata id="meta2-iperf-test">
<iperf:subject id="subject-1">
<nmwgt:endPointPair
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
Modified: trunk/geant2-java-sql-ma/conf/sql-database_iperf_TEST.xml
===================================================================
--- trunk/geant2-java-sql-ma/conf/sql-database_iperf_TEST.xml 2009-01-30
14:33:10 UTC (rev 4925)
+++ trunk/geant2-java-sql-ma/conf/sql-database_iperf_TEST.xml 2009-02-02
12:36:51 UTC (rev 4926)
@@ -32,7 +32,6 @@
-
<nmwg:metadata id="meta2-iperf-test">
<iperf:subject id="subject-1">
<nmwgt:endPointPair
xmlns:nmwgt="http://ggf.org/ns/nmwg/topology/2.0/";>
Modified:
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
===================================================================
---
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
2009-01-30 14:33:10 UTC (rev 4925)
+++
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
2009-02-02 12:36:51 UTC (rev 4926)
@@ -237,7 +237,6 @@
Message response= new Message();
Collection<Metadata> collection = dataSet.getMetadataMap().values();
-
for (Metadata md : collection) {
Key key = md.getKey();
@@ -247,9 +246,7 @@
Map ibatisParams = new HashMap();
-
// moving parameters from key into ibatisParam map
-
Parameter[] paramsArray =
key.getParameters().getParameterArray();
for (int i = 0; i < paramsArray.length; i++) {
Parameter param = paramsArray[i];
@@ -272,7 +269,6 @@
// getting data from Datum
-
try {
String resource = (String) ibatisParams.get("ibatisConfig");
Modified:
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
===================================================================
---
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2009-01-30 14:33:10 UTC (rev 4925)
+++
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2009-02-02 12:36:51 UTC (rev 4926)
@@ -241,7 +241,6 @@
key.addParameter("eventType", eventType);
} else {
-
// metadata does not exist in xmldb
// getting default ibatis parameter from service.properties
@@ -255,7 +254,6 @@
Parameter ibatisConfig = null;
if (!ibatis_config_str.trim().equals("")) {
-
ibatisConfig = new Parameter();
ibatisConfig.setParameterName("ibatisConfig");
@@ -268,8 +266,10 @@
String metadataId = "meta" + Long.toString(rand.nextLong());
Parameters params = metadata.getParameters();
- if (params == null)
+ if (params == null) {
params = new Parameters();
+ params.addParameter("eventType", eventType);
+ }
if (ibatisConfig != null) {
@@ -284,7 +284,6 @@
}
-
if (params.getParameterByName("ibatisConfig") == null) {
logger.error("SQLTypeMAServiceEngine.getStoreKey: "
+ "No default ibatis property in the key");
@@ -352,14 +351,14 @@
if (eventType == null)
throw new PerfSONARException(
"error.ma.query",
- "SQLTypeMAServiceEngine.getStoreKey: "
+ "SQLTypeMAServiceEngine.getIbatisConfig: "
+ "eventType " + eventTypeStr + " is not supported");
String ibatisConfigStr = eventType.getIbatisConfig();
logger.debug(
- "SQLTypeMAServiceEngine.getStoreKey: "
+ "SQLTypeMAServiceEngine.getIbatisConfig: "
+ "ibatisConfig parameter for eventType (" + eventTypeStr +
"): "
+ ibatisConfigStr);
Added:
trunk/geant2-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
- perfsonar: r4926 - in trunk/geant2-java-sql-ma: conf src/main/java/org/perfsonar/service/measurementArchive/sqlType src/main/java/org/perfsonar/service/measurementArchive/sqlType/store, svnlog, 02/02/2009
Archive powered by MHonArc 2.6.16.