fix: keep key types only without field names

Author: georgeh0

src/builder/analyzer.rs

@@ -643,7 +643,7 @@ fn add_collector(
 struct ExportDataFieldsInfo {
     local_collector_ref: AnalyzedLocalCollectorReference,
     primary_key_def: AnalyzedPrimaryKeyDef,
-    primary_key_schema: Arc<[FieldSchema]>,
+    primary_key_schema: Box<[FieldSchema]>,
     value_fields_idx: Vec<u32>,
     value_stable: bool,
 }
@@ -852,7 +852,7 @@ impl AnalyzerContext {
                         let primary_key_schema = pk_fields_idx
                             .iter()
                             .map(|idx| collector_schema.fields[*idx].without_attrs())
-                            .collect::<Arc<[_]>>();
+                            .collect::<Box<[_]>>();
                         let mut value_fields_schema: Vec<FieldSchema> = vec![];
                         let mut value_fields_idx = vec![];
                         for (idx, field) in collector_schema.fields.iter().enumerate() {
@@ -911,7 +911,13 @@ impl AnalyzerContext {
                     setup_key: data_coll_output.setup_key,
                     desired_setup_state: data_coll_output.desired_setup_state,
                     setup_by_user: export_op.spec.setup_by_user,
-                    key_schema: Some(data_fields_info.primary_key_schema.clone()),
+                    key_type: Some(
+                        data_fields_info
+                            .primary_key_schema
+                            .iter()
+                            .map(|field| field.value_type.typ.clone())
+                            .collect::<Box<[_]>>(),
+                    ),
                 };
                 targets_analyzed_ss[*idx] = Some(export_op_ss);
 
@@ -941,7 +947,7 @@ impl AnalyzerContext {
                 setup_key,
                 desired_setup_state,
                 setup_by_user: false,
-                key_schema: None,
+                key_type: None,
             };
             declarations_analyzed_ss.push(decl_ss);
         }

src/builder/exec_ctx.rs

@@ -24,7 +24,7 @@ pub struct AnalyzedTargetSetupState {
     pub desired_setup_state: serde_json::Value,
     pub setup_by_user: bool,
     /// None for declarations.
-    pub key_schema: Option<Arc<[schema::FieldSchema]>>,
+    pub key_type: Option<Box<[schema::ValueType]>>,
 }
 
 pub struct AnalyzedSetupState {
@@ -123,9 +123,9 @@ fn build_target_id(
     let mut compatible_target_ids = HashSet::<Option<i32>>::new();
     let mut reusable_schema_version_ids = HashSet::<Option<i32>>::new();
     for existing_state in existing_target_states.iter().flat_map(|v| v.iter()) {
-        let compatibility = if let Some(key_schema) = &analyzed_target_ss.key_schema
-            && let Some(existing_key_schema) = &existing_state.common.key_schema
-            && key_schema != existing_key_schema
+        let compatibility = if let Some(key_type) = &analyzed_target_ss.key_type
+            && let Some(existing_key_type) = &existing_state.common.key_type
+            && key_type != existing_key_type
         {
             SetupStateCompatibility::NotCompatible
         } else if analyzed_target_ss.setup_by_user != existing_state.common.setup_by_user {
@@ -190,7 +190,7 @@ fn build_target_id(
                     schema_version_id,
                     max_schema_version_id: max_schema_version_id.max(schema_version_id),
                     setup_by_user: analyzed_target_ss.setup_by_user,
-                    key_schema: analyzed_target_ss.key_schema.clone(),
+                    key_type: analyzed_target_ss.key_type.clone(),
                 },
                 state: analyzed_target_ss.desired_setup_state.clone(),
             });

src/builder/plan.rs

@@ -105,7 +105,7 @@ pub struct AnalyzedExportOp {
     pub export_target_factory: Arc<dyn TargetFactory + Send + Sync>,
     pub export_context: Arc<dyn Any + Send + Sync>,
     pub primary_key_def: AnalyzedPrimaryKeyDef,
-    pub primary_key_schema: Arc<[FieldSchema]>,
+    pub primary_key_schema: Box<[FieldSchema]>,
     /// idx for value fields - excluding the primary key field.
     pub value_fields: Vec<u32>,
     /// If true, value is never changed on the same primary key.

src/ops/factory_bases.rs

@@ -363,7 +363,7 @@ pub struct TypedExportDataCollectionBuildOutput<F: TargetFactoryBase + ?Sized> {
 pub struct TypedExportDataCollectionSpec<F: TargetFactoryBase + ?Sized> {
     pub name: String,
     pub spec: F::Spec,
-    pub key_fields_schema: Arc<[FieldSchema]>,
+    pub key_fields_schema: Box<[FieldSchema]>,
     pub value_fields_schema: Vec<FieldSchema>,
     pub index_options: IndexOptions,
 }

src/ops/interface.rs

@@ -258,7 +258,7 @@ pub struct ExportDataCollectionBuildOutput {
 pub struct ExportDataCollectionSpec {
     pub name: String,
     pub spec: serde_json::Value,
-    pub key_fields_schema: Arc<[FieldSchema]>,
+    pub key_fields_schema: Box<[FieldSchema]>,
     pub value_fields_schema: Vec<FieldSchema>,
     pub index_options: IndexOptions,
 }

src/ops/targets/postgres.rs

@@ -132,7 +132,7 @@ fn bind_value_field<'arg>(
 pub struct ExportContext {
     db_ref: Option<spec::AuthEntryReference<DatabaseConnectionSpec>>,
     db_pool: PgPool,
-    key_fields_schema: Vec<FieldSchema>,
+    key_fields_schema: Box<[FieldSchema]>,
     value_fields_schema: Vec<FieldSchema>,
     upsert_sql_prefix: String,
     upsert_sql_suffix: String,
@@ -144,7 +144,7 @@ impl ExportContext {
         db_ref: Option<spec::AuthEntryReference<DatabaseConnectionSpec>>,
         db_pool: PgPool,
         table_name: String,
-        key_fields_schema: Vec<FieldSchema>,
+        key_fields_schema: Box<[FieldSchema]>,
         value_fields_schema: Vec<FieldSchema>,
     ) -> Result<Self> {
         let key_fields = key_fields_schema
@@ -632,7 +632,7 @@ impl TargetFactoryBase for Factory {
                         db_ref,
                         db_pool.clone(),
                         table_name,
-                        d.key_fields_schema.iter().cloned().collect(),
+                        d.key_fields_schema,
                         d.value_fields_schema,
                     )?);
                     Ok(export_context)

src/ops/targets/shared/property_graph.rs

@@ -112,7 +112,7 @@ impl<AuthEntry> std::fmt::Display for GraphElementType<AuthEntry> {
 
 pub struct GraphElementSchema {
     pub elem_type: ElementType,
-    pub key_fields: Arc<[schema::FieldSchema]>,
+    pub key_fields: Box<[schema::FieldSchema]>,
     pub value_fields: Vec<schema::FieldSchema>,
 }
 
@@ -349,7 +349,7 @@ pub struct DataCollectionGraphMappingInput<'a, AuthEntry> {
     pub mapping: &'a GraphElementMapping,
     pub index_options: &'a spec::IndexOptions,
 
-    pub key_fields_schema: Arc<[FieldSchema]>,
+    pub key_fields_schema: Box<[FieldSchema]>,
     pub value_fields_schema: Vec<FieldSchema>,
 }
 
@@ -435,7 +435,6 @@ pub fn analyze_graph_mappings<'a, AuthEntry: 'a>(
                                 .key_fields_schema
                                 .into_iter()
                                 .enumerate()
-                                .map(|(idx, f)| (idx, f.clone()))
                                 .collect(),
                             data_coll_input
                                 .value_fields_schema

src/setup/states.rs

@@ -181,7 +181,7 @@ pub struct TargetSetupStateCommon {
     #[serde(default)]
     pub setup_by_user: bool,
     #[serde(default)]
-    pub key_schema: Option<Arc<[schema::FieldSchema]>>,
+    pub key_type: Option<Box<[schema::ValueType]>>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]