[DBx1000] added Hekaton, Silo and TicToc.

Author: Xiangyao Yu

Makefile

@@ -4,43 +4,29 @@ CFLAGS=-Wall -g -std=c++0x
 .SUFFIXES: .o .cpp .h
 
 SRC_DIRS = ./ ./benchmarks/ ./concurrency_control/ ./storage/ ./system/
-DEPS = -I. -I./benchmarks -I./concurrency_control -I./storage -I./system
+INCLUDE = -I. -I./benchmarks -I./concurrency_control -I./storage -I./system
 
-CFLAGS += $(DEPS) -D NOGRAPHITE=1 -Werror
-LDFLAGS = -Wall -L. -pthread -g -lrt -std=c++0x 
+CFLAGS += $(INCLUDE) -D NOGRAPHITE=1 -Werror -O3
+LDFLAGS = -Wall -L. -pthread -g -lrt -std=c++0x -O3 -ljemalloc
 LDFLAGS += $(CFLAGS)
 
-CPPS = $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)*.cpp)) 
-
-#CPPS = $(wildcard *.cpp)
-OBJS = $(addprefix obj/, $(notdir $(CPPS:.cpp=.o)))
-
-#NOGRAPHITE=1
+CPPS = $(foreach dir, $(SRC_DIRS), $(wildcard $(dir)*.cpp))
+OBJS = $(CPPS:.cpp=.o)
+DEPS = $(CPPS:.cpp=.d)
 
 all:rundb
 
-.PHONY: deps
-deps:$(CPPS)
-	$(CC) $(CFLAGS) -MM $^ > obj/deps
-	sed '/^[^ ]/s/^/obj\//g' obj/deps > obj/deps.tmp
-	mv obj/deps.tmp obj/deps
--include obj/deps
-
 rundb : $(OBJS)
 	$(CC) -o $@ $^ $(LDFLAGS)
-#./deps/%.d: %.cpp
-#	$(CC) -MM -MT $*.o -MF $@ $(CFLAGS) $<
-./obj/%.o: benchmarks/%.cpp
-	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
-./obj/%.o: storage/%.cpp
-	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
-./obj/%.o: system/%.cpp
-	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
-./obj/%.o: concurrency_control/%.cpp
-	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
-./obj/%.o: %.cpp
-	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
+
+-include $(OBJS:%.o=%.d)
+
+%.d: %.cpp
+	$(CC) -MM -MT $*.o -MF $@ $(CFLAGS) $<
+
+%.o: %.cpp
+	$(CC) -c $(CFLAGS) -o $@ $<
 
 .PHONY: clean
 clean:
