Merge pull request #11 from zhihu/bump

Cherry pick from private repo
zhihu · Nov 23, 2020 · 5b55f84 · 5b55f84
2 parents 782d1bb + b2e7b12
commit 5b55f84
Show file tree

Hide file tree

Showing 9 changed files with 210 additions and 218 deletions.
diff --git a/src/core/codec/doc_values/doc_values_producer.rs b/src/core/codec/doc_values/doc_values_producer.rs
@@ -56,5 +56,3 @@ pub trait DocValuesProducer: Send + Sync {
     /// Returns an instance optimized for merging.
     fn get_merge_instance(&self) -> Result<Box<dyn DocValuesProducer>>;
 }
-
-pub type DocValuesProducerRef = Arc<dyn DocValuesProducer>;
diff --git a/src/core/index/merge/merge_policy.rs b/src/core/index/merge/merge_policy.rs
@@ -636,9 +636,9 @@ impl TieredMergePolicy {
                 next_merges.iter().map(|i| info_seg_bytes[*i]).collect();
 
             info!(
-                "segment_count={} curr_merge_bytes={} one_merge={:?}",
-                next_merges_bytes.len(),
+                "curr_merge_bytes={} segment_count={} one_merge={:?}",
                 curr_merge_bytes,
+                next_merges_bytes.len(),
                 next_merges_bytes
             );
             let mut segments = Vec::with_capacity(next_merges.len());

diff --git a/src/core/index/mod.rs b/src/core/index/mod.rs
@@ -33,7 +33,7 @@ pub mod tests {
     use std::collections::HashMap;
 
     use core::codec::doc_values::{
-        BinaryDocValues, DocValuesProducerRef, NumericDocValues, SortedDocValues,
+        BinaryDocValues, DocValuesProducer, NumericDocValues, SortedDocValues,
         SortedNumericDocValues, SortedSetDocValues,
     };
     use core::codec::field_infos::{FieldInfo, FieldInfos};
@@ -271,7 +271,7 @@ pub mod tests {
             unimplemented!()
         }
 
-        fn doc_values_reader(&self) -> Result<Option<DocValuesProducerRef>> {
+        fn doc_values_reader(&self) -> Result<Option<Arc<dyn DocValuesProducer>>> {
             unimplemented!()
         }
 

diff --git a/src/core/index/reader/leaf_reader.rs b/src/core/index/reader/leaf_reader.rs
@@ -12,8 +12,8 @@
 // limitations under the License.
 
 use core::codec::doc_values::{
-    BinaryDocValues, DocValuesProducerRef, NumericDocValues, SortedDocValues,
-    SortedNumericDocValues, SortedSetDocValues,
+    BinaryDocValues, DocValuesProducer, NumericDocValues, SortedDocValues, SortedNumericDocValues,
+    SortedSetDocValues,
 };
 use core::codec::field_infos::{FieldInfo, FieldInfos};
 use core::codec::norms::NormsProducer;
@@ -176,7 +176,7 @@ pub trait LeafReader {
 
     fn norms_reader(&self) -> Result<Option<Self::NormsReader>>;
 
-    fn doc_values_reader(&self) -> Result<Option<DocValuesProducerRef>>;
+    fn doc_values_reader(&self) -> Result<Option<Arc<dyn DocValuesProducer>>>;
 
     fn postings_reader(&self) -> Result<Self::FieldsProducer>;
 }