CBL-6239: Fixed c4doc_getRevisionBody in a 2.x db w/version vectors #2136
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
VectorRecord didn't properly manage the `body` column of a doc from a 2.x db that doesn't have the `extra` column. In such a db the body is the encoded rev tree, not just the current rev. VectorRecord was returning that entire slice from its currentRevisionData method. I added a new member _bodyDocRange, a slice that's just the current rev within the _bodyDoc. Normally it's the same as _bodyDoc.data(), but in a 2.x doc it encompasses just the current rev body. Fixes CBL-6239
snej
changed the title
|
Code Coverage Results:
|
jianminzhao
approved these changes
Sep 16, 2024
jianminzhao
added a commit
that referenced
this pull request
Sep 17, 2024
CBL-5616: Update SG version in docker-compose.yml (#2121) CBL-6239: Fixed c4doc_getRevisionBody in a 2.x db (#2136) 92fc5cc Make sync work across VV upgrades (#1913) abe9759 Merge in tag 3.2.0 8009302 Statically link to libstdc++ (#2134) CBL-6169: DataFile::documentKeys() is not thread-safe (#2132) CBL-6189: Annotation of thread-safety, filling in the missing ones after the first pass. (#2129) 471e5ec Allow a Timer to destruct itself during its callback (#2124) b090363 Fixed C4CollectionSpec hash and equality (#2122) cba409e LogEncoder cleanup (#2130) cf53ccd Rewritten query translator (#1966) 9f75fab Updated Fleece now that its PR is merged d6c2091 Update Android NDK even more 47cc9ad Update Jenkins configuration to support C++20 1652943 C++20: use std::ranges, contains() methods, std::size() f27f8dd Build with C++20
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.
VectorRecord didn't properly manage the
bodycolumn of a doc from a 2.x db that doesn't have theextracolumn. In such a db the body is the encoded rev tree, not just the current rev. VectorRecord was returning that entire slice from its currentRevisionData method ... and since that wasn't valid Fleece data, getting the root Dict would fail.I added a new member
_bodyDocRange, a slice that's just the current rev within the _bodyDoc. Normally it's the same as_bodyDoc.data(), but in a 2.x doc it encompasses just the current rev body.Our db upgrade tests didn't catch this because they called
c4doc_getPropertiesbut notc4doc_getRevisionBody. I remedied that (which reproduced the bug.)Fixes CBL-6239