Skip to content

Commit

Permalink
Update search index API (#79)
Browse files Browse the repository at this point in the history
  • Loading branch information
@chvck
chvck authored Sep 26, 2023
1 parent 437af61 commit 16713d2
Show file tree
Hide file tree
Showing 11 changed files with 766 additions and 42 deletions.
2 changes: 1 addition & 1 deletion contrib/gocbcorex
Submodule gocbcorex updated 16 files
+40 −0 agent_ops.go
+33 −0 agent_ops_test.go
+39 −0 cbsearchx/index_json.go
+381 −23 cbsearchx/search.go
+2 −0 collectionresolver_cached.go
+1 −1 go.mod
+2 −7 go.sum
+5 −3 kvclient.go
+6 −1 kvclient_ops.go
+66 −0 kvclient_test.go
+14 −0 memdx/errors.go
+3 −3 memdx/packetwriter.go
+42 −0 retrymanager.go
+76 −14 searchcomponent.go
+173 −0 searchcomponent_test.go
+6 −5 testutils/utils.go
14 changes: 7 additions & 7 deletions contrib/goprotostellar/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
module github.com/couchbase/goprotostellar

go 1.19
go 1.18

require (
google.golang.org/genproto v0.0.0-20230131230820-1c016267d619
google.golang.org/grpc v1.52.3
google.golang.org/protobuf v1.28.1
google.golang.org/genproto v0.0.0-20230320184635-7606e756e683
google.golang.org/grpc v1.53.0
google.golang.org/protobuf v1.30.0
)

require (
github.com/golang/protobuf v1.5.2 // indirect
golang.org/x/net v0.4.0 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
)
24 changes: 12 additions & 12 deletions contrib/goprotostellar/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/genproto v0.0.0-20230131230820-1c016267d619 h1:p0kMzw6AG0JEzd7Z+kXqOiLhC6gjUQTbtS2zR0Q3DbI=
google.golang.org/genproto v0.0.0-20230131230820-1c016267d619/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
google.golang.org/grpc v1.52.3 h1:pf7sOysg4LdgBqduXveGKrcEwbStiK2rtfghdzlUYDQ=
google.golang.org/grpc v1.52.3/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY=
google.golang.org/genproto v0.0.0-20230320184635-7606e756e683 h1:khxVcsk/FhnzxMKOyD+TDGwjbEOpcPuIpmafPGFmhMA=
google.golang.org/genproto v0.0.0-20230320184635-7606e756e683/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc=
google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
2 changes: 1 addition & 1 deletion contrib/protostellar
Submodule protostellar updated 1 files
+108 −27 couchbase/admin/search/v1/search.proto
4 changes: 2 additions & 2 deletions gateway/dataimpl/server_v1/errorhandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ func (e ErrorHandler) NewCollectionExistsStatus(baseErr error, bucketName, scope
return st
}

func (e ErrorHandler) NewSearchIndexExistsStatus(baseErr error, indexName string) *status.Status {
func (e ErrorHandler) NewSearchIndexMissingStatus(baseErr error, indexName string) *status.Status {
st := status.New(codes.NotFound,
fmt.Sprintf("Search index '%s' not found.",
indexName))
Expand All @@ -194,7 +194,7 @@ func (e ErrorHandler) NewSearchIndexExistsStatus(baseErr error, indexName string
return st
}

func (e ErrorHandler) NewSearchIndexMissingStatus(baseErr error, indexName string) *status.Status {
func (e ErrorHandler) NewSearchIndexExistsStatus(baseErr error, indexName string) *status.Status {
st := status.New(codes.AlreadyExists,
fmt.Sprintf("Search index '%s' already existed.",
indexName))
Expand Down
Loading

0 comments on commit 16713d2

Please sign in to comment.