-
Notifications
You must be signed in to change notification settings - Fork 191
Expand file tree
/
Copy pathpartition.rs
More file actions
398 lines (347 loc) · 13.9 KB
/
Copy pathpartition.rs
File metadata and controls
398 lines (347 loc) · 13.9 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
// SPDX-License-Identifier: Apache-2.0
// SPDX-FileCopyrightText: Copyright the Vortex contributors
use std::fmt::Display;
use std::fmt::Formatter;
use std::hash::Hash;
use itertools::Itertools;
use vortex_error::VortexExpect;
use vortex_error::VortexResult;
use vortex_utils::aliases::hash_map::HashMap;
use crate::dtype::DType;
use crate::dtype::FieldName;
use crate::dtype::FieldNames;
use crate::dtype::Nullability;
use crate::dtype::StructFields;
use crate::expr::Expression;
use crate::expr::analysis::Annotation;
use crate::expr::analysis::AnnotationFn;
use crate::expr::analysis::Annotations;
use crate::expr::analysis::descendent_annotations;
use crate::expr::get_item;
use crate::expr::pack;
use crate::expr::root;
use crate::expr::traversal::NodeExt;
use crate::expr::traversal::NodeRewriter;
use crate::expr::traversal::Transformed;
use crate::expr::traversal::TraversalOrder;
/// Partition an expression into sub-expressions that are uniquely associated with an annotation.
/// A root expression is also returned that can be used to recombine the results of the partitions
/// into the result of the original expression.
///
/// ## Note
///
/// This function is agnostic to what the annotations denote. To partition over a *nullable*
/// struct scope, expand the root with
/// [`replace_root_scope`][crate::expr::transform::replace_root_scope] and annotate with
/// [`make_struct_part_annotator`][crate::expr::analysis::make_struct_part_annotator], which
/// treats the scope's own validity as one more coordinate alongside its fields
/// (see <https://github.com/vortex-data/vortex/issues/1907>).
pub fn partition<A: AnnotationFn>(
expr: Expression,
scope: &DType,
annotate_fn: A,
) -> VortexResult<PartitionedExpr<A::Annotation>>
where
A::Annotation: Display,
FieldName: From<A::Annotation>,
{
// Annotate each expression with the annotations that any of its descendent expressions have.
let annotations = descendent_annotations(&expr, annotate_fn);
partition_annotations(expr.clone(), scope, annotations)
}
pub fn partition_annotations<A>(
expr: Expression,
scope: &DType,
annotations: Annotations<A>,
) -> VortexResult<PartitionedExpr<A>>
where
A: Display + Clone + Eq + Hash,
FieldName: From<A>,
{
// Now we split the original expression into sub-expressions based on the annotations, and
// generate a root expression to re-assemble the results.
let mut splitter = StructFieldExpressionSplitter::<A>::new(&annotations);
let root = expr.rewrite(&mut splitter)?.value;
let mut partitions = Vec::with_capacity(splitter.sub_expressions.len());
let mut partition_annotations = Vec::with_capacity(splitter.sub_expressions.len());
let mut partition_dtypes = Vec::with_capacity(splitter.sub_expressions.len());
for (annotation, exprs) in splitter.sub_expressions.into_iter() {
// We pack all sub-expressions for the same annotation into a single expression.
let expr = pack(
exprs.into_iter().enumerate().map(|(idx, expr)| {
(
StructFieldExpressionSplitter::field_name(&annotation, idx),
expr,
)
}),
Nullability::NonNullable,
);
let expr = expr.optimize_recursive(scope)?;
let expr_dtype = expr.return_dtype(scope)?;
partitions.push(expr);
partition_annotations.push(annotation);
partition_dtypes.push(expr_dtype);
}
let partition_names = partition_annotations
.iter()
.map(|id| FieldName::from(id.clone()))
.collect::<FieldNames>();
let root_scope = DType::Struct(
StructFields::new(partition_names.clone(), partition_dtypes.clone()),
Nullability::NonNullable,
);
Ok(PartitionedExpr {
root: root.optimize_recursive(&root_scope)?,
partitions: partitions.into_boxed_slice(),
partition_names,
partition_dtypes: partition_dtypes.into_boxed_slice(),
partition_annotations: partition_annotations.into_boxed_slice(),
})
}
/// The result of partitioning an expression.
#[derive(Debug)]
pub struct PartitionedExpr<A> {
/// The root expression used to re-assemble the results.
pub root: Expression,
/// The partition expressions themselves.
pub partitions: Box<[Expression]>,
/// The field name of each partition as referenced in the root expression.
pub partition_names: FieldNames,
/// The return dtype of each partition expression.
pub partition_dtypes: Box<[DType]>,
/// The annotation associated with each partition.
pub partition_annotations: Box<[A]>,
}
impl<A: Display> Display for PartitionedExpr<A> {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
write!(
f,
"root: {} {{{}}}",
self.root,
self.partition_names
.iter()
.zip(self.partitions.iter())
.map(|(name, partition)| format!("{name}: {partition}"))
.join(", ")
)
}
}
impl<A: Annotation> PartitionedExpr<A>
where
FieldName: From<A>,
{
/// Return the partition for a given field, if it exists.
// FIXME(ngates): this should return an iterator since an annotation may have multiple partitions.
pub fn find_partition(&self, id: &A) -> Option<&Expression> {
let id = FieldName::from(id.clone());
self.partition_names
.iter()
.position(|field| field == id)
.map(|idx| &self.partitions[idx])
}
}
#[derive(Debug)]
struct StructFieldExpressionSplitter<'a, A: Annotation> {
annotations: &'a Annotations<'a, A>,
sub_expressions: HashMap<A, Vec<Expression>>,
}
impl<'a, A: Annotation + Display> StructFieldExpressionSplitter<'a, A> {
fn new(annotations: &'a Annotations<'a, A>) -> Self {
Self {
sub_expressions: HashMap::new(),
annotations,
}
}
/// Each annotation may be associated with multiple sub-expressions, so we need to
/// a unique name for each sub-expression.
fn field_name(annotation: &A, idx: usize) -> FieldName {
format!("{annotation}_{idx}").into()
}
}
impl<A: Annotation + Display> NodeRewriter for StructFieldExpressionSplitter<'_, A>
where
FieldName: From<A>,
{
type NodeTy = Expression;
fn visit_down(&mut self, node: Self::NodeTy) -> VortexResult<Transformed<Self::NodeTy>> {
match self.annotations.get(&node) {
// If this expression only accesses a single field, then we can skip the children
Some(annotations) if annotations.len() == 1 => {
let annotation = annotations
.iter()
.next()
.vortex_expect("expected one field");
let sub_exprs = self.sub_expressions.entry(annotation.clone()).or_default();
let idx = sub_exprs.len();
sub_exprs.push(node.clone());
let value = get_item(
StructFieldExpressionSplitter::field_name(annotation, idx),
get_item(FieldName::from(annotation.clone()), root()),
);
Ok(Transformed {
value,
changed: true,
order: TraversalOrder::Skip,
})
}
// Otherwise, continue traversing.
_ => Ok(Transformed::no(node)),
}
}
fn visit_up(&mut self, node: Self::NodeTy) -> VortexResult<Transformed<Self::NodeTy>> {
Ok(Transformed::no(node))
}
}
#[cfg(test)]
mod tests {
use rstest::fixture;
use rstest::rstest;
use vortex_utils::aliases::hash_set::HashSet;
use super::*;
use crate::dtype::DType;
use crate::dtype::Nullability::NonNullable;
use crate::dtype::Nullability::Nullable;
use crate::dtype::PType::I32;
use crate::dtype::StructFields;
use crate::expr::analysis::make_free_field_annotator;
use crate::expr::analysis::make_struct_part_annotator;
use crate::expr::analysis::struct_part::StructPart;
use crate::expr::and;
use crate::expr::col;
use crate::expr::get_item;
use crate::expr::gt;
use crate::expr::is_not_null;
use crate::expr::lit;
use crate::expr::merge;
use crate::expr::pack;
use crate::expr::root;
use crate::expr::transform::replace::replace_root_fields;
use crate::expr::transform::replace::replace_root_scope;
#[fixture]
fn dtype() -> DType {
DType::Struct(
StructFields::from_iter([
(
"a",
DType::Struct(
StructFields::from_iter([("x", I32.into()), ("y", DType::from(I32))]),
NonNullable,
),
),
("b", I32.into()),
("c", I32.into()),
]),
NonNullable,
)
}
#[rstest]
fn test_expr_top_level_ref(dtype: DType) {
let fields = dtype.as_struct_fields_opt().unwrap();
let expr = root();
let partitioned =
partition(expr.clone(), &dtype, make_free_field_annotator(fields)).unwrap();
// An un-expanded root expression is annotated by all fields, but since it is a single node
assert_eq!(partitioned.partitions.len(), 0);
assert_eq!(&partitioned.root, &root());
// Instead, callers must expand the root expression themselves.
let expr = replace_root_fields(expr, fields);
let partitioned = partition(expr, &dtype, make_free_field_annotator(fields)).unwrap();
assert_eq!(partitioned.partitions.len(), fields.names().len());
}
#[rstest]
fn test_expr_top_level_ref_get_item_and_split(dtype: DType) {
let fields = dtype.as_struct_fields_opt().unwrap();
let expr = get_item("y", get_item("a", root()));
let partitioned = partition(expr, &dtype, make_free_field_annotator(fields)).unwrap();
assert_eq!(&partitioned.root, &get_item("a_0", get_item("a", root())));
}
#[rstest]
fn test_expr_top_level_ref_get_item_and_split_pack(dtype: DType) {
let fields = dtype.as_struct_fields_opt().unwrap();
let expr = pack(
[
("x", get_item("x", get_item("a", root()))),
("y", get_item("y", get_item("a", root()))),
("c", get_item("c", root())),
],
NonNullable,
);
let partitioned = partition(expr, &dtype, make_free_field_annotator(fields)).unwrap();
let split_a = partitioned.find_partition(&"a".into()).unwrap();
assert_eq!(
&split_a.optimize_recursive(&dtype).unwrap(),
&pack(
[
("a_0", get_item("x", get_item("a", root()))),
("a_1", get_item("y", get_item("a", root())))
],
NonNullable
)
);
}
#[rstest]
fn test_expr_top_level_ref_get_item_add(dtype: DType) {
let fields = dtype.as_struct_fields_opt().unwrap();
let expr = and(get_item("y", get_item("a", root())), lit(1));
let partitioned = partition(expr, &dtype, make_free_field_annotator(fields)).unwrap();
// Whole expr is a single split
assert_eq!(partitioned.partitions.len(), 1);
}
#[rstest]
fn test_expr_top_level_ref_get_item_add_cannot_split(dtype: DType) {
let fields = dtype.as_struct_fields_opt().unwrap();
let expr = and(get_item("y", get_item("a", root())), get_item("b", root()));
let partitioned = partition(expr, &dtype, make_free_field_annotator(fields)).unwrap();
// One for id.a and id.b
assert_eq!(partitioned.partitions.len(), 2);
}
#[rstest]
fn test_partition_validity_coordinate() -> VortexResult<()> {
// A nullable struct scope has a validity coordinate alongside its fields. After
// expanding the root, a validity observer partitions to the validity coordinate and
// a field predicate partitions to the field — the validity is never guessed at a
// fixed position.
let dtype = DType::Struct(
StructFields::from_iter([("a", I32.into()), ("b", DType::from(I32))]),
Nullable,
);
let fields = dtype.as_struct_fields_opt().unwrap();
let expr = and(is_not_null(root()), gt(get_item("a", root()), lit(5)));
let expr = replace_root_scope(expr, &dtype).optimize_recursive(&dtype)?;
let partitioned = partition(expr, &dtype, make_struct_part_annotator(fields, Nullable))?;
let annotations: HashSet<StructPart> =
partitioned.partition_annotations.iter().cloned().collect();
assert_eq!(
annotations,
HashSet::from_iter([StructPart::Validity, StructPart::Field("a".into())]),
"{partitioned}"
);
Ok(())
}
#[rstest]
fn test_expr_merge(dtype: DType) {
let fields = dtype.as_struct_fields_opt().unwrap();
let expr = merge([col("a"), pack([("b", col("b"))], NonNullable)]);
let partitioned = partition(expr, &dtype, make_free_field_annotator(fields)).unwrap();
let expected = pack(
[
("x", get_item("x", get_item("a_0", col("a")))),
("y", get_item("y", get_item("a_0", col("a")))),
("b", get_item("b", get_item("b_0", col("b")))),
],
NonNullable,
);
assert_eq!(
&partitioned.root, &expected,
"{} {}",
partitioned.root, expected
);
assert_eq!(partitioned.partitions.len(), 2);
let part_a = partitioned.find_partition(&"a".into()).unwrap();
let expected_a = pack([("a_0", col("a"))], NonNullable);
assert_eq!(part_a, &expected_a, "{part_a} {expected_a}");
let part_b = partitioned.find_partition(&"b".into()).unwrap();
let expected_b = pack([("b_0", pack([("b", col("b"))], NonNullable))], NonNullable);
assert_eq!(part_b, &expected_b, "{part_b} {expected_b}");
}
}