From 35e8c5ef9d140d47e8cee8f82f5a18e8970b95a8 Mon Sep 17 00:00:00 2001
From: Jan Vonka <jan.vonka@alfresco.com>
Date: Wed, 1 Sep 2010 11:25:42 +0000
Subject: [PATCH] ALF-4280 - Node DAO: index recovery/tracking (select_Txns /
 select_TxnsUnused) - add missing order by(s) to "select_Txns" and
 "select_TxnsUnused" - initially affected Oracle build

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22117 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../node-common-SqlMap.xml                             | 10 +++++++---
 .../alfresco/repo/domain/node/ibatis/NodeDAOImpl.java  |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
index a9e025904c..a8970e4d87 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
@@ -835,9 +835,10 @@
             txn.change_txn_id   as change_txn_id,
             txn.commit_time_ms  as commit_time_ms
     </sql>
-    <sql id="select_Transaction_OrderByCommitTime">
-        <isEqual property="orderByCommit" compareValue="true">order by txn.commit_time ASC</isEqual>
-        <isEqual property="orderByCommit" compareValue="false">order by txn.commit_time DESC</isEqual>
+    
+    <sql id="select_Transaction_OrderByCommitTimeTxnId">
+        <isEqual property="ascending" compareValue="true">order by txn.commit_time_ms ASC, txn.id ASC</isEqual>
+        <isEqual property="ascending" compareValue="false">order by txn.commit_time_ms DESC, txn.id DESC</isEqual>
     </sql>
     
     <!-- Full WHERE clause for TransactionQueryEntity -->
@@ -888,6 +889,7 @@
         from
             alf_transaction txn
         <include refid="alfresco.node.select_Transaction_FullWhere"/>
+        <include refid="alfresco.node.select_Transaction_OrderByCommitTimeTxnId"/>
     </select>
 
     <select id="select_TxnCount" resultClass="java.lang.Integer">
@@ -917,6 +919,8 @@
             node.id is null
             <isNotNull property="minId"><![CDATA[and txn.id >= #minId#]]></isNotNull>
             <isNotNull property="maxCommitTime"><![CDATA[and txn.commit_time_ms <= #maxCommitTime#]]></isNotNull>
+        order by
+            txn.id ASC
     </select>
     
     <select id="select_TxnMinCommitTime" resultClass="java.lang.Long">
diff --git a/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java b/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
index ad01c65910..b229d77374 100644
--- a/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
@@ -1291,6 +1291,7 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
         query.setIncludeTxnIds(includeTxnIds);
         query.setExcludeTxnIds(excludeTxnIds);
         query.setExcludeServerId(excludeServerId);
+        query.setAscending(ascending);
         
         if (count == null)
         {