Skip to content
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.

Sign up for GitHub

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

Jump to bottom

sql: refactor type types #10624

Merged
merged 4 commits into from
Feb 15, 2022
Merged

sql: refactor type types #10624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e4b031
repr: remove deref impls on Char and VarChar wrappers
benesch Feb 12, 2022
4ede69f
postgres-util,pgrepr,sql: redistribute responsibilities for postgres …
benesch Feb 12, 2022
7a89637
coord,sql: store types differently in catalog
benesch Feb 13, 2022
6141324
ci-builder: silence warning with shellcheck 0.7.0
benesch Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bin/ci-builder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ case "$cmd" in
fi
if [[ "${CI_BUILDER_SCCACHE:-}" ]]; then
args+=(
--env RUSTC_WRAPPER=sccache
--env "RUSTC_WRAPPER=sccache"
--env SCCACHE_BUCKET
)
fi
Expand Down
115 changes: 19 additions & 96 deletions src/coord/src/catalog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ use mz_sql::ast::display::AstDisplay;
use mz_sql::ast::{Expr, Raw};
use mz_sql::catalog::{
CatalogError as SqlCatalogError, CatalogItem as SqlCatalogItem,
CatalogItemType as SqlCatalogItemType, SessionCatalog,
CatalogItemType as SqlCatalogItemType, CatalogTypeDetails, SessionCatalog,
};
use mz_sql::names::{DatabaseSpecifier, FullName, PartialName, SchemaName};
use mz_sql::plan::{
Expand Down Expand Up @@ -538,37 +538,11 @@ pub struct Index {
#[derive(Debug, Clone, Serialize)]
pub struct Type {
pub create_sql: String,
pub inner: TypeInner,
#[serde(skip)]
pub details: CatalogTypeDetails,
pub depends_on: Vec<GlobalId>,
}

#[derive(Debug, Clone, Serialize)]
pub enum TypeInner {
Array {
element_id: GlobalId,
},
Base,
List {
element_id: GlobalId,
},
Map {
key_id: GlobalId,
value_id: GlobalId,
},
Pseudo,
}

impl From<mz_sql::plan::TypeInner> for TypeInner {
fn from(t: mz_sql::plan::TypeInner) -> TypeInner {
match t {
mz_sql::plan::TypeInner::List { element_id } => TypeInner::List { element_id },
mz_sql::plan::TypeInner::Map { key_id, value_id } => {
TypeInner::Map { key_id, value_id }
}
}
}
}

#[derive(Debug, Clone, Serialize)]
pub struct Func {
#[serde(skip)]
Expand Down Expand Up @@ -1042,25 +1016,15 @@ impl Catalog {
Builtin::Type(typ) => {
catalog.state.insert_item(
typ.id,
typ.oid(),
typ.oid,
FullName {
database: DatabaseSpecifier::Ambient,
schema: PG_CATALOG_SCHEMA.into(),
item: typ.name().to_owned(),
item: typ.name.to_owned(),
},
CatalogItem::Type(Type {
create_sql: format!("CREATE TYPE {}", typ.name()),
inner: match typ.kind() {
postgres_types::Kind::Array(element_type) => {
let element_id = catalog.state.ambient_schemas
[PG_CATALOG_SCHEMA]
.items[element_type.name()];
TypeInner::Array { element_id }
}
postgres_types::Kind::Pseudo => TypeInner::Pseudo,
postgres_types::Kind::Simple => TypeInner::Base,
_ => unreachable!(),
},
create_sql: format!("CREATE TYPE {}", typ.name),
details: typ.details.clone(),
depends_on: vec![],
}),
);
Expand Down Expand Up @@ -1811,16 +1775,6 @@ impl Catalog {
)));
}
};
if let CatalogItem::Type(Type {
inner: TypeInner::Base { .. },
..
}) = item
{
return Err(CoordError::Catalog(Error::new(ErrorKind::ReadOnlyItem(
name.item,
))));
}

let schema_id = tx.load_schema_id(database_id, &name.schema)?;
let serialized_item = self.serialize_item(&item);
tx.insert_item(id, schema_id, &name.item, &serialized_item)?;
Expand Down Expand Up @@ -2277,7 +2231,10 @@ impl Catalog {
}),
Plan::CreateType(CreateTypePlan { typ, .. }) => CatalogItem::Type(Type {
create_sql: typ.create_sql,
inner: typ.inner.into(),
details: CatalogTypeDetails {
array_id: None,
typ: typ.inner,
},
depends_on: typ.depends_on,
}),
_ => bail!("catalog entry generated inappropriate plan"),
Expand Down Expand Up @@ -2760,48 +2717,6 @@ impl SessionCatalog for ConnCatalog<'_> {
self.catalog.try_get(name, self.conn_id).is_some()
}

fn try_get_lossy_scalar_type_by_id(&self, id: &GlobalId) -> Option<ScalarType> {
let entry = self.catalog.get_by_id(id);
let t = match entry.item() {
CatalogItem::Type(t) => t,
_ => return None,
};

Some(match t.inner {
TypeInner::Array { element_id } => {
let element_type = self
.try_get_lossy_scalar_type_by_id(&element_id)
.expect("array's element_id refers to a valid type");
ScalarType::Array(Box::new(element_type))
}
TypeInner::Base => mz_pgrepr::Type::from_oid(entry.oid())?.to_scalar_type_lossy(),
TypeInner::List { element_id } => {
let element_type = self
.try_get_lossy_scalar_type_by_id(&element_id)
.expect("list's element_id refers to a valid type");
ScalarType::List {
element_type: Box::new(element_type),
custom_oid: Some(entry.oid),
}
}
TypeInner::Map { key_id, value_id } => {
let key_type = self
.try_get_lossy_scalar_type_by_id(&key_id)
.expect("map's key_id refers to a valid type");
assert!(matches!(key_type, ScalarType::String));
let value_type = Box::new(
self.try_get_lossy_scalar_type_by_id(&value_id)
.expect("map's value_id refers to a valid type"),
);
ScalarType::Map {
value_type,
custom_oid: Some(entry.oid),
}
}
TypeInner::Pseudo => return None,
})
}

fn config(&self) -> &mz_sql::catalog::CatalogConfig {
&self.catalog.config
}
Expand Down Expand Up @@ -2906,6 +2821,14 @@ impl mz_sql::catalog::CatalogItem for CatalogEntry {
}
}

fn type_details(&self) -> Option<&CatalogTypeDetails> {
if let CatalogItem::Type(Type { details, .. }) = self.item() {
Some(details)
} else {
None
}
}

fn uses(&self) -> &[GlobalId] {
self.uses()
}
Expand Down
Loading