SstFileWriter: get the ownership of Options (#82)

src/rocksdb.rs

@@ -1346,25 +1346,31 @@ impl Drop for BackupEngine {
 /// All keys in files generated by SstFileWriter will have sequence number = 0
 pub struct SstFileWriter {
     inner: *mut crocksdb_ffi::SstFileWriter,
+    _env_opt: EnvOptions,
+    _opt: Options,
 }
 
 unsafe impl Send for SstFileWriter {}
 
 impl SstFileWriter {
-    pub fn new(env_opt: &EnvOptions, opt: &Options) -> SstFileWriter {
+    pub fn new(env_opt: EnvOptions, opt: Options) -> SstFileWriter {
         unsafe {
             SstFileWriter {
                 inner: crocksdb_ffi::crocksdb_sstfilewriter_create(env_opt.inner, opt.inner),
+                _env_opt: env_opt,
+                _opt: opt,
             }
         }
     }
 
-    pub fn new_cf(env_opt: &EnvOptions, opt: &Options, cf: &CFHandle) -> SstFileWriter {
+    pub fn new_cf(env_opt: EnvOptions, opt: Options, cf: &CFHandle) -> SstFileWriter {
         unsafe {
             SstFileWriter {
                 inner: crocksdb_ffi::crocksdb_sstfilewriter_create_cf(env_opt.inner,
                                                                       opt.inner,
                                                                       cf.inner),
+                _env_opt: env_opt,
+                _opt: opt,
             }
         }
     }
@@ -1408,7 +1414,6 @@ impl Drop for SstFileWriter {
 
 #[cfg(test)]
 mod test {
-    use rocksdb_options::*;
     use std::fs;
     use std::path::Path;
     use std::str;

tests/test_ingest_external_file.rs

@@ -16,13 +16,13 @@ use rocksdb::*;
 use std::fs;
 use tempdir::TempDir;
 
-fn gen_sst(opt: &Options, cf: Option<&CFHandle>, path: &str, data: &[(&[u8], &[u8])]) {
+fn gen_sst(opt: Options, cf: Option<&CFHandle>, path: &str, data: &[(&[u8], &[u8])]) {
     let _ = fs::remove_file(path);
     let env_opt = EnvOptions::new();
     let mut writer = if cf.is_some() {
-        SstFileWriter::new_cf(&env_opt, opt, cf.unwrap())
+        SstFileWriter::new_cf(env_opt, opt, cf.unwrap())
     } else {
-        SstFileWriter::new(&env_opt, opt)
+        SstFileWriter::new(env_opt, opt)
     };
     writer.open(path).unwrap();
     for &(k, v) in data {
@@ -48,7 +48,7 @@ fn test_ingest_external_file() {
     let test_sstfile_str = test_sstfile.to_str().unwrap();
 
     let default_options = db.get_options();
-    gen_sst(&default_options,
+    gen_sst(default_options,
             Some(db.cf_handle("default").unwrap()),
             test_sstfile_str,
             &[(b"k1", b"v1"), (b"k2", b"v2")]);
@@ -60,7 +60,7 @@ fn test_ingest_external_file() {
     assert_eq!(db.get(b"k1").unwrap().unwrap(), b"v1");
     assert_eq!(db.get(b"k2").unwrap().unwrap(), b"v2");
 
-    gen_sst(&cf_opts,
+    gen_sst(cf_opts,
             None,
             test_sstfile_str,
             &[(b"k1", b"v3"), (b"k2", b"v4")]);
@@ -71,7 +71,8 @@ fn test_ingest_external_file() {
 
     let snap = db.snapshot();
 
-    gen_sst(&default_options,
+    let opt = Options::new();
+    gen_sst(opt,
             None,
             test_sstfile_str,
             &[(b"k2", b"v5"), (b"k3", b"v6")]);