-
Notifications
You must be signed in to change notification settings - Fork 133
feat: add VarBin compressor to btrblocks string compressor #5360
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
ab71b6b
feat: add VarBin compressor to btrblocks string compressor
joseph-isaacs 3ddbe35
refactor: use to_arrow_preferred for VarBinView to VarBin conversion
joseph-isaacs 0415270
fix: use into_arrow with specific DataType for VarBin conversion
joseph-isaacs a6e48f6
fix: assign VarBinScheme to code 5 without renumbering existing schemes
joseph-isaacs 9e41aa1
feat: calculate actual size-based compression ratio for VarBinScheme
joseph-isaacs 5dff651
fix: correct typo offest -> offset
joseph-isaacs e17e8b8
fix: correctly calculate offset array size based on string bytes
joseph-isaacs ae0840a
fix: return 0.0 compression ratio to prevent automatic selection
joseph-isaacs b5aab36
u
joseph-isaacs 11e3db8
u
joseph-isaacs bfff5ac
u
joseph-isaacs 8472086
u
joseph-isaacs ccd0736
fix: update Python tests to handle string vs string_view encoding dif…
joseph-isaacs File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // SPDX-FileCopyrightText: Copyright the Vortex contributors | ||
|
|
||
| use vortex_array::arrays::builder::VarBinBuilder; | ||
| use vortex_array::arrays::{ | ||
| ConstantArray, DictArray, MaskedArray, VarBinArray, VarBinViewArray, VarBinViewVTable, | ||
| }; | ||
|
|
@@ -93,6 +94,7 @@ impl Compressor for StringCompressor { | |
| fn schemes() -> &'static [&'static Self::SchemeType] { | ||
| &[ | ||
| &UncompressedScheme, | ||
| &VarBinScheme, | ||
| &DictScheme, | ||
| &FSSTScheme, | ||
| &ConstantScheme, | ||
|
|
@@ -116,6 +118,9 @@ impl<T> StringScheme for T where T: Scheme<StatsType = StringStats, CodeType = S | |
| #[derive(Debug, Copy, Clone)] | ||
| pub struct UncompressedScheme; | ||
|
|
||
| #[derive(Debug, Copy, Clone)] | ||
| pub struct VarBinScheme; | ||
|
|
||
| #[derive(Debug, Copy, Clone)] | ||
| pub struct DictScheme; | ||
|
|
||
|
|
@@ -132,11 +137,12 @@ pub struct NullDominated; | |
| pub struct StringCode(u8); | ||
|
|
||
| const UNCOMPRESSED_SCHEME: StringCode = StringCode(0); | ||
| const DICT_SCHEME: StringCode = StringCode(1); | ||
| const FSST_SCHEME: StringCode = StringCode(2); | ||
| const CONSTANT_SCHEME: StringCode = StringCode(3); | ||
| const VARBIN_SCHEME: StringCode = StringCode(1); | ||
| const DICT_SCHEME: StringCode = StringCode(2); | ||
| const FSST_SCHEME: StringCode = StringCode(3); | ||
| const CONSTANT_SCHEME: StringCode = StringCode(4); | ||
|
|
||
| const SPARSE_SCHEME: StringCode = StringCode(4); | ||
| const SPARSE_SCHEME: StringCode = StringCode(5); | ||
|
|
||
| impl Scheme for UncompressedScheme { | ||
| type StatsType = StringStats; | ||
|
|
@@ -167,6 +173,52 @@ impl Scheme for UncompressedScheme { | |
| } | ||
| } | ||
|
|
||
| impl Scheme for VarBinScheme { | ||
| type StatsType = StringStats; | ||
| type CodeType = StringCode; | ||
|
|
||
| fn code(&self) -> StringCode { | ||
| VARBIN_SCHEME | ||
| } | ||
|
|
||
| fn expected_compression_ratio( | ||
| &self, | ||
| stats: &Self::StatsType, | ||
| is_sample: bool, | ||
| allowed_cascading: usize, | ||
| excludes: &[StringCode], | ||
| ) -> VortexResult<f64> { | ||
| estimate_compression_ratio_with_sampling( | ||
| self, | ||
| stats, | ||
| is_sample, | ||
| allowed_cascading, | ||
| excludes, | ||
| ) | ||
|
||
| } | ||
|
|
||
| fn compress( | ||
| &self, | ||
| stats: &Self::StatsType, | ||
| _is_sample: bool, | ||
| _allowed_cascading: usize, | ||
| _excludes: &[StringCode], | ||
| ) -> VortexResult<ArrayRef> { | ||
| use vortex_array::accessor::ArrayAccessor; | ||
|
|
||
| let src = stats.source(); | ||
| let mut builder = VarBinBuilder::<i32>::with_capacity(src.len()); | ||
|
|
||
| src.with_iterator(|iter| { | ||
| for value in iter { | ||
| builder.append(value); | ||
| } | ||
| }); | ||
a10y marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| Ok(builder.finish(src.dtype().clone()).into_array()) | ||
| } | ||
| } | ||
|
|
||
| impl Scheme for DictScheme { | ||
| type StatsType = StringStats; | ||
| type CodeType = StringCode; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.