updating make files for store common files

Makefile

@@ -124,6 +124,9 @@ endef
 include lib/Rules.mk
 include replication/common/Rules.mk
 include replication/vr/Rules.mk
+include store/common/Rules.mk
+#include store/txnstore/Rules.mk
+include store/qwstore/Rules.mk
 
 ##################################################################
 # General rules

store/common/Rules.mk

+d := $(dir $(lastword $(MAKEFILE_LIST)))
+
+SRCS += $(addprefix $(d), \
+	timestamp.cc transaction.cc promise.cc tracer.cc truetime.cc)
+
+PROTOS += $(addprefix $(d), common-proto.proto)
+
+LIB-common := $(o)timestamp.o $(o)transaction.o $(o)promise.o $(o)truetime.o $(o)common-proto.o $(o)tracer.o
+
+include store/common/frontend/Rules.mk
+include store/common/backend/Rules.mk

store/common/backend/Rules.mk

+d := $(dir $(lastword $(MAKEFILE_LIST)))
+
+SRCS += $(addprefix $(d), \
+	kvstore.cc lockserver.cc versionstore.cc)
+
+LIB-backend := $(o)kvstore.o $(o)versionstore.o $(o)lockserver.o

store/common/common-proto.proto

+message TimestampMessage {
+    required uint64 timestamp = 1;
+    required uint64 id = 2;
+}
+
+message ReadMessage {
+    required string key = 1;
+    required TimestampMessage readtime = 2;
+}
+
+message WriteMessage {
+    required string key = 1;
+    required string value = 2;
+}
+
+// A serialized transaction
+message TransactionMessage {
+    repeated ReadMessage readset = 1;
+    repeated WriteMessage writeset = 2;
+}

store/common/frontend/Rules.mk

+d := $(dir $(lastword $(MAKEFILE_LIST)))
+
+SRCS += $(addprefix $(d), \
+	bufferclient.cc client.cc shardclient.cc)
+
+LIB-frontend := $(o)bufferclient.o $(o)txnclient.o $(o)client.o

store/lib/promise.cc → store/common/promise.cc

@@ -7,7 +7,7 @@
  *
  **********************************************************************/
 
-#include "common/promise.h"
+#include "store/common/promise.h"
 
 using namespace std;
 

store/lib/promise.h → store/common/promise.h

@@ -10,10 +10,10 @@
 #ifndef _PROMISE_H_
 #define _PROMISE_H_
 
-#include "paxos-lib/lib/assert.h"
-#include "paxos-lib/lib/message.h"
-#include "paxos-lib/lib/transport.h"
-#include "common/transaction.h"
+#include "lib/assert.h"
+#include "lib/message.h"
+#include "lib/transport.h"
+#include "store/common/transaction.h"
 #include <condition_variable>
 #include <mutex>
 

store/lib/timestamp.cc → store/common/timestamp.cc

@@ -7,7 +7,7 @@
  *
  **********************************************************************/
 
-#include "common/timestamp.h"
+#include "store/common/timestamp.h"
 
 void
 Timestamp::operator=(const Timestamp &t)