diff options
author | rescobar | 2011-09-06 18:01:17 +0000 |
---|---|---|
committer | Ryan D. Brooks | 2011-09-06 18:01:17 +0000 |
commit | 15392b03c0fd505a80196ca1e4d2456a05ea9f0a (patch) | |
tree | 5ed9a060bea4e372175aaf30786b69df9d94a3a8 | |
parent | 3b82a5609b4083be694347c190bf0b857d77d30e (diff) | |
download | org.eclipse.osee-15392b03c0fd505a80196ca1e4d2456a05ea9f0a.tar.gz org.eclipse.osee-15392b03c0fd505a80196ca1e4d2456a05ea9f0a.tar.xz org.eclipse.osee-15392b03c0fd505a80196ca1e4d2456a05ea9f0a.zip |
bug[ats_D7P5E]: Merge Manager sql queries need to use txs index
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UpdateMergeBranch.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UpdateMergeBranch.java index 7d9b5841bb3..e01d2726430 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UpdateMergeBranch.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UpdateMergeBranch.java @@ -47,7 +47,7 @@ public class UpdateMergeBranch extends DbTransaction { " END"; private static final String UPDATE_ARTIFACTS = - "INSERT INTO osee_txs (transaction_id, gamma_id, mod_type, tx_current, branch_id) SELECT ?, txs1.gamma_id, txs1.mod_type, " + TX_CURRENT_SETTINGS + ", txs1.branch_id FROM osee_attribute attr1, osee_txs txs1 WHERE attr1.art_id = ? AND txs1.gamma_id = attr1.gamma_id AND txs1.branch_id = ? AND txs1.tx_current <> ? AND NOT EXISTS (SELECT 'x' FROM osee_txs txs2, osee_attribute attr2 WHERE txs2.transaction_id = ? AND txs2.gamma_id = attr2.gamma_id AND attr2.attr_id = attr1.attr_id)"; + "INSERT INTO osee_txs (transaction_id, gamma_id, mod_type, tx_current, branch_id) SELECT ?, txs1.gamma_id, txs1.mod_type, " + TX_CURRENT_SETTINGS + ", txs1.branch_id FROM osee_attribute attr1, osee_txs txs1 WHERE attr1.art_id = ? AND txs1.gamma_id = attr1.gamma_id AND txs1.branch_id = ? AND txs1.tx_current <> ? AND NOT EXISTS (SELECT 'x' FROM osee_txs txs2, osee_attribute attr2 WHERE txs2.branch_id = txs1.branch_id AND txs2.transaction_id = ? AND txs2.gamma_id = attr2.gamma_id AND attr2.attr_id = attr1.attr_id)"; private static final String PURGE_BASELINE_ATTRIBUTE_TRANS = "DELETE from osee_txs txs WHERE EXISTS (SELECT 'x' FROM osee_attribute attr WHERE txs.gamma_id = attr.gamma_id AND txs.branch_id = ? AND attr.art_id = ?)"; @@ -240,7 +240,6 @@ public class UpdateMergeBranch extends DbTransaction { * will also be removed from the database only for the branch it is on). */ private static void purgeArtifactFromBranch(OseeConnection connection, Branch branch, int artId) throws OseeCoreException { - int baseTxId = branch.getBaseTransaction().getId(); int branchId = branch.getId(); //Remove from Baseline diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictStatusManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictStatusManager.java index 07150974997..1637ccc8d34 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictStatusManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictStatusManager.java @@ -32,7 +32,7 @@ public class ConflictStatusManager { private static final String MERGE_UPDATE_GAMMAS = "UPDATE osee_conflict SET source_gamma_id = ?, dest_gamma_id = ?, status = ? WHERE merge_branch_id = ? AND conflict_id = ? AND conflict_type = ?"; private static final String MERGE_BRANCH_GAMMAS = - "UPDATE osee_txs SET gamma_id = ? where (transaction_id, gamma_id) = (SELECT tx.transaction_id, tx.gamma_id FROM osee_txs tx, osee_attribute atr WHERE tx.transaction_id = ? AND atr.gamma_id = tx.gamma_id AND atr.attr_id = ? )"; + "UPDATE osee_txs SET gamma_id = ? where (transaction_id, gamma_id) = (SELECT tx.transaction_id, tx.gamma_id FROM osee_txs tx, osee_attribute atr WHERE tx.branch_id = ? AND tx.transaction_id = ? AND atr.gamma_id = tx.gamma_id AND atr.attr_id = ? )"; public static void setStatus(ConflictStatus status, int sourceGamma, int destGamma, int mergeBranchId) throws OseeCoreException { IOseeStatement chStmt = ConnectionHandler.getStatement(); @@ -67,7 +67,8 @@ public class ConflictStatusManager { ConnectionHandler.runPreparedUpdate(MERGE_UPDATE_GAMMAS, sourceGamma, destGamma, intStatus, branchID, objectID, conflictType); if (conflictType == ConflictType.ATTRIBUTE.getValue()) { - ConnectionHandler.runPreparedUpdate(MERGE_BRANCH_GAMMAS, sourceGamma, transactionId, objectID); + ConnectionHandler.runPreparedUpdate(MERGE_BRANCH_GAMMAS, sourceGamma, branchID, transactionId, + objectID); } } if (intStatus == ConflictStatus.INFORMATIONAL.getValue() || passedStatus == ConflictStatus.INFORMATIONAL) { |