-	rm -f obj/*.o obj/.depend rundb
+	rm -f rundb $(OBJS) $(DEPS)

README

@@ -37,7 +37,6 @@ dbms benchmark has the following parameters in the config file. Parameters with
   PAGE_SIZE		: memory page size
   CL_SIZE		: cache line size
   WARMUP		: number of transactions to run for warmup
-  HW_MIGRATE	: enable execution migration
 
   WORKLOAD		: workload supported (TPCC or YCSB)
 

benchmarks/TPCC_full_schema.txt

@@ -110,25 +110,19 @@ TABLE=STOCK
 	50,string,S_DATA
 
 INDEX=ITEM_IDX
-	ITEM,0
+ITEM,400000
 
 INDEX=WAREHOUSE_IDX
-	WAREHOUSE,0
+WAREHOUSE,100
 
 INDEX=DISTRICT_IDX
-	DISTRICT,0
+DISTRICT,1000
 
 INDEX=CUSTOMER_ID_IDX
-	CUSTOMER,0
+CUSTOMER,120000
 
 INDEX=CUSTOMER_LAST_IDX
-	CUSTOMER,0
+CUSTOMER,120000
 
 INDEX=STOCK_IDX
-	STOCK,0
-
-INDEX=ORDER_IDX
-	ORDER,0
-
-INDEX=ORDER-LINE_IDX
-	ORDER-LINE,0
+STOCK,400000

benchmarks/TPCC_short_schema.txt

@@ -81,20 +81,19 @@ TABLE=STOCK
 	8,int64_t,S_REMOTE_CNT
 
 INDEX=ITEM_IDX
-	ITEM,0
+ITEM,10000
 
 INDEX=WAREHOUSE_IDX
-	WAREHOUSE,0
+WAREHOUSE,1
 
 INDEX=DISTRICT_IDX
-	DISTRICT,0
+DISTRICT,10
 
 INDEX=CUSTOMER_ID_IDX
-	CUSTOMER,0
+CUSTOMER,40000
 
 INDEX=CUSTOMER_LAST_IDX
-	CUSTOMER,0
+CUSTOMER,40000
 
 INDEX=STOCK_IDX
-	STOCK,0
-
+STOCK,10000

benchmarks/YCSB_schema.txt

@@ -1,15 +1,15 @@
 //size, type, name
 TABLE=MAIN_TABLE
-	100,string,F0
-	100,string,F1
-	100,string,F2
-	100,string,F3
-	100,string,F4
-	100,string,F5
-	100,string,F6
-	100,string,F7
-	100,string,F8
-	100,string,F9
+	10,string,F0
+	10,string,F1
+	10,string,F2
+	10,string,F3
+	10,string,F4
+	10,string,F5
+	10,string,F6
+	10,string,F7
+	10,string,F8
+	10,string,F9
 
 INDEX=MAIN_INDEX
 	MAIN_TABLE,0

benchmarks/tpcc.h

@@ -31,32 +31,22 @@ class tpcc_wl : public workload {
 	INDEX * 	i_customer_last;
 	INDEX * 	i_stock;
 	INDEX * 	i_order; // key = (w_id, d_id, o_id)
-//	INDEX * 	i_order_wdo; // key = (w_id, d_id, o_id)
-//	INDEX * 	i_order_wdc; // key = (w_id, d_id, c_id)
 	INDEX * 	i_orderline; // key = (w_id, d_id, o_id)
 	INDEX * 	i_orderline_wd; // key = (w_id, d_id). 
 
-	// XXX HACK
-	// For delivary. Only one txn can be delivering a warehouse at a time.
-	// *_delivering[warehouse_id] -> the warehouse is delivering.
 	bool ** delivering;
-//	bool volatile ** delivering;
-
+	uint32_t next_tid;
 private:
 	uint64_t num_wh;
 	void init_tab_item();
-	void init_tab_wh();
+	void init_tab_wh(uint32_t wid);
 	void init_tab_dist(uint64_t w_id);
 	void init_tab_stock(uint64_t w_id);
-	// init_tab_cust initializes both tab_cust and tab_hist.
 	void init_tab_cust(uint64_t d_id, uint64_t w_id);
 	void init_tab_hist(uint64_t c_id, uint64_t d_id, uint64_t w_id);
 	void init_tab_order(uint64_t d_id, uint64_t w_id);
 
-	UInt32 perm_count;
-	uint64_t * perm_c_id;
-	void init_permutation();
-	uint64_t get_permutation();
+	void init_permutation(uint64_t * perm_c_id, uint64_t wid);
 
 	static void * threadInitItem(void * This);
 	static void * threadInitWh(void * This);
@@ -65,6 +55,8 @@ class tpcc_wl : public workload {
 	static void * threadInitCust(void * This);
 	static void * threadInitHist(void * This);
 	static void * threadInitOrder(void * This);
+
+	static void * threadInitWarehouse(void * This);
 };
 
 class tpcc_txn_man : public txn_man

benchmarks/tpcc_helper.cpp

@@ -1,5 +1,7 @@
 #include "tpcc_helper.h"
 
+drand48_data ** tpcc_buffer;
+
 uint64_t distKey(uint64_t d_id, uint64_t d_w_id)  {
 	return d_w_id * DIST_PER_WARE + d_id; 
 }
@@ -20,26 +22,16 @@ uint64_t custNPKey(char * c_last, uint64_t c_d_id, uint64_t c_w_id) {
 	uint64_t key = 0;
 	char offset = 'A';
 	for (uint32_t i = 0; i < strlen(c_last); i++) 
-		key = (key << 1) + (c_last[i] - offset);
-	key = key << 10;
+		key = (key << 2) + (c_last[i] - offset);
+	key = key << 3;
 	key += c_w_id * DIST_PER_WARE + c_d_id;
 	return key;
 }
 
 uint64_t stockKey(uint64_t s_i_id, uint64_t s_w_id) {
 	return s_w_id * g_max_items + s_i_id;
 }
-/*
-uint64_t orderKey(uint64_t o_id, uint64_t o_d_id, uint64_t o_w_id) {
-	return ((o_w_id * DIST_PER_WARE + o_d_id) * ORD_PER_DIST + o_id);
-}
-// the max of ol_number is 15. That's why there is a 15 here	
-uint64_t olKey(uint64_t ol_o_id, uint64_t ol_d_id, 
-	uint64_t ol_w_id, uint64_t ol_number) {
-	return ((ol_w_id * DIST_PER_WARE + ol_d_id) * ORD_PER_DIST + ol_o_id) * 15
-		+ ol_number;
-}
-*/
+
 uint64_t Lastname(uint64_t num, char* name) {
   	static const char *n[] =
     	{"BAR", "OUGHT", "ABLE", "PRI", "PRES",
@@ -50,15 +42,17 @@ uint64_t Lastname(uint64_t num, char* name) {
   	return strlen(name);
 }
 
-uint64_t RAND(uint64_t max) {
-	return rand() % max;
+uint64_t RAND(uint64_t max, uint64_t thd_id) {
+	int64_t rint64 = 0;
+	lrand48_r(tpcc_buffer[thd_id], &rint64);
+	return rint64 % max;
 }
 
-uint64_t URand(uint64_t x, uint64_t y) {
-    return x + RAND(y - x + 1);
+uint64_t URand(uint64_t x, uint64_t y, uint64_t thd_id) {
+    return x + RAND(y - x + 1, thd_id);
 }
 
-uint64_t NURand(uint64_t A, uint64_t x, uint64_t y) {
+uint64_t NURand(uint64_t A, uint64_t x, uint64_t y, uint64_t thd_id) {
   static bool C_255_init = false;
   static bool C_1023_init = false;
   static bool C_8191_init = false;
@@ -67,21 +61,21 @@ uint64_t NURand(uint64_t A, uint64_t x, uint64_t y) {
   switch(A) {
     case 255:
       if(!C_255_init) {
-        C_255 = (uint64_t) URand(0,255);
+        C_255 = (uint64_t) URand(0,255, thd_id);
         C_255_init = true;
       }
       C = C_255;
       break;
     case 1023:
       if(!C_1023_init) {
-        C_1023 = (uint64_t) URand(0,1023);
+        C_1023 = (uint64_t) URand(0,1023, thd_id);
         C_1023_init = true;
       }
       C = C_1023;
       break;
     case 8191:
       if(!C_8191_init) {
-        C_8191 = (uint64_t) URand(0,8191);
+        C_8191 = (uint64_t) URand(0,8191, thd_id);
         C_8191_init = true;
       }
       C = C_8191;
@@ -90,29 +84,29 @@ uint64_t NURand(uint64_t A, uint64_t x, uint64_t y) {
       M_ASSERT(false, "Error! NURand\n");
       exit(-1);
   }
-  return(((URand(0,A) | URand(x,y))+C)%(y-x+1))+x;
+  return(((URand(0,A, thd_id) | URand(x,y, thd_id))+C)%(y-x+1))+x;
 }
 
-uint64_t MakeAlphaString(int min, int max, char* str) {
+uint64_t MakeAlphaString(int min, int max, char* str, uint64_t thd_id) {
     char char_list[] = {'1','2','3','4','5','6','7','8','9','a','b','c',
                         'd','e','f','g','h','i','j','k','l','m','n','o',
                         'p','q','r','s','t','u','v','w','x','y','z','A',
                         'B','C','D','E','F','G','H','I','J','K','L','M',
                         'N','O','P','Q','R','S','T','U','V','W','X','Y','Z'};
-    uint64_t cnt = URand(min, max);
+    uint64_t cnt = URand(min, max, thd_id);
     for (uint32_t i = 0; i < cnt; i++) 
-		str[i] = char_list[URand(0L, 60L)];
+		str[i] = char_list[URand(0L, 60L, thd_id)];
     for (int i = cnt; i < max; i++)
 		str[i] = '\0';
 
     return cnt;
 }
 
-uint64_t MakeNumberString(int min, int max, char* str) {
+uint64_t MakeNumberString(int min, int max, char* str, uint64_t thd_id) {
 
-  uint64_t cnt = URand(min, max);
+  uint64_t cnt = URand(min, max, thd_id);
   for (UInt32 i = 0; i < cnt; i++) {
-    uint64_t r = URand(0L,9L);
+    uint64_t r = URand(0L,9L, thd_id);
     str[i] = '0' + r;
   }
   return cnt;

benchmarks/tpcc_helper.h

@@ -1,6 +1,4 @@
-#ifndef _TPCC_HELPER_H_
-#define _TPCC_HELPER_H_
-
+#pragma once
 #include "global.h"
 #include "helper.h"
 
@@ -12,23 +10,17 @@ uint64_t orderPrimaryKey(uint64_t w_id, uint64_t d_id, uint64_t o_id);
 uint64_t custNPKey(char * c_last, uint64_t c_d_id, uint64_t c_w_id);
 uint64_t stockKey(uint64_t s_i_id, uint64_t s_w_id);
 
-//uint64_t orderKey(uint64_t o_id, uint64_t o_d_id, uint64_t o_w_id); 
-// the max of ol_number is 15. That's why there is a 15 here	
-//uint64_t olKey(uint64_t ol_o_id, uint64_t ol_d_id, 
-//	uint64_t ol_w_id, uint64_t ol_number);
-
 uint64_t Lastname(uint64_t num, char* name);
 
+extern drand48_data ** tpcc_buffer;
 // return random data from [0, max-1]
-uint64_t RAND(uint64_t max);
+uint64_t RAND(uint64_t max, uint64_t thd_id);
 // random number from [x, y]
-uint64_t URand(uint64_t x, uint64_t y);
+uint64_t URand(uint64_t x, uint64_t y, uint64_t thd_id);
 // non-uniform random number
-uint64_t NURand(uint64_t A, uint64_t x, uint64_t y);
+uint64_t NURand(uint64_t A, uint64_t x, uint64_t y, uint64_t thd_id);
 // random string with random length beteen min and max.
-uint64_t MakeAlphaString(int min, int max, char * str);
-uint64_t MakeNumberString(int min, int max, char* str);
+uint64_t MakeAlphaString(int min, int max, char * str, uint64_t thd_id);
+uint64_t MakeNumberString(int min, int max, char* str, uint64_t thd_id);
 
 uint64_t wh_to_part(uint64_t wid); 
-
-#endif