v2.2.6

bill-wangbiao · Sep 14, 2017 · 4ee1d80 · 4ee1d80
1 parent 9fcfbdb
commit 4ee1d80
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -54,7 +54,6 @@ Pika is a persistent huge storage service , compatible  with the vast majority o
 ### Dependencies
 
 * snappy - a library for fast data compression
-* protobuf - google protobuf library
 * glog - google log library
 
 Upgrade your gcc to version at least 4.8 to get C++11 support.

diff --git a/README_CN.md b/README_CN.md
@@ -43,10 +43,10 @@ Pika是一个可持久化的大容量redis存储服务，兼容string、hash、l
 
 ## 编译安装
 
-1.在编译机上安装snappy，glog，protobuf，CentOS系统可以用yum安装，Ubuntu可以用apt-get安装。如是CentOS系统，执行如下命令：
+1.在编译机上安装snappy，glog，CentOS系统可以用yum安装，Ubuntu可以用apt-get安装。如是CentOS系统，执行如下命令：
 
 ```
-    yum install snappy-devel protobuf-devel glog-devel
+    yum install snappy-devel glog-devel
 ```
 
 2.安装g++(若没有安装), 在CentOS上执行如下命令：

diff --git a/conf/pika.conf b/conf/pika.conf
@@ -76,7 +76,7 @@ binlog-file-size : 104857600
 compression : snappy
 # max-background-flushes: default is 1, limited in [1, 4]
 max-background-flushes : 1
-# max-background-compactions: default is 1, limited in [1, 4]
+# max-background-compactions: default is 2, limited in [1, 8]
 max-background-compactions : 2
 # max-cache-files default is 5000
 max-cache-files : 5000

diff --git a/include/pika_version.h b/include/pika_version.h
@@ -8,6 +8,6 @@
 
 #define PIKA_MAJOR 2
 #define PIKA_MINOR 2
-#define PIKA_PATCH 5
+#define PIKA_PATCH 6
 
 #endif  // INCLUDE_PIKA_VERSION_H_
diff --git a/src/pika_admin.cc b/src/pika_admin.cc
@@ -565,6 +565,7 @@ void InfoCmd::InfoStats(std::string &info) {
   tmp_stream << "\r\n";
   tmp_stream << "is_compact:" << g_pika_server->db()->GetCurrentTaskType() << "\r\n";
   tmp_stream << "compact_cron:" << g_pika_conf->compact_cron() << "\r\n";
+  tmp_stream << "compact_interval:" << g_pika_conf->compact_interval() << "\r\n";
 
   info.append(tmp_stream.str());
 }

diff --git a/src/pika_conf.cc b/src/pika_conf.cc
@@ -163,13 +163,13 @@ int PikaConf::Load()
     max_background_flushes_ = 4;
   }
 
-  max_background_compactions_ = 1;
+  max_background_compactions_ = 2;
   GetConfInt("max-background-compactions", &max_background_compactions_);
   if (max_background_compactions_ <= 0) {
-    max_background_compactions_ = 1;
+    max_background_compactions_ = 2;
   }
-  if (max_background_compactions_ >= 4) {
-    max_background_compactions_ = 4;
+  if (max_background_compactions_ >= 8) {
+    max_background_compactions_ = 8;
   }
 
   max_cache_files_ = 5000;