projects
/
iotcloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5f55bf3
)
simplify code
author
bdemsky
<bdemsky@uci.edu>
Mon, 1 Aug 2016 19:51:17 +0000
(12:51 -0700)
committer
bdemsky
<bdemsky@uci.edu>
Mon, 1 Aug 2016 19:51:17 +0000
(12:51 -0700)
src/java/iotcloud/Table.java
patch
|
blob
|
history
diff --git
a/src/java/iotcloud/Table.java
b/src/java/iotcloud/Table.java
index cf7095e42c15784277b95e9420792c0d655deded..bbcfe6a5e0fb759cf01366c269009187af9e3e0c 100644
(file)
--- a/
src/java/iotcloud/Table.java
+++ b/
src/java/iotcloud/Table.java
@@
-134,27
+134,29
@@
final public class Table {
RejectedMessage rm=new RejectedMessage(s, localmachineid, old_seqn, new_seqn, false);
s.addEntry(rm);
} else {
RejectedMessage rm=new RejectedMessage(s, localmachineid, old_seqn, new_seqn, false);
s.addEntry(rm);
} else {
- long prev_seqn=old_seqn;
- for(int i=0; i<rejectedmessagelist.size();i++) {
+ long prev_seqn=-1;
+ int i=0;
+ /* Go through list of missing messages */
+ for(;i<rejectedmessagelist.size();i++) {
long curr_seqn=rejectedmessagelist.get(i);
Slot s_msg=buffer.getSlot(curr_seqn);
long curr_seqn=rejectedmessagelist.get(i);
Slot s_msg=buffer.getSlot(curr_seqn);
- if (s_msg!=null) {
- long machineid=s_msg.getMachineID();
- RejectedMessage rm=new RejectedMessage(s, machineid, curr_seqn, curr_seqn, true);
- s.addEntry(rm);
- if (old_seqn != -1 && old_seqn != curr_seqn) {
- RejectedMessage rmprev=new RejectedMessage(s, localmachineid, old_seqn, prev_seqn, false);
- s.addEntry(rmprev);
- }
- old_seqn = -1;
- } else {
- prev_seqn=curr_seqn;
- }
+ if (s_msg!=null)
+ break;
+ prev_seqn=curr_seqn;
}
}
- if (old_seqn != -1) {
+ /* Generate rejected message entry for missing messages */
+ if (prev_seqn != -1) {
RejectedMessage rm=new RejectedMessage(s, localmachineid, old_seqn, prev_seqn, false);
s.addEntry(rm);
}
RejectedMessage rm=new RejectedMessage(s, localmachineid, old_seqn, prev_seqn, false);
s.addEntry(rm);
}
+ /* Generate rejected message entries for present messages */
+ for(;i<rejectedmessagelist.size();i++) {
+ long curr_seqn=rejectedmessagelist.get(i);
+ Slot s_msg=buffer.getSlot(curr_seqn);
+ long machineid=s_msg.getMachineID();
+ RejectedMessage rm=new RejectedMessage(s, machineid, curr_seqn, curr_seqn, true);
+ s.addEntry(rm);
+ }
}
}
}
}