Add: 'server' info to show

engine/db.c

@@ -26,6 +26,7 @@ struct nessdb *db_open(size_t bufferpool_size, const char *basedir, int tolog)
 	db->idx = index_new(basedir, DB, LIST_SIZE, tolog);
 	db->lru = llru_new(bufferpool_size);
 	db->buf = buffer_new(1024);
+	db->start_time = time(NULL);
 
 	return db;
 }
@@ -81,26 +82,42 @@ void db_remove(struct nessdb *db, struct slice *sk)
 
 char *db_info(struct nessdb *db)
 {
+	time_t uptime = time(NULL) - db->start_time;
 	buffer_clear(db->buf);
 	buffer_scatf(db->buf, 
-	"# Stats\r\n"
-	"total_lru_count:%d\r\n"
-	"total_lru_hot_count:%d\r\n"
-	"total_lru_cold_count:%d\r\n"
-	"total_lru_memory_usage:%d(MB)\r\n"
-	"total_lru_hot_memory_usage:%d(MB)\r\n"
-	"total_lru_cold_meomry_usage:%d(MB)\r\n"
-	"max_allow_lru_memory_usage:%d(MB)\r\n\r\n"
-	"total_memtable_count:%d\r\n",
-	(db->lru->level_old.count + db->lru->level_new.count),
-	db->lru->level_new.count,
-	db->lru->level_old.count,
-	(db->lru->level_new.used_size + db->lru->level_old.used_size) / (1024 * 1024),
-	db->lru->level_new.used_size / (1024 * 1024),
-	db->lru->level_old.used_size / (1024 * 1024),
-	(db->lru->level_old.allow_size + db->lru->level_new.allow_size) / (1024 * 1024),
-
-	db->idx->list->count);
+			"#Server\r\n"
+			"gcc_version:%d.%d.%d\r\n"
+			"process_id:%ld\r\n"
+			"uptime_in_seconds:%ld\r\n"
+			"uptime_in_days:%ld\r\n\r\n"
+
+			"# Stats\r\n"
+			"total_lru_count:%d\r\n"
+			"total_lru_hot_count:%d\r\n"
+			"total_lru_cold_count:%d\r\n"
+			"total_lru_memory_usage:%d(MB)\r\n"
+			"total_lru_hot_memory_usage:%d(MB)\r\n"
+			"total_lru_cold_meomry_usage:%d(MB)\r\n"
+			"max_allow_lru_memory_usage:%d(MB)\r\n\r\n"
+			"total_memtable_count:%d\r\n",
+#ifdef __GNUC__
+			__GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__,
+#else
+			0,0,0,
+#endif
+			(long) getpid(),
+			uptime,
+			uptime/(3600*24),
+
+			(db->lru->level_old.count + db->lru->level_new.count),
+			db->lru->level_new.count,
+			db->lru->level_old.count,
+			(db->lru->level_new.used_size + db->lru->level_old.used_size) / (1024 * 1024),
+			db->lru->level_new.used_size / (1024 * 1024),
+			db->lru->level_old.used_size / (1024 * 1024),
+			(db->lru->level_old.allow_size + db->lru->level_new.allow_size) / (1024 * 1024),
+
+			db->idx->list->count);
 
 	return buffer_detach(db->buf);
 }

engine/db.h

@@ -9,6 +9,7 @@
 #ifndef _DB_H
 #define _DB_H
 
+#include <time.h>
 #include "llru.h"
 #include "index.h"
 #include "buffer.h"
@@ -18,6 +19,7 @@ struct nessdb {
 	struct llru *lru;
 	struct index *idx;
 	struct buffer *buf;
+	time_t start_time;
 };
 
 struct nessdb *db_open(size_t bufferpool_size, const char *basedir, int tolog);

engine/log.c

@@ -143,7 +143,7 @@ int _log_read(char *logname, struct skiplist *list)
 int log_recovery(struct log *l, struct skiplist *list)
 {
 	DIR *dd;
-	int ret;
+	int ret = 0;
 	int flag = 0;
 	char new_log[LOG_NSIZE];
 	char old_log[LOG_NSIZE];

engine/sst.c

@@ -488,7 +488,8 @@ void sst_merge(struct sst *sst, struct skiplist *list, int fromlog)
 
 		__DEBUG(LEVEL_DEBUG, "%s", "adding log items to bloomfilter");
 		while (cur != first) {
-			bloom_add(sst->bloom, cur->key);
+			if (cur->opt == ADD)
+				bloom_add(sst->bloom, cur->key);
 			cur = cur->forward[0];
 		}
 	}