Cherry-pick Titan related fixes (#313)

Cherry-picking changes:
c503e736 2019-07-02 yiwu@pingcap.com     Fix Titan portable build (#312)
c17648a5 2019-07-01 yiwu@pingcap.com     Fix create_cf not passinig titan specific options to titan (#311)

librocksdb_sys/Cargo.toml

@@ -16,8 +16,8 @@ tempdir = "0.3"
 default = []
 # portable doesn't require static link, though it's meaningless
 # when not using with static-link right now in this crate.
-portable = []
-sse = []
+portable = ["libtitan_sys/portable"]
+sse = ["libtitan_sys/portable"]
 
 [build-dependencies]
 cc = "1.0.3"

librocksdb_sys/crocksdb/c.cc

@@ -4958,6 +4958,9 @@ struct ctitandb_options_t {
   TitanOptions rep;
 };
 
+// TODO: Simplify the API by merging db_options into tdb_options, and
+// column_family_options into titan_column_family_options, since the later
+// of the pairs already contain the former.
 crocksdb_t* ctitandb_open_column_families(
     const char* name, const crocksdb_options_t* db_options,
     const ctitandb_options_t* tdb_options, int num_column_families,
@@ -4993,6 +4996,26 @@ crocksdb_t* ctitandb_open_column_families(
   return result;
 }
 
+// Caller should make sure `db` is created from ctitandb_open_column_families.
+//
+// TODO: ctitandb_open_column_family should return a ctitandb_t. Caller can
+// use ctitandb_t for titan specific functions.
+crocksdb_column_family_handle_t* ctitandb_create_column_family(
+    crocksdb_t* db,
+    const ctitandb_options_t* titan_column_family_options,
+    const char* column_family_name,
+    char** errptr) {
+  // Blindly cast db into TitanDB.
+  TitanDB* titan_db = reinterpret_cast<TitanDB*>(db->rep);
+  crocksdb_column_family_handle_t* handle = new crocksdb_column_family_handle_t;
+  SaveError(errptr,
+      titan_db->CreateColumnFamily(
+          TitanCFDescriptor(std::string(column_family_name),
+                            titan_column_family_options->rep),
+          &(handle->rep)));
+  return handle;
+}
+
 /* TitanDBOptions */
 
 ctitandb_options_t* ctitandb_options_create() { return new ctitandb_options_t; }

librocksdb_sys/crocksdb/crocksdb/c.h

@@ -1976,6 +1976,13 @@ extern C_ROCKSDB_LIBRARY_API crocksdb_t* ctitandb_open_column_families(
     const ctitandb_options_t** titan_column_family_options,
     crocksdb_column_family_handle_t** column_family_handles, char** errptr);
 
+extern C_ROCKSDB_LIBRARY_API
+crocksdb_column_family_handle_t* ctitandb_create_column_family(
+    crocksdb_t* db,
+    const ctitandb_options_t* titan_column_family_options,
+    const char* column_family_name,
+    char** errptr);
+
 /* TitanDBOptions */
 
 extern C_ROCKSDB_LIBRARY_API ctitandb_options_t* ctitandb_options_create();

librocksdb_sys/libtitan_sys/Cargo.toml

@@ -7,6 +7,13 @@ links = "titan"
 [dependencies]
 libc = "0.2.11"
 
+[features]
+default = []
+# portable doesn't require static link, though it's meaningless
+# when not using with static-link right now in this crate.
+portable = []
+sse = []
+
 [build-dependencies]
 cc = "1.0.3"
 cmake = "0.1"

librocksdb_sys/libtitan_sys/build.rs

@@ -3,7 +3,14 @@ extern crate cmake;
 
 fn main() {
     let cur_dir = std::env::current_dir().unwrap();
-    let dst = cmake::Config::new("titan")
+    let mut cfg = cmake::Config::new("titan");
+    if cfg!(feature = "portable") {
+        cfg.define("PORTABLE", "ON");
+    }
+    if cfg!(feature = "sse") {
+        cfg.define("FORCE_SSE42", "ON");
+    }
+    let dst = cfg
         .define("ROCKSDB_DIR", cur_dir.join("..").join("rocksdb"))
         .define("WITH_TITAN_TESTS", "OFF")
         .define("WITH_TITAN_TOOLS", "OFF")

librocksdb_sys/src/lib.rs

@@ -1826,6 +1826,13 @@ extern "C" {
         err: *mut *mut c_char,
     ) -> *mut DBInstance;
 
+    pub fn ctitandb_create_column_family(
+        db: *mut DBInstance,
+        titan_column_family_options: *const DBTitanDBOptions,
+        column_family_name: *const c_char,
+        err: *mut *mut c_char,
+    ) -> *mut DBCFHandle;
+
     pub fn ctitandb_options_create() -> *mut DBTitanDBOptions;
     pub fn ctitandb_options_destroy(opts: *mut DBTitanDBOptions);
     pub fn ctitandb_options_copy(opts: *mut DBTitanDBOptions) -> *mut DBTitanDBOptions;

src/rocksdb.rs

@@ -772,11 +772,19 @@ impl DB {
         };
         let cname_ptr = cname.as_ptr();
         unsafe {
-            let cf_handler = ffi_try!(crocksdb_create_column_family(
-                self.inner,
-                cfd.options.inner,
-                cname_ptr
-            ));
+            let cf_handler = if !self.is_titan() {
+                ffi_try!(crocksdb_create_column_family(
+                    self.inner,
+                    cfd.options.inner,
+                    cname_ptr
+                ))
+            } else {
+                ffi_try!(ctitandb_create_column_family(
+                    self.inner,
+                    cfd.options.titan_inner,
+                    cname_ptr
+                ))
+            };
             let handle = CFHandle { inner: cf_handler };
             self._cf_opts.push(cfd.options);
             Ok(match self.cfs.entry(cfd.name.to_owned()) {