Skip to content

Commit fac023f

Browse files
committed
fix decimal tests after rebase
Signed-off-by: Matt Katz <[email protected]>
1 parent cb5af56 commit fac023f

3 files changed

Lines changed: 16 additions & 12 deletions

File tree

‎vortex-btrblocks/src/builder.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,13 +254,14 @@ mod tests {
254254

255255
use super::*;
256256
use crate::CompressionSession;
257-
use crate::schemes::decimal::DecimalScheme;
257+
use crate::schemes::decimal::DECIMAL_V1;
258+
use crate::schemes::decimal::DECIMAL_V2;
258259

259260
#[rstest]
260261
#[case::fsst_missing_codes(&string::FSSTScheme, vec![FSST.id()], false)]
261262
#[case::fsst_with_codes(&string::FSSTScheme, vec![FSST.id(), VarBin.id()], true)]
262-
#[case::decimal_serialized_id(&DecimalScheme, vec![decimal_byte_parts_v1_id()], true)]
263-
#[case::decimal_runtime_id(&DecimalScheme, vec![DecimalByteParts.id()], false)]
263+
#[case::decimal_v1_id(&DECIMAL_V1, vec![decimal_byte_parts_v1_id()], true)]
264+
#[case::decimal_both_ids(&DECIMAL_V2, vec![decimal_byte_parts_v1_id(), DecimalByteParts.id()], true)]
264265
fn test_allowed_schemes(
265266
#[case] scheme: &'static dyn Scheme,
266267
#[case] allowed: Vec<ArrayId>,

‎vortex-btrblocks/src/schemes/decimal.rs‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,13 @@ enum DecimalSchemeMode {
3232
V2,
3333
}
3434

35-
/// The v1 decimal scheme, which the default [`CompressionSession`](crate::CompressionSession)
36-
/// registers.
35+
/// The decimal scheme that only produces v1-compatible DBP arrays (does not compress wide
36+
/// decimals).
3737
pub(crate) static DECIMAL_V1: DecimalScheme = DecimalScheme::v1();
38-
static DECIMAL_V2: DecimalScheme = DecimalScheme::v2();
38+
39+
/// The decimal scheme that produces both v1 and v2 compatible DBP arrays (compresses wide
40+
/// decimals).
41+
pub(crate) static DECIMAL_V2: DecimalScheme = DecimalScheme::v2();
3942

4043
/// Compression scheme for decimal arrays via byte-part decomposition.
4144
///
@@ -44,8 +47,8 @@ static DECIMAL_V2: DecimalScheme = DecimalScheme::v2();
4447
/// significant part and up to three unsigned lower parts. Single-part arrays serialize as v1
4548
/// in either mode, while arrays with lower parts serialize as v2.
4649
///
47-
/// The default uses v1. [`refine`](Scheme::refine) picks v2 when both decimal IDs are allowed
48-
/// and v1 otherwise.
50+
/// The default uses v1. [`refine`](Scheme::refine) picks v2 when the v2 ID is allowed and v1
51+
/// otherwise.
4952
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
5053
pub struct DecimalScheme {
5154
mode: DecimalSchemeMode,
@@ -174,13 +177,13 @@ mod tests {
174177
use crate::Scheme;
175178
use crate::SchemeExt;
176179

177-
/// Both variants refine to v2 exactly when both decimal IDs are allowed.
180+
/// Both variants refine to v2 exactly when the v2 ID is allowed.
178181
#[rstest]
179182
#[case::neither(false, false, false)]
180183
#[case::v1(true, false, false)]
181-
#[case::v2_only(false, true, false)]
184+
#[case::v2_only(false, true, true)]
182185
#[case::both(true, true, true)]
183-
fn refine_picks_v2_only_when_both_ids_are_allowed(
186+
fn refine_picks_v2_when_v2_id_is_allowed(
184187
#[case] allow_v1: bool,
185188
#[case] allow_v2: bool,
186189
#[case] expect_v2: bool,

‎vortex-btrblocks/src/session.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ impl Default for CompressionSession {
8787
&binary::ZstdScheme,
8888
#[cfg(feature = "zstd")]
8989
&binary::ZstdBuffersScheme,
90-
// Decimal schemes. `refine` switches to v2 where both decimal IDs are allowed.
90+
// Decimal schemes. `refine` switches to v2 where the v2 ID is allowed.
9191
&decimal::DECIMAL_V1,
9292
// Temporal schemes.
9393
&temporal::TemporalScheme,

0 commit comments

Comments
 (0)