Skip to content

Commit b9ae199

Browse files
committed
Json-Variant exprs
Signed-off-by: Adam Gutglick <adam@spiraldb.com>
1 parent fb489a1 commit b9ae199

11 files changed

Lines changed: 1224 additions & 18 deletions

File tree

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

encodings/parquet-variant/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ prost = { workspace = true }
2727
vortex-array = { workspace = true }
2828
vortex-buffer = { workspace = true }
2929
vortex-error = { workspace = true }
30+
vortex-json = { workspace = true }
3031
vortex-mask = { workspace = true }
31-
vortex-proto = { workspace = true }
32+
vortex-proto = { workspace = true, features = ["expr"] }
3233
vortex-session = { workspace = true }
3334

3435
[dev-dependencies]

encodings/parquet-variant/src/arrow.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ fn parquet_variant_storage_request(fields: &Fields) -> Option<(bool, bool)> {
5858
(has_metadata && (has_value || has_typed_value)).then_some((has_value, has_typed_value))
5959
}
6060

61-
fn export_storage_to_target<T: ParquetVariantArrayExt>(
61+
pub(crate) fn export_storage_to_target<T: ParquetVariantArrayExt>(
6262
parquet_array: &T,
6363
target_fields: &Fields,
6464
ctx: &mut ExecutionCtx,
@@ -99,7 +99,7 @@ fn export_storage_to_target<T: ParquetVariantArrayExt>(
9999
)?))
100100
}
101101

102-
fn export_unshredded_storage_to_target<T: ParquetVariantArrayExt>(
102+
pub(crate) fn export_unshredded_storage_to_target<T: ParquetVariantArrayExt>(
103103
parquet_array: &T,
104104
target_fields: &Fields,
105105
ctx: &mut ExecutionCtx,
@@ -115,7 +115,10 @@ fn export_unshredded_storage_to_target<T: ParquetVariantArrayExt>(
115115
export_storage_to_target(&unshredded_parquet, target_fields, ctx)
116116
}
117117

118-
fn parquet_variant_for_export(array: ArrayRef, ctx: &mut ExecutionCtx) -> VortexResult<ArrayRef> {
118+
pub(crate) fn parquet_variant_for_export(
119+
array: ArrayRef,
120+
ctx: &mut ExecutionCtx,
121+
) -> VortexResult<ArrayRef> {
119122
let executed = array.execute_until::<ParquetVariant>(ctx)?;
120123
if executed.is::<ParquetVariant>() {
121124
return Ok(executed);

0 commit comments

Comments
 (0)