Small but important protocol changes

Author: Biatbe13

saved-logs/saved-runs-v2/random-25-0.txt saved-logs/saved-runs-v1/random-25-0.txt

@@ -89,7 +89,7 @@ public class HbftJavaReplica<O extends Serializable, R extends Serializable> ext
 
     // The received requests stored as <timestamp, clientId>
     @Getter
-    private final SortedMap<Long, String> receivedRequests = new TreeMap<>();
+    private final SortedMap<ReplicaRequestKey, String> receivedRequests = new TreeMap<>();
 
     public HbftJavaReplica(String replicaId,
                            SortedSet<String> nodeIds,
@@ -174,12 +174,11 @@ private void recvRequest(RequestMessage request, boolean wasRequestBuffered) {
             }
         }
 
-        // TODO: Maybe timestamp needs to be double checked
-        // FIXME: This is not good requests can be discarded
-        if (this.receivedRequests.get(request.getTimestamp()) != null) {
+        // TODO: Should double check if this is correct
+        if (this.receivedRequests.get(key) != null) {
             return;
         }
-        this.receivedRequests.put(request.getTimestamp(), request.getClientId());
+        this.receivedRequests.put(key, request.getClientId());
 
 
         String primaryId = this.getPrimaryId();

saved-logs/saved-runs-v2/random-25-25-v1.txt saved-logs/saved-runs-v1/random-25-25-v1.txt

@@ -437,7 +437,7 @@ public NewViewMessage produceNewView(long newViewNumber, String replicaId, int t
             allRequests.add(requests);
 
             for (long seqNum : requests.keySet()) {
-                ClientRequestKey key = new ClientRequestKey(seqNum, requests.get(seqNum).getClientId());
+                ClientRequestKey key = new ClientRequestKey(seqNum, requests.get(seqNum).getOperation().toString());
                 requestMap.put(key, requestMap.getOrDefault(key, 0) + 1);
             }
 
@@ -501,7 +501,7 @@ public NewViewMessage produceNewView(long newViewNumber, String replicaId, int t
          */
         for (SortedMap<Long, RequestMessage> requests : allRequests) {
             for (Map.Entry<Long, RequestMessage> request : requests.entrySet()) {
-                ClientRequestKey key = new ClientRequestKey(request.getKey(), request.getValue().getClientId());
+                ClientRequestKey key = new ClientRequestKey(request.getKey(), request.getValue().getOperation().toString());
                 //System.out.println(selectedHistoryM + " " + request + " " + (requestMap.get(key) >= tolerance + 1));
                 if ((selectedHistoryM == null || request.getKey() > selectedHistoryM.getGreatestSeqNumber()) && requestMap.get(key) >= tolerance + 1) {
                     sortedRequests.addEntry(request.getKey(), request.getValue());
@@ -654,20 +654,21 @@ public boolean acceptNewView(NewViewMessage newView, long tolerance, ScheduleLog
             allRequests.add(requestsPerReplica);
 
             for (long seqNum : requestsPerReplica.keySet()) {
-                ClientRequestKey key = new ClientRequestKey(seqNum, requestsPerReplica.get(seqNum).getClientId());
+                ClientRequestKey key = new ClientRequestKey(seqNum, requestsPerReplica.get(seqNum).getOperation().toString());
                 requestMap.put(key, requestMap.getOrDefault(key, 0) + 1);
             }
         }
 
         SpeculativeHistory sortedRequests = new SpeculativeHistory();
+        // System.out.println(requestMap + " " + allRequests);
 
         /*  
          * Select every request in R if f+1 replicas include it
          * And sequence number is greater than the largest in selectedHistoryM
          */
         for (SortedMap<Long, RequestMessage> requests : allRequests) {
             for (Map.Entry<Long, RequestMessage> request : requests.entrySet()) {
-                ClientRequestKey key = new ClientRequestKey(request.getKey(), request.getValue().getClientId());
+                ClientRequestKey key = new ClientRequestKey(request.getKey(), request.getValue().getOperation().toString());
                 if ((checkpoint == null || request.getKey() > checkpoint.getSequenceNumber()) && requestMap.get(key) >= tolerance + 1) {
                     sortedRequests.addEntry(request.getKey(), request.getValue());
                 } else if (checkpoint == null || request.getKey() > checkpoint.getSequenceNumber()) {