minor fixes for debug messages

Makefile

 #
-# Top-level makefile for OR-2PC
+# Top-level makefile for IR and TAPIR
 #
 
 CC = clang
@@ -7,7 +7,7 @@ CXX = clang++
 LD = clang++
 EXPAND = lib/tmpl/expand
 
-#CFLAGS := -g -Wall -pthread -iquote.obj/gen -Wno-uninitialized -levent_pthreads -O2 -DNASSERT
+#CFLAGS := -g -Wall -pthread -iquote.obj/gen -Wno-uninitialized -O2 -DNASSERT
 CFLAGS := -g -Wall -pthread -iquote.obj/gen -Wno-uninitialized 
 CXXFLAGS := -g -std=c++0x
 LDFLAGS := -levent_pthreads

replication/ir/client.cc

@@ -300,7 +300,7 @@ IRClient::HandleInconsistentReply(const TransportAddress &remote,
                                   const proto::ReplyInconsistentMessage &msg)
 {
     if (pendingInconsistentRequest == NULL) {
-        Warning("Received reply when no request was pending");
+        Debug("Received reply when no request was pending");
         return;
     }
     

store/strongstore/lockstore.cc

@@ -99,12 +99,10 @@ LockStore::Commit(uint64_t id, uint64_t timestamp)
     Transaction txn = prepared[id];
 
     for (auto &write : txn.getWriteSet()) {
-        bool ret = store.put(write.first, // key
-                             write.second); // value
-        ASSERT(ret);
+        store.put(write.first, write.second);
     }
 
-    //drop locks
+    // Drop locks.
     dropLocks(id, txn);
 
     prepared.erase(id);

store/tapirstore/shardclient.cc

@@ -320,10 +320,9 @@ ShardClient::CommitCallback(const string &request_str, const string &reply_str)
     blockingBegin->Reply(0);
 
     if (waiting != NULL) {
-        Promise *w = waiting;
         waiting = NULL;
     }
-    Debug("[shard %i] Received COMMIT callback [%d]", shard);
+    Debug("[shard %i] Received COMMIT callback", shard);
 }
 
 /* Callback from a shard replica on abort operation completion. */
@@ -336,10 +335,9 @@ ShardClient::AbortCallback(const string &request_str, const string &reply_str)
     blockingBegin->Reply(0);
 
     if (waiting != NULL) {
-        Promise *w = waiting;
         waiting = NULL;
     }
-    Debug("[shard %i] Received ABORT callback [%d]", shard);
+    Debug("[shard %i] Received ABORT callback", shard);
 }
 
 } // namespace tapir