Refactor for shapes with ids

Author: jpschorr

.gitconfig

@@ -0,0 +1,2 @@
+[url "https://github.com/"]
+    insteadOf = git@github.com:

Cargo.toml

@@ -8,15 +8,14 @@ readme = "../README.md"
 #keywords = TODO
 #categories = TODO
 exclude = [
-  "**/.git/**",
-  "**/.github/**",
-  "**/.travis.yml",
-  "**/.appveyor.yml",
+    "**/.git/**",
+    "**/.github/**",
+    "**/.travis.yml",
+    "**/.appveyor.yml",
 ]
 edition = "2021"
 version = "0.1.0"
 
-[patch.crates-io]
 [workspace]
 members = [
     "partiql-beamline-cli",
@@ -36,3 +35,14 @@ opt-level = 3
 [profile.bench]
 debug = true
 lto = true
+
+[patch.crates-io]
+partiql-parser = { git = "https://github.com/partiql/partiql-lang-rust", branch = "feat-type-nodeid" }
+partiql-ast = { git = "https://github.com/partiql/partiql-lang-rust", branch = "feat-type-nodeid" }
+partiql-types = { git = "https://github.com/partiql/partiql-lang-rust", branch = "feat-type-nodeid" }
+partiql-value = { git = "https://github.com/partiql/partiql-lang-rust", branch = "feat-type-nodeid" }
+partiql-extension-ddl = { git = "https://github.com/partiql/partiql-lang-rust", branch = "feat-type-nodeid" }
+partiql-extension-ion = { git = "https://github.com/partiql/partiql-lang-rust", branch = "feat-type-nodeid" }
+
+[net]
+git-fetch-with-cli = true

config.toml

@@ -0,0 +1,2 @@
+[net]
+git-fetch-with-cli = true

partiql-beamline-query/Cargo.toml

@@ -16,7 +16,7 @@ version.workspace = true
 partiql-beamline = { path = "../partiql-beamline-sim", version = "0.1" }
 
 partiql-parser = "0.10"
-partiql-ast = "0.10.1"
+partiql-ast = "^0.10.1"
 partiql-extension-ion = "0.10"
 partiql-value = "0.10"
 partiql-types = "0.10"

partiql-beamline-query/tests/simple.rs

@@ -16,7 +16,7 @@ use partiql_beamline_query::strategy::query::SelectFromWhereBuilder;
 use partiql_beamline_query::strategy::where_clause::{RandomRowFilter, RandomRowPredicateBuilder};
 use partiql_beamline_query::strategy::{QueryStrategy, StrategyBoxed};
 use partiql_beamline_query::{QueryTextGenerator, QueryTextGeneratorConfigBuilder};
-use partiql_types::{BagType, PartiqlShape, StaticType};
+use partiql_types::{BagType, PartiqlShape, PartiqlShapeBuilder, StaticType};
 use rand::SeedableRng;
 use rand_pcg::Pcg64Mcg;
 use std::collections::Bound;
@@ -108,27 +108,27 @@ fn simple_ast_gen() -> miette::Result<()> {
     let from = FromTable {
         name: "Foo".to_string(),
     }
-    .agboxed();
+        .agboxed();
     let five = ConstantLiteral::Int8Lit(5).agboxed();
     let eight = ConstantLiteral::Int8Lit(8).agboxed();
     let sum = BinOp {
         kind: ast::BinOpKind::Add,
         lhs: five,
         rhs: eight,
     }
-    .agboxed();
+        .agboxed();
     let gt = BinOp {
         kind: ast::BinOpKind::Gt,
         lhs: sum,
         rhs: ConstantLiteral::Int8Lit(7).agboxed(),
     }
-    .agboxed();
+        .agboxed();
     let and = BinOp {
         kind: ast::BinOpKind::And,
         lhs: gt.clone(),
         rhs: gt,
     }
-    .agboxed();
+        .agboxed();
     let where_clause = Some(RowFilter { expr: and }.agboxed());
     let sfw = BasicSFW {
         project,
@@ -149,9 +149,9 @@ fn simple_strategy() -> miette::Result<()> {
         .into_diagnostic()?
         .sboxed();
 
-    let shape = PartiqlShape::new_bag(BagType::new(Box::new(PartiqlShape::Static(
-        StaticType::new(partiql_types::Static::Int),
-    ))));
+    let shape = PartiqlShapeBuilder::init_or_get().new_bag(BagType::new(Box::new(
+        PartiqlShapeBuilder::init_or_get().new_static(partiql_types::Static::Int),
+    )));
     let dataset = DatasetTypeMapping::from([("Table".to_string(), shape)]);
     let gen = strat.build(&dataset, rng).into_diagnostic()?;
 

partiql-beamline-sim/src/gen/data.rs

@@ -3,7 +3,7 @@ use crate::gen::{DataGenerationResult, ValueGenerator};
 
 use crate::sim::SimContext;
 use indexmap::IndexMap;
-use partiql_types::{PartiqlShape, StructConstraint, StructField, StructType};
+use partiql_types::{PartiqlShape, PartiqlShapeBuilder, StructConstraint, StructField, StructType};
 use partiql_value::{Tuple, Value};
 use rand::Rng;
 use std::fmt::{Debug, Formatter};
@@ -109,7 +109,8 @@ where
                         }
                     })
                     .collect();
-                PartiqlShape::new_struct(StructType::new([StructConstraint::Fields(fields)].into()))
+                PartiqlShapeBuilder::init_or_get()
+                    .new_struct(StructType::new([StructConstraint::Fields(fields)].into()))
             }
         }
     }

