perfsonar-dev - perfsonar: r4708 - trunk/geant2-java-sql-ma/conf
Subject: perfsonar development work
List archive
- From:
- To:
- Subject: perfsonar: r4708 - trunk/geant2-java-sql-ma/conf
- Date: Fri, 28 Nov 2008 05:40:37 -0500
Author: roman
Date: 2008-11-28 05:40:36 -0500 (Fri, 28 Nov 2008)
New Revision: 4708
Modified:
trunk/geant2-java-sql-ma/conf/ibatis-L2-status-domain.xml
trunk/geant2-java-sql-ma/conf/ibatis-L2-status-interdomain.xml
trunk/geant2-java-sql-ma/conf/ibatis-L2-status.xml
trunk/geant2-java-sql-ma/conf/sql-database_TEST.xml
Log:
sql select statements updated in order to not present duplicates (use of
'distinct')
Modified: trunk/geant2-java-sql-ma/conf/ibatis-L2-status-domain.xml
===================================================================
--- trunk/geant2-java-sql-ma/conf/ibatis-L2-status-domain.xml 2008-11-27
08:19:08 UTC (rev 4707)
+++ trunk/geant2-java-sql-ma/conf/ibatis-L2-status-domain.xml 2008-11-28
10:40:36 UTC (rev 4708)
@@ -32,7 +32,7 @@
<select id="getResults1"
parameterMap="select-parameters1" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, unix_timestamp(time) as time
+ select distinct status_oper, status_admin, unix_timestamp(time) as
time
from domain_link
where id = ?
and time >= from_unixtime(?)
@@ -47,7 +47,7 @@
<select id="getResults1"
parameterMap="select-parameters1" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, date_part('epoch', time) as time
+ select distinct status_oper, status_admin, date_part('epoch', time)
as time
from domain_link
where id = ?
and time >= to_timestamp(?)
@@ -68,7 +68,7 @@
<select id="getResults2"
parameterMap="select-parameters2" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, unix_timestamp(time) as time
+ select distinct status_oper, status_admin, unix_timestamp(time) as
time
from domain_link
where id = ?
and time = (select MAX(time) from domain_link where id = ?)
@@ -81,7 +81,7 @@
<select id="getResults2"
parameterMap="select-parameters2" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, date_part('epoch', time) as time
+ select distinct status_oper, status_admin, date_part('epoch', time)
as time
from domain_link
where id = ?
and time = (select MAX(time) from domain_link where id = ?)
Modified: trunk/geant2-java-sql-ma/conf/ibatis-L2-status-interdomain.xml
===================================================================
--- trunk/geant2-java-sql-ma/conf/ibatis-L2-status-interdomain.xml
2008-11-27 08:19:08 UTC (rev 4707)
+++ trunk/geant2-java-sql-ma/conf/ibatis-L2-status-interdomain.xml
2008-11-28 10:40:36 UTC (rev 4708)
@@ -32,7 +32,7 @@
<select id="getResults1"
parameterMap="select-parameters1" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, unix_timestamp(time) as time
+ select distinct status_oper, status_admin, unix_timestamp(time) as
time
from interdomain_link
where id = ?
and time >= from_unixtime(?)
@@ -47,7 +47,7 @@
<select id="getResults1"
parameterMap="select-parameters1" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, date_part('epoch', time) as time
+ select distinct status_oper, status_admin, date_part('epoch', time)
as time
from interdomain_link
where id = ?
and time >= to_timestamp(?)
@@ -68,7 +68,7 @@
<select id="getResults2"
parameterMap="select-parameters2" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, unix_timestamp(time) as time
+ select distinct status_oper, status_admin, unix_timestamp(time) as
time
from interdomain_link
where id = ?
and time = (select MAX(time) from interdomain_link where id = ?)
@@ -81,7 +81,7 @@
<select id="getResults2"
parameterMap="select-parameters2" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, date_part('epoch', time) as time
+ select distinct status_oper, status_admin, date_part('epoch', time)
as time
from interdomain_link
where id = ?
and time = (select MAX(time) from interdomain_link where id = ?)
Modified: trunk/geant2-java-sql-ma/conf/ibatis-L2-status.xml
===================================================================
--- trunk/geant2-java-sql-ma/conf/ibatis-L2-status.xml 2008-11-27 08:19:08
UTC (rev 4707)
+++ trunk/geant2-java-sql-ma/conf/ibatis-L2-status.xml 2008-11-28 10:40:36
UTC (rev 4708)
@@ -32,7 +32,7 @@
<select id="getResults1"
parameterMap="select-parameters1" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, unix_timestamp(time) as time
+ select distinct status_oper, status_admin, unix_timestamp(time) as
time
from perfsonar_links
where id = ?
and time >= from_unixtime(?)
@@ -47,7 +47,7 @@
<select id="getResults1"
parameterMap="select-parameters1" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, date_part('epoch', time) as time
+ select distinct status_oper, status_admin, date_part('epoch', time)
as time
from perfsonar_links
where id = ?
and time >= to_timestamp(?)
@@ -68,7 +68,7 @@
<select id="getResults2"
parameterMap="select-parameters2" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, unix_timestamp(time) as time
+ select distinct status_oper, status_admin, unix_timestamp(time) as
time
from perfsonar_links
where id = ?
and time = (select MAX(time) from perfsonar_links where id = ?)
@@ -81,7 +81,7 @@
<select id="getResults2"
parameterMap="select-parameters2" resultMap="select-results">
<![CDATA[
- select status_oper, status_admin, date_part('epoch', time) as time
+ select distinct status_oper, status_admin, date_part('epoch', time)
as time
from perfsonar_links
where id = ?
and time = (select MAX(time) from perfsonar_links where id = ?)
Modified: trunk/geant2-java-sql-ma/conf/sql-database_TEST.xml
===================================================================
--- trunk/geant2-java-sql-ma/conf/sql-database_TEST.xml 2008-11-27 08:19:08
UTC (rev 4707)
+++ trunk/geant2-java-sql-ma/conf/sql-database_TEST.xml 2008-11-28 10:40:36
UTC (rev 4708)
@@ -299,7 +299,7 @@
<nmwg:key>
<nmwg:parameters>
<nmwg:parameter name="pathId">DFN-link-1234</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:data>
@@ -309,7 +309,7 @@
<nmwg:key>
<nmwg:parameters>
<nmwg:parameter
name="pathId">DFN-Surfnet-Link-5678</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:data>
@@ -319,7 +319,7 @@
<nmwg:key>
<nmwg:parameters>
<nmwg:parameter
name="pathId">PSNC-DFN-MUE-Link-1001</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-domain.xml</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:data>
@@ -329,7 +329,7 @@
<nmwg:key>
<nmwg:parameters>
<nmwg:parameter
name="pathId">PSNC-2-DFN-MUE-Link-1002</nmwg:parameter>
- <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status-interdomain.xml</nmwg:parameter>
+ <nmwg:parameter
name="ibatisConfig">ibatis-SqlMapConfig-L2-status.xml</nmwg:parameter>
</nmwg:parameters>
</nmwg:key>
</nmwg:data>
- perfsonar: r4708 - trunk/geant2-java-sql-ma/conf, svnlog, 11/28/2008
Archive powered by MHonArc 2.6.16.