inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALF-4280 - Node DAO: index recovery/tracking (select_Txns / select_TxnsUnused)

Browse Source 
- 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
This commit is contained in:
Jan Vonka
2010-09-01 11:25:42 +00:00
parent 59b797c8fc
commit 35e8c5ef9d
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
View File

@@ -835,9 +835,10 @@
txn.change_txn_id as change_txn_id, txn.change_txn_id as change_txn_id,
txn.commit_time_ms as commit_time_ms txn.commit_time_ms as commit_time_ms
</sql> </sql>
<sql id="select_Transaction_OrderByCommitTime">
<isEqual property="orderByCommit" compareValue="true">order by txn.commit_time ASC</isEqual> <sql id="select_Transaction_OrderByCommitTimeTxnId">
<isEqual property="orderByCommit" compareValue="false">order by txn.commit_time DESC</isEqual> <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> </sql>
<!-- Full WHERE clause for TransactionQueryEntity --> <!-- Full WHERE clause for TransactionQueryEntity -->
@@ -888,6 +889,7 @@
from from
alf_transaction txn alf_transaction txn
<include refid="alfresco.node.select_Transaction_FullWhere"/> <include refid="alfresco.node.select_Transaction_FullWhere"/>
<include refid="alfresco.node.select_Transaction_OrderByCommitTimeTxnId"/>
</select> </select>
<select id="select_TxnCount" resultClass="java.lang.Integer"> <select id="select_TxnCount" resultClass="java.lang.Integer">
@@ -917,6 +919,8 @@
node.id is null node.id is null
<isNotNull property="minId"><![CDATA[and txn.id >= #minId#]]></isNotNull> <isNotNull property="minId"><![CDATA[and txn.id >= #minId#]]></isNotNull>
<isNotNull property="maxCommitTime"><![CDATA[and txn.commit_time_ms <= #maxCommitTime#]]></isNotNull> <isNotNull property="maxCommitTime"><![CDATA[and txn.commit_time_ms <= #maxCommitTime#]]></isNotNull>
order by
txn.id ASC
</select> </select>
<select id="select_TxnMinCommitTime" resultClass="java.lang.Long"> <select id="select_TxnMinCommitTime" resultClass="java.lang.Long">

1
source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
View File

@@ -1291,6 +1291,7 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
query.setIncludeTxnIds(includeTxnIds); query.setIncludeTxnIds(includeTxnIds);
query.setExcludeTxnIds(excludeTxnIds); query.setExcludeTxnIds(excludeTxnIds);
query.setExcludeServerId(excludeServerId); query.setExcludeServerId(excludeServerId);
query.setAscending(ascending);
if (count == null) if (count == null)
{ {