Merge pull request #9144 from NuGet/dev

[Bug]Fix potential overflow of statistics values. (#9128)

Author: ryuyu

src/NuGet.Services.Entities/Package.cs

@@ -58,7 +58,7 @@ public Package()
         /// </remarks>
         public string ReleaseNotes { get; set; }
 
-        public int DownloadCount { get; set; }
+        public long DownloadCount { get; set; }
 
         /// <remarks>
         ///     Is not a property that we support. Maintained for legacy reasons.

src/NuGet.Services.Entities/PackageRegistration.cs

@@ -23,7 +23,7 @@ public PackageRegistration()
         [Required]
         public string Id { get; set; }
 
-        public int DownloadCount { get; set; }
+        public long DownloadCount { get; set; }
 
         public bool IsVerified { get; set; }
 

src/NuGetGallery.Core/Auditing/AuditedEntities/AuditedPackage.cs

@@ -14,7 +14,7 @@ public class AuditedPackage
         public DateTime Created { get; private set; }
         public string Description { get; private set; }
         public string ReleaseNotes { get; private set; }
-        public int DownloadCount { get; private set; }
+        public long DownloadCount { get; private set; }
         public string ExternalPackageUrl { get; private set; }
         public string HashAlgorithm { get; private set; }
         public string Hash { get; private set; }

src/NuGetGallery.Core/Auditing/AuditedEntities/AuditedPackageRegistration.cs

@@ -8,7 +8,7 @@ namespace NuGetGallery.Auditing.AuditedEntities
     public class AuditedPackageRegistration
     {
         public string Id { get; private set; }
-        public int DownloadCount { get; private set; }
+        public long DownloadCount { get; private set; }
         public int Key { get; private set; }
         public bool IsVerified { get; private set; }
 

src/NuGetGallery.Services/Models/PackageDependent.cs

@@ -8,7 +8,7 @@ namespace NuGetGallery
     public class PackageDependent
     {
         public string Id { get; set; }
-        public int DownloadCount { get; set; }
+        public long DownloadCount { get; set; }
         public string Description { get; set; }
         public bool IsVerified { get; set; }
     }

src/NuGetGallery/Areas/Admin/ViewModels/PackageSearchResult.cs

@@ -9,7 +9,7 @@ public class PackageSearchResult
     {
         public string PackageId { get; set; }
         public string PackageVersionNormalized { get; set; }
-        public int DownloadCount { get; set; }
+        public long DownloadCount { get; set; }
         public string Created { get; set; }
         public bool Listed { get; set; }
         public string PackageStatus { get; set; }

src/NuGetGallery/Extensions/NumberExtensions.cs

@@ -83,11 +83,16 @@ public static string ToUserFriendlyBytesLabel(this int bytes)
         /// <param name="number">The number to format</param>
         /// <returns>String representation of the formatted number</returns>
         public static string ToKiloFormat(this int number)
+        {
+            return ToKiloFormat((long)number);
+        }
+
+        public static string ToKiloFormat(this long number)
         {
             // To avoid overflow (with Math.Abs()). 1 difference won't make a difference in the simplified format :)
-            if (number == int.MinValue)
+            if (number == long.MinValue)
             {
-                number = -1 * int.MaxValue;
+                number = -1 * long.MaxValue;
             }
 
             if (Math.Abs(number) < 1000)
@@ -97,9 +102,10 @@ public static string ToKiloFormat(this int number)
 
             var powers = new[]
             {
-                new { Value = 1_000_000_000f, Unit = 'B'},
-                new { Value = 1_000_000f    , Unit = 'M'},
-                new { Value = 1_000f        , Unit = 'K'}
+                new { Value = 1_000_000_000_000f, Unit = 'T'},
+                new { Value = 1_000_000_000f    , Unit = 'B'},
+                new { Value = 1_000_000f        , Unit = 'M'},
+                new { Value = 1_000f            , Unit = 'K'}
             };
 
             return powers

src/NuGetGallery/Infrastructure/Lucene/ExternalSearchService.cs

@@ -193,7 +193,7 @@ internal static Package ReadPackage(JObject doc, string semVerLevel)
                     Owners = reg.Value<JArray>("Owners")
                        .Select(v => new User { Username = v.Value<string>() })
                        .ToArray(),
-                    DownloadCount = reg.Value<int>("DownloadCount"),
+                    DownloadCount = reg.Value<long>("DownloadCount"),
                     IsVerified = reg.Value<bool>("Verified"),
                     Key = reg.Value<int>("Key")
                 };
@@ -209,7 +209,7 @@ internal static Package ReadPackage(JObject doc, string semVerLevel)
                 Created = doc.Value<DateTime>("Created"),
                 Description = doc.Value<string>("Description"),
                 Dependencies = dependencies,
-                DownloadCount = doc.Value<int>("DownloadCount"),
+                DownloadCount = doc.Value<long>("DownloadCount"),
                 FlattenedAuthors = doc.Value<string>("Authors"),
                 FlattenedDependencies = doc.Value<string>("FlattenedDependencies"),
                 Hash = doc.Value<string>("Hash"),

src/NuGetGallery/Infrastructure/Lucene/LuceneSearchService.cs

@@ -102,8 +102,8 @@ private SearchResults SearchCore(SearchFilter searchFilter)
 
         private static Package PackageFromDoc(Document doc)
         {
-            int downloadCount = Int32.Parse(doc.Get("DownloadCount"), CultureInfo.InvariantCulture);
-            int versionDownloadCount = Int32.Parse(doc.Get("VersionDownloadCount"), CultureInfo.InvariantCulture);
+            long downloadCount = long.Parse(doc.Get("DownloadCount"), CultureInfo.InvariantCulture);
+            long versionDownloadCount = long.Parse(doc.Get("VersionDownloadCount"), CultureInfo.InvariantCulture);
             int key = Int32.Parse(doc.Get("Key"), CultureInfo.InvariantCulture);
             int packageRegistrationKey = Int32.Parse(doc.Get("PackageRegistrationKey"), CultureInfo.InvariantCulture);
             int packageSize = Int32.Parse(doc.Get("PackageFileSize"), CultureInfo.InvariantCulture);