Reorder aspect unions

metadata-ingestion/src/datahub/ingestion/source/feast.py

@@ -242,6 +242,7 @@ def get_workunits(self) -> Iterable[MetadataWorkUnit]:
                             )
                             for feature in table["features"]
                         ],
+                        # a feature table can have multiple primary keys, which then act as a composite key
                         mlPrimaryKeys=[
                             builder.make_ml_primary_key_urn(
                                 table["name"], entity["name"]

metadata-ingestion/src/datahub/metadata/schema.avsc

@@ -3623,7 +3623,6 @@
                       "name": "mlPrimaryKeyKey"
                     }
                   },
-                  "com.linkedin.pegasus2avro.common.Ownership",
                   {
                     "type": "record",
                     "name": "MLPrimaryKeyProperties",
@@ -3721,6 +3720,7 @@
                       "name": "mlPrimaryKeyProperties"
                     }
                   },
+                  "com.linkedin.pegasus2avro.common.Ownership",
                   "com.linkedin.pegasus2avro.common.InstitutionalMemory",
                   "com.linkedin.pegasus2avro.common.Status",
                   "com.linkedin.pegasus2avro.common.Deprecation"
@@ -3905,7 +3905,6 @@
                       "name": "mlFeatureTableKey"
                     }
                   },
-                  "com.linkedin.pegasus2avro.common.Ownership",
                   {
                     "type": "record",
                     "name": "MLFeatureTableProperties",
@@ -3966,6 +3965,7 @@
                       "name": "mlFeatureTableProperties"
                     }
                   },
+                  "com.linkedin.pegasus2avro.common.Ownership",
                   "com.linkedin.pegasus2avro.common.InstitutionalMemory",
                   "com.linkedin.pegasus2avro.common.Status",
                   "com.linkedin.pegasus2avro.common.Deprecation"

metadata-ingestion/src/datahub/metadata/schema_classes.py

@@ -4380,7 +4380,7 @@ class MLFeatureTableSnapshotClass(DictWrapper):
     RECORD_SCHEMA = get_schema_type("com.linkedin.pegasus2avro.metadata.snapshot.MLFeatureTableSnapshot")
     def __init__(self,
         urn: str,
-        aspects: List[Union["MLFeatureTableKeyClass", "OwnershipClass", "MLFeatureTablePropertiesClass", "InstitutionalMemoryClass", "StatusClass", "DeprecationClass"]],
+        aspects: List[Union["MLFeatureTableKeyClass", "MLFeatureTablePropertiesClass", "OwnershipClass", "InstitutionalMemoryClass", "StatusClass", "DeprecationClass"]],
     ):
         super().__init__()
 
@@ -4412,13 +4412,13 @@ def urn(self, value: str) -> None:
 
 
     @property
-    def aspects(self) -> List[Union["MLFeatureTableKeyClass", "OwnershipClass", "MLFeatureTablePropertiesClass", "InstitutionalMemoryClass", "StatusClass", "DeprecationClass"]]:
+    def aspects(self) -> List[Union["MLFeatureTableKeyClass", "MLFeatureTablePropertiesClass", "OwnershipClass", "InstitutionalMemoryClass", "StatusClass", "DeprecationClass"]]:
         """Getter: The list of metadata aspects associated with the MLFeatureTable. Depending on the use case, this can either be all, or a selection, of supported aspects."""
         return self._inner_dict.get('aspects')  # type: ignore
 
 
     @aspects.setter
-    def aspects(self, value: List[Union["MLFeatureTableKeyClass", "OwnershipClass", "MLFeatureTablePropertiesClass", "InstitutionalMemoryClass", "StatusClass", "DeprecationClass"]]) -> None:
+    def aspects(self, value: List[Union["MLFeatureTableKeyClass", "MLFeatureTablePropertiesClass", "OwnershipClass", "InstitutionalMemoryClass", "StatusClass", "DeprecationClass"]]) -> None:
         """Setter: The list of metadata aspects associated with the MLFeatureTable. Depending on the use case, this can either be all, or a selection, of supported aspects."""
         self._inner_dict['aspects'] = value
 
@@ -4478,7 +4478,7 @@ class MLPrimaryKeySnapshotClass(DictWrapper):
     RECORD_SCHEMA = get_schema_type("com.linkedin.pegasus2avro.metadata.snapshot.MLPrimaryKeySnapshot")
     def __init__(self,
         urn: str,
-        aspects: List[Union["MLPrimaryKeyKeyClass", "OwnershipClass", "MLPrimaryKeyPropertiesClass", "InstitutionalMemoryClass", "StatusClass", "DeprecationClass"]],
+        aspects: List[Union["MLPrimaryKeyKeyClass", "MLPrimaryKeyPropertiesClass", "OwnershipClass", "InstitutionalMemoryClass", "StatusClass", "DeprecationClass"]],
     ):
         super().__init__()
 
@@ -4510,13 +4510,13 @@ def urn(self, value: str) -> None:
 
 
     @property
-    def aspects(self) -> List[Union["MLPrimaryKeyKeyClass", "OwnershipClass", "MLPrimaryKeyPropertiesClass", "InstitutionalMemoryClass", "StatusClass", "DeprecationClass"]]:
+    def aspects(self) -> List[Union["MLPrimaryKeyKeyClass", "MLPrimaryKeyPropertiesClass", "OwnershipClass", "InstitutionalMemoryClass", "StatusClass", "DeprecationClass"]]:
         """Getter: The list of metadata aspects associated with the MLPrimaryKey. Depending on the use case, this can either be all, or a selection, of supported aspects."""
         return self._inner_dict.get('aspects')  # type: ignore
 
 
     @aspects.setter
-    def aspects(self, value: List[Union["MLPrimaryKeyKeyClass", "OwnershipClass", "MLPrimaryKeyPropertiesClass", "InstitutionalMemoryClass", "StatusClass", "DeprecationClass"]]) -> None:
+    def aspects(self, value: List[Union["MLPrimaryKeyKeyClass", "MLPrimaryKeyPropertiesClass", "OwnershipClass", "InstitutionalMemoryClass", "StatusClass", "DeprecationClass"]]) -> None:
         """Setter: The list of metadata aspects associated with the MLPrimaryKey. Depending on the use case, this can either be all, or a selection, of supported aspects."""
         self._inner_dict['aspects'] = value
 

metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/MLFeatureTableAspect.pdl

@@ -12,8 +12,8 @@ import com.linkedin.common.Deprecation
  */
 typeref MLFeatureTableAspect = union[
   MLFeatureTableKey,
-  Ownership,
   MLFeatureTableProperties,
+  Ownership,
   InstitutionalMemory,
   Status,
   Deprecation

metadata-models/src/main/pegasus/com/linkedin/metadata/aspect/MLPrimaryKeyAspect.pdl

@@ -12,8 +12,8 @@ import com.linkedin.common.Deprecation
  */
 typeref MLPrimaryKeyAspect = union[
   MLPrimaryKeyKey,
-  Ownership,
   MLPrimaryKeyProperties,
+  Ownership,
   InstitutionalMemory,
   Status,
   Deprecation