RavenDB-22835 : fix failing legacy-counters tests

aviv86 · Nov 26, 2024 · 4ec3b83 · 4ec3b83
1 parent 51c2bb3
commit 4ec3b83
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Raven.Server/Documents/Handlers/CountersHandler.cs b/src/Raven.Server/Documents/Handlers/CountersHandler.cs
@@ -6,6 +6,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
@@ -425,8 +426,11 @@ private void UpdateDocumentsMetadata(DocumentsOperationContext context)
 
             private static void CheckForDataCorruption(DocumentsOperationContext context, CounterGroupDetail counterGroup, Document doc)
             {
-                counterGroup.Values.TryGet(Values, out BlittableJsonReaderObject counterValues);
-                counterGroup.Values.TryGet(CounterNames, out BlittableJsonReaderObject counterNames);
+                if (counterGroup.Values.TryGet(Values, out BlittableJsonReaderObject counterValues) == false)
+                    throw new InvalidDataException($"Counter-group of document '{counterGroup.DocumentId}' is missing '{Values}' property");
+
+                if (counterGroup.Values.TryGet(CounterNames, out BlittableJsonReaderObject counterNames) == false)
+                    return; // legacy counters
 
                 if (counterValues.Count == counterNames.Count && 
                     counterValues.GetSortedPropertyNames().SequenceEqual(counterNames.GetSortedPropertyNames()))