partiql-beamline-sim/src/gen/distributions.rs

@@ -1,6 +1,6 @@
 use crate::gen::{DataGenerationResult, ValueGenerator};
 use crate::sim::SimContext;
-use partiql_types::PartiqlShape;
+use partiql_types::{PartiqlShape, PartiqlShapeBuilder};
 use partiql_value::Value;
 use rand::Rng;
 use rand_distr::Distribution;
@@ -197,7 +197,9 @@ where
         if self.density().null.is_some() {
             inner_type
         } else {
-            inner_type.as_non_nullable().unwrap_or(inner_type)
+            PartiqlShapeBuilder::init_or_get()
+                .as_non_nullable(&inner_type)
+                .expect("non-nullable")
         }
     }
 

partiql-beamline-sim/src/gen/process.rs

@@ -3,7 +3,7 @@ use crate::primitives::{DataSetId, DataSetName, ProcessId, Sample, Tick};
 use crate::sim::{ConstantBindingValue, DatasetTypeMapping, SimContext};
 use indexmap::map::Entry;
 use indexmap::IndexMap;
-use partiql_types::{BagType, PartiqlShape};
+use partiql_types::{BagType, PartiqlShape, PartiqlShapeBuilder};
 
 #[derive(Debug, Clone)]
 pub struct SimpleProcess {
@@ -99,7 +99,7 @@ impl RandomDataSets {
             .map(|(k, v)| {
                 (
                     k.to_string(),
-                    PartiqlShape::new_bag(BagType::new(Box::new(v))),
+                    PartiqlShapeBuilder::init_or_get().new_bag(BagType::new(Box::new(v))),
                 )
             })
             .collect()

partiql-beamline-sim/src/gen/simple.rs

@@ -1,7 +1,7 @@
 use crate::gen::distributions::{Density, InnerValueGenerator, Meta, RandomVariable};
 use crate::gen::{DataGenerationError, DataGenerationResult, ValueGenerator};
 use crate::sim::SimContext;
-use partiql_types::{ArrayType, PartiqlShape, TYPE_BOOL, TYPE_STRING};
+use partiql_types::{type_bool, type_string, ArrayType, PartiqlShape, PartiqlShapeBuilder};
 
 use partiql_value::{List, Value};
 use rand::distributions::Distribution;
@@ -35,7 +35,7 @@ where
         density: Density,
     ) -> DataGenerationResult<Self> {
         let types: Vec<PartiqlShape> = generators.iter().map(|gen| gen.value_type()).collect();
-        let types = PartiqlShape::any_of(types);
+        let types = PartiqlShapeBuilder::init_or_get().any_of(types);
         let dist =
             statrs::distribution::DiscreteUniform::new(0, (generators.len() - 1) as i64)?.into();
         RandomVariable::create(
@@ -90,7 +90,8 @@ where
                 "Empty choice vector".to_string(),
             ));
         }
-        let types = PartiqlShape::any_of(choices.iter().map(|v| v.infer_shape()));
+        let types =
+            PartiqlShapeBuilder::init_or_get().any_of(choices.iter().map(|v| v.infer_shape()));
         RandomVariable::create(rng, meta, density, SimpleChooseImpl { choices, types })
     }
 }
@@ -137,8 +138,8 @@ where
             Err(DataGenerationError::Bounds(min, max))
         } else {
             let dist = statrs::distribution::DiscreteUniform::new(min, max)?.into();
-            let types =
-                PartiqlShape::new_array(ArrayType::new(Box::new(elem_generator.value_type())));
+            let types = PartiqlShapeBuilder::init_or_get()
+                .new_array(ArrayType::new(Box::new(elem_generator.value_type())));
             RandomVariable::create(
                 rng,
                 meta,
@@ -200,7 +201,7 @@ where
     }
 
     fn value_type(&self) -> PartiqlShape {
-        TYPE_BOOL
+        type_bool!()
     }
 }
 
@@ -219,6 +220,6 @@ where
     }
 
     fn value_type(&self) -> PartiqlShape {
-        TYPE_STRING
+        type_string!()
     }
 }

partiql-beamline-sim/src/gen/simple_numeric.rs

