Skip to content

Commit e177776

Browse files
committed
chore: codefmt
1 parent ee53f4d commit e177776

File tree

4 files changed

+25
-10
lines changed

4 files changed

+25
-10
lines changed

src/storage/mod.rs

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use crate::serdes::ReferenceTables;
1010
use crate::storage::table_codec::TableCodec;
1111
use crate::types::index::{Index, IndexId, IndexMetaRef, IndexType};
1212
use crate::types::tuple::{Tuple, TupleId};
13+
use crate::types::tuple_builder::TupleIdBuilder;
1314
use crate::types::value::DataValue;
1415
use crate::types::{ColumnId, LogicalType};
1516
use crate::utils::lru::SharedLruCache;
@@ -21,7 +22,6 @@ use std::ops::SubAssign;
2122
use std::sync::Arc;
2223
use std::{mem, slice};
2324
use ulid::Generator;
24-
use crate::types::tuple_builder::TupleIdBuilder;
2525

2626
pub(crate) type StatisticsMetaCache = SharedLruCache<(TableName, IndexId), StatisticsMeta>;
2727
pub(crate) type TableCache = SharedLruCache<TableName, TableCatalog>;
@@ -657,7 +657,11 @@ impl<T: Transaction> IndexImplParams<'_, T> {
657657
Ok(val)
658658
}
659659

660-
fn get_tuple_by_id(&self, id_builder: &mut TupleIdBuilder, tuple_id: &TupleId) -> Result<Option<Tuple>, DatabaseError> {
660+
fn get_tuple_by_id(
661+
&self,
662+
id_builder: &mut TupleIdBuilder,
663+
tuple_id: &TupleId,
664+
) -> Result<Option<Tuple>, DatabaseError> {
661665
let key = TableCodec::encode_tuple_key(self.table_name, tuple_id)?;
662666

663667
Ok(self.tx.get(&key)?.map(|bytes| {
@@ -1000,7 +1004,9 @@ impl<T: Transaction> Iter for IndexIter<'_, T> {
10001004
continue;
10011005
}
10021006
Self::limit_sub(&mut self.limit);
1003-
let tuple = self.inner.index_lookup(&bytes, &mut self.id_builder, &self.params)?;
1007+
let tuple = self
1008+
.inner
1009+
.index_lookup(&bytes, &mut self.id_builder, &self.params)?;
10041010

10051011
return Ok(Some(tuple));
10061012
}
@@ -1063,7 +1069,10 @@ impl<T: Transaction> Iter for IndexIter<'_, T> {
10631069
Range::Eq(mut val) => {
10641070
val = self.params.try_cast(val)?;
10651071

1066-
match self.inner.eq_to_res(&val, &mut self.id_builder, &self.params)? {
1072+
match self
1073+
.inner
1074+
.eq_to_res(&val, &mut self.id_builder, &self.params)?
1075+
{
10671076
IndexResult::Tuple(tuple) => {
10681077
if Self::offset_move(&mut self.offset) {
10691078
return self.next_tuple();

src/storage/rocksdb.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ mod test {
141141
};
142142
use crate::types::index::{IndexMeta, IndexType};
143143
use crate::types::tuple::Tuple;
144+
use crate::types::tuple_builder::TupleIdBuilder;
144145
use crate::types::value::DataValue;
145146
use crate::types::LogicalType;
146147
use crate::utils::lru::SharedLruCache;
@@ -149,7 +150,6 @@ mod test {
149150
use std::hash::RandomState;
150151
use std::sync::Arc;
151152
use tempfile::TempDir;
152-
use crate::types::tuple_builder::TupleIdBuilder;
153153

154154
#[test]
155155
fn test_in_rocksdb_storage_works_with_data() -> Result<(), DatabaseError> {

src/storage/table_codec.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ use crate::serdes::{ReferenceSerialization, ReferenceTables};
55
use crate::storage::{TableCache, Transaction};
66
use crate::types::index::{Index, IndexId, IndexMeta, IndexType};
77
use crate::types::tuple::{Schema, Tuple, TupleId};
8+
use crate::types::tuple_builder::TupleIdBuilder;
89
use crate::types::value::DataValue;
910
use crate::types::LogicalType;
1011
use bytes::Bytes;
1112
use integer_encoding::FixedInt;
1213
use lazy_static::lazy_static;
1314
use std::io::{Cursor, Read, Seek, SeekFrom, Write};
14-
use crate::types::tuple_builder::TupleIdBuilder;
1515

1616
const BOUND_MIN_TAG: u8 = 0;
1717
const BOUND_MAX_TAG: u8 = 1;
@@ -499,6 +499,7 @@ mod tests {
499499
use crate::storage::Storage;
500500
use crate::types::index::{Index, IndexMeta, IndexType};
501501
use crate::types::tuple::Tuple;
502+
use crate::types::tuple_builder::TupleIdBuilder;
502503
use crate::types::value::DataValue;
503504
use crate::types::LogicalType;
504505
use bytes::Bytes;
@@ -510,7 +511,6 @@ mod tests {
510511
use std::slice;
511512
use std::sync::Arc;
512513
use ulid::Ulid;
513-
use crate::types::tuple_builder::TupleIdBuilder;
514514

515515
fn build_table_codec() -> TableCatalog {
516516
let columns = vec![
@@ -548,7 +548,13 @@ mod tests {
548548
let mut id_builder = TupleIdBuilder::new(schema);
549549

550550
debug_assert_eq!(
551-
TableCodec::decode_tuple(&table_catalog.types(), &mut id_builder, &[0, 1], schema, &bytes),
551+
TableCodec::decode_tuple(
552+
&table_catalog.types(),
553+
&mut id_builder,
554+
&[0, 1],
555+
schema,
556+
&bytes
557+
),
552558
tuple
553559
);
554560

src/types/tuple.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use crate::catalog::ColumnRef;
22
use crate::errors::DatabaseError;
3+
use crate::types::tuple_builder::TupleIdBuilder;
34
use crate::types::value::DataValue;
45
use crate::types::LogicalType;
56
use comfy_table::{Cell, Table};
67
use itertools::Itertools;
78
use lazy_static::lazy_static;
89
use std::sync::Arc;
9-
use crate::types::tuple_builder::TupleIdBuilder;
1010

1111
lazy_static! {
1212
pub static ref EMPTY_TUPLE: Tuple = {
@@ -168,13 +168,13 @@ pub fn create_table(schema: &Schema, tuples: &[Tuple]) -> Table {
168168
mod tests {
169169
use crate::catalog::{ColumnCatalog, ColumnDesc, ColumnRef};
170170
use crate::types::tuple::Tuple;
171+
use crate::types::tuple_builder::TupleIdBuilder;
171172
use crate::types::value::{DataValue, Utf8Type};
172173
use crate::types::LogicalType;
173174
use itertools::Itertools;
174175
use rust_decimal::Decimal;
175176
use sqlparser::ast::CharLengthUnits;
176177
use std::sync::Arc;
177-
use crate::types::tuple_builder::TupleIdBuilder;
178178

179179
#[test]
180180
fn test_tuple_serialize_to_and_deserialize_from() {

0 commit comments

Comments
 (0)