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 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785
// Copyright Materialize, Inc. and contributors. All rights reserved.
//
// Use of this software is governed by the Business Source License
// included in the LICENSE file.
//
// As of the Change Date specified in that file, in accordance with
// the Business Source License, use of this software will be governed
// by the Apache License, Version 2.0.
//! Persist schema evolution.
use std::str::FromStr;
use std::sync::Arc;
use arrow::array::{new_null_array, Array, AsArray, ListArray, StructArray};
use arrow::datatypes::{DataType, Field, FieldRef, Fields, SchemaBuilder};
use itertools::Itertools;
use mz_ore::cast::CastFrom;
use mz_proto::{ProtoType, RustType, TryFromProtoError};
use proptest_derive::Arbitrary;
use serde::{Deserialize, Serialize};
/// An ordered identifier for a pair of key and val schemas registered to a
/// shard.
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, Arbitrary)]
#[serde(try_from = "String", into = "String")]
pub struct SchemaId(pub usize);
impl std::fmt::Display for SchemaId {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "h{}", self.0)
}
}
impl From<SchemaId> for String {
fn from(schema_id: SchemaId) -> Self {
schema_id.to_string()
}
}
impl TryFrom<String> for SchemaId {
type Error = String;
fn try_from(encoded: String) -> Result<Self, Self::Error> {
let encoded = match encoded.strip_prefix('h') {
Some(x) => x,
None => return Err(format!("invalid SchemaId {}: incorrect prefix", encoded)),
};
let schema_id = u64::from_str(encoded)
.map_err(|err| format!("invalid SchemaId {}: {}", encoded, err))?;
Ok(SchemaId(usize::cast_from(schema_id)))
}
}
impl RustType<u64> for SchemaId {
fn into_proto(&self) -> u64 {
self.0.into_proto()
}
fn from_proto(proto: u64) -> Result<Self, TryFromProtoError> {
Ok(SchemaId(proto.into_rust()?))
}
}
/// Returns a function to migrate arrow data encoded by `old` to be the same
/// DataType as arrow data encoded by `new`, if `new` is backward compatible
/// with `old`. Exposed for testing.
pub fn backward_compatible(old: &DataType, new: &DataType) -> Option<Migration> {
backward_compatible_typ(old, new).map(Migration)
}
/// See [backward_compatible].
#[derive(Debug, PartialEq)]
pub struct Migration(ArrayMigration);
impl Migration {
/// Returns true if the migration requires dropping data, including nested
/// structs.
pub fn contains_drop(&self) -> bool {
self.0.contains_drop()
}
/// Returns true if the output array will preserve the input's sortedness.
pub fn preserves_order(&self) -> bool {
// If we add support for reordering fields, then this will also have to
// account for that.
!self.contains_drop()
}
/// For the `old` and `new` schemas used at construction time, migrates data
/// encoded by `old` to be the same arrow DataType as data encoded by `new`.
pub fn migrate(&self, array: Arc<dyn Array>) -> Arc<dyn Array> {
self.0.migrate(array)
}
}
#[derive(Debug, PartialEq)]
pub(crate) enum ArrayMigration {
NoOp,
Struct(Vec<StructArrayMigration>),
List(FieldRef, Box<ArrayMigration>),
}
#[derive(Debug, PartialEq)]
pub(crate) enum StructArrayMigration {
// TODO: Support adding fields not at the end, if/when that becomes
// necessary.
AddFieldNullableAtEnd {
name: String,
typ: DataType,
},
DropField {
name: String,
},
AlterFieldNullable {
name: String,
},
Recurse {
name: String,
migration: ArrayMigration,
},
}
impl ArrayMigration {
fn contains_drop(&self) -> bool {
use ArrayMigration::*;
match self {
NoOp => false,
Struct(xs) => xs.iter().any(|x| x.contains_drop()),
List(_f, x) => x.contains_drop(),
}
}
fn migrate(&self, array: Arc<dyn Array>) -> Arc<dyn Array> {
use ArrayMigration::*;
match self {
NoOp => array,
Struct(migrations) => {
let len = array.len();
let (mut fields, mut arrays, nulls) = match array.data_type() {
DataType::Null => {
let all_add_nullable = migrations.iter().all(|action| {
matches!(action, StructArrayMigration::AddFieldNullableAtEnd { .. })
});
assert!(all_add_nullable, "invalid migrations, {migrations:?}");
(Fields::empty(), Vec::new(), None)
}
DataType::Struct(_) => {
let array = array
.as_any()
.downcast_ref::<StructArray>()
.expect("known to be StructArray")
.clone();
array.into_parts()
}
other => panic!("expected Struct or Null got {other:?}"),
};
for migration in migrations {
migration.migrate(len, &mut fields, &mut arrays);
}
Arc::new(StructArray::new(fields, arrays, nulls))
}
List(field, entry_migration) => {
let list_array: ListArray = if let Some(list_array) = array.as_list_opt() {
list_array.clone()
} else if let Some(map_array) = array.as_map_opt() {
map_array.clone().into()
} else {
panic!("expected list-like array; got {:?}", array.data_type())
};
let (_field, offsets, entries, nulls) = list_array.into_parts();
let entries = entry_migration.migrate(entries);
Arc::new(ListArray::new(Arc::clone(field), offsets, entries, nulls))
}
}
}
}
impl StructArrayMigration {
fn contains_drop(&self) -> bool {
use StructArrayMigration::*;
match self {
AddFieldNullableAtEnd { .. } => false,
DropField { .. } => true,
AlterFieldNullable { .. } => false,
Recurse { migration, .. } => migration.contains_drop(),
}
}
fn migrate(&self, len: usize, fields: &mut Fields, arrays: &mut Vec<Arc<dyn Array>>) {
use StructArrayMigration::*;
match self {
AddFieldNullableAtEnd { name, typ } => {
arrays.push(new_null_array(typ, len));
let mut f = SchemaBuilder::from(&*fields);
f.push(Arc::new(Field::new(name, typ.clone(), true)));
*fields = f.finish().fields;
}
DropField { name } => {
let (idx, _) = fields
.find(name)
.unwrap_or_else(|| panic!("expected to find field {} in {:?}", name, fields));
arrays.remove(idx);
let mut f = SchemaBuilder::from(&*fields);
f.remove(idx);
*fields = f.finish().fields;
}
AlterFieldNullable { name } => {
let (idx, _) = fields
.find(name)
.unwrap_or_else(|| panic!("expected to find field {} in {:?}", name, fields));
let mut f = SchemaBuilder::from(&*fields);
let field = f.field_mut(idx);
// Defensively assert field is not nullable.
assert_eq!(field.is_nullable(), false);
*field = Arc::new(Field::new(field.name(), field.data_type().clone(), true));
*fields = f.finish().fields;
}
Recurse { name, migration } => {
let (idx, _) = fields
.find(name)
.unwrap_or_else(|| panic!("expected to find field {} in {:?}", name, fields));
arrays[idx] = migration.migrate(Arc::clone(&arrays[idx]));
let mut f = SchemaBuilder::from(&*fields);
*f.field_mut(idx) = Arc::new(Field::new(
name,
arrays[idx].data_type().clone(),
f.field(idx).is_nullable(),
));
*fields = f.finish().fields;
}
}
}
}
fn backward_compatible_typ(old: &DataType, new: &DataType) -> Option<ArrayMigration> {
use ArrayMigration::NoOp;
use DataType::*;
match (old, new) {
(Null, Struct(fields)) if fields.iter().all(|field| field.is_nullable()) => {
let migrations = fields
.iter()
.map(|field| StructArrayMigration::AddFieldNullableAtEnd {
name: field.name().clone(),
typ: field.data_type().clone(),
})
.collect();
Some(ArrayMigration::Struct(migrations))
}
(
Null | Boolean | Int8 | Int16 | Int32 | Int64 | UInt8 | UInt16 | UInt32 | UInt64
| Float16 | Float32 | Float64 | Binary | Utf8 | Date32 | Date64 | LargeBinary
| BinaryView | LargeUtf8 | Utf8View,
_,
) => (old == new).then_some(NoOp),
(FixedSizeBinary(o), FixedSizeBinary(n)) => (o == n).then_some(NoOp),
(FixedSizeBinary(_), _) => None,
(Struct(o), Struct(n)) => backward_compatible_struct(o, n),
(Struct(_), _) => None,
(List(o), List(n)) | (Map(o, _), List(n)) => {
// The list migration can proceed if the entry types are compatible and the
// field metadata is compatible. (In practice, this requires making sure that
// nullable fields don't become non-nullable.)
if o.is_nullable() && !n.is_nullable() {
None
} else {
let nested = backward_compatible_typ(o.data_type(), n.data_type())?;
let migration =
if matches!(old, DataType::List(_)) && o == n && nested == ArrayMigration::NoOp
{
ArrayMigration::NoOp
} else {
ArrayMigration::List(Arc::clone(n), nested.into())
};
Some(migration)
}
}
(List(_), _) => None,
(Map(o, _), Map(n, _)) => (o == n).then_some(NoOp),
(Map(_, _), _) => None,
(
Timestamp(_, _)
| Time32(_)
| Time64(_)
| Duration(_)
| Interval(_)
| ListView(_)
| FixedSizeList(_, _)
| LargeList(_)
| LargeListView(_)
| Union(_, _)
| Dictionary(_, _)
| Decimal128(_, _)
| Decimal256(_, _)
| RunEndEncoded(_, _),
_,
) => unimplemented!("not used in mz: old={:?} new={:?}", old, new),
}
}
fn backward_compatible_struct(old: &Fields, new: &Fields) -> Option<ArrayMigration> {
use ArrayMigration::*;
use StructArrayMigration::*;
let mut added_field = false;
let mut field_migrations = Vec::new();
for n in new.iter() {
// This find (and the below) make the overall runtime of this O(n^2). We
// could get it down to O(n log n) by indexing fields in old and new by
// name, but the number of fields is expected to be small, so for now
// avoid the allocation.
let o = old.find(n.name());
let o = match o {
// If we've already added a field and then encounter another that
// exists in old, the field we added wasn't at the end. We only
// support adding fields at the end for now, so return incompatible.
Some(_) if added_field => return None,
Some((_, o)) => o,
// Allowed to add a new field but it must be nullable.
None if !n.is_nullable() => return None,
None => {
added_field = true;
field_migrations.push(AddFieldNullableAtEnd {
name: n.name().to_owned(),
typ: n.data_type().clone(),
});
continue;
}
};
// Not allowed to make a nullable field into non-nullable.
if o.is_nullable() && !n.is_nullable() {
return None;
}
// However, allowed to make a non-nullable field nullable.
let make_nullable = !o.is_nullable() && n.is_nullable();
match backward_compatible_typ(o.data_type(), n.data_type()) {
None => return None,
Some(NoOp) if make_nullable => {
field_migrations.push(AlterFieldNullable {
name: n.name().clone(),
});
}
Some(NoOp) => continue,
Some(migration) => {
/// Checks if an [`ArrayMigration`] is only recursively making fields nullable.
fn recursively_all_nullable(migration: &ArrayMigration) -> bool {
match migration {
NoOp => true,
List(_field, child) => recursively_all_nullable(child),
Struct(children) => children.iter().all(|child| match child {
AddFieldNullableAtEnd { .. } | DropField { .. } => false,
AlterFieldNullable { .. } => true,
Recurse { migration, .. } => recursively_all_nullable(migration),
}),
}
}
// We only support making a field nullable concurrently with other changes to said
// field, if those other changes are making children nullable as well. Otherwise we
// don't allow the migration.
//
// Note: There's nothing that should really prevent us from supporting this, but at
// the moment it's not needed in Materialize.
if make_nullable {
if recursively_all_nullable(&migration) {
field_migrations.extend([
AlterFieldNullable {
name: n.name().clone(),
},
Recurse {
name: n.name().clone(),
migration,
},
]);
} else {
return None;
}
} else {
field_migrations.push(Recurse {
name: n.name().clone(),
migration,
})
}
}
}
}
for o in old.iter() {
let n = new.find(o.name());
if n.is_none() {
// Allowed to drop a field regardless of nullability.
field_migrations.push(DropField {
name: o.name().to_owned(),
});
}
}
// Now detect if any re-ordering happened.
let same_order = new
.iter()
.flat_map(|n| old.find(n.name()))
.tuple_windows()
.all(|((i, _), (j, _))| i <= j);
if !same_order {
return None;
}
if field_migrations.is_empty() {
Some(NoOp)
} else {
Some(Struct(field_migrations))
}
}
#[cfg(test)]
mod tests {
use arrow::array::new_empty_array;
use arrow::datatypes::Field;
use super::*;
#[track_caller]
fn testcase(old: DataType, new: DataType, expected: Option<bool>) {
let migration = super::backward_compatible_typ(&old, &new);
let actual = migration.as_ref().map(|x| x.contains_drop());
assert_eq!(actual, expected);
// If it's backward compatible, make sure that the migration
// logic works.
if let Some(migration) = migration {
let (old, new) = (new_empty_array(&old), new_empty_array(&new));
let migrated = migration.migrate(old);
assert_eq!(new.data_type(), migrated.data_type());
}
}
fn struct_(fields: impl IntoIterator<Item = (&'static str, DataType, bool)>) -> DataType {
let fields = fields
.into_iter()
.map(|(name, typ, nullable)| Field::new(name, typ, nullable))
.collect();
DataType::Struct(fields)
}
// NB: We also have proptest coverage of all this, but it works on
// RelationDesc+SourceData and so lives in src/storage-types.
#[mz_ore::test]
fn backward_compatible() {
use DataType::*;
// Matching primitive types
testcase(Boolean, Boolean, Some(false));
testcase(Utf8, Utf8, Some(false));
// Non-matching primitive types
testcase(Boolean, Utf8, None);
testcase(Utf8, Boolean, None);
// Matching structs.
testcase(
struct_([("a", Boolean, true)]),
struct_([("a", Boolean, true)]),
Some(false),
);
testcase(
struct_([("a", Boolean, false)]),
struct_([("a", Boolean, false)]),
Some(false),
);
// Changing nullability in a struct.
testcase(
struct_([("a", Boolean, true)]),
struct_([("a", Boolean, false)]),
None,
);
testcase(
struct_([("a", Boolean, false)]),
struct_([("a", Boolean, true)]),
Some(false),
);
// Add/remove field in a struct.
testcase(struct_([]), struct_([("a", Boolean, true)]), Some(false));
testcase(struct_([]), struct_([("a", Boolean, false)]), None);
testcase(struct_([("a", Boolean, true)]), struct_([]), Some(true));
testcase(struct_([("a", Boolean, false)]), struct_([]), Some(true));
// Add AND remove field in a struct.
testcase(
struct_([("a", Boolean, true)]),
struct_([("b", Boolean, true)]),
Some(true),
);
// Add two fields.
testcase(
struct_([]),
struct_([("a", Boolean, true), ("b", Boolean, true)]),
Some(false),
);
// Nested struct.
testcase(
struct_([("a", struct_([("b", Boolean, false)]), false)]),
struct_([("a", struct_([("b", Boolean, false)]), false)]),
Some(false),
);
testcase(
struct_([("a", struct_([]), false)]),
struct_([("a", struct_([("b", Boolean, true)]), false)]),
Some(false),
);
testcase(
struct_([("a", struct_([]), false)]),
struct_([("a", struct_([("b", Boolean, false)]), false)]),
None,
);
testcase(
struct_([("a", struct_([("b", Boolean, true)]), false)]),
struct_([("a", struct_([]), false)]),
Some(true),
);
testcase(
struct_([("a", struct_([("b", Boolean, false)]), false)]),
struct_([("a", struct_([]), false)]),
Some(true),
);
// For now, don't support both making a field nullable and also
// modifying it in some other way. It doesn't seem that we need this for
// mz usage.
testcase(
struct_([("a", struct_([]), false)]),
struct_([("a", struct_([("b", Boolean, false)]), true)]),
None,
);
// Similarly, don't support reordering fields. This matters to persist
// because it affects sortedness, which is used in the consolidating
// iter.
testcase(
struct_([("a", Boolean, false), ("b", Utf8, false)]),
struct_([("b", Utf8, false), ("a", Boolean, false)]),
None,
);
// Regression test for a bug in the (fundamentally flawed) original
// impl.
testcase(
struct_([("2", Boolean, false), ("10", Utf8, false)]),
struct_([("10", Utf8, false)]),
Some(true),
);
// Regression test for another bug caught during code review where a
// field was added not at the end.
testcase(
struct_([("a", Boolean, true), ("c", Boolean, true)]),
struct_([
("a", Boolean, true),
("b", Boolean, true),
("c", Boolean, true),
]),
None,
);
// Regression test for migrating a RelationDesc with no columns
// (which gets encoded as a NullArray) to a RelationDesc with one
// nullable column.
testcase(Null, struct_([("a", Boolean, true)]), Some(false));
// Test that we can migrate the old maparray columns to listarrays if the contents match.
testcase(
Map(
Field::new_struct(
"map_entries",
vec![
Field::new("keys", Utf8, false),
Field::new("values", Boolean, true),
],
false,
)
.into(),
true,
),
List(
Field::new_struct(
"map_entries",
vec![
Field::new("keys", Utf8, false),
Field::new("values", Boolean, true),
],
false,
)
.into(),
),
Some(false),
);
// Recursively migrate list contents
testcase(
List(Field::new_struct("entries", vec![Field::new("keys", Utf8, false)], true).into()),
List(
Field::new_struct(
"entries",
vec![
Field::new("keys", Utf8, false),
Field::new("values", Boolean, true),
],
true,
)
.into(),
),
Some(false),
);
// Nested nullability changes
testcase(
struct_([("0", struct_([("foo", Utf8, false)]), false)]),
struct_([("0", struct_([("foo", Utf8, true)]), true)]),
Some(false),
)
}
/// This is a regression test for a case we found when trying to merge [#30205]
///
/// [#30205]: https://github.com/MaterializeInc/materialize/pull/30205
#[mz_ore::test]
fn backwards_compatible_nested_types() {
use DataType::*;
testcase(
struct_([
(
"ok",
struct_([
(
"0",
List(
Field::new_struct(
"map_entries",
vec![
Field::new("key", Utf8, false),
Field::new("val", Int32, true),
],
false,
)
.into(),
),
true,
),
(
"1",
List(
Field::new_struct(
"map_entries",
vec![
Field::new("key", Utf8, false),
Field::new("val", Int32, true),
],
false,
)
.into(),
),
false,
),
(
"2",
List(
Field::new_list("item", Field::new_list_field(Int32, true), true)
.into(),
),
true,
),
(
"3",
List(
Field::new_list("item", Field::new_list_field(Int32, true), true)
.into(),
),
false,
),
("4", struct_([("0", Int32, true), ("1", Utf8, true)]), true),
(
"5",
struct_([("0", Int32, false), ("1", Utf8, false)]),
false,
),
("6", Utf8, true),
(
"7",
struct_([
(
"dims",
List(Field::new_list_field(FixedSizeBinary(16), true).into()),
true,
),
("vals", List(Field::new_list_field(Utf8, true).into()), true),
]),
false,
),
]),
true,
),
("err", Binary, true),
]),
struct_([
(
"ok",
struct_([
(
"0",
List(
Field::new_struct(
"map_entries",
vec![
Field::new("key", Utf8, false),
Field::new("val", Int32, true),
],
false,
)
.into(),
),
true,
),
(
"1",
List(
Field::new_struct(
"map_entries",
vec![
Field::new("key", Utf8, false),
Field::new("val", Int32, true),
],
false,
)
.into(),
),
true,
),
(
"2",
List(
Field::new_list("item", Field::new_list_field(Int32, true), true)
.into(),
),
true,
),
(
"3",
List(
Field::new_list("item", Field::new_list_field(Int32, true), true)
.into(),
),
true,
),
("4", struct_([("0", Int32, true), ("1", Utf8, true)]), true),
("5", struct_([("0", Int32, true), ("1", Utf8, true)]), true),
("6", Utf8, true),
(
"7",
struct_([
(
"dims",
List(Field::new_list_field(FixedSizeBinary(16), true).into()),
true,
),
("vals", List(Field::new_list_field(Utf8, true).into()), true),
]),
true,
),
]),
true,
),
("err", Binary, true),
]),
// Should be able to migrate, should not contain any drops.
Some(false),
)
}
}