fix(storage): rename 'RowsetRaw' to 'EncodedRowset', 'ColumnRaw' to '…

…EncodedColumn' Signed-off-by: arkbriar <arkbriar@gmail.com>
risinglightdb · Feb 21, 2022 · 089c8bc · 089c8bc
1 parent 6b8c5eb
commit 089c8bc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/storage/secondary/rowset/raw.rs → src/storage/secondary/rowset/encoded.rs b/src/storage/secondary/rowset/raw.rs → src/storage/secondary/rowset/encoded.rs
@@ -2,25 +2,25 @@ use std::sync::Arc;
 
 use crate::catalog::ColumnCatalog;
 
-/// Raw columns.
-pub struct ColumnRaw {
+/// Encoded column.
+pub struct EncodedColumn {
     pub index: Vec<u8>,
     pub data: Vec<u8>,
 }
 
-/// Raw rowset.
-pub struct RowsetRaw {
+/// Encoded rowset.
+pub struct EncodedRowset {
     /// Size.
     pub size: usize,
 
     /// Column information.
     pub columns_info: Arc<[ColumnCatalog]>,
 
     /// Column data.
-    pub columns: Vec<ColumnRaw>,
+    pub columns: Vec<EncodedColumn>,
 }
 
-impl RowsetRaw {
+impl EncodedRowset {
     #[allow(dead_code)]
     /// Number of rows in the rowset.
     pub fn cardinality(&self) -> usize {

diff --git a/src/storage/secondary/rowset/mod.rs b/src/storage/secondary/rowset/mod.rs
@@ -35,15 +35,15 @@
 //! * `IntColumnBuilder` - `IntColumn` - `IntColumnIterator` - an entry in proto
 
 pub use disk_rowset::*;
+pub use encoded::*;
 pub use mem_rowset::*;
-pub use raw::*;
 pub use rowset_builder::*;
 pub use rowset_iterator::*;
 pub use rowset_writer::*;
 
 mod disk_rowset;
+mod encoded;
 mod mem_rowset;
-mod raw;
 mod rowset_builder;
 mod rowset_iterator;
 mod rowset_writer;
diff --git a/src/storage/secondary/rowset/rowset_builder.rs b/src/storage/secondary/rowset/rowset_builder.rs
@@ -7,7 +7,7 @@ use itertools::Itertools;
 use super::super::{ColumnBuilderImpl, IndexBuilder};
 use crate::array::DataChunk;
 use crate::catalog::ColumnCatalog;
-use crate::storage::secondary::rowset::{ColumnRaw, RowsetRaw};
+use crate::storage::secondary::rowset::{EncodedColumn, EncodedRowset};
 use crate::storage::secondary::ColumnBuilderOptions;
 
 /// Builds a Rowset from [`DataChunk`].
@@ -48,9 +48,9 @@ impl RowsetBuilder {
         }
     }
 
-    pub fn finish(self) -> RowsetRaw {
+    pub fn finish(self) -> EncodedRowset {
         let checksum_type = self.column_options.checksum_type;
-        RowsetRaw {
+        EncodedRowset {
             size: self.row_cnt as usize,
             columns_info: self.columns.clone(),
             columns: self
@@ -64,7 +64,7 @@ impl RowsetBuilder {
                         index_builder.append(index);
                     }
 
-                    ColumnRaw {
+                    EncodedColumn {
                         index: index_builder.finish(),
                         data,
                     }

diff --git a/src/storage/secondary/rowset/rowset_writer.rs b/src/storage/secondary/rowset/rowset_writer.rs
@@ -6,7 +6,7 @@ use tokio::fs::{File, OpenOptions};
 use tokio::io::{AsyncWriteExt, BufWriter};
 
 use crate::catalog::ColumnCatalog;
-use crate::storage::secondary::rowset::RowsetRaw;
+use crate::storage::secondary::rowset::EncodedRowset;
 use crate::storage::StorageResult;
 
 pub fn path_of_data_column(base: impl AsRef<Path>, column_info: &ColumnCatalog) -> PathBuf {
@@ -67,9 +67,9 @@ impl RowsetWriter {
         Ok(())
     }
 
-    /// Flush rows in a raw rowset. Create files if not exists.
+    /// Flush rows in an encoded rowset. Create files if not exists.
     /// Panics if the rowset is empty.
-    pub async fn flush(self, rowset: RowsetRaw) -> StorageResult<()> {
+    pub async fn flush(self, rowset: EncodedRowset) -> StorageResult<()> {
         // Panic on empty flush.
         if rowset.is_empty() {
             panic!("empty rowset")