fix compile error

Signed-off-by: tabokie <xy.tao@outlook.com>
tikv · Dec 21, 2020 · a7a9b5e · a7a9b5e
1 parent 9656901
commit a7a9b5e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/librocksdb_sys/crocksdb/c.cc b/librocksdb_sys/crocksdb/c.cc
@@ -4162,15 +4162,15 @@ size_t crocksdb_file_system_inspector_read(
  crocksdb_file_system_inspector_t* inspector, size_t len, char** errptr) {
  assert(inspector != nullptr && inspector->rep != nullptr);
  size_t allowed = 0;
- SaveError(errptr, inspector->rep->Read(len, allowed));
+ SaveError(errptr, inspector->rep->Read(len, &allowed));
  return allowed;
 }
 
 size_t crocksdb_file_system_inspector_write(
  crocksdb_file_system_inspector_t* inspector, size_t len, char** errptr) {
  assert(inspector != nullptr && inspector->rep != nullptr);
  size_t allowed = 0;
- SaveError(errptr, inspector->rep->Write(len, allowed));
+ SaveError(errptr, inspector->rep->Write(len, &allowed));
  return allowed;
 }
 

diff --git a/src/file_system.rs b/src/file_system.rs
@@ -88,15 +88,15 @@ impl Drop for DBFileSystemInspector {
 impl FileSystemInspector for DBFileSystemInspector {
  fn read(&self, len: usize) -> Result<usize, String> {
  let ret = unsafe {
- ffi_try!(crocksdb_ffi::crocksdb_file_system_inspector_read(
+ ffi_try!(crocksdb_file_system_inspector_read(
  self.inner, len
  ))
  };
  Ok(ret)
  }
  fn write(&self, len: usize) -> Result<usize, String> {
  let ret = unsafe {
- ffi_try!(crocksdb_ffi::crocksdb_file_system_inspector_write(
+ ffi_try!(crocksdb_file_system_inspector_write(
  self.inner, len
  ))
  };
@@ -106,7 +106,6 @@ impl FileSystemInspector for DBFileSystemInspector {
 
 #[cfg(test)]
 mod test {
- use std::io::{Error, ErrorKind};
  use std::sync::atomic::{AtomicUsize, Ordering};
  use std::sync::{Arc, Mutex};
 
@@ -147,7 +146,7 @@ mod test {
  if len <= inner.refill_bytes {
  Ok(len)
  } else {
- Err("request exceeds refill bytes");
+ Err("request exceeds refill bytes".into())
  }
  }
  fn write(&self, len: usize) -> Result<usize, String> {
@@ -156,7 +155,7 @@ mod test {
  if len <= inner.refill_bytes {
  Ok(len)
  } else {
- Err("request exceeds refill bytes");
+ Err("request exceeds refill bytes".into())
  }
  }
  }