Author: rr
Date: Mon Aug  3 13:40:00 2009
New Revision: 800378

URL: http://svn.apache.org/viewvc?rev=800378&view=rev
Log:
ODE-641: Hibernate DAO delete instances queries optimization

Modified:
    
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
    
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
    
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
    
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HLargeData.java
    
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java
    
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchangeProperty.java
    
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java

Modified: 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java?rev=800378&r1=800377&r2=800378&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/MessageExchangeDaoImpl.java
 Mon Aug  3 13:40:00 2009
@@ -359,7 +359,8 @@
 
     @SuppressWarnings("unchecked")
     public void releasePremieMessages() {
-        deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_MESSAGE_LDATA_IDS_BY_MEX).setParameter("mex",
 _hself).list());
+        deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_MESSAGE_LDATA_IDS_BY_MEX_1).setParameter("mex",
 _hself).list());
+        deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_MESSAGE_LDATA_IDS_BY_MEX_2).setParameter("mex",
 _hself).list());
         deleteByIds(HCorrelatorMessage.class, 
getSession().getNamedQuery(HCorrelatorMessage.SELECT_CORMESSAGE_IDS_BY_MEX).setParameter("mex",
 _hself).list());
     }
 
@@ -369,7 +370,8 @@
     
     @SuppressWarnings("unchecked")
     public void deleteMessages() {
-        deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_MESSAGE_LDATA_IDS_BY_MEX).setParameter("mex",
 _hself).list());
+        deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_MESSAGE_LDATA_IDS_BY_MEX_1).setParameter("mex",
 _hself).list());
+        deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_MESSAGE_LDATA_IDS_BY_MEX_2).setParameter("mex",
 _hself).list());
         deleteByIds(HCorrelatorMessage.class, 
getSession().getNamedQuery(HCorrelatorMessage.SELECT_CORMESSAGE_IDS_BY_MEX).setParameter("mex",
 _hself).list());
           
         getSession().delete(_hself);

Modified: 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java?rev=800378&r1=800377&r2=800378&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
 Mon Aug  3 13:40:00 2009
