Cosmos: Modernize materializer & subdocument projectionbinding

src/EFCore.Cosmos/Extensions/Internal/CosmosPropertyExtensions.cs

@@ -0,0 +1,23 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.EntityFrameworkCore.Cosmos.Extensions.Internal;
+
+/// <summary>
+///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+///     any release. You should only use it directly in your code with extreme caution and knowing that
+///     doing so can result in application failures when updating to a new Entity Framework Core release.
+/// </summary>
+public static class CosmosPropertyExtensions
+{
+    /// <summary>
+    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+    ///     any release. You should only use it directly in your code with extreme caution and knowing that
+    ///     doing so can result in application failures when updating to a new Entity Framework Core release.
+    /// </summary>
+    public static bool IsPersisted(this IReadOnlyProperty property)
+        => property.GetJsonPropertyName() != string.Empty;
+
+}

src/EFCore.Cosmos/Extensions/Internal/CosmosResponseStreamHelper.cs

@@ -0,0 +1,43 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.EntityFrameworkCore.Cosmos.Extensions.Internal;
+
+/// <summary>
+///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+///     any release. You should only use it directly in your code with extreme caution and knowing that
+///     doing so can result in application failures when updating to a new Entity Framework Core release.
+/// </summary>
+public static class CosmosResponseStreamHelper
+{
+    /// <summary>
+    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+    ///     any release. You should only use it directly in your code with extreme caution and knowing that
+    ///     doing so can result in application failures when updating to a new Entity Framework Core release.
+    /// </summary>
+    public static ReadOnlyMemory<byte> ExtractContentAsMemory(Stream content)
+    {
+        if (content is MemoryStream memoryStream
+            && memoryStream.TryGetBuffer(out var segment))
+        {
+            return segment.AsMemory(
+                checked((int)memoryStream.Position),
+                checked((int)(memoryStream.Length - memoryStream.Position)));
+        }
+
+        // SDK returns a memory stream in most cases, but sometimes it returns its own internal wrapper of a MemoryStream.
+        // In that case, copy to a single, exactly-sized buffer.
+        var length = checked((int)(content.Length - content.Position));
+        if (length == 0)
+        {
+            return ReadOnlyMemory<byte>.Empty;
+        }
+
+        var buffer = GC.AllocateUninitializedArray<byte>(length);
+        content.ReadExactly(buffer);
+
+        return buffer;
+    }
+}

src/EFCore.Cosmos/Infrastructure/Internal/CosmosModelValidator.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.EntityFrameworkCore.Cosmos.Diagnostics.Internal;
+using Microsoft.EntityFrameworkCore.Cosmos.Extensions.Internal;
 using Microsoft.EntityFrameworkCore.Cosmos.Internal;
 using Microsoft.EntityFrameworkCore.Cosmos.Metadata.Internal;
 
