Performance improvements (#1011)

* Improve performance. * Minor formatting. * Mini improvements. * Fix hasher.
Squidex · Jul 29, 2023 · 10544d2 · 10544d2
1 parent 7ade8a3
commit 10544d2
Show file tree

Hide file tree

Showing 27 changed files with 943 additions and 397 deletions.
diff --git a/backend/src/Squidex.Domain.Apps.Core.Model/Contents/TranslationStatus.cs b/backend/src/Squidex.Domain.Apps.Core.Model/Contents/TranslationStatus.cs
@@ -62,6 +62,6 @@ public static TranslationStatus Create(ContentData data, Schema schema, Language
 
     private static bool IsValidValue(JsonValue? value)
     {
-        return value != null && value.Value.Type != JsonValueType.Null;
+        return value != null && value.Value.Value != null;
     }
 }
diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/DefaultValueFactory.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/DefaultValueFactory.cs
@@ -27,10 +27,9 @@ private DefaultValueFactory()
 
     public static JsonValue CreateDefaultValue(IField field, Instant now, string partition)
     {
-        Guard.NotNull(field);
-        Guard.NotNull(partition);
+        var args = new Args(now, partition);
 
-        return field.RawProperties.Accept(Instance, new Args(now, partition));
+        return field.RawProperties.Accept(Instance, args);
     }
 
     public JsonValue Visit(ArrayFieldProperties properties, Args args)

diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/ExcludeChangedTypes.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/ExcludeChangedTypes.cs
@@ -52,13 +52,6 @@ public ExcludeChangedTypes(IJsonSerializer serializer)
 
     private bool IsChangedType(IField field, JsonValue source)
     {
-        try
-        {
-            return !JsonValueValidator.IsValid(field, source, serializer);
-        }
-        catch
-        {
-            return true;
-        }
+        return !JsonValueValidator.IsValid(field, source, serializer);
     }
 }
diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/ResolveLanguages.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/ResolveLanguages.cs
@@ -14,14 +14,13 @@ namespace Squidex.Domain.Apps.Core.ConvertContent;
 
 public sealed class ResolveLanguages : IContentFieldConverter
 {
-    private readonly LanguagesConfig languages;
-    private readonly HashSet<string> languageCodes;
+    private readonly Dictionary<string, string[]> languagesWithFallbacks;
 
     public bool ResolveFallback { get; init; }
 
     public ResolveLanguages(LanguagesConfig languages, params Language[] filteredLanguages)
     {
-        this.languages = languages;
+        HashSet<string> languageCodes;
 
         if (filteredLanguages?.Length > 0)
         {
@@ -36,6 +35,11 @@ public ResolveLanguages(LanguagesConfig languages, params Language[] filteredLan
         {
             languageCodes.Add(languages.Master);
         }
+
+        languagesWithFallbacks =
+            languageCodes.ToDictionary(
+                language => language,
+                language => languages.GetPriorities(language).Where(l => l != language).ToArray());
     }
 
     public ContentFieldData? ConvertFieldAfter(IRootField field, ContentFieldData source)
@@ -47,20 +51,15 @@ public ResolveLanguages(LanguagesConfig languages, params Language[] filteredLan
 
         if (ResolveFallback)
         {
-            foreach (var languageCode in languageCodes)
+            foreach (var (languageCode, fallbacks) in languagesWithFallbacks)
             {
                 if (source.TryGetNonNull(languageCode, out _))
                 {
                     continue;
                 }
 
-                foreach (var fallback in languages.GetPriorities(languageCode))
+                foreach (var fallback in fallbacks)
                 {
-                    if (fallback == languageCode)
-                    {
-                        continue;
-                    }
-
                     if (source.TryGetNonNull(fallback, out var fallbackValue))
                     {
                         source[languageCode] = fallbackValue;
@@ -76,7 +75,7 @@ public ResolveLanguages(LanguagesConfig languages, params Language[] filteredLan
 
             foreach (var (key, _) in source)
             {
-                if (!languageCodes.Contains(key))
+                if (!languagesWithFallbacks.ContainsKey(key))
                 {
                     source.Remove(key);
                     isRemoved = true;

diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/JsonValueConverter.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/JsonValueConverter.cs
@@ -31,9 +31,6 @@ private JsonValueConverter()
     public static (object? Result, JsonError? Error) ConvertValue(IField field, JsonValue value, IJsonSerializer serializer,
         ResolvedComponents components)
     {
-        Guard.NotNull(field);
-        Guard.NotNull(value);
-
         var args = new Args(value, serializer, components);
 
         return field.RawProperties.Accept(Instance, args);

diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/JsonValueValidator.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/JsonValueValidator.cs
@@ -117,6 +117,11 @@ private static bool IsValidStringList(JsonValue value)
             return false;
         }
 
+        if (a.Count == 0)
+        {
+            return true;
+        }
+
         foreach (var item in a)
         {
             if (item.Value is not string)
@@ -135,6 +140,11 @@ private static bool IsValidObjectList(JsonValue value)
             return false;
         }
 
+        if (a.Count == 0)
+        {
+            return true;
+        }
+
         foreach (var item in a)
         {
             if (item.Value is not JsonObject)

diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetEnricher.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetEnricher.cs
@@ -7,6 +7,7 @@
 
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.Reflection;
+using System.Diagnostics;
 
 namespace Squidex.Domain.Apps.Entities.Assets.Queries;
 
@@ -36,7 +37,7 @@ public AssetEnricher(IEnumerable<IAssetEnricherStep> steps)
         Guard.NotNull(assets);
         Guard.NotNull(context);
 
-        using (Telemetry.Activities.StartActivity("AssetEnricher/EnrichAsync"))
+        using (var activity = Telemetry.Activities.StartActivity("AssetEnricher/EnrichAsync"))
         {
             var results = new List<AssetEntity>();
 
@@ -73,6 +74,8 @@ public AssetEnricher(IEnumerable<IAssetEnricherStep> steps)
                 }
             }
 
+            activity?.SetTag("numItems", results.Count);
+
             return results;
         }
     }

diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/Steps/CalculateTokens.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/Steps/CalculateTokens.cs
@@ -42,9 +42,9 @@ public CalculateTokens(IUrlGenerator urlGenerator, IJsonSerializer serializer)
                 u = url
             };
 
-            var json = serializer.Serialize(token);
+            var json = serializer.SerializeToBytes(token);
 
-            asset.EditToken = Convert.ToBase64String(Encoding.UTF8.GetBytes(json));
+            asset.EditToken = Convert.ToBase64String(json);
         }
 
         return Task.CompletedTask;

diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Contents/ContentFields.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Contents/ContentFields.cs
@@ -232,9 +232,9 @@ private static IFieldResolver Resolve<T>(Func<IEnrichedContentEntity, T> resolve
 
     private static string? GetSchemaName(JsonObject component)
     {
-        if (component.TryGetValue("schemaName", out var name) && name.Type == JsonValueType.String)
+        if (component.TryGetValue("schemaName", out var value) && value.Value is string name)
         {
-            return name.ToString();
+            return name;
         }
 
         return null;

diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentEnricher.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentEnricher.cs
@@ -46,7 +46,7 @@ public ContentEnricher(IEnumerable<IContentEnricherStep> steps, IAppProvider app
     private async Task<IReadOnlyList<IEnrichedContentEntity>> EnrichInternalAsync(IEnumerable<IContentEntity> contents, bool cloneData, Context context,
         CancellationToken ct)
     {
-        using (Telemetry.Activities.StartActivity("ContentEnricher/EnrichInternalAsync"))
+        using (var activity = Telemetry.Activities.StartActivity("ContentEnricher/EnrichInternalAsync"))
         {
             var results = new List<ContentEntity>();
 
@@ -110,6 +110,8 @@ public ContentEnricher(IEnumerable<IContentEnricherStep> steps, IAppProvider app
                 }
             }
 
+            activity?.SetTag("numItems", results.Count);
+
             return results;
         }
     }

diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/CalculateTokens.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/CalculateTokens.cs
@@ -38,9 +38,9 @@ public CalculateTokens(IUrlGenerator urlGenerator, IJsonSerializer serializer)
                 u = url
             };
 
-            var json = serializer.Serialize(token);
+            var json = serializer.SerializeToBytes(token);
 
-            content.EditToken = Convert.ToBase64String(Encoding.UTF8.GetBytes(json));
+            content.EditToken = Convert.ToBase64String(json);
         }
 
         return Task.CompletedTask;

diff --git a/backend/src/Squidex.Infrastructure.GetEventStore/EventSourcing/Formatter.cs b/backend/src/Squidex.Infrastructure.GetEventStore/EventSourcing/Formatter.cs
@@ -73,8 +73,8 @@ public static EventStoreData Write(EventData eventData, IJsonSerializer serializ
     {
         var payload = Encoding.UTF8.GetBytes(eventData.Payload);
 
-        var headersJson = serializer.Serialize(eventData.Headers);
-        var headersBytes = Encoding.UTF8.GetBytes(headersJson);
+        var headersJson = serializer.SerializeToBytes(eventData.Headers);
+        var headersBytes = headersJson;
 
         return new EventStoreData(Uuid.FromGuid(Guid.NewGuid()), eventData.Type, payload, headersBytes);
     }