re-add performance optimization (compressed flag replaced with hashing)

marcin-krystianc · marcin-krystianc · commit 48c37d818c06 · 2022-04-01T15:20:29.000+02:00
diff --git a/src/NuGet.Core/NuGet.ProjectModel/DependencyGraphSpec.cs b/src/NuGet.Core/NuGet.ProjectModel/DependencyGraphSpec.cs
@@ -286,7 +286,7 @@ public void Save(string path)
             {
                 jsonWriter.Formatting = Formatting.Indented;
 
-                Write(writer, PackageSpecWriter.Write);
+                Write(writer, hashing: false, PackageSpecWriter.Write);
             }
         }
 
@@ -295,12 +295,12 @@ public string GetHash()
             using (var hashFunc = new Sha512HashFunction())
             using (var writer = new HashObjectWriter(hashFunc))
             {
-                Write(writer, PackageSpecWriter.Write);
+                Write(writer, hashing: true, PackageSpecWriter.Write);
                 return writer.GetHash();
             }
         }
 
-        private void Write(RuntimeModel.IObjectWriter writer, Action<PackageSpec, RuntimeModel.IObjectWriter> writeAction)
+        private void Write(RuntimeModel.IObjectWriter writer, bool hashing, Action<PackageSpec, RuntimeModel.IObjectWriter, bool> writeAction)
         {
             writer.WriteObjectStart();
             writer.WriteNameValue("format", Version);
@@ -324,7 +324,7 @@ private void Write(RuntimeModel.IObjectWriter writer, Action<PackageSpec, Runtim
                 var project = pair.Value;
 
                 writer.WriteObjectStart(project.RestoreMetadata.ProjectUniqueName);
-                writeAction.Invoke(project, writer);
+                writeAction.Invoke(project, writer, hashing);
                 writer.WriteObjectEnd();
             }
 
diff --git a/src/NuGet.Core/NuGet.ProjectModel/PackageSpecWriter.cs b/src/NuGet.Core/NuGet.ProjectModel/PackageSpecWriter.cs
@@ -29,6 +29,11 @@ public sealed class PackageSpecWriter
         /// <param name="packageSpec">A <c>PackageSpec</c> instance.</param>
         /// <param name="writer">An <c>NuGet.Common.IObjectWriter</c> instance.</param>
         public static void Write(PackageSpec packageSpec, IObjectWriter writer)
+        {
+            Write(packageSpec, writer, hashing: false);
+        }
+
+        internal static void Write(PackageSpec packageSpec, IObjectWriter writer, bool hashing)
         {
             if (packageSpec == null)
             {
@@ -67,7 +72,7 @@ public static void Write(PackageSpec packageSpec, IObjectWriter writer)
                 SetDependencies(writer, packageSpec.Dependencies);
             }
 
-            SetFrameworks(writer, packageSpec.TargetFrameworks);
+            SetFrameworks(writer, packageSpec.TargetFrameworks, hashing);
 
             JsonRuntimeFormat.WriteRuntimeGraph(writer, packageSpec.RuntimeGraph);
         }
@@ -533,7 +538,7 @@ private static void SetDownloadDependencies(IObjectWriter writer, IList<Download
             writer.WriteArrayEnd();
         }
 
-        private static void SetFrameworks(IObjectWriter writer, IList<TargetFrameworkInformation> frameworks)
+        private static void SetFrameworks(IObjectWriter writer, IList<TargetFrameworkInformation> frameworks, bool hashing)
         {
             if (frameworks.Any())
             {
@@ -544,7 +549,7 @@ private static void SetFrameworks(IObjectWriter writer, IList<TargetFrameworkInf
                     writer.WriteObjectStart(framework.FrameworkName.GetShortFolderName());
                     SetValueIfNotNull(writer, "targetAlias", framework.TargetAlias);
                     SetDependencies(writer, framework.Dependencies);
-                    SetCentralDependencies(writer, framework.CentralPackageVersions.Values);
+                    SetCentralDependencies(writer, framework.CentralPackageVersions.Values, hashing);
                     SetImports(writer, framework.Imports);
                     SetValueIfTrue(writer, "assetTargetFallback", framework.AssetTargetFallback);
                     SetValueIfNotNull(writer, "secondaryFramework",
@@ -592,18 +597,30 @@ private static void SetFrameworkReferences(IObjectWriter writer, ISet<FrameworkD
             }
         }
 
-        private static void SetCentralDependencies(IObjectWriter writer, ICollection<CentralPackageVersion> centralPackageVersions)
+        private static void SetCentralDependencies(IObjectWriter writer, ICollection<CentralPackageVersion> centralPackageVersions, bool hashing)
         {
             if (!centralPackageVersions.Any())
             {
                 return;
             }
 
             writer.WriteObjectStart("centralPackageVersions");
-            foreach (var dependency in centralPackageVersions.OrderBy(dep => dep.Name))
+
+            if (hashing)
             {
-                writer.WriteNameValue(name: dependency.Name, value: dependency.VersionRange.ToNormalizedString());
+                foreach (var dependency in centralPackageVersions)
+                {
+                    writer.WriteNameValue(name: dependency.Name, value: dependency.VersionRange.OriginalString ?? dependency.VersionRange.ToNormalizedString());
+                }
             }
+            else
+            {
+                foreach (var dependency in centralPackageVersions.OrderBy(dep => dep.Name))
+                {
+                    writer.WriteNameValue(name: dependency.Name, value: dependency.VersionRange.ToNormalizedString());
+                }
+            }
+
             writer.WriteObjectEnd();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ public void Save(string path)`
`286`	`286`	`{`
`287`	`287`	`jsonWriter.Formatting = Formatting.Indented;`
`288`	`288`
`289`		`- Write(writer, PackageSpecWriter.Write);`
	`289`	`+ Write(writer, hashing: false, PackageSpecWriter.Write);`
`290`	`290`	`}`
`291`	`291`	`}`
`292`	`292`
`@@ -295,12 +295,12 @@ public string GetHash()`
`295`	`295`	`using (var hashFunc = new Sha512HashFunction())`
`296`	`296`	`using (var writer = new HashObjectWriter(hashFunc))`
`297`	`297`	`{`
`298`		`- Write(writer, PackageSpecWriter.Write);`
	`298`	`+ Write(writer, hashing: true, PackageSpecWriter.Write);`
`299`	`299`	`return writer.GetHash();`
`300`	`300`	`}`
`301`	`301`	`}`
`302`	`302`
`303`		`- private void Write(RuntimeModel.IObjectWriter writer, Action<PackageSpec, RuntimeModel.IObjectWriter> writeAction)`
	`303`	`+ private void Write(RuntimeModel.IObjectWriter writer, bool hashing, Action<PackageSpec, RuntimeModel.IObjectWriter, bool> writeAction)`
`304`	`304`	`{`
`305`	`305`	`writer.WriteObjectStart();`
`306`	`306`	`writer.WriteNameValue("format", Version);`
`@@ -324,7 +324,7 @@ private void Write(RuntimeModel.IObjectWriter writer, Action<PackageSpec, Runtim`
`324`	`324`	`var project = pair.Value;`
`325`	`325`
`326`	`326`	`writer.WriteObjectStart(project.RestoreMetadata.ProjectUniqueName);`
`327`		`- writeAction.Invoke(project, writer);`
	`327`	`+ writeAction.Invoke(project, writer, hashing);`
`328`	`328`	`writer.WriteObjectEnd();`
`329`	`329`	`}`
`330`	`330`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,11 @@ public sealed class PackageSpecWriter`
`29`	`29`	`/// <param name="packageSpec">A <c>PackageSpec</c> instance.</param>`
`30`	`30`	`/// <param name="writer">An <c>NuGet.Common.IObjectWriter</c> instance.</param>`
`31`	`31`	`public static void Write(PackageSpec packageSpec, IObjectWriter writer)`
	`32`	`+ {`
	`33`	`+ Write(packageSpec, writer, hashing: false);`
	`34`	`+ }`
	`35`	`+`
	`36`	`+ internal static void Write(PackageSpec packageSpec, IObjectWriter writer, bool hashing)`
`32`	`37`	`{`
`33`	`38`	`if (packageSpec == null)`
`34`	`39`	`{`
`@@ -67,7 +72,7 @@ public static void Write(PackageSpec packageSpec, IObjectWriter writer)`
`67`	`72`	`SetDependencies(writer, packageSpec.Dependencies);`
`68`	`73`	`}`
`69`	`74`
`70`		`- SetFrameworks(writer, packageSpec.TargetFrameworks);`
	`75`	`+ SetFrameworks(writer, packageSpec.TargetFrameworks, hashing);`
`71`	`76`
`72`	`77`	`JsonRuntimeFormat.WriteRuntimeGraph(writer, packageSpec.RuntimeGraph);`
`73`	`78`	`}`
`@@ -533,7 +538,7 @@ private static void SetDownloadDependencies(IObjectWriter writer, IList<Download`
`533`	`538`	`writer.WriteArrayEnd();`
`534`	`539`	`}`
`535`	`540`
`536`		`- private static void SetFrameworks(IObjectWriter writer, IList<TargetFrameworkInformation> frameworks)`
	`541`	`+ private static void SetFrameworks(IObjectWriter writer, IList<TargetFrameworkInformation> frameworks, bool hashing)`
`537`	`542`	`{`
`538`	`543`	`if (frameworks.Any())`
`539`	`544`	`{`
`@@ -544,7 +549,7 @@ private static void SetFrameworks(IObjectWriter writer, IList<TargetFrameworkInf`
`544`	`549`	`writer.WriteObjectStart(framework.FrameworkName.GetShortFolderName());`
`545`	`550`	`SetValueIfNotNull(writer, "targetAlias", framework.TargetAlias);`
`546`	`551`	`SetDependencies(writer, framework.Dependencies);`
`547`		`- SetCentralDependencies(writer, framework.CentralPackageVersions.Values);`
	`552`	`+ SetCentralDependencies(writer, framework.CentralPackageVersions.Values, hashing);`
`548`	`553`	`SetImports(writer, framework.Imports);`
`549`	`554`	`SetValueIfTrue(writer, "assetTargetFallback", framework.AssetTargetFallback);`
`550`	`555`	`SetValueIfNotNull(writer, "secondaryFramework",`
`@@ -592,18 +597,30 @@ private static void SetFrameworkReferences(IObjectWriter writer, ISet<FrameworkD`
`592`	`597`	`}`
`593`	`598`	`}`
`594`	`599`
`595`		`- private static void SetCentralDependencies(IObjectWriter writer, ICollection<CentralPackageVersion> centralPackageVersions)`
	`600`	`+ private static void SetCentralDependencies(IObjectWriter writer, ICollection<CentralPackageVersion> centralPackageVersions, bool hashing)`
`596`	`601`	`{`
`597`	`602`	`if (!centralPackageVersions.Any())`
`598`	`603`	`{`
`599`	`604`	`return;`
`600`	`605`	`}`
`601`	`606`
`602`	`607`	`writer.WriteObjectStart("centralPackageVersions");`
`603`		`- foreach (var dependency in centralPackageVersions.OrderBy(dep => dep.Name))`
	`608`	`+`
	`609`	`+ if (hashing)`
`604`	`610`	`{`
`605`		`- writer.WriteNameValue(name: dependency.Name, value: dependency.VersionRange.ToNormalizedString());`
	`611`	`+ foreach (var dependency in centralPackageVersions)`
	`612`	`+ {`
	`613`	`+ writer.WriteNameValue(name: dependency.Name, value: dependency.VersionRange.OriginalString ?? dependency.VersionRange.ToNormalizedString());`
	`614`	`+ }`
`606`	`615`	`}`
	`616`	`+ else`
	`617`	`+ {`
	`618`	`+ foreach (var dependency in centralPackageVersions.OrderBy(dep => dep.Name))`
	`619`	`+ {`
	`620`	`+ writer.WriteNameValue(name: dependency.Name, value: dependency.VersionRange.ToNormalizedString());`
	`621`	`+ }`
	`622`	`+ }`
	`623`	`+`
`607`	`624`	`writer.WriteObjectEnd();`
`608`	`625`	`}`
`609`	`626`