CBG-3211: Add PutExistingRev for HLV #6515

gregns1 · 2023-10-11T11:07:24Z

Adds a new function entitled PutExistingCurrentVersion which carries much the same functionality for PutExistingRev but carries out logic on the HLV.

Check for conflict between the two HLV's
If conflict is found we cancel the rest of the update to the doc. Here we need to add merge version and send the doc back to the client.
If not in conflict we need to add all newer source/version pairs from the incoming HLV to the local HLV for that doc. I have added a function called AddNewerVersions that does this, first by iterating through the Previous Versions and adding any newer version pair, then the incoming HLV's current version pair.
If not in conflict the revtree entry still needs to be computed and added to the doc update.
Added tests to ensure that the CV of the incoming HLV is preserved and that the cvCAS is updated still, then the PV of the HLV on the doc is updated correctly.
Also included a test where a conflict is found and assert we cancel the doc update, then fetch the persisted sync data to ensure it has remained unchanged.

Pre-review checklist

Removed debug logging (fmt.Print, log.Print, ...)
Logging sensitive data? Make sure it's tagged (e.g. base.UD(docID), base.MD(dbName))
Updated relevant information in the API specifications (such as endpoint descriptions, schemas, ...) in docs/api

Integration Tests

GSI=true,xattrs=true https://jenkins.sgwdev.com/job/SyncGateway-Integration/2149/

adamcfraser

A few areas that need a second look.

db/hybrid_logical_vector.go

db/crud.go

db/hybrid_logical_vector.go

db/hybrid_logical_vector_test.go

db/util_testing.go

db/hybrid_logical_vector.go

db/hybrid_logical_vector_test.go

adamcfraser

Let's remove the merge handling until we're ready to implement that, and remove the invalid test case. With that removed this should be good to merge.

db/hybrid_logical_vector.go

db/hybrid_logical_vector_test.go

* CBG-3209: changes for retreival of a doc from the rev cache via CV with backwards compatability in mind * fix failing test, add commnets * fix lint * updated to address comments * rebase chnages needed * updated to tests that call Get on revision cache * updates based of new direction with PR + addressing comments * updated to fix panic * updated to fix another panic * address comments * updates based off commnets * remove commnented out line * updates to skip test relying on import and update PutExistingRev doc update type to update HLV * updates to remove code adding rev id to value inside addToRevMapPostLoad. Added code to assign this inside value.store * remove redundent code

* CBG-3210: Updating HLV on Put And PutExistingRev (#6366) * CBG-3209: Add cv index and retrieval for revision cache (#6491) * CBG-3209: changes for retreival of a doc from the rev cache via CV with backwards compatability in mind * fix failing test, add commnets * fix lint * updated to address comments * rebase chnages needed * updated to tests that call Get on revision cache * updates based of new direction with PR + addressing comments * updated to fix panic * updated to fix another panic * address comments * updates based off commnets * remove commnented out line * updates to skip test relying on import and update PutExistingRev doc update type to update HLV * updates to remove code adding rev id to value inside addToRevMapPostLoad. Added code to assign this inside value.store * remove redundent code * Add support for PutExistingCurrentVersion * updated to remove function not used anymore * remove duplicated code from dev time * fix linter errors + add assertions on body of doc update * address commnets * updates to add further test cases for AddNewerVersions function + fix some incorrect logic * updates to chnage helper function for creation of doc for tests. Also adress further comments * lint error * address comments, add new merge function for merge versions when hlv is in conflict. * updates to remove test case and test * remove unused function * rebase * missed current version name change * more missing updates to name changes

gregns1 requested a review from adamcfraser October 11, 2023 13:46

gregns1 assigned adamcfraser Oct 11, 2023

adamcfraser requested changes Oct 26, 2023

View reviewed changes

db/hybrid_logical_vector.go Outdated Show resolved Hide resolved

db/hybrid_logical_vector.go Outdated Show resolved Hide resolved

db/hybrid_logical_vector.go Outdated Show resolved Hide resolved

db/crud.go Outdated Show resolved Hide resolved

adamcfraser assigned gregns1 and unassigned adamcfraser Oct 27, 2023

gregns1 force-pushed the CBG-3211 branch from a745df5 to 5c022b7 Compare October 31, 2023 15:21

gregns1 assigned adamcfraser and unassigned gregns1 Oct 31, 2023

adamcfraser requested changes Oct 31, 2023

View reviewed changes

db/hybrid_logical_vector.go Outdated Show resolved Hide resolved

db/hybrid_logical_vector.go Outdated Show resolved Hide resolved

adamcfraser assigned gregns1 and unassigned adamcfraser Oct 31, 2023

gregns1 assigned adamcfraser and unassigned gregns1 Nov 1, 2023

adamcfraser requested changes Nov 1, 2023

View reviewed changes

adamcfraser assigned gregns1 and unassigned adamcfraser Nov 1, 2023

bbrks force-pushed the beryllium branch from adf6cfa to 1de3947 Compare November 2, 2023 15:41

gregns1 assigned adamcfraser and unassigned gregns1 Nov 2, 2023

adamcfraser reviewed Nov 2, 2023

View reviewed changes

db/hybrid_logical_vector_test.go Outdated Show resolved Hide resolved

db/hybrid_logical_vector_test.go Outdated Show resolved Hide resolved

gregns1 force-pushed the CBG-3211 branch from 755ef5a to 74562c7 Compare November 7, 2023 16:19

gregns1 requested a review from adamcfraser November 7, 2023 16:59

adamcfraser requested changes Nov 10, 2023

View reviewed changes

db/hybrid_logical_vector.go Outdated Show resolved Hide resolved

db/hybrid_logical_vector_test.go Outdated Show resolved Hide resolved

adamcfraser assigned gregns1 and unassigned adamcfraser Nov 10, 2023

gregns1 assigned adamcfraser and unassigned gregns1 Nov 13, 2023

gregns1 and others added 3 commits November 15, 2023 15:32

CBG-3210: Updating HLV on Put And PutExistingRev (#6366)

1b77db5

Add support for PutExistingCurrentVersion

4411f2b

gregns1 added 2 commits November 15, 2023 15:36

remove unused function

e34d758

rebase

2e9b39c

gregns1 force-pushed the CBG-3211 branch from 7ebbfe6 to 2e9b39c Compare November 15, 2023 15:39

gregns1 added 2 commits November 15, 2023 15:48

missed current version name change

f67debb

more missing updates to name changes

7c196d3

adamcfraser approved these changes Nov 16, 2023

View reviewed changes

adamcfraser merged commit 540a5c0 into beryllium Nov 16, 2023
17 checks passed

adamcfraser deleted the CBG-3211 branch November 16, 2023 22:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CBG-3211: Add PutExistingRev for HLV #6515

CBG-3211: Add PutExistingRev for HLV #6515

gregns1 commented Oct 11, 2023 •

edited

Loading

adamcfraser left a comment

adamcfraser left a comment

CBG-3211: Add PutExistingRev for HLV #6515

CBG-3211: Add PutExistingRev for HLV #6515

Conversation

gregns1 commented Oct 11, 2023 • edited Loading

Pre-review checklist

Integration Tests

adamcfraser left a comment

Choose a reason for hiding this comment

adamcfraser left a comment

Choose a reason for hiding this comment

gregns1 commented Oct 11, 2023 •

edited

Loading