remove some pub

Signed-off-by: CalvinNeo <[email protected]>
pingcap · Sep 7, 2022 · f165e8e · f165e8e
1 parent 572b2bc
commit f165e8e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/components/engine_rocks/src/encryption.rs b/components/engine_rocks/src/encryption.rs
@@ -12,7 +12,7 @@ use rocksdb::{
 use crate::raw::Env;
 
 // Use engine::Env directly since Env is not abstracted.
-pub fn get_env(
+pub(crate) fn get_env(
     base_env: Option<Arc<Env>>,
     key_manager: Option<Arc<DataKeyManager>>,
 ) -> std::result::Result<Arc<Env>, String> {

diff --git a/components/engine_rocks/src/engine.rs b/components/engine_rocks/src/engine.rs
@@ -23,7 +23,7 @@ use crate::{
 
 #[derive(Clone, Debug)]
 pub struct RocksEngine {
-    pub db: Arc<DB>,
+    db: Arc<DB>,
     shared_block_cache: bool,
 }
 

diff --git a/components/raftstore/src/engine_store_ffi/mod.rs b/components/raftstore/src/engine_store_ffi/mod.rs
@@ -18,7 +18,7 @@ use std::{
 };
 
 use encryption::DataKeyManager;
-use engine_rocks::{encryption::get_env, RocksSstIterator, RocksSstReader};
+use engine_rocks::{get_env, RocksSstIterator, RocksSstReader};
 use engine_traits::{
     EncryptionKeyManager, EncryptionMethod, FileEncryptionInfo, Iterator, Peekable, SeekKey,
     SstReader, CF_DEFAULT, CF_LOCK, CF_WRITE,
@@ -664,7 +664,7 @@ pub struct SSTFileReader {
 
 impl SSTFileReader {
     fn ffi_get_cf_file_reader(path: &str, key_manager: Option<Arc<DataKeyManager>>) -> RawVoidPtr {
-        let env = get_env(None, key_manager).unwrap();
+        let env = get_env(key_manager, None).unwrap();
         let sst_reader_res = RocksSstReader::open_with_env(path, Some(env));
         match sst_reader_res {
             Err(ref e) => tikv_util::error!("Can not open sst file {:?}", e),

diff --git a/components/sst_importer/src/sst_importer.rs b/components/sst_importer/src/sst_importer.rs
@@ -42,7 +42,7 @@ use crate::{
 /// SstImporter manages SST files that are waiting for ingesting.
 pub struct SstImporter {
     dir: ImportDir,
-    pub key_manager: Option<Arc<DataKeyManager>>,
+    key_manager: Option<Arc<DataKeyManager>>,
     switcher: ImportModeSwitcher,
     // TODO: lift api_version as a type parameter.
     api_version: ApiVersion,