edits
[iotcloud.git] / src / java / iotcloud / Table.java
index c2adbc93fe9a67e84b6f669e52177760ff9d760a..d4a62c6abda0576fcd9e0dd04180ce3cc43cb47b 100644 (file)
@@ -2,8 +2,6 @@ package iotcloud;
 import java.util.HashMap;
 import java.util.Arrays;
 import java.util.Vector;
-import javax.crypto.spec.*;
-import javax.crypto.*;
 
 final public class Table {
        private int numslots;
@@ -11,49 +9,32 @@ final public class Table {
        private HashMap<Long, Pair<Long, Liveness> > lastmessagetable=new HashMap<Long, Pair<Long, Liveness> >();
        private SlotBuffer buffer;
        private CloudComm cloud;
-       private Mac hmac;
        private long sequencenumber;
        private long localmachineid;
-  private TableStatus lastTableStatus;
-  static final int FREE_SLOTS = 10;
-  static final int FORCED_RESIZE_INCREMENT = 20;
-  
+       private TableStatus lastTableStatus;
+       static final int FREE_SLOTS = 10;
+       static final int FORCED_RESIZE_INCREMENT = 20;
+
        public Table(String baseurl, String password, long _localmachineid) {
                localmachineid=_localmachineid;
                buffer = new SlotBuffer();
-               sequencenumber = 1;
-               initCloud(baseurl, password);
-       }
-
-       private void initCloud(String baseurl, String password) {
-               try {
-                       SecretKeySpec secret=getKey(password);
-                       Cipher encryptCipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
-                       encryptCipher.init(Cipher.ENCRYPT_MODE, secret);
-                       Cipher decryptCipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
-                       decryptCipher.init(Cipher.DECRYPT_MODE, secret);
-                       hmac = Mac.getInstance("HmacSHA256");
-                       hmac.init(secret);
-                       cloud=new CloudComm(baseurl, encryptCipher, decryptCipher, hmac);
-               } catch (Exception e) {
-                       throw new Error("Failed To Initialize Ciphers");
-               }
+               numslots = buffer.capacity();
+               sequencenumber = 0;
+               cloud=new CloudComm(baseurl, password);
        }
 
-       private SecretKeySpec getKey(String password) {
-               try {
-                       PBEKeySpec keyspec = new PBEKeySpec(password.toCharArray());
-                       SecretKey key = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256").generateSecret(keyspec);
-                       SecretKeySpec secret = new SecretKeySpec(key.getEncoded(), "AES");
-                       return secret;
-               } catch (Exception e) {
-                       throw new Error("Failed generating key.");
-               }
+       public Table(CloudComm _cloud, long _localmachineid) {
+               localmachineid=_localmachineid;
+               buffer = new SlotBuffer();
+               numslots = buffer.capacity();
+               sequencenumber = 0;
+               cloud=_cloud;
        }
 
        public void update() {
-               Slot[] newslots=cloud.getSlots(sequencenumber);
-               validateandupdate(newslots);
+               Slot[] newslots=cloud.getSlots(sequencenumber+1);
+
+               validateandupdate(newslots, false);
        }
 
        public IoTString get(IoTString key) {
@@ -64,133 +45,173 @@ final public class Table {
                        return null;
        }
 
+       public void initTable() {
+               Slot s=new Slot(1, localmachineid);
+               TableStatus status=new TableStatus(s, numslots);
+               s.addEntry(status);
+               Slot[] array=cloud.putSlot(s, numslots);
+               if (array == null) {
+                       array = new Slot[] {s};
+                       validateandupdate(array, true);                                                                         // update data structure
+               } else {
+                       throw new Error("Error on initialization");
+               }
+       }
+
        public IoTString put(IoTString key, IoTString value) {
-    while(true) {
-      KeyValue oldvalue=table.get(key);
-      if (tryput(key, value)) {
-        return oldvalue.getValue();
-      }
-    }
-  }
-
-  private boolean tryput(IoTString key, IoTString value) {
-    Slot s=new Slot(sequencenumber+1, localmachineid, buffer.getSlot(sequencenumber).getHMAC());
-    boolean forcedresize = false;
-
-    long seqn = buffer.getOldestSeqNum();
-    
-    if ((numslots - buffer.size()) < FREE_SLOTS) {
-      //have to check whether we have enough free slots
-      seqn = buffer.getNewestSeqNum() + 1 - numslots;
-      for(int i=0; i < FREE_SLOTS; i++, seqn++) {
-        Slot prevslot=buffer.getSlot(seqn);
-        if (!prevslot.isLive())
-          continue;
-        Vector<Entry> liveentries = prevslot.getLiveEntries();
-        for(Entry liveentry:liveentries) {
-          if (s.hasSpace(liveentry))
-            s.addEntry(liveentry);
-          else if (i==0) {
-            if (s.canFit(liveentry))
-              s.addEntry(liveentry);
-            else
-              forcedresize = true;
-          }
-        }
-      }
-    }
-    KeyValue kv=new KeyValue(s, key, value);
-    boolean insertedkv=false;
-    if (s.hasSpace(kv)) {
-      s.addEntry(kv);
-      insertedkv=true;
-    }
-
-    long newestseqnum=buffer.getNewestSeqNum();
-    search:
-    for(;seqn<=newestseqnum;seqn++) {
-      Slot prevslot=buffer.getSlot(seqn);
-      if (!prevslot.isLive())
-        continue;
-      Vector<Entry> liveentries = prevslot.getLiveEntries();
-      for(Entry liveentry:liveentries) {
-        if (s.hasSpace(liveentry))
-          s.addEntry(liveentry);
-        else
-          break search;
-      }
-    }
-    
-    int max=0;
-    if (forcedresize)
-      max = numslots + FORCED_RESIZE_INCREMENT;
-    Slot[] array=cloud.putSlot(s, max);
-    if (array == null)
-      array = new Slot[] {s};
-    else
-      insertedkv=false;
-    
-               validateandupdate(array); // update data structure
-    
-    return insertedkv;
+               while(true) {
+                       KeyValue oldvalue=table.get(key);
+                       if (tryput(key, value, false)) {
+                               if (oldvalue==null)
+                                       return null;
+                               else
+                                       return oldvalue.getValue();
+                       }
+               }
+       }
+
+       private boolean tryput(IoTString key, IoTString value, boolean forcedresize) {
+               Slot s=new Slot(sequencenumber+1, localmachineid, buffer.getSlot(sequencenumber).getHMAC());
+               long seqn = buffer.getOldestSeqNum();
+
+               if (forcedresize) {
+                       TableStatus status=new TableStatus(s, FORCED_RESIZE_INCREMENT + numslots);
+                       s.addEntry(status);
+               }
+
+               if ((numslots - buffer.size()) < FREE_SLOTS) {
+                       //have to check whether we have enough free slots
+                       long fullfirstseqn = buffer.getNewestSeqNum() + 1 - numslots;
+                       seqn = fullfirstseqn < 1?1:fullfirstseqn;
+                       for(int i=0; i < FREE_SLOTS; i++, seqn++) {
+                               Slot prevslot=buffer.getSlot(seqn);
+                               if (!prevslot.isLive())
+                                       continue;
+                               Vector<Entry> liveentries = prevslot.getLiveEntries();
+                               for(Entry liveentry:liveentries) {
+                                       if (redundant(liveentry))
+                                               continue;
+                                       if (s.hasSpace(liveentry))
+                                               s.addEntry(liveentry);
+                                       else if (i==0) {
+                                               if (s.canFit(liveentry))
+                                                       s.addEntry(liveentry);
+                                               else if (!forcedresize) {
+                                                       return tryput(key, value, true);
+                                               }
+                                       }
+                               }
+                       }
+               }
+               KeyValue kv=new KeyValue(s, key, value);
+               boolean insertedkv=false;
+               if (s.hasSpace(kv)) {
+                       s.addEntry(kv);
+                       insertedkv=true;
+               }
+
+               long newestseqnum=buffer.getNewestSeqNum();
+search:
+               for(; seqn<=newestseqnum; seqn++) {
+                       Slot prevslot=buffer.getSlot(seqn);
+                       if (!prevslot.isLive())
+                               continue;
+                       Vector<Entry> liveentries = prevslot.getLiveEntries();
+                       for(Entry liveentry:liveentries) {
+                               if (redundant(liveentry))
+                                       continue;
+                               if (s.hasSpace(liveentry))
+                                       s.addEntry(liveentry);
+                               else
+                                       break search;
+                       }
+               }
+
+               int max=0;
+               if (forcedresize)
+                       max = numslots + FORCED_RESIZE_INCREMENT;
+               Slot[] array=cloud.putSlot(s, max);
+               if (array == null)
+                       array = new Slot[] {s};
+               else
+                       insertedkv=false;
+
+               validateandupdate(array, true);                                                 // update data structure
+
+               return insertedkv;
        }
 
-       private void validateandupdate(Slot[] newslots) {
+       boolean redundant(Entry liveentry) {
+               if (liveentry.getType()==Entry.TypeLastMessage) {
+                       LastMessage lastmsg=(LastMessage) liveentry;
+                       return lastmsg.getMachineID() == localmachineid;
+               }
+               return false;
+       }
+
+
+       private void validateandupdate(Slot[] newslots, boolean isput) {
                //The cloud communication layer has checked slot HMACs already
                //before decoding
                if (newslots.length==0)
                        return;
 
                long firstseqnum=newslots[0].getSequenceNumber();
-               if (firstseqnum < sequencenumber)
+               if (firstseqnum <= sequencenumber)
                        throw new Error("Server Error: Sent older slots!");
 
                SlotIndexer indexer = new SlotIndexer(newslots, buffer);
                checkHMACChain(indexer, newslots);
 
-    initExpectedSize();
-    for(Slot slot: newslots) {
-      updateExpectedSize();
-                       processSlot(indexer, slot);
+               initExpectedSize();
+               for(Slot slot: newslots) {
+                       updateExpectedSize();
+                       processSlot(indexer, slot, isput);
                }
-    checkNumSlots(newslots.length);
-    commitNewMaxSize();
 
-    //commit new to slots
-    for(Slot slot:newslots) {
-      buffer.putSlot(slot);
-    }
+               //If there is a gap, check to see if the server sent us everything
+               if (firstseqnum != (sequencenumber+1))
+                       checkNumSlots(newslots.length);
+
+               commitNewMaxSize();
+
+               //commit new to slots
+               for(Slot slot:newslots) {
+                       buffer.putSlot(slot);
+               }
+               sequencenumber = newslots[newslots.length - 1].getSequenceNumber();
+       }
+
+       private int expectedsize, currmaxsize;
+
+       private void checkNumSlots(int numslots) {
+               if (numslots != expectedsize)
+                       throw new Error("Server Error: Server did not send all slots.  Expected: "+expectedsize+" Received:"+numslots);
+       }
+
+       private void initExpectedSize() {
+               long prevslots = sequencenumber;
+               expectedsize = (prevslots < ((long) numslots))?(int) prevslots:numslots;
+               currmaxsize = numslots;
+       }
+
+       private void updateExpectedSize() {
+               expectedsize++;
+               if (expectedsize > currmaxsize)
+                       expectedsize = currmaxsize;
+       }
+
+       private void updateCurrMaxSize(int newmaxsize) {
+               currmaxsize=newmaxsize;
+       }
+
+       private void commitNewMaxSize() {
+               if (numslots != currmaxsize)
+                       buffer.resize(currmaxsize);
+
+               numslots=currmaxsize;
        }
 
-  private int expectedsize, currmaxsize;
-
-  private void checkNumSlots(int numslots) {
-    if (numslots != expectedsize)
-      throw new Error("Server Error: Server did not send all slots");
-  }
-  
-  private void initExpectedSize() {
-    expectedsize = (sequencenumber < ((long) numslots)) ? (int) sequencenumber : numslots;
-    currmaxsize = numslots;
-  }
-
-  private void updateExpectedSize() {
-    expectedsize++;
-    if (expectedsize > currmaxsize)
-      expectedsize = currmaxsize;
-  }
-
-  private void updateCurrMaxSize(int newmaxsize) {
-    currmaxsize=newmaxsize;
-  }
-
-  private void commitNewMaxSize() {
-    if (numslots != currmaxsize)
-      buffer.resize(currmaxsize);
-
-    numslots=currmaxsize;
-  }
-  
        private void processEntry(KeyValue entry, SlotIndexer indexer) {
                IoTString key=entry.getKey();
                KeyValue oldvalue=table.get(key);
@@ -201,7 +222,7 @@ final public class Table {
        }
 
        private void processEntry(LastMessage entry, SlotIndexer indexer) {
-               updateLastMessage(entry.getMachineID(), entry.getSequenceNumber(), entry);
+               updateLastMessage(entry.getMachineID(), entry.getSequenceNumber(), entry, false);
        }
 
        private void processEntry(RejectedMessage entry, SlotIndexer indexer) {
@@ -221,14 +242,14 @@ final public class Table {
        }
 
        private void processEntry(TableStatus entry, SlotIndexer indexer) {
-    int newnumslots=entry.getMaxSlots();
-    updateCurrMaxSize(newnumslots);
-    if (lastTableStatus != null)
-      lastTableStatus.setDead();
-    lastTableStatus = entry;
+               int newnumslots=entry.getMaxSlots();
+               updateCurrMaxSize(newnumslots);
+               if (lastTableStatus != null)
+                       lastTableStatus.setDead();
+               lastTableStatus = entry;
        }
 
-       private void updateLastMessage(long machineid, long seqnum, Liveness liveness) {
+       private void updateLastMessage(long machineid, long seqnum, Liveness liveness, boolean isput) {
                Pair<Long, Liveness> lastmsgentry = lastmessagetable.put(machineid, new Pair<Long, Liveness>(seqnum, liveness));
                if (lastmsgentry == null)
                        return;
@@ -244,7 +265,7 @@ final public class Table {
                }
 
                if (machineid == localmachineid) {
-                       if (lastmsgseqnum != seqnum)
+                       if (lastmsgseqnum != seqnum && !isput)
                                throw new Error("Server Error: Mismatch on local machine sequence number");
                } else {
                        if (lastmsgseqnum > seqnum)
@@ -252,9 +273,9 @@ final public class Table {
                }
        }
 
-       private void processSlot(SlotIndexer indexer, Slot slot) {
-               updateLastMessage(slot.getMachineID(), slot.getSequenceNumber(), slot);
-    
+       private void processSlot(SlotIndexer indexer, Slot slot, boolean isput) {
+               updateLastMessage(slot.getMachineID(), slot.getSequenceNumber(), slot, isput);
+
                for(Entry entry : slot.getEntries()) {
                        switch(entry.getType()) {
                        case Entry.TypeKeyValue:
@@ -285,7 +306,7 @@ final public class Table {
                        Slot prevslot=indexer.getSlot(currslot.getSequenceNumber()-1);
                        if (prevslot != null &&
                                        !Arrays.equals(prevslot.getHMAC(), currslot.getPrevHMAC()))
-                               throw new Error("Server Error: Invalid HMAC Chain");
+                               throw new Error("Server Error: Invalid HMAC Chain"+currslot+" "+prevslot);
                }
        }
 }