@@ -227,8 +227,8 @@
         deleteByIds(HVariableProperty.class, 
getSession().getNamedQuery(HVariableProperty.SELECT_VARIABLE_PROPERTY_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
         deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_XMLDATA_LDATA_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
         deleteByIds(HXmlData.class, 
getSession().getNamedQuery(HXmlData.SELECT_XMLDATA_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
-
-        deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_PARTNER_LINK_LDATA_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
+        deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_PARTNER_LINK_LDATA_IDS_BY_INSTANCES_1).setParameterList("instances",
 instances).list());
+        deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_PARTNER_LINK_LDATA_IDS_BY_INSTANCES_2).setParameterList("instances",
 instances).list());
         deleteByIds(HPartnerLink.class, 
getSession().getNamedQuery(HPartnerLink.SELECT_PARTNER_LINK_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
         deleteByIds(HScope.class, 
getSession().getNamedQuery(HScope.SELECT_SCOPE_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
     }
@@ -236,11 +236,12 @@
     @SuppressWarnings("unchecked")
     private void deleteMessages(Collection<HProcessInstance> instances) {
         deleteByIds(HActivityRecovery.class, 
getSession().getNamedQuery(HCorrelatorMessage.SELECT_CORMESSAGE_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
-
-        deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_MESSAGE_LDATA_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
+        deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_MESSAGE_LDATA_IDS_BY_INSTANCES_1).setParameterList("instances",
 instances).list());
+        deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_MESSAGE_LDATA_IDS_BY_INSTANCES_2).setParameterList("instances",
 instances).list());
         deleteByIds(HMessage.class, 
getSession().getNamedQuery(HMessage.SELECT_MESSAGE_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
-        
getSession().getNamedQuery(HMessageExchangeProperty.DELETE_MEX_PROPS_BY_INSTANCES).setParameterList("instances",
 instances).executeUpdate();
-        deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_MEX_LDATA_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
+        deleteByIds(HMessageExchangeProperty.class, 
getSession().getNamedQuery(HMessageExchangeProperty.SELECT_MEX_PROPS_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
+        deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_MEX_LDATA_IDS_BY_INSTANCES_1).setParameterList("instances",
 instances).list());
+        deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_MEX_LDATA_IDS_BY_INSTANCES_2).setParameterList("instances",
 instances).list());
         deleteByIds(HMessageExchange.class, 
getSession().getNamedQuery(HMessageExchange.SELECT_MEX_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
     }
     

Modified: 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java?rev=800378&r1=800377&r2=800378&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessInstanceDaoImpl.java
 Mon Aug  3 13:40:00 2009
@@ -378,7 +378,8 @@
       deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_XMLDATA_LDATA_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
       deleteByIds(HXmlData.class, 
getSession().getNamedQuery(HXmlData.SELECT_XMLDATA_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
 
-      deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_PARTNER_LINK_LDATA_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
+      deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_PARTNER_LINK_LDATA_IDS_BY_INSTANCES_1).setParameterList("instances",
 instances).list());
+      deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_PARTNER_LINK_LDATA_IDS_BY_INSTANCES_2).setParameterList("instances",
 instances).list());
       deleteByIds(HPartnerLink.class, 
getSession().getNamedQuery(HPartnerLink.SELECT_PARTNER_LINK_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
 
       deleteByIds(HScope.class, 
getSession().getNamedQuery(HScope.SELECT_SCOPE_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
@@ -386,15 +387,15 @@
 
   @SuppressWarnings("unchecked")
   private void deleteMessages(HProcessInstance[] instances) {
-    // there are chances that some unmatched messages are still there
-      deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_UNMATCHED_MESSAGE_LDATA_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
+      // there are chances that some unmatched messages are still there
+      deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_UNMATCHED_MESSAGE_LDATA_IDS_BY_INSTANCES_1).setParameterList("instances",
 instances).list());
+      deleteByIds(HLargeData.class, 
getSession().getNamedQuery(HLargeData.SELECT_UNMATCHED_MESSAGE_LDATA_IDS_BY_INSTANCES_2).setParameterList("instances",
 instances).list());
+
       Collection unmatchedMex = 
getSession().getNamedQuery(HMessageExchange.SELECT_UNMATCHED_MEX_BY_INSTANCES).setParameterList("instances",
 instances).list();
       if( !unmatchedMex.isEmpty() ) {
           getSession().delete(unmatchedMex);
-//          
getSession().getNamedQuery(HMessageExchange.SELECT_UNMATCHED_MEX).setParameter("mex",
 unmatchedMex).executeUpdate();
       }
       deleteByIds(HCorrelatorMessage.class, 
getSession().getNamedQuery(HCorrelatorMessage.SELECT_CORMESSAGE_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
-
       deleteByIds(HCorrelatorSelector.class, 
getSession().getNamedQuery(HCorrelatorSelector.SELECT_MESSAGE_ROUTE_IDS_BY_INSTANCES).setParameterList("instances",
 instances).list());
   }
   

Modified: 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HLargeData.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HLargeData.java?rev=800378&r1=800377&r2=800378&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HLargeData.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HLargeData.java
 Mon Aug  3 13:40:00 2009
@@ -24,32 +24,42 @@
  * instance needs to store as part of its state large binary or text
  * data, a reference to an instance of this class must be created.
  * @hibernate.class table="LARGE_DATA"
- * @hibernate.query name="SELECT_ACTIVITY_RECOVERY_LDATA_IDS_BY_INSTANCES" 
query="select id from HLargeData as d where d in(select a.details from 
HActivityRecovery as a where a.instance in (:instances))"
- * @hibernate.query name="SELECT_JACOB_LDATA_IDS_BY_INSTANCES" query="select 
id from HLargeData as d where d in(select i.jacobState from HProcessInstance as 
i where i in (:instances))"
- * @hibernate.query name="SELECT_MESSAGE_LDATA_IDS_BY_INSTANCES" query="select 
id from HLargeData as d where d in(select m.messageData from HMessage m where 
m.messageExchange.instance in (:instances)) or d IN(select m.header from 
HMessage m where m.messageExchange.instance in (:instances))"
- * @hibernate.query name="SELECT_MEX_LDATA_IDS_BY_INSTANCES" query="select id 
from HLargeData as d where d in(select e.endpoint from HMessageExchange as e 
where e.instance in (:instances)) or d IN(select e.callbackEndpoint from 
HMessageExchange as e where e.instance in (:instances))"
+ * @hibernate.query name="SELECT_ACTIVITY_RECOVERY_LDATA_IDS_BY_INSTANCES" 
query="select a.details.id from HActivityRecovery as a where a.instance in 
(:instances)"
+ * @hibernate.query name="SELECT_JACOB_LDATA_IDS_BY_INSTANCES" query="select 
i.jacobState.id from HProcessInstance as i where i in (:instances)"
+ * @hibernate.query name="SELECT_MESSAGE_LDATA_IDS_BY_INSTANCES_1" 
query="select m.messageData.id from HMessage m where m.messageExchange.instance 
in (:instances)"
+ * @hibernate.query name="SELECT_MESSAGE_LDATA_IDS_BY_INSTANCES_2" 
query="select m.header.id from HMessage m where m.messageExchange.instance in 
(:instances)"
+ * @hibernate.query name="SELECT_MEX_LDATA_IDS_BY_INSTANCES_1" query="select 
e.endpoint.id from HMessageExchange as e where e.instance in (:instances)"
+ * @hibernate.query name="SELECT_MEX_LDATA_IDS_BY_INSTANCES_2" query="select 
e.callbackEndpoint.id from HMessageExchange as e where e.instance in 
(:instances)"
  *
- * @hibernate.query name="SELECT_EVENT_LDATA_IDS_BY_INSTANCES" query="select 
id from HLargeData as d where d in(select e.data from HBpelEvent as e where 
e.instance in (:instances))"
- * @hibernate.query name="SELECT_UNMATCHED_MESSAGE_LDATA_IDS_BY_INSTANCES" 
query="select id from HLargeData as d where d in(select m.messageData from 
HMessage m, HCorrelatorMessage cm where m.messageExchange = cm.messageExchange 
and m.messageExchange.instance in (:instances)) or d in(select m.header from 
HMessage m, HCorrelatorMessage cm where m.messageExchange = cm.messageExchange 
and m.messageExchange.instance in (:instances))"
- * @hibernate.query name="SELECT_XMLDATA_LDATA_IDS_BY_INSTANCES" query="select 
id from HLargeData as d where d in(select x.data from HXmlData as x where 
x.instance in (:instances))"
- * @hibernate.query name="SELECT_PARTNER_LINK_LDATA_IDS_BY_INSTANCES" 
query="select id from HLargeData as d where d in(select l.myEPR from 
HPartnerLink as l where l.scope.instance in (:instances)) or d IN(select 
l.partnerEPR from HPartnerLink as l where l.scope.instance in (:instances))"
- * @hibernate.query name="SELECT_FAULT_LDATA_IDS_BY_INSTANCE_IDS" 
query="select id from HLargeData as d where d in(select f.data from HFaultData 
as f, HProcessInstance as i where f.id = i.fault and i.id in (:instanceIds))"
+ * @hibernate.query name="SELECT_EVENT_LDATA_IDS_BY_INSTANCES" query="select 
e.data.id from HBpelEvent as e where e.instance in (:instances)"
+ * @hibernate.query name="SELECT_UNMATCHED_MESSAGE_LDATA_IDS_BY_INSTANCES_1" 
query="select m.messageData.id from HMessage m, HCorrelatorMessage cm where 
m.messageExchange = cm.messageExchange and m.messageExchange.instance in 
(:instances)"
+ * @hibernate.query name="SELECT_UNMATCHED_MESSAGE_LDATA_IDS_BY_INSTANCES_2" 
query="select m.header.id from HMessage m, HCorrelatorMessage cm where 
m.messageExchange = cm.messageExchange and m.messageExchange.instance in 
(:instances)"
+ * @hibernate.query name="SELECT_XMLDATA_LDATA_IDS_BY_INSTANCES" query="select 
x.data.id from HXmlData as x where x.instance in (:instances)"
+ * @hibernate.query name="SELECT_PARTNER_LINK_LDATA_IDS_BY_INSTANCES_1" 
query="select l.myEPR.id from HPartnerLink as l where l.scope.instance in 
(:instances)"
+ * @hibernate.query name="SELECT_PARTNER_LINK_LDATA_IDS_BY_INSTANCES_2" 
query="select l.partnerEPR.id from HPartnerLink as l where l.scope.instance in 
(:instances)"
+ * @hibernate.query name="SELECT_FAULT_LDATA_IDS_BY_INSTANCE_IDS" 
query="select f.data.id from HFaultData as f, HProcessInstance as i where f.id 
= i.fault and i.id in (:instanceIds)"
 
- * @hibernate.query name="SELECT_MESSAGE_LDATA_IDS_BY_MEX" query="select id 
from HLargeData as d where d in(select m.messageData from HMessage m where 
m.messageExchange = :mex) or d in(select m.header from HMessage m where 
m.messageExchange = :mex)"
+ * @hibernate.query name="SELECT_MESSAGE_LDATA_IDS_BY_MEX_1" query="select 
m.messageData.id from HMessage m where m.messageExchange = :mex"
+ * @hibernate.query name="SELECT_MESSAGE_LDATA_IDS_BY_MEX_2" query="select 
m.header.id from HMessage m where m.messageExchange = :mex"
  */
 public class HLargeData extends HObject {
     public final static String SELECT_ACTIVITY_RECOVERY_LDATA_IDS_BY_INSTANCES 
= "SELECT_ACTIVITY_RECOVERY_LDATA_IDS_BY_INSTANCES";
     public final static String SELECT_JACOB_LDATA_IDS_BY_INSTANCES = 
"SELECT_JACOB_LDATA_IDS_BY_INSTANCES";
-    public final static String SELECT_MESSAGE_LDATA_IDS_BY_INSTANCES = 
"SELECT_MESSAGE_LDATA_IDS_BY_INSTANCES";
-    public final static String SELECT_MEX_LDATA_IDS_BY_INSTANCES = 
"SELECT_MEX_LDATA_IDS_BY_INSTANCES";
+    public final static String SELECT_MESSAGE_LDATA_IDS_BY_INSTANCES_1 = 
"SELECT_MESSAGE_LDATA_IDS_BY_INSTANCES_1";
+    public final static String SELECT_MESSAGE_LDATA_IDS_BY_INSTANCES_2 = 
"SELECT_MESSAGE_LDATA_IDS_BY_INSTANCES_2";
+    public final static String SELECT_MEX_LDATA_IDS_BY_INSTANCES_1 = 
"SELECT_MEX_LDATA_IDS_BY_INSTANCES_1";
+    public final static String SELECT_MEX_LDATA_IDS_BY_INSTANCES_2 = 
"SELECT_MEX_LDATA_IDS_BY_INSTANCES_2";
 
     public final static String SELECT_EVENT_LDATA_IDS_BY_INSTANCES = 
"SELECT_EVENT_LDATA_IDS_BY_INSTANCES";
-    public final static String SELECT_UNMATCHED_MESSAGE_LDATA_IDS_BY_INSTANCES 
= "SELECT_UNMATCHED_MESSAGE_LDATA_IDS_BY_INSTANCES";
+    public final static String 
SELECT_UNMATCHED_MESSAGE_LDATA_IDS_BY_INSTANCES_1 = 
"SELECT_UNMATCHED_MESSAGE_LDATA_IDS_BY_INSTANCES_1";
+    public final static String 
SELECT_UNMATCHED_MESSAGE_LDATA_IDS_BY_INSTANCES_2 = 
"SELECT_UNMATCHED_MESSAGE_LDATA_IDS_BY_INSTANCES_2";
     public final static String SELECT_XMLDATA_LDATA_IDS_BY_INSTANCES = 
"SELECT_XMLDATA_LDATA_IDS_BY_INSTANCES";
-    public final static String SELECT_PARTNER_LINK_LDATA_IDS_BY_INSTANCES = 
"SELECT_PARTNER_LINK_LDATA_IDS_BY_INSTANCES";
+    public final static String SELECT_PARTNER_LINK_LDATA_IDS_BY_INSTANCES_1 = 
"SELECT_PARTNER_LINK_LDATA_IDS_BY_INSTANCES_1";
+    public final static String SELECT_PARTNER_LINK_LDATA_IDS_BY_INSTANCES_2 = 
"SELECT_PARTNER_LINK_LDATA_IDS_BY_INSTANCES_2";
     public final static String SELECT_FAULT_LDATA_IDS_BY_INSTANCE_IDS = 
"SELECT_FAULT_LDATA_IDS_BY_INSTANCE_IDS";
     
-    public final static String SELECT_MESSAGE_LDATA_IDS_BY_MEX = 
"SELECT_MESSAGE_LDATA_IDS_BY_MEX";
+    public final static String SELECT_MESSAGE_LDATA_IDS_BY_MEX_1 = 
"SELECT_MESSAGE_LDATA_IDS_BY_MEX_1";
+    public final static String SELECT_MESSAGE_LDATA_IDS_BY_MEX_2 = 
"SELECT_MESSAGE_LDATA_IDS_BY_MEX_2";
        
     private byte[] binary = null;
 

Modified: 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java?rev=800378&r1=800377&r2=800378&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessage.java
 Mon Aug  3 13:40:00 2009
@@ -23,7 +23,7 @@
  *
  * @hibernate.class table="BPEL_MESSAGE"
  * @hibernate.query name="SELECT_MESSAGE_IDS_BY_MEX" query="select id from 
HMessage as m WHERE m.messageExchange = :messageExchange"
- * @hibernate.query name="SELECT_MESSAGE_IDS_BY_INSTANCES" query="select id 
from HMessage as m WHERE m.messageExchange IN(select e from HMessageExchange e 
where e.instance in (:instances))"
+ * @hibernate.query name="SELECT_MESSAGE_IDS_BY_INSTANCES" query="select m.id 
from HMessage m, HMessageExchange mex WHERE m.messageExchange = mex and 
mex.instance in (:instances)"
  */
 public class HMessage extends HObject {
     public final static String SELECT_MESSAGE_IDS_BY_MEX = 
"SELECT_MESSAGE_IDS_BY_MEX";

Modified: 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchangeProperty.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchangeProperty.java?rev=800378&r1=800377&r2=800378&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchangeProperty.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HMessageExchangeProperty.java
 Mon Aug  3 13:40:00 2009
@@ -25,11 +25,11 @@
  * is excluded from schema export.
  * 
  * @hibernate.class table="BPEL_MEX_PROPS" lazy="true"
- * @hibernate.query name="DELETE_MEX_PROPS_BY_INSTANCES" query="delete from 
HMessageExchangeProperty as p where p.mex in(select e from HMessageExchange e 
where e.instance in (:instances))"
+ * @hibernate.query name="SELECT_MEX_PROPS_IDS_BY_INSTANCES" query="select 
p.id from HMessageExchangeProperty p, HMessageExchange e where p.mex = e and 
e.instance in (:instances)"
  */
 @SuppressWarnings("serial")
 public class HMessageExchangeProperty implements Serializable {
-    public final static String DELETE_MEX_PROPS_BY_INSTANCES = 
"DELETE_MEX_PROPS_BY_INSTANCES";
+    public final static String SELECT_MEX_PROPS_IDS_BY_INSTANCES = 
"SELECT_MEX_PROPS_IDS_BY_INSTANCES";
 
     private HMessageExchange _mex;
     private String _name;
@@ -93,4 +93,4 @@
         // actually HMessageExchangePropery is never retrieved by the id 
         return _mex.hashCode() * 29 + _name.hashCode() * 13;
     }
-}
\ No newline at end of file
+}

Modified: 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java
URL: 
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java?rev=800378&r1=800377&r2=800378&view=diff
==============================================================================
--- 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java
 (original)
+++ 
ode/branches/APACHE_ODE_1.X/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/hobj/HPartnerLink.java
 Mon Aug  3 13:40:00 2009
@@ -28,7 +28,7 @@
  * configuration).
  * 
  * @hibernate.class table="BPEL_PLINK_VAL"
- * @hibernate.query name="SELECT_PARTNER_LINK_IDS_BY_INSTANCES" query="select 
id from HPartnerLink as l where l.scope in (select s from HScope as s where 
s.instance in (:instances))"
+ * @hibernate.query name="SELECT_PARTNER_LINK_IDS_BY_INSTANCES" query="select 
l.id from HPartnerLink l, HScope s where l.scope = s and s.instance in 
(:instances)"
  */
 public class HPartnerLink extends HObject {
     public final static String SELECT_PARTNER_LINK_IDS_BY_INSTANCES = 
"SELECT_PARTNER_LINK_IDS_BY_INSTANCES";


Reply via email to