Mark Cache and Env as Send and Sync (#530)

master
Artem Krylysov 4 years ago committed by GitHub
parent f00ae8c4ab
commit 54cbd34d2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/db_options.rs
  2. 11
      src/lib.rs

@ -384,6 +384,8 @@ unsafe impl Send for BlockBasedOptions {}
unsafe impl Send for CuckooTableOptions {} unsafe impl Send for CuckooTableOptions {}
unsafe impl Send for ReadOptions {} unsafe impl Send for ReadOptions {}
unsafe impl Send for IngestExternalFileOptions {} unsafe impl Send for IngestExternalFileOptions {}
unsafe impl Send for Cache {}
unsafe impl Send for Env {}
// Sync is similarly safe for many types because they do not expose interior mutability, and their // Sync is similarly safe for many types because they do not expose interior mutability, and their
// use within the rocksdb library is generally behind a const reference // use within the rocksdb library is generally behind a const reference
@ -393,6 +395,8 @@ unsafe impl Sync for BlockBasedOptions {}
unsafe impl Sync for CuckooTableOptions {} unsafe impl Sync for CuckooTableOptions {}
unsafe impl Sync for ReadOptions {} unsafe impl Sync for ReadOptions {}
unsafe impl Sync for IngestExternalFileOptions {} unsafe impl Sync for IngestExternalFileOptions {}
unsafe impl Sync for Cache {}
unsafe impl Sync for Env {}
impl Drop for Options { impl Drop for Options {
fn drop(&mut self) { fn drop(&mut self) {

@ -172,9 +172,10 @@ impl fmt::Display for Error {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use super::{ use super::{
BlockBasedOptions, BoundColumnFamily, ColumnFamily, ColumnFamilyDescriptor, DBIterator, BlockBasedOptions, BoundColumnFamily, Cache, ColumnFamily, ColumnFamilyDescriptor,
DBRawIterator, IngestExternalFileOptions, Options, PlainTableFactoryOptions, ReadOptions, DBIterator, DBRawIterator, Env, IngestExternalFileOptions, Options,
Snapshot, SstFileWriter, WriteBatch, WriteOptions, DB, PlainTableFactoryOptions, ReadOptions, Snapshot, SstFileWriter, WriteBatch, WriteOptions,
DB,
}; };
#[test] #[test]
@ -201,6 +202,8 @@ mod test {
is_send::<BoundColumnFamily<'_>>(); is_send::<BoundColumnFamily<'_>>();
is_send::<SstFileWriter>(); is_send::<SstFileWriter>();
is_send::<WriteBatch>(); is_send::<WriteBatch>();
is_send::<Cache>();
is_send::<Env>();
} }
#[test] #[test]
@ -221,5 +224,7 @@ mod test {
is_sync::<PlainTableFactoryOptions>(); is_sync::<PlainTableFactoryOptions>();
is_sync::<ColumnFamilyDescriptor>(); is_sync::<ColumnFamilyDescriptor>();
is_sync::<SstFileWriter>(); is_sync::<SstFileWriter>();
is_sync::<Cache>();
is_sync::<Env>();
} }
} }

Loading…
Cancel
Save