diff options
author | 2019-09-04 15:45:00 +0000 | |
---|---|---|
committer | 2019-09-04 15:45:00 +0000 | |
commit | d2b5c18e008c4be333ff0f5c47d1d8136802f6b6 (patch) | |
tree | d687a5bb030ff0246522c116991a14f51f6874cb /mdbc-server/src/main/java/org/onap/music/mdbc/MdbcConnection.java | |
parent | 84c322b7d05bb820af38421fbda75e8dc9817c69 (diff) | |
parent | 42214c84ef398fb65db4d84012de1e46c585f300 (diff) |
Merge "Replay Transaction Updates"
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 | 7 |
1 files changed, 4 insertions, 3 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 6f097dd..42864ea 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,8 @@ public class MdbcConnection implements Connection { try { partition = mi.splitPartitionIfNecessary(partition, rangesUsed); } catch (MDBCServiceException e) { - logger.warn(EELFLoggerDelegate.errorLogger, "Failure to split partition, trying to continue", + logger.warn(EELFLoggerDelegate.errorLogger, + "Failure to split partition '" + partition.getMRIIndex() + "' trying to continue", AppMessages.UNKNOWNERROR, ErrorTypes.UNKNOWN, ErrorSeverity.FATAL); } @@ -541,7 +542,6 @@ public class MdbcConnection implements Connection { DatabasePartition tempPartition = own(scRanges, MDBCUtils.getOperationType(tableToQueryType)); if(tempPartition!=null && tempPartition != partition) { this.partition.updateDatabasePartition(tempPartition); - statemanager.getOwnAndCheck().reloadAlreadyApplied(this.partition); } dbi.preStatementHook(sql); } @@ -619,7 +619,8 @@ public class MdbcConnection implements Connection { 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, lock, ownershipReturn.getOwnershipId()); + 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()); } |