@@ -3,7 +3,8 @@ use crate::gen::{DataGenerationError, DataGenerationResult};
 use crate::sim::SimContext;
 
 use partiql_types::{
-    PartiqlShape, Static, TYPE_DOUBLE, TYPE_INT16, TYPE_INT32, TYPE_INT64, TYPE_INT8,
+    type_float64, type_int16, type_int32, type_int64, type_int8, PartiqlShape, PartiqlShapeBuilder,
+    Static,
 };
 use partiql_value::Value;
 use rand::distributions::Distribution;
@@ -107,36 +108,30 @@ macro_rules! make_rv_ranged_continuous {
     };
 }
 
-// TODO fix in partiql-type
-pub const TYPE_UINT8: PartiqlShape = PartiqlShape::new(Static::Int64);
-pub const TYPE_UINT16: PartiqlShape = PartiqlShape::new(Static::Int64);
-pub const TYPE_UINT32: PartiqlShape = PartiqlShape::new(Static::Int64);
-pub const TYPE_UINT64: PartiqlShape = PartiqlShape::new(Static::Int64);
-
 #[rustfmt::skip::macros(make_rv_ranged_discrete)]
-make_rv_ranged_discrete!(SimpleUInt8, SimpleUInt8Impl,  u8,  TYPE_UINT8,       u8::MIN,  u8::MAX);
+make_rv_ranged_discrete!(SimpleUInt8, SimpleUInt8Impl,  u8,  type_int8!(),       u8::MIN,  u8::MAX);
 #[rustfmt::skip::macros(make_rv_ranged_discrete)]
-make_rv_ranged_discrete!(SimpleUInt16,SimpleUInt16Impl, u16, TYPE_UINT16,      u16::MIN, u16::MAX);
+make_rv_ranged_discrete!(SimpleUInt16,SimpleUInt16Impl, u16, type_int16!(),      u16::MIN, u16::MAX);
 #[rustfmt::skip::macros(make_rv_ranged_discrete)]
-make_rv_ranged_discrete!(SimpleUInt32,SimpleUInt32Impl, u32, TYPE_UINT32,      u32::MIN, u32::MAX);
+make_rv_ranged_discrete!(SimpleUInt32,SimpleUInt32Impl, u32, type_int32!(),      u32::MIN, u32::MAX);
 #[rustfmt::skip::macros(make_rv_ranged_discrete)]
-make_rv_ranged_discrete!(SimpleUInt64,SimpleUInt64Impl, u64, TYPE_UINT64, i64, u64::MIN as i64, i64::MAX);
+make_rv_ranged_discrete!(SimpleUInt64,SimpleUInt64Impl, u64, type_int64!(), i64, u64::MIN as i64, i64::MAX);
 #[rustfmt::skip::macros(make_rv_ranged_discrete)]
-make_rv_ranged_discrete!(SimpleInt8,  SimpleInt8Impl,   i8,  TYPE_INT8,        i8::MIN,  i8::MAX);
+make_rv_ranged_discrete!(SimpleInt8,  SimpleInt8Impl,   i8,  type_int8!(),        i8::MIN,  i8::MAX);
 #[rustfmt::skip::macros(make_rv_ranged_discrete)]
-make_rv_ranged_discrete!(SimpleInt16, SimpleInt16Impl,  i16, TYPE_INT16,       i16::MIN, i16::MAX);
+make_rv_ranged_discrete!(SimpleInt16, SimpleInt16Impl,  i16, type_int16!(),       i16::MIN, i16::MAX);
 #[rustfmt::skip::macros(make_rv_ranged_discrete)]
-make_rv_ranged_discrete!(SimpleInt32, SimpleInt32Impl,  i32, TYPE_INT32,       i32::MIN, i32::MAX);
+make_rv_ranged_discrete!(SimpleInt32, SimpleInt32Impl,  i32, type_int32!(),       i32::MIN, i32::MAX);
 #[rustfmt::skip::macros(make_rv_ranged_discrete)]
-make_rv_ranged_discrete!(SimpleInt64, SimpleInt64Impl,  i64, TYPE_INT64,       i64::MIN, i64::MAX);
+make_rv_ranged_discrete!(SimpleInt64, SimpleInt64Impl,  i64, type_int64!(),       i64::MIN, i64::MAX);
 
 rv_ranged!(SimpleF64Impl, f64, statrs::distribution::Uniform);
 rv_typedef!(
     #[doc = "Yields values of type f64"]
     SimpleF64,
     SimpleF64Impl
 );
-rv_ranged_ivg!(SimpleF64Impl, f64, TYPE_DOUBLE);
+rv_ranged_ivg!(SimpleF64Impl, f64, type_float64!());
 
 impl<R> SimpleF64<R>
 where
@@ -236,7 +231,7 @@ where
     }
 
     fn value_type(&self) -> PartiqlShape {
-        PartiqlShape::new(Static::DecimalP(
+        PartiqlShapeBuilder::init_or_get().new_static(Static::DecimalP(
             self.precision as usize,
             self.scale as usize,
         ))