Skip to content

Commit a06a4a0

Browse files
committed
refactor: remove unused Strategy enum and related code
1 parent ec95c46 commit a06a4a0

9 files changed

Lines changed: 11 additions & 49 deletions

File tree

columnar/examples/macro.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ use std::collections::BTreeMap;
22

33
use serde_columnar::columnar;
44

5+
#[allow(dead_code)]
56
#[columnar(vec, map, ser, de)]
67
#[derive(Debug, Clone, PartialEq)]
78
struct A {
89
a: u64,
910
}
1011

12+
#[allow(dead_code)]
1113
#[columnar(vec, map, ser, de)]
1214
#[derive(Debug, Clone, PartialEq)]
1315
struct B {

columnar/src/column/bool_rle.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{
22
strategy::{BoolRleDecoder, BoolRleEncoder},
3-
ColumnAttr, ColumnarError, Strategy,
3+
ColumnAttr, ColumnarError,
44
};
55

66
use super::ColumnTrait;
@@ -19,8 +19,6 @@ impl BoolRleColumn {
1919
}
2020

2121
impl ColumnTrait for BoolRleColumn {
22-
const STRATEGY: Strategy = Strategy::BoolRle;
23-
2422
fn attr(&self) -> ColumnAttr {
2523
self.attr
2624
}

columnar/src/column/delta_of_delta.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{
22
strategy::{DeltaOfDeltaDecoder, DeltaOfDeltaEncoder},
3-
ColumnAttr, ColumnarError, Strategy,
3+
ColumnAttr, ColumnarError,
44
};
55

66
use super::ColumnTrait;
@@ -22,8 +22,6 @@ impl<T> DeltaOfDeltaColumn<T> {
2222
}
2323

2424
impl<T: DeltaOfDeltable> ColumnTrait for DeltaOfDeltaColumn<T> {
25-
const STRATEGY: Strategy = Strategy::DeltaRle;
26-
2725
fn attr(&self) -> ColumnAttr {
2826
self.attr
2927
}

columnar/src/column/delta_rle.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::{
22
strategy::{DeltaRleDecoder, DeltaRleEncoder},
3-
ColumnAttr, ColumnarError, Strategy,
3+
ColumnAttr, ColumnarError,
44
};
55

66
use super::{rle::Rleable, ColumnTrait};
@@ -26,8 +26,6 @@ impl<T> ColumnTrait for DeltaRleColumn<T>
2626
where
2727
T: DeltaRleable,
2828
{
29-
const STRATEGY: Strategy = Strategy::DeltaRle;
30-
3129
fn attr(&self) -> ColumnAttr {
3230
self.attr
3331
}

columnar/src/column/mod.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@ pub mod rle;
55
pub mod serde_impl;
66

77
use crate::{columnar_internal::ColumnarEncoder, ColumnarDecoder, ColumnarError};
8-
use crate::{
9-
BoolRleColumn, DeltaOfDeltaColumn, DeltaRleColumn, DeltaRleable, RleColumn, Rleable, Strategy,
10-
};
8+
use crate::{BoolRleColumn, DeltaOfDeltaColumn, DeltaRleColumn, DeltaRleable, RleColumn, Rleable};
119
use serde::{Deserialize, Serialize};
1210
use std::fmt::Debug;
1311
use std::ops::DerefMut;
1412

1513
pub trait ColumnTrait {
16-
const STRATEGY: Strategy;
1714
fn attr(&self) -> ColumnAttr;
1815
fn encode(&self) -> Result<Vec<u8>, ColumnarError>;
1916
fn decode(bytes: &[u8]) -> Result<Self, ColumnarError>
@@ -100,8 +97,6 @@ impl<T> ColumnTrait for GenericColumn<T>
10097
where
10198
T: Serialize + for<'de> Deserialize<'de>,
10299
{
103-
const STRATEGY: Strategy = Strategy::None;
104-
105100
fn attr(&self) -> ColumnAttr {
106101
ColumnAttr::empty()
107102
}

columnar/src/column/rle.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
22

33
use crate::{
44
strategy::{AnyRleDecoder, AnyRleEncoder},
5-
ColumnAttr, ColumnarError, Strategy,
5+
ColumnAttr, ColumnarError,
66
};
77

88
use super::ColumnTrait;
@@ -27,8 +27,6 @@ impl<T> ColumnTrait for RleColumn<T>
2727
where
2828
T: Rleable,
2929
{
30-
const STRATEGY: Strategy = Strategy::Rle;
31-
3230
fn len(&self) -> usize {
3331
self.data.len()
3432
}

columnar/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ use serde::{Deserialize, Serialize};
9393
mod strategy;
9494
pub use strategy::{
9595
AnyRleDecoder, AnyRleEncoder, BoolRleDecoder, BoolRleEncoder, DeltaOfDeltaDecoder,
96-
DeltaOfDeltaEncoder, DeltaRleDecoder, DeltaRleEncoder, Strategy,
96+
DeltaOfDeltaEncoder, DeltaRleDecoder, DeltaRleEncoder,
9797
};
9898
mod wrap;
9999
pub use wrap::{ColumnarMap, ColumnarVec};

columnar/src/strategy/mod.rs

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,4 @@ pub use rle::{
44
DeltaOfDeltaEncoder, DeltaRleDecoder, DeltaRleEncoder,
55
};
66

7-
use crate::ColumnarError;
8-
9-
/// The enum of Strategy includes `Rle`/`BoolRle`/`DeltaRle`
10-
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
11-
#[repr(u8)]
12-
pub enum Strategy {
13-
Rle = 1,
14-
BoolRle,
15-
DeltaRle,
16-
DeltaOfDelta,
17-
None,
18-
}
19-
20-
impl TryFrom<u8> for Strategy {
21-
type Error = ColumnarError;
22-
23-
fn try_from(value: u8) -> Result<Self, Self::Error> {
24-
match value {
25-
1 => Ok(Strategy::Rle),
26-
2 => Ok(Strategy::BoolRle),
27-
3 => Ok(Strategy::DeltaRle),
28-
4 => Ok(Strategy::DeltaOfDelta),
29-
_ => Err(ColumnarError::InvalidStrategy(value)),
30-
}
31-
}
32-
}
33-
347
pub const MAX_RLE_COUNT: usize = 1e9 as usize;

columnar_derive/src/serde/de.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,9 @@ impl<'a, P: WithGenericsBorrow> ToTokens for DeTypeGenerics<'a, P> {
355355
pub fn split_with_de_lifetime<P: WithGenericsBorrow>(
356356
params: &P,
357357
) -> (
358-
DeImplGenerics<P>,
359-
DeTypeGenerics<P>,
360-
syn::TypeGenerics,
358+
DeImplGenerics<'_, P>,
359+
DeTypeGenerics<'_, P>,
360+
syn::TypeGenerics<'_>,
361361
Option<&syn::WhereClause>,
362362
) {
363363
let de_impl_generics = DeImplGenerics(params);

0 commit comments

Comments
 (0)