Merge pull request #5406 from Sage-Bionetworks/release-562

Release 562

Author: marcomarasca

services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/grid/internal/replica/change/InsertRowChangeHandler.java

@@ -25,7 +25,13 @@ public IntendedChangeType getType() {
 	public void handleChange(PatchBuilder builder, InsertRowChange change) {
 		JSONArray rowData = change.getRowData();
 		Integer[] rowVectorIndex = change.getRowVectorIndex();
-	
+		
+		// The vector that contains the row data is wrapped into an object as the "data" key value.
+		// We need to create the object before the vector because the row object node id needs to be 
+		// smaller than the vector id for the LWW insertion routine to succeed 
+		// (See https://jsonjoy.com/specs/json-crdt/model-document/crdt-algorithms#Last-Write-Wins-(LWW)-CRDT-Algorithm)
+		LogicalTimestamp rowObjectId = builder.addOperationBuilder(Operations.newObject());
+		
 		// First creates the vector that represents the new row
 		LogicalTimestamp rowVecId = builder.addOperationBuilder(Operations.newVector());
 		Map<Integer, LogicalTimestamp> newVecConstantMap = new HashMap<>(rowData.length());
@@ -41,9 +47,6 @@ public void handleChange(PatchBuilder builder, InsertRowChange change) {
 		// Add the data to the vector
 		builder.addOperationBuilder(Operations.insertVector().setVectorId(rowVecId).setMap(newVecConstantMap));
 
-		// The vector is wrapped into an object
-		LogicalTimestamp rowObjectId = builder.addOperationBuilder(Operations.newObject());
-		
 		builder.addOperationBuilder(Operations.insertObject()
 			.setObjectId(rowObjectId)
 			.setMap(Map.of("data", rowVecId))

services/repository-managers/src/test/java/org/sagebionetworks/repo/manager/grid/internal/replica/change/InsertRowChangeHandlerTest.java

@@ -44,6 +44,10 @@ public void before() {
 	public void testHandleChange() {
 		Long repId = 5L;
 
+		LogicalTimestamp rowObjId = new LogicalTimestamp().setReplicaId(repId).setSequenceNumber(5L);
+		
+		when(mockPatchBuilder.addOperationBuilder(Operations.newObject())).thenReturn(rowObjId);
+		
 		LogicalTimestamp rowVecId = new LogicalTimestamp().setReplicaId(repId).setSequenceNumber(6L);
 
 		when(mockPatchBuilder.addOperationBuilder(Operations.newVector())).thenReturn(rowVecId);
@@ -53,7 +57,7 @@ public void testHandleChange() {
 		for (int i=0; i<change.getRowData().length(); i++) {
 			Object value = change.getRowData().get(i);
 
-			LogicalTimestamp constId = new LogicalTimestamp().setReplicaId(repId).setSequenceNumber(20L + i);
+			LogicalTimestamp constId = new LogicalTimestamp().setReplicaId(repId).setSequenceNumber(7L + i);
 
 			when(mockPatchBuilder.addOperationBuilder(Operations.newConstant().setValue(new ConValue(ConType.STRING, value))))
 				.thenReturn(constId);
@@ -64,10 +68,6 @@ public void testHandleChange() {
 		when(mockPatchBuilder.addOperationBuilder(Operations.insertVector().setVectorId(rowVecId).setMap(constMap)))
 			.thenReturn(new LogicalTimestamp().setReplicaId(repId).setSequenceNumber(30L));
 
-		LogicalTimestamp rowObjId = new LogicalTimestamp().setReplicaId(repId).setSequenceNumber(40L);
-		
-		when(mockPatchBuilder.addOperationBuilder(Operations.newObject())).thenReturn(rowObjId);
-		
 		when(mockPatchBuilder.addOperationBuilder(Operations.insertObject()
 				.setObjectId(rowObjId)
 				.setMap(Map.of("data", rowVecId))