Upgrade RocksDB to 6.4.x (#336)

Upgrade RocksDB to 6.4.x. Also updating titan master.
Signed-off-by: Yi Wu <yiwu@pingcap.com>

.gitmodules

 [submodule "rocksdb"]
 	path = librocksdb_sys/rocksdb
 	url = https://github.com/pingcap/rocksdb.git
-	branch = tikv-3.0
+	branch = 6.4.tikv
 [submodule "titan"]
 	path = librocksdb_sys/libtitan_sys/titan
 	url = https://github.com/pingcap/titan.git
+	branch = master
+

.travis.yml

@@ -19,9 +19,7 @@ env:
   global:
   - RUST_BACKTRACE=1
 
-cache:
-  directories:
-  - target
+cache: false
 
 before_script:
   - rustup component add rustfmt-preview

librocksdb_sys/build.rs

@@ -140,6 +140,10 @@ fn build_rocksdb() -> Build {
     build.include(cur_dir.join("libtitan_sys").join("titan").join("include"));
     build.include(cur_dir.join("libtitan_sys").join("titan"));
 
+    // Adding rocksdb specific compile macros.
+    // TODO: should make sure crocksdb compile options is the same as rocksdb and titan.
+    build.define("ROCKSDB_SUPPORT_THREAD_LOCAL", None);
+
     println!("cargo:rustc-link-lib=static=rocksdb");
     println!("cargo:rustc-link-lib=static=titan");
     println!("cargo:rustc-link-lib=static=z");

librocksdb_sys/crocksdb/c.cc

@@ -41,8 +41,8 @@
 
 #include "db/column_family.h"
 #include "table/sst_file_writer_collectors.h"
+#include "table/block_based/block_based_table_factory.h"
 #include "table/table_reader.h"
-#include "table/block_based_table_factory.h"
 #include "util/file_reader_writer.h"
 #include "util/coding.h"
 
@@ -3899,11 +3899,6 @@ void crocksdb_fifo_compaction_options_set_max_table_files_size(
   fifo_opts->rep.max_table_files_size = size;
 }
 
-void crocksdb_fifo_compaction_options_set_ttl(
-    crocksdb_fifo_compaction_options_t* fifo_opts, uint64_t ttl) {
-  fifo_opts->rep.ttl = ttl;
-}
-
 void crocksdb_fifo_compaction_options_set_allow_compaction(
     crocksdb_fifo_compaction_options_t* fifo_opts, bool allow_compaction) {
   fifo_opts->rep.allow_compaction = allow_compaction;
@@ -5247,9 +5242,9 @@ void ctitandb_options_set_max_background_gc(ctitandb_options_t* options,
   options->rep.max_background_gc = size;
 }
 
-void ctitandb_options_set_purge_obsolete_files_period(ctitandb_options_t* options,
-                                                      unsigned int period) {
-  options->rep.purge_obsolete_files_period = period;
+void ctitandb_options_set_purge_obsolete_files_period_sec(
+    ctitandb_options_t* options, unsigned int period) {
+  options->rep.purge_obsolete_files_period_sec = period;
 }
 
 void ctitandb_options_set_blob_cache(ctitandb_options_t* options,

librocksdb_sys/crocksdb/crocksdb/c.h

@@ -1563,9 +1563,6 @@ extern C_ROCKSDB_LIBRARY_API void
 crocksdb_fifo_compaction_options_set_max_table_files_size(
     crocksdb_fifo_compaction_options_t* fifo_opts, uint64_t size);
 extern C_ROCKSDB_LIBRARY_API void
-crocksdb_fifo_compaction_options_set_ttl(
-    crocksdb_fifo_compaction_options_t* fifo_opts, uint64_t ttl);
-extern C_ROCKSDB_LIBRARY_API void
 crocksdb_fifo_compaction_options_set_allow_compaction(
     crocksdb_fifo_compaction_options_t* fifo_opts, bool allow_compaction);
 extern C_ROCKSDB_LIBRARY_API void crocksdb_fifo_compaction_options_destroy(
@@ -2102,7 +2099,8 @@ ctitandb_options_set_merge_small_file_threshold(ctitandb_options_t* options,
 extern C_ROCKSDB_LIBRARY_API void ctitandb_options_set_max_background_gc(
     ctitandb_options_t* options, int32_t size);
 
-extern C_ROCKSDB_LIBRARY_API void ctitandb_options_set_purge_obsolete_files_period(
+extern C_ROCKSDB_LIBRARY_API void
+ctitandb_options_set_purge_obsolete_files_period_sec(
     ctitandb_options_t* options, unsigned int period);
 
 extern C_ROCKSDB_LIBRARY_API void ctitandb_options_set_blob_cache(

titan @ 974e5c6a

-Subproject commit 9cd140f9cbd41ba7b1d477e11a8f1c40a1c23e01
+Subproject commit 974e5c6a0fdf429d2b39e154e5897beeed80aa61

rocksdb @ 5479d051

-Subproject commit a29144f8e992c36f429d74603c43cb22fbead616
+Subproject commit 5479d0516c5b1100fa8b7120d5bb8632b329a9bb

librocksdb_sys/src/lib.rs

@@ -1146,10 +1146,6 @@ extern "C" {
         fifo_opts: *mut DBFifoCompactionOptions,
         size: uint64_t,
     );
-    pub fn crocksdb_fifo_compaction_options_set_ttl(
-        fifo_opts: *mut DBFifoCompactionOptions,
-        ttl: uint64_t,
-    );
     pub fn crocksdb_fifo_compaction_options_set_allow_compaction(
         fifo_opts: *mut DBFifoCompactionOptions,
         allow_compaction: bool,
@@ -1956,7 +1952,7 @@ extern "C" {
 
     pub fn ctitandb_options_set_disable_background_gc(opts: *mut DBTitanDBOptions, disable: bool);
     pub fn ctitandb_options_set_max_background_gc(opts: *mut DBTitanDBOptions, size: i32);
-    pub fn ctitandb_options_set_purge_obsolete_files_period(
+    pub fn ctitandb_options_set_purge_obsolete_files_period_sec(
         opts: *mut DBTitanDBOptions,
         period: usize,
     );

src/rocksdb_options.rs

@@ -1859,12 +1859,6 @@ impl FifoCompactionOptions {
         }
     }
 
-    pub fn set_ttl(&mut self, ttl: u64) {
-        unsafe {
-            crocksdb_ffi::crocksdb_fifo_compaction_options_set_ttl(self.inner, ttl);
-        }
-    }
-
     pub fn set_max_table_files_size(&mut self, max_table_files_size: u64) {
         unsafe {
             crocksdb_ffi::crocksdb_fifo_compaction_options_set_max_table_files_size(

src/titan.rs

@@ -72,7 +72,7 @@ impl TitanDBOptions {
 
     pub fn set_purge_obsolete_files_period(&mut self, period: usize) {
         unsafe {
-            crocksdb_ffi::ctitandb_options_set_purge_obsolete_files_period(self.inner, period);
+            crocksdb_ffi::ctitandb_options_set_purge_obsolete_files_period_sec(self.inner, period);
         }
     }
 

tests/cases/test_rocksdb_options.rs

@@ -772,7 +772,6 @@ fn test_fifo_compaction_options() {
     let mut cf_opts = ColumnFamilyOptions::new();
     let mut fifo_opts = FifoCompactionOptions::new();
     fifo_opts.set_allow_compaction(true);
-    fifo_opts.set_ttl(100000);
     fifo_opts.set_max_table_files_size(100000);
     cf_opts.set_fifo_compaction_options(fifo_opts);
     DB::open_cf(opts, path_str, vec![("default", cf_opts)]).unwrap();