Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make SubdocXattrStore work with Rosmar collections #6374

Merged
merged 3 commits into from
Aug 31, 2023

Conversation

snej
Copy link
Contributor

@snej snej commented Aug 21, 2023

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

Dependencies (if applicable)

  • Link upstream PRs
  • Update Go module dependencies when merged

Integration Tests

Copy link
Collaborator

@torcolvin torcolvin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove TestRequiresSubdocXattrStore https://github.com/couchbase/sync_gateway/blob/master/base/util_testing.go#L768

I think all the tests pass with SG_TEST_USE_XATTRS=false and SG_TEST_USE_XATTRS=true and this review?

Otherwise looks good, we'll just wait to merge until upstream go.mod hit the main branch.

* There's a new interface sgbucket.XattrStore2 that contains the
  methods of SubdocXattrStore that aren't redundant.
* rosmar.Collection implements XattrStore2.
* LeakyDataStore now implements SubdocXattrStore; the methods are
  either delegated to their existing DataStore counterparts, or to
  the new methods from XattrStore2.
* AsSubdocXattrStore() isn't needed anymore, because LeakyDataStore
  now implements SubdocXattrStore.
@snej
Copy link
Contributor Author

snej commented Aug 24, 2023

OK, removed it. Everything seems to work with and without xattrs enabled.

@torcolvin torcolvin enabled auto-merge (squash) August 31, 2023 14:55
@torcolvin torcolvin merged commit 2689cf8 into master Aug 31, 2023
13 checks passed
@torcolvin torcolvin deleted the rosmar-subdocXattrStore branch August 31, 2023 14:56
bbrks pushed a commit that referenced this pull request Mar 28, 2024
* Make SubdocXattrStore work with Rosmar collections

* There's a new interface sgbucket.XattrStore2 that contains the
  methods of SubdocXattrStore that aren't redundant.
* rosmar.Collection implements XattrStore2.
* LeakyDataStore now implements SubdocXattrStore; the methods are
  either delegated to their existing DataStore counterparts, or to
  the new methods from XattrStore2.
* AsSubdocXattrStore() isn't needed anymore, because LeakyDataStore
  now implements SubdocXattrStore.
* Removed obsolete TestRequiresSubdocXattrStore()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants