CBG-3291 Define macro expansion in MutateInOpts #6419
Conversation
base/collection_xattr.go
Outdated
|
|
||
| // initializeMutateInSpec will append macro expansions defined in MutateInOptions to the provided | ||
| // gocb MutateInSpec. | ||
| func (c *Collection) appendMacroExpansions(mutateInSpec []gocb.MutateInSpec, opts *sgbucket.MutateInOptions) []gocb.MutateInSpec { |
There was a problem hiding this comment.
I'm loosely inclined to make this not be a method on Collection because it doesn't have a dependency on Collection
| @@ -2582,3 +2585,25 @@ func (db *DatabaseCollectionWithUser) CheckProposedRev(ctx context.Context, doci | |||
| return ProposedRev_Conflict, doc.CurrentRev | |||
| } | |||
| } | |||
|
|
|||
| const ( | |||
| xattrMacroCas = "cas" | |||
There was a problem hiding this comment.
should we pull this value from sg-bucket? not convinced either way
There was a problem hiding this comment.
I think it belongs in SGW as this defines the document property that's using the macro expansion, not the macro expansion type.
| @@ -1899,6 +1899,10 @@ func (db *DatabaseCollectionWithUser) updateAndReturnDoc(ctx context.Context, do | |||
| if db.UseXattrs() || upgradeInProgress { | |||
| var casOut uint64 | |||
| // Update the document, storing metadata in extended attribute | |||
| if opts == nil { | |||
| opts = &sgbucket.MutateInOptions{} | |||
There was a problem hiding this comment.
is this DefaultMutateInOpts() ?
There was a problem hiding this comment.
It's possible that the caller has already set MutateInOptions.PreserveExpiry, so just initializing here and then adding the MacroExpansion (for either case) below.
| opts := &sgbucket.MutateInOptions{ | ||
| MacroExpansion: macroExpandSpec(base.SyncXattrName), | ||
| } |
There was a problem hiding this comment.
Is this DefaultMutateInOpts() ?
There was a problem hiding this comment.
I intended DefaultMutateInOpts() to be test-only, as I thought the non-test usages should be more intentional about what they are setting. I think I'd prefer to leave as-is for now, and possibly revisit during future HLV work that makes the default more complex.
Uptake sg-bucket changes to pass macro expansions for a given operation to the XattrStore implementation (*Collection), instead of hardcoding in the low-level subdoc operations. The macro expansion options are set in three places for non-test code: - updateAndReturnDoc, handles standard writes/imports via WriteUpdateWithXattr - migrateMetadata, performs migration via WriteWithXattr - resyncDocument, uses WriteUpdateWithXattr (different retry than updateAndReturnDoc) Prerequisite for the expanded use of macro expansion for HLV properties. Also includes some cleanup of the XattrStore interface to remove internal-only operations.
adamcfraser
force-pushed
the
CBG-3291-rebase
branch
from
9c24dc9 to
f005112
Compare
* Rebase on master * go.mod bump for merged dependencies * CBG-3291 Define macro expansion in MutateInOpts Uptake sg-bucket changes to pass macro expansions for a given operation to the XattrStore implementation (*Collection), instead of hardcoding in the low-level subdoc operations. The macro expansion options are set in three places for non-test code: - updateAndReturnDoc, handles standard writes/imports via WriteUpdateWithXattr - migrateMetadata, performs migration via WriteWithXattr - resyncDocument, uses WriteUpdateWithXattr (different retry than updateAndReturnDoc) Prerequisite for the expanded use of macro expansion for HLV properties. Also includes some cleanup of the XattrStore interface to remove internal-only operations. * Integration test fixes * Fix attachment test * PR suggestions/fixes * Update dependencies
CBG-3291
Uptake sg-bucket changes to pass macro expansions for a given operation to the XattrStore implementation (*Collection), instead of hardcoding in the low-level subdoc operations.
The macro expansion options are set in three places for non-test code:
Prerequisite for the expanded use of macro expansion for HLV properties.
Also includes some cleanup of the XattrStore interface to remove internal-only operations.
Dependencies (if applicable)
Integration Tests
GSI=true,xattrs=truehttps://jenkins.sgwdev.com/job/SyncGateway-Integration/2020/