From 3e715b07751176034983edc5edcd6dcd1513e450 Mon Sep 17 00:00:00 2001 From: adamcfraser Date: Fri, 8 Sep 2023 15:33:19 -0700 Subject: [PATCH 1/3] Remove XattrStore2 reference --- collection+xattrs.go | 1 - 1 file changed, 1 deletion(-) diff --git a/collection+xattrs.go b/collection+xattrs.go index c3a2856..4c12203 100644 --- a/collection+xattrs.go +++ b/collection+xattrs.go @@ -633,5 +633,4 @@ func (e *event) expandSyncXattrMacros(xattr any) { var ( // Enforce interface conformance: _ sgbucket.UserXattrStore = &Collection{} - _ sgbucket.XattrStore2 = &Collection{} ) From 0e6c8bec54b057b5983fc878ba8fad6f575eb377 Mon Sep 17 00:00:00 2001 From: adamcfraser Date: Mon, 11 Sep 2023 16:12:59 -0700 Subject: [PATCH 2/3] go.mod update for sg-bucket PR branch --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index b4b734e..abbef37 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/couchbaselabs/rosmar go 1.19 require ( - github.com/couchbase/sg-bucket v0.0.0-20230824211334-789eb9635f76 + github.com/couchbase/sg-bucket v0.0.0-20230908223124-2f1078e2282c github.com/google/uuid v1.3.0 github.com/mattn/go-sqlite3 v1.14.17 github.com/stretchr/testify v1.8.4 diff --git a/go.sum b/go.sum index 66cf6c7..130129f 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/couchbase/sg-bucket v0.0.0-20230824211334-789eb9635f76 h1:SkanGCttA5xsq43ekHTcIR57ZXvA+MjK5WfdbeDNWek= github.com/couchbase/sg-bucket v0.0.0-20230824211334-789eb9635f76/go.mod h1:sZO/b/EAyLhPJWOSiaaYRQ3rnveSumRh2wUEfNkK/UM= +github.com/couchbase/sg-bucket v0.0.0-20230908223124-2f1078e2282c h1:gs5NrvLopWkZOoI7FdYHWjAuJ3KYQtey/++CTTfJBow= +github.com/couchbase/sg-bucket v0.0.0-20230908223124-2f1078e2282c/go.mod h1:sZO/b/EAyLhPJWOSiaaYRQ3rnveSumRh2wUEfNkK/UM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= From bc86b2d386d78173ed660f7c53b7f3059384bfcd Mon Sep 17 00:00:00 2001 From: adamcfraser Date: Tue, 12 Sep 2023 11:41:58 -0700 Subject: [PATCH 3/3] Bump go.mod for sg-bucket --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index abbef37..33cad2b 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/couchbaselabs/rosmar go 1.19 require ( - github.com/couchbase/sg-bucket v0.0.0-20230908223124-2f1078e2282c + github.com/couchbase/sg-bucket v0.0.0-20230912183916-dfc81a029d3b github.com/google/uuid v1.3.0 github.com/mattn/go-sqlite3 v1.14.17 github.com/stretchr/testify v1.8.4 diff --git a/go.sum b/go.sum index 130129f..c26d256 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,9 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/couchbase/sg-bucket v0.0.0-20230824211334-789eb9635f76 h1:SkanGCttA5xsq43ekHTcIR57ZXvA+MjK5WfdbeDNWek= -github.com/couchbase/sg-bucket v0.0.0-20230824211334-789eb9635f76/go.mod h1:sZO/b/EAyLhPJWOSiaaYRQ3rnveSumRh2wUEfNkK/UM= github.com/couchbase/sg-bucket v0.0.0-20230908223124-2f1078e2282c h1:gs5NrvLopWkZOoI7FdYHWjAuJ3KYQtey/++CTTfJBow= github.com/couchbase/sg-bucket v0.0.0-20230908223124-2f1078e2282c/go.mod h1:sZO/b/EAyLhPJWOSiaaYRQ3rnveSumRh2wUEfNkK/UM= +github.com/couchbase/sg-bucket v0.0.0-20230912183916-dfc81a029d3b h1:kTGWkJ30HJQ39SIgtkGjFIOcE3p1L0RwN5sBiVakVAs= +github.com/couchbase/sg-bucket v0.0.0-20230912183916-dfc81a029d3b/go.mod h1:sZO/b/EAyLhPJWOSiaaYRQ3rnveSumRh2wUEfNkK/UM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=