5.4 to 6.0 merge #18507
Merged
5.4 to 6.0 merge #18507
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… are removed from cache.
-Move projections to use generic document instead of `Document`. -Track referenceCount for releasing the memory -Prevent leak in case of compressed db - Release all related memory to the projected document
…ing (indicates original document).
…rectGetInternal as base method to retrieve document from cache.
- When PulseTransaction creates a new transaction, we need to clear the cache to avoid invalid pointers - Move QueriedDocument to a dedicated file - Optimise QueriedDocument list for single reference - Rename variables within `QueriedDocument` to make them more meaningful - Handling of non-existing documents in the cache for memory calls
…ded the document but suspend the current document object.
- Created QueriedDocumentCache to move logic with QueriedDocument from LRU Dictionary - Unified disposal logic - Added assert messages - Explained OnPulse functionality in comment
- Asserts fix for map-reduce -In case of fanout projection we need to increase reference counter to avoid disposing document. -Avoid typeof(QueriedDocument) in QueryResultRetrieverBase -Added implementation for increasing/linking documents to LruDictionaries to avoid type casts in QueryResultRetrieverBase.
…ting document too long.
# Conflicts: # src/Raven.Server/Documents/Document.cs # src/Raven.Server/Documents/DocumentsStorage.cs # src/Raven.Server/Documents/Indexes/Persistence/Corax/CoraxIndexQueryingScope.cs # src/Raven.Server/Documents/Indexes/Persistence/Corax/CoraxIndexReadOperation.cs # src/Raven.Server/Documents/Indexes/Persistence/IndexOperationBase.cs # src/Raven.Server/Documents/Indexes/Persistence/IndexReadOperationBase.cs # src/Raven.Server/Documents/Indexes/Persistence/Lucene/LuceneIndexReadOperation.cs # src/Raven.Server/Documents/Indexes/Persistence/QueryFilter.cs # src/Raven.Server/Documents/Queries/CollectionQueryEnumerable.cs # src/Raven.Server/Documents/Queries/Results/GraphQueryResultRetriever.cs # src/Raven.Server/Documents/Queries/Results/IQueryResultRetriever.cs # src/Raven.Server/Documents/Queries/Results/MapQueryResultRetriever.cs # src/Raven.Server/Documents/Queries/Results/MapReduceQueryResultRetriever.cs # src/Raven.Server/Documents/Queries/Results/QueryResultRetrieverBase.cs # src/Raven.Server/Documents/Queries/Results/TimeSeries/TimeSeriesRetriever.cs # src/Raven.Server/Documents/ResourceCache.cs # test/Tests.Infrastructure/RavenTestCategory.cs
|
test this in debug please |
|
test this in debug please |
maciejaszyk
reviewed
May 13, 2024
| public IEnumerable<Document> GetDocumentsStartingWith(DocumentsOperationContext context, string idPrefix, string startAfterId, | ||
| long start, long take, string collection, Reference<long> skippedResults, DocumentFields fields = DocumentFields.All, CancellationToken token = default) | ||
| => GetDocumentsStartingWith(context, idPrefix, startAfterId, start, take, collection, skippedResults, fields, token); |
There was a problem hiding this comment.
Suggested change
| => GetDocumentsStartingWith(context, idPrefix, startAfterId, start, take, collection, skippedResults, fields, token); | |
| => GetDocumentsStartingWith<Document>(context, idPrefix, startAfterId, start, take, collection, skippedResults, fields, token); |
otherwise it's recursive call
There was a problem hiding this comment.
BTW, we need to think about where this scenario might happen and add a test for it.
There was a problem hiding this comment.
It was unused, I've removed it. The only call to GetDocumentsStartingWith is from CollectionQuery which is now changed to QueriedDocument.
| public abstract class QueryResultRetrieverBase<TDocument> : QueryResultRetrieverCommon, IQueryResultRetriever<TDocument> | ||
| where TDocument : Document, new() | ||
| { | ||
| private const string CurrentRootDocumentMarker = "@root-doc"; |
There was a problem hiding this comment.
I managed to create document with that id:
Maybe it's worth to add GUID to it? We use same tricks in Corax:
ravendb/src/Corax/Constants.cs
Lines 12 to 13 in 92df767
There was a problem hiding this comment.
Let's leave it as it was earlier (string.Empty) and not introduce a new marker here.
| using Raven.Server.Documents.Queries.AST; | ||
|
|
||
| namespace Raven.Server.Documents.Sharding.Queries; | ||
|
|
||
| public sealed class ShardedQueryResultDocument : Document | ||
| public sealed class ShardedQueryResultDocument : QueriedDocument |
There was a problem hiding this comment.
ShardedQueryResultDocument is from QueriedDocument but ShardedMapReduceResultRetriever is using Document. Let's talk about it directly
…to avoid handling different document.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges the following changes from 5.4: