- private ReadWriteSet performUnion(ReadWriteSet recordedRWSet, ReadWriteSet rwSet) {
- // Combine the same write accesses and record in the recordedRWSet
- HashMap<String, Integer> recordedWriteMap = recordedRWSet.getWriteMap();
- HashMap<String, Integer> writeMap = rwSet.getWriteMap();
- for(Map.Entry<String, Integer> entry : recordedWriteMap.entrySet()) {
- String writeField = entry.getKey();
- // Remove the entry from rwSet if both field and object ID are the same
- if (writeMap.containsKey(writeField) &&
- (writeMap.get(writeField) == recordedWriteMap.get(writeField))) {
- writeMap.remove(writeField);
- }
- }
- // Then add everything into the recorded map because these will be traversed
- recordedWriteMap.putAll(writeMap);
- // Combine the same read accesses and record in the recordedRWSet
- HashMap<String, Integer> recordedReadMap = recordedRWSet.getReadMap();
- HashMap<String, Integer> readMap = rwSet.getReadMap();
- for(Map.Entry<String, Integer> entry : recordedReadMap.entrySet()) {
- String readField = entry.getKey();
- // Remove the entry from rwSet if both field and object ID are the same
- if (readMap.containsKey(readField) &&
- (readMap.get(readField) == recordedReadMap.get(readField))) {
- readMap.remove(readField);
- }
- }
- // Then add everything into the recorded map because these will be traversed
- recordedReadMap.putAll(readMap);
+// private ReadWriteSet performUnion(ReadWriteSet recordedRWSet, ReadWriteSet rwSet) {
+// // Combine the same write accesses and record in the recordedRWSet
+// HashMap<String, Integer> recordedWriteMap = recordedRWSet.getWriteMap();
+// HashMap<String, Integer> writeMap = rwSet.getWriteMap();
+// for(Map.Entry<String, Integer> entry : recordedWriteMap.entrySet()) {
+// String writeField = entry.getKey();
+// // Remove the entry from rwSet if both field and object ID are the same
+// if (writeMap.containsKey(writeField) &&
+// (writeMap.get(writeField) == recordedWriteMap.get(writeField))) {
+// writeMap.remove(writeField);
+// }
+// }
+// // Then add everything into the recorded map because these will be traversed
+// recordedWriteMap.putAll(writeMap);
+// // Combine the same read accesses and record in the recordedRWSet
+// HashMap<String, Integer> recordedReadMap = recordedRWSet.getReadMap();
+// HashMap<String, Integer> readMap = rwSet.getReadMap();
+// for(Map.Entry<String, Integer> entry : recordedReadMap.entrySet()) {
+// String readField = entry.getKey();
+// // Remove the entry from rwSet if both field and object ID are the same
+// if (readMap.containsKey(readField) &&
+// (readMap.get(readField) == recordedReadMap.get(readField))) {
+// readMap.remove(readField);
+// }
+// }
+// // Then add everything into the recorded map because these will be traversed
+// recordedReadMap.putAll(readMap);
+//
+// return rwSet;
+// }