RavenDB-23100 - use the correct item ID casing to align with the stor…

…age state
grisha-kotler · Dec 9, 2024 · 5e4f23a · 5e4f23a
1 parent 644489c
commit 5e4f23a
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 3 deletions.
diff --git a/...aven.Server/Documents/Indexes/Workers/Counters/HandleCompareExchangeCountersReferences.cs b/...aven.Server/Documents/Indexes/Workers/Counters/HandleCompareExchangeCountersReferences.cs
@@ -32,6 +32,11 @@ protected override IndexItem GetItem(DocumentsOperationContext databaseContext,
             return new CounterIndexItem(counter.LuceneKey, counter.DocumentId, counter.Etag, counter.CounterName, counter.Size, counter);
         }
 
+        protected override string GetNextItemId(IndexItem indexItem)
+        {
+            return indexItem.LowerSourceDocumentId;
+        }
+
         public override void HandleDelete(Tombstone tombstone, string collection, Lazy<IndexWriteOperationBase> writer, TransactionOperationContext indexContext, IndexingStatsScope stats)
         {
             using (DocumentIdWorker.GetSliceFromId(indexContext, tombstone.LowerId, out Slice documentIdPrefixWithCounterKeySeparator, SpecialChars.RecordSeparator))

diff --git a/src/Raven.Server/Documents/Indexes/Workers/Counters/HandleCountersReferences.cs b/src/Raven.Server/Documents/Indexes/Workers/Counters/HandleCountersReferences.cs
@@ -28,6 +28,11 @@ protected override IndexItem GetItem(DocumentsOperationContext databaseContext,
             return new CounterIndexItem(counter.LuceneKey, counter.DocumentId, counter.Etag, counter.CounterName, counter.Size, counter);
         }
 
+        protected override string GetNextItemId(IndexItem indexItem)
+        {
+            return indexItem.LowerSourceDocumentId;
+        }
+
         public override void HandleDelete(Tombstone tombstone, string collection, Lazy<IndexWriteOperationBase> writer, TransactionOperationContext indexContext, IndexingStatsScope stats)
         {
             using (DocumentIdWorker.GetSliceFromId(indexContext, tombstone.LowerId, out Slice documentIdPrefixWithTsKeySeparator, SpecialChars.RecordSeparator))

diff --git a/src/Raven.Server/Documents/Indexes/Workers/HandleNotNormalizedCompareExchangeReferences.cs b/src/Raven.Server/Documents/Indexes/Workers/HandleNotNormalizedCompareExchangeReferences.cs
@@ -16,6 +16,11 @@ protected override IndexItem GetItem(DocumentsOperationContext databaseContext,
         return HandleNotNormalizedDocumentReferences.GetNonNormalizedDocumentItem(databaseContext, key);
     }
 
+    protected override string GetNextItemId(IndexItem indexItem)
+    {
+        return indexItem.Id;
+    }
+
     protected override void DeleteReferences(string collection, IndexingStatsScope stats, DocumentsOperationContext databaseContext, TransactionOperationContext indexContext)
     {
         HandleNotNormalizedDocumentReferences.DeleteReferences(collection, stats, _referencesStorage, databaseContext, indexContext);

diff --git a/src/Raven.Server/Documents/Indexes/Workers/HandleNotNormalizedDocumentReferences.cs b/src/Raven.Server/Documents/Indexes/Workers/HandleNotNormalizedDocumentReferences.cs
@@ -22,6 +22,11 @@ protected override IndexItem GetItem(DocumentsOperationContext databaseContext,
         return GetNonNormalizedDocumentItem(databaseContext, key);
     }
 
+    protected override string GetNextItemId(IndexItem indexItem)
+    {
+        return indexItem.Id;
+    }
+
     public static unsafe IndexItem GetNonNormalizedDocumentItem(DocumentsOperationContext databaseContext, Slice key)
     {
         using (DocumentIdWorker.GetLower(databaseContext.Allocator, key.Content.Ptr, key.Size, out var loweredKey))

diff --git a/src/Raven.Server/Documents/Indexes/Workers/HandleReferences.cs b/src/Raven.Server/Documents/Indexes/Workers/HandleReferences.cs
@@ -33,6 +33,11 @@ protected override IndexItem GetItem(DocumentsOperationContext databaseContext,
             return GetDocumentItem(databaseContext, key);
         }
 
+        protected override string GetNextItemId(IndexItem indexItem)
+        {
+            return indexItem.LowerId;
+        }
+
         public static IndexItem GetDocumentItem(DocumentsOperationContext databaseContext, Slice key)
         {
             // when there is conflict, we need to apply same behavior as if the document would not exist
@@ -247,7 +252,7 @@ protected HandleReferencesBase(Index index, DocumentsStorage documentsStorage, I
                                                 if (CanContinueReferenceBatch() == false)
                                                 {
                                                     // updating the last reference state in order to continue from the place we left off
-                                                    referenceState = new ReferencesState.ReferenceState(referencedItem.Key, referencedItem.Etag, current.LowerSourceDocumentId ?? current.Id, lastIndexedParentEtag);
+                                                    referenceState = new ReferencesState.ReferenceState(referencedItem.Key, referencedItem.Etag, GetNextItemId(current), lastIndexedParentEtag);
 
                                                     if (batchContinuationResult != Index.CanContinueBatchResult.RenewTransaction)
                                                     {
@@ -504,6 +509,8 @@ public InMemoryReferencesInfo GetReferencesInfo(string collection)
 
         protected abstract IndexItem GetItem(DocumentsOperationContext databaseContext, Slice key);
 
+        protected abstract string GetNextItemId(IndexItem indexItem);
+
         protected virtual void DeleteReferences(string collection, IndexingStatsScope stats, DocumentsOperationContext databaseContext, TransactionOperationContext indexContext)
         {
         }

diff --git a/....Server/Documents/Indexes/Workers/TimeSeries/HandleCompareExchangeTimeSeriesReferences.cs b/....Server/Documents/Indexes/Workers/TimeSeries/HandleCompareExchangeTimeSeriesReferences.cs
@@ -31,6 +31,11 @@ protected override IndexItem GetItem(DocumentsOperationContext databaseContext,
             return new TimeSeriesIndexItem(timeSeries.LuceneKey, timeSeries.DocId, timeSeries.Etag, default, timeSeries.Name, timeSeries.SegmentSize, timeSeries);
         }
 
+        protected override string GetNextItemId(IndexItem indexItem)
+        {
+            return indexItem.LowerSourceDocumentId;
+        }
+
         public override void HandleDelete(Tombstone tombstone, string collection, Lazy<IndexWriteOperationBase> writer, TransactionOperationContext indexContext, IndexingStatsScope stats)
         {
             using (DocumentIdWorker.GetSliceFromId(indexContext, tombstone.LowerId, out Slice documentIdPrefixWithTsKeySeparator, SpecialChars.RecordSeparator))

diff --git a/src/Raven.Server/Documents/Indexes/Workers/TimeSeries/HandleTimeSeriesReferences.cs b/src/Raven.Server/Documents/Indexes/Workers/TimeSeries/HandleTimeSeriesReferences.cs
@@ -28,6 +28,11 @@ protected override IndexItem GetItem(DocumentsOperationContext databaseContext,
             return new TimeSeriesIndexItem(timeSeries.LuceneKey, timeSeries.DocId, timeSeries.Etag, default, timeSeries.Name, timeSeries.SegmentSize, timeSeries);
         }
 
+        protected override string GetNextItemId(IndexItem indexItem)
+        {
+            return indexItem.LowerSourceDocumentId;
+        }
+
         public override void HandleDelete(Tombstone tombstone, string collection, Lazy<IndexWriteOperationBase> writer, TransactionOperationContext indexContext, IndexingStatsScope stats)
         {
             using (DocumentIdWorker.GetSliceFromId(indexContext, tombstone.LowerId, out Slice documentIdPrefixWithTsKeySeparator, SpecialChars.RecordSeparator))

diff --git a/test/SlowTests/Issues/RavenDB-15754.cs b/test/SlowTests/Issues/RavenDB-15754.cs
@@ -52,11 +52,15 @@ public async Task CanIndexReferencedDocumentChange()
 
                     using (var bulk = store.BulkInsert())
                     {
+                        var baseDate = new DateTime(2024, 9, 1);
                         for (var i = 0; i < _employeesCount; i++)
                         {
+                            var date = baseDate.AddDays(i);
+                            var dateString = date.ToString("yyyy-MM-dd");
                             await bulk.StoreAsync(new Employee
                             {
-                                CompanyId = company.Id
+                                CompanyId = company.Id,
+                                Id = $"Employees/Accounts/937-A/{dateString}"
                             });
                         }
                     }
@@ -447,11 +451,15 @@ public async Task CanIndexReferencedCompareExchangeWithQuery()
 
                 using (var bulk = store.BulkInsert())
                 {
+                    var baseDate = new DateTime(2024, 9, 1);
                     for (var i = 0; i < _employeesCount; i++)
                     {
+                        var date = baseDate.AddDays(i);
+                        var dateString = date.ToString("yyyy-MM-dd");
                         await bulk.StoreAsync(new Employee
                         {
-                            CompanyId = _commonName
+                            CompanyId = _commonName,
+                            Id = $"Employees/Accounts/937-A/{dateString}"
                         });
                     }
                 }