Refactoring

src/Abc.Zebus.Persistence.Cassandra/Cql/CqlStorage.cs

@@ -131,10 +131,10 @@ namespace Abc.Zebus.Persistence.Cassandra.Cql
 
         private static StorageReport ToStorageReport(IList<MatcherEntry> entriesToPersist)
         {
-            var fattestMessage = entriesToPersist.OrderByDescending(msg => msg.MessageBytes?.Length ?? 0).First();
+            var fattestMessage = entriesToPersist.OrderByDescending(msg => msg.MessageLength).First();
             var entriesByTypeName = entriesToPersist.ToLookup(x => x.MessageTypeName)
-                                                    .ToDictionary(xs => xs.Key, xs => new MessageTypeStatistics(xs.Count(), xs.Sum(x => x.MessageBytes?.Length) ?? 0));
-            return new StorageReport(entriesToPersist.Count, entriesToPersist.Sum(msg => msg.MessageBytes?.Length ?? 0), fattestMessage.MessageBytes?.Length ?? 0, fattestMessage.MessageTypeName, entriesByTypeName);
+                                                    .ToDictionary(xs => xs.Key, xs => new MessageTypeStatistics(xs.Count(), xs.Sum(x => x.MessageLength)));
+            return new StorageReport(entriesToPersist.Count, entriesToPersist.Sum(msg => msg.MessageLength), fattestMessage.MessageLength, fattestMessage.MessageTypeName, entriesByTypeName);
         }
 
         public Task RemovePeer(PeerId peerId)

src/Abc.Zebus.Persistence.RocksDb/RocksDbStorage.cs

@@ -122,10 +122,10 @@ namespace Abc.Zebus.Persistence.RocksDb
 
         private static StorageReport ToStorageReport(IList<MatcherEntry> entriesToPersist)
         {
-            var fattestMessage = entriesToPersist.OrderByDescending(msg => msg.MessageBytes?.Length ?? 0).First();
+            var fattestMessage = entriesToPersist.OrderByDescending(msg => msg.MessageLength).First();
             var entriesByTypeName = entriesToPersist.ToLookup(x => x.MessageTypeName)
-                                                    .ToDictionary(xs => xs.Key, xs => new MessageTypeStatistics(xs.Count(), xs.Sum(x => x.MessageBytes?.Length) ?? 0));
-            return new StorageReport(entriesToPersist.Count, entriesToPersist.Sum(msg => msg.MessageBytes?.Length ?? 0), fattestMessage.MessageBytes?.Length ?? 0, fattestMessage.MessageTypeName, entriesByTypeName);
+                                                    .ToDictionary(xs => xs.Key, xs => new MessageTypeStatistics(xs.Count(), xs.Sum(x => x.MessageLength)));
+            return new StorageReport(entriesToPersist.Count, entriesToPersist.Sum(msg => msg.MessageLength), fattestMessage.MessageLength, fattestMessage.MessageTypeName, entriesByTypeName);
         }
 
         private void UpdateNonAckedCounts(IGrouping<PeerId, MatcherEntry> entry)

src/Abc.Zebus.Persistence/Matching/MatcherEntry.cs

@@ -47,5 +47,7 @@ namespace Abc.Zebus.Persistence.Matching
         {
             return IsEventWaitHandle || SystemDateTime.UtcNow - TimestampUtc >= delay;
         }
+
+        public int MessageLength => MessageBytes?.Length ?? 0;
     }
 }