Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid W. Miller2016-02-09 11:48:48 -0500
committerDavid Miller2016-02-10 15:24:48 -0500
commit8b396aa891cc81db57d409655dc24c1143119075 (patch)
tree651a77271592410387d2411c0e9a6bd32cf895ca
parentfbb119ec50ee190493b6b124c76b8f4a5f169497 (diff)
downloadorg.eclipse.osee-8b396aa891cc81db57d409655dc24c1143119075.tar.gz
org.eclipse.osee-8b396aa891cc81db57d409655dc24c1143119075.tar.xz
org.eclipse.osee-8b396aa891cc81db57d409655dc24c1143119075.zip
bug[ats_ATS265142]: Update sql for conflict multiplicity detection0.23.1.v201602182221_NRB
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictTest.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java51
2 files changed, 32 insertions, 23 deletions
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictTest.java
index bb7bc75453..9c60f1ae41 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictTest.java
@@ -46,6 +46,7 @@ import org.eclipse.osee.framework.skynet.core.conflict.ConflictManagerExternal;
import org.eclipse.osee.framework.skynet.core.conflict.RelationConflict;
import org.eclipse.osee.framework.skynet.core.revision.ConflictManagerInternal;
import org.eclipse.osee.framework.skynet.core.utility.ConnectionHandler;
+import org.eclipse.osee.framework.skynet.core.utility.OseeInfo;
import org.eclipse.osee.jdbc.JdbcStatement;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -242,6 +243,9 @@ public class ConflictTest {
Assert.assertNotEquals(child1AttrId, child2AttrId);
+ // enable multiplicity conflict checking
+ OseeInfo.setValue("osee.disable.multiplicity.conflicts", "false");
+
mgr = new ConflictManagerExternal(parent, child2);
Assert.assertTrue(mgr.originalConflictsExist());
List<Conflict> conflicts = mgr.getOriginalConflicts();
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java
index 2c94ac42ba..5a284e355a 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java
@@ -28,7 +28,6 @@ import org.eclipse.osee.framework.core.model.TransactionRecord;
import org.eclipse.osee.framework.core.sql.OseeSql;
import org.eclipse.osee.framework.jdk.core.type.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
@@ -52,27 +51,33 @@ import org.eclipse.osee.jdbc.JdbcStatement;
* @author Jeff C. Phillips
*/
public class ConflictManagerInternal {
- private static final String MULTIPLICITY_DETECTION =
- "select attr_s.art_id, attr_s.attr_id as source_attr_id, attr_d.attr_id as dest_attr_id " + //
- "from " + //
- "osee_attribute attr_s, " + //
- "osee_txs txs_s, " + //
- "osee_txs txs_d, " + //
- "osee_attribute attr_d, " + //
- "osee_join_id jid " + //
- "where " + //
- "txs_s.tx_current = 1 AND " + //
- "txs_s.branch_id = ? AND " + //
- "txs_s.transaction_id > ? AND " + //
- "txs_s.gamma_id = attr_s.gamma_id AND " + //
- "attr_s.attr_type_id = jid.id AND " + //
- "jid.query_id = ? AND " + //
- "txs_d.tx_current = 1 AND " + //
- "txs_d.branch_id = ? AND " + //
- "txs_d.gamma_id = attr_d.gamma_id AND " + //
- "attr_d.attr_type_id = attr_s.attr_type_id AND " + //
- "attr_d.art_id = attr_s.art_id AND " + //
- "attr_d.attr_id <> attr_s.attr_id";
+
+ private static final String MULTIPLICITY_DETECTION = "with " + //
+ "attr_c as (select attr_src.art_id as src_art_id, " + //
+ "attr_src.attr_id as src_attr_id, " + //
+ "attr_src.attr_type_id as src_attr_tid, " + //
+ "txs_src.gamma_id as src_txs_gid " + //
+ "from osee_txs txs_src, osee_attribute attr_src where " + //
+ "branch_id = ? and " + //
+ "tx_current = 1 and " + //
+ "transaction_id > ? and " + //
+ "txs_src.gamma_id = attr_src.gamma_id), " + //
+ "sj_c as (select attr_c.src_art_id as sj_art_id, " + //
+ "attr_c.src_attr_id as sj_attr_id, " + //
+ "attr_c.src_attr_tid as sj_attr_tid " + //
+ "from attr_c, osee_join_id jid where " + //
+ "attr_c.src_attr_tid = jid.id and " + //
+ "jid.query_id = ?) " + //
+ "select attr_d.art_id as art_id, " + //
+ "sj_c.sj_attr_id as source_attr_id, " + //
+ "attr_d.attr_id as dest_attr_id " + //
+ "from sj_c, osee_attribute attr_d, osee_txs txs_d where " + //
+ "txs_d.branch_id = ? and " + //
+ "txs_d.tx_current = 1 and " + //
+ "txs_d.gamma_id = attr_d.gamma_id and " + //
+ "attr_d.attr_type_id = sj_c.sj_attr_tid and " + //
+ "attr_d.art_id = sj_c.sj_art_id and " + //
+ "attr_d.attr_id <> sj_c.sj_attr_id";
private static final String CONFLICT_CLEANUP =
"DELETE FROM osee_conflict t1 WHERE merge_branch_id = ? and NOT EXISTS (SELECT 'X' FROM osee_join_artifact WHERE query_id = ? and t1.conflict_id = art_id and (t1.conflict_type = transaction_id or transaction_id is NULL))";
@@ -142,7 +147,7 @@ public class ConflictManagerInternal {
TransactionRecord commonTransaction = findCommonTransaction(sourceBranch, destinationBranch);
String disableChecks = OseeInfo.getValue("osee.disable.multiplicity.conflicts");
- if (!Strings.isValid(disableChecks)) {
+ if ("false".equals(disableChecks)) {
// check for multiplicity conflicts
Collection<IAttributeType> singleMultiplicityTypes = AttributeTypeManager.getSingleMultiplicityTypes();
loadMultiplicityConflicts(singleMultiplicityTypes, sourceBranch, destinationBranch, baselineTransaction,

Back to the top