diff options
Diffstat (limited to 'mdbc-server/src/main/java/org/onap/music/mdbc/MdbcConnection.java')
-rwxr-xr-x | mdbc-server/src/main/java/org/onap/music/mdbc/MdbcConnection.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/mdbc-server/src/main/java/org/onap/music/mdbc/MdbcConnection.java b/mdbc-server/src/main/java/org/onap/music/mdbc/MdbcConnection.java index f662207..7ce1d71 100755 --- a/mdbc-server/src/main/java/org/onap/music/mdbc/MdbcConnection.java +++ b/mdbc-server/src/main/java/org/onap/music/mdbc/MdbcConnection.java @@ -193,7 +193,7 @@ public class MdbcConnection implements Connection { dbi.preCommitHook(); try { - partition = mi.splitPartitionIfNecessary(partition, rangesUsed); + partition = mi.splitPartitionIfNecessary(partition, rangesUsed, ownerId); } catch (MDBCServiceException e) { logger.warn(EELFLoggerDelegate.errorLogger, "Failure to split partition '" + partition.getMRIIndex() + "' trying to continue", @@ -617,14 +617,10 @@ public class MdbcConnection implements Connection { } Dag dag = ownershipReturn.getDag(); if(dag!=null) { - DagNode node = dag.getNode(ownershipReturn.getRangeId()); - MusicRangeInformationRow row = node.getRow(); - Map<MusicRangeInformationRow, LockResult> lock = new HashMap<>(); - lock.put(row, new LockResult(row.getPartitionIndex(), ownershipReturn.getOwnerId(), true, ranges)); ownAndCheck.checkpoint(this.mi, this.dbi, dag, ranges, ownershipReturn.getOwnershipId()); //TODO: need to update pointer in alreadyapplied if a merge happened instead of in prestatement hook newPartition = new DatabasePartition(ownershipReturn.getRanges(), ownershipReturn.getRangeId(), - ownershipReturn.getOwnerId()); + ownershipReturn.getLockId()); } } catch (MDBCServiceException e) { MusicDeadlockException de = Utils.getDeadlockException(e); |