@@ -510,13 +511,9 @@ protected virtual void ValidateDatabaseProperties(
         IDiagnosticsLogger<DbLoggerCategory.Model.Validation> logger)
     {
         var properties = new Dictionary<string, IPropertyBase>();
-        foreach (var property in entityType.GetProperties())
+        foreach (var property in entityType.GetProperties().Where(x => x.IsPersisted()))
         {
             var jsonName = property.GetJsonPropertyName();
-            if (string.IsNullOrWhiteSpace(jsonName))
-            {
-                continue;
-            }
 
             if (properties.TryGetValue(jsonName, out var otherProperty))
             {

src/EFCore.Cosmos/Metadata/Conventions/CosmosPartitionKeyInPrimaryKeyConvention.cs

@@ -8,8 +8,7 @@
 namespace Microsoft.EntityFrameworkCore.Metadata.Conventions;
 
 /// <summary>
-///     A convention that adds partition key properties to the EF primary key and adds the '__jObject' containing the JSON
-///     object returned by the store.
+///     A convention that adds partition key properties to the EF primary key.
 /// </summary>
 /// <remarks>
 ///     See <see href="https://aka.ms/efcore-docs-conventions">Model building conventions</see>, and
@@ -26,15 +25,6 @@ public class CosmosPartitionKeyInPrimaryKeyConvention :
     IEntityTypeAnnotationChangedConvention,
     IEntityTypeBaseTypeChangedConvention
 {
-    /// <summary>
-    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-    ///     any release. You should only use it directly in your code with extreme caution and knowing that
-    ///     doing so can result in application failures when updating to a new Entity Framework Core release.
-    /// </summary>
-    [EntityFrameworkInternal]
-    public static readonly string JObjectPropertyName = "__jObject";
-
     /// <summary>
     ///     Creates a new instance of <see cref="CosmosPartitionKeyInPrimaryKeyConvention" />.
     /// </summary>
@@ -82,33 +72,12 @@ private static void ProcessIdProperty(IConventionEntityTypeBuilder entityTypeBui
         }
     }
 
-    private static void ProcessJObjectProperty(IConventionEntityTypeBuilder entityTypeBuilder)
-    {
-        var entityType = entityTypeBuilder.Metadata;
-        if (entityType.BaseType == null
-            && !entityType.IsKeyless)
-        {
-            var jObjectProperty = entityTypeBuilder.Property(typeof(JObject), JObjectPropertyName);
-            jObjectProperty?.ToJsonProperty("");
-            jObjectProperty?.ValueGenerated(ValueGenerated.OnAddOrUpdate);
-        }
-        else
-        {
-            var jObjectProperty = entityType.FindDeclaredProperty(JObjectPropertyName);
-            if (jObjectProperty != null)
-            {
-                entityType.Builder.RemoveUnusedImplicitProperties([jObjectProperty]);
-            }
-        }
-    }
-
     /// <inheritdoc />
     public virtual void ProcessEntityTypeAdded(
         IConventionEntityTypeBuilder entityTypeBuilder,
         IConventionContext<IConventionEntityTypeBuilder> context)
     {
         ProcessIdProperty(entityTypeBuilder);
-        ProcessJObjectProperty(entityTypeBuilder);
     }
 
     /// <inheritdoc />
@@ -139,7 +108,6 @@ public virtual void ProcessKeyAdded(
         if (entityTypeBuilder.Metadata.GetKeys().Count() == 1)
         {
             ProcessIdProperty(entityTypeBuilder);
-            ProcessJObjectProperty(entityTypeBuilder);
         }
     }
 
@@ -157,7 +125,6 @@ public virtual void ProcessKeyRemoved(
         if (entityTypeBuilder.Metadata.IsKeyless)
         {
             ProcessIdProperty(entityTypeBuilder);
-            ProcessJObjectProperty(entityTypeBuilder);
         }
     }
 
@@ -189,7 +156,6 @@ public virtual void ProcessEntityTypeBaseTypeChanged(
         if (entityTypeBuilder.Metadata.BaseType == newBaseType)
         {
             ProcessIdProperty(entityTypeBuilder);
-            ProcessJObjectProperty(entityTypeBuilder);
         }
     }
 

src/EFCore.Cosmos/Metadata/Internal/CosmosPropertyExtensions.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.EntityFrameworkCore.Cosmos.Extensions.Internal;
+
 namespace Microsoft.EntityFrameworkCore.Cosmos.Metadata.Internal;
 
 /// <summary>
@@ -18,14 +20,9 @@ public static class CosmosPropertyExtensions
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public static bool IsOrdinalKeyProperty(this IReadOnlyProperty property)
-    {
-        Check.DebugAssert(
-            (property.DeclaringType as IEntityType)?.IsOwned() == true, $"Expected {property.DeclaringType.DisplayName()} to be owned.");
-
-        return property.ClrType == typeof(int)
-            && !property.IsForeignKey()
-            && (property.ValueGenerated & ValueGenerated.OnAdd) != 0
-            && property.FindContainingPrimaryKey() is { Properties.Count: > 1 }
-            && property.GetJsonPropertyName().Length == 0;
-    }
+        => property.ClrType == typeof(int)
+        && !property.IsForeignKey()
+        && (property.ValueGenerated & ValueGenerated.OnAdd) != 0
+        && property.FindContainingPrimaryKey() is { Properties.Count: > 1 }
+        && !property.IsPersisted();
 }

src/EFCore.Cosmos/Metadata/Internal/TypeBaseExtensions.cs

@@ -0,0 +1,33 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace Microsoft.EntityFrameworkCore.Cosmos.Metadata.Internal;
+
+/// <summary>
+///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+///     any release. You should only use it directly in your code with extreme caution and knowing that
+///     doing so can result in application failures when updating to a new Entity Framework Core release.
+/// </summary>
+public static class TypeBaseExtensions
+{
+    /// <summary>
+    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+    ///     any release. You should only use it directly in your code with extreme caution and knowing that
+    ///     doing so can result in application failures when updating to a new Entity Framework Core release.
+    /// </summary>
+    public static bool TryGetOrdinalKey(this ITypeBase structuralType, [NotNullWhen(true)] out IProperty? ordinalKeyProperty)
+    {
+        if (structuralType is IEntityType entityType && entityType.IsOwned())
+        {
+            ordinalKeyProperty = entityType.GetProperties().SingleOrDefault(x => x.IsOrdinalKeyProperty());
+            return ordinalKeyProperty != null;
+        }
+
+        ordinalKeyProperty = null;
+        return false;
+    }
+}

src/EFCore.Cosmos/Properties/CosmosStrings.resx

@@ -316,6 +316,9 @@
   <data name="NoSubqueryPushdown" xml:space="preserve">
     <value>Azure Cosmos DB does not have an appropriate subquery for this translation.</value>
   </data>
+  <data name="NoTrackingIdentityResolutionOwnedEntityProjectionMissingOwnerKey" xml:space="preserve">
+    <value>The query uses 'NoTrackingWithIdentityResolution' and projects owned entities, but the projection does not include the primary key properties '{properties}' of the root document entity type '{entityType}'. Include all primary key properties of the root document entity in the projection.</value>
+  </data>
   <data name="NullTypeMappingInSqlTree" xml:space="preserve">
     <value>The expression '{sqlExpression}' in the SQL tree does not have a type mapping assigned.</value>
   </data>
@@ -364,6 +367,9 @@
   <data name="PartitionKeyStoreNameMismatch" xml:space="preserve">
     <value>The partition key property '{property1}' on '{entityType1}' is mapped as '{storeName1}', but the partition key property '{property2}' on '{entityType2}' is mapped as '{storeName2}'. All partition key properties need to be mapped to the same store property for entity types mapped to the same container.</value>
   </data>
+  <data name="ProjectionUndefined" xml:space="preserve">
+    <value>A part of the projection was undefined, use the coalesce operator to handle possible undefined values.</value>
+  </data>
   <data name="ResourceIdMissing" xml:space="preserve">
     <value>Unable to execute a 'ReadItem' query since the 'id' value is missing and cannot be generated.</value>
   </data>