-
Notifications
You must be signed in to change notification settings - Fork 56
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
refactor: Change from protobuf to cbor for gRPC #3061
Merged
fredcarle
merged 3 commits into
sourcenetwork:develop
from
fredcarle:fredcarle/refactor/3057-protobuf-to-cbor
Sep 24, 2024
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
// Copyright 2024 Democratized Data Foundation | ||
// | ||
// Use of this software is governed by the Business Source License | ||
// included in the file licenses/BSL.txt. | ||
// | ||
// As of the Change Date specified in that file, in accordance with | ||
// the Business Source License, use of this software will be governed | ||
// by the Apache License, Version 2.0, included in the file | ||
// licenses/APL.txt. | ||
|
||
package net | ||
|
||
import ( | ||
"github.com/fxamacker/cbor/v2" | ||
"google.golang.org/grpc/encoding" | ||
) | ||
|
||
const cborCodecName = "cbor" | ||
|
||
// cborCodec is a gRPC Codec implementation with CBOR encoding. | ||
type cborCodec struct{} | ||
|
||
func (c *cborCodec) Marshal(v any) ([]byte, error) { | ||
return cbor.Marshal(v) | ||
} | ||
|
||
func (c *cborCodec) Unmarshal(data []byte, v any) error { | ||
if v == nil { | ||
return nil | ||
} | ||
return cbor.Unmarshal(data, v) | ||
} | ||
|
||
func (c *cborCodec) Name() string { | ||
return cborCodecName | ||
} | ||
|
||
func init() { | ||
encoding.RegisterCodec(&cborCodec{}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
// Copyright 2024 Democratized Data Foundation | ||
// | ||
// Use of this software is governed by the Business Source License | ||
// included in the file licenses/BSL.txt. | ||
// | ||
// As of the Change Date specified in that file, in accordance with | ||
// the Business Source License, use of this software will be governed | ||
// by the Apache License, Version 2.0, included in the file | ||
// licenses/APL.txt. | ||
|
||
package net | ||
|
||
import ( | ||
"context" | ||
|
||
"google.golang.org/grpc" | ||
) | ||
|
||
const ( | ||
grpcServiceName = "defradb.net.Service" | ||
|
||
serviceGetDocGraphName = "/" + grpcServiceName + "/GetDocGraph" | ||
servicePushDocGraphName = "/" + grpcServiceName + "/PushDocGraph" | ||
serviceGetLogName = "/" + grpcServiceName + "/GetLog" | ||
servicePushLogName = "/" + grpcServiceName + "/PushLog" | ||
serviceGetHeadLogName = "/" + grpcServiceName + "/GetHeadLog" | ||
) | ||
|
||
type getDocGraphRequest struct{} | ||
|
||
type getDocGraphReply struct{} | ||
|
||
type getHeadLogRequest struct{} | ||
|
||
type getHeadLogReply struct{} | ||
|
||
type getLogRequest struct{} | ||
|
||
type getLogReply struct{} | ||
|
||
type pushDocGraphRequest struct{} | ||
|
||
type pushDocGraphReply struct{} | ||
|
||
type pushLogRequest struct { | ||
DocID string | ||
CID []byte | ||
SchemaRoot string | ||
Creator string | ||
Block []byte | ||
} | ||
|
||
type pushLogReply struct{} | ||
|
||
type serviceServer interface { | ||
// GetDocGraph from this peer. | ||
GetDocGraph(context.Context, *getDocGraphRequest) (*getDocGraphReply, error) | ||
// PushDocGraph to this peer. | ||
PushDocGraph(context.Context, *pushDocGraphRequest) (*pushDocGraphReply, error) | ||
// GetLog from this peer. | ||
GetLog(context.Context, *getLogRequest) (*getLogReply, error) | ||
// PushLog to this peer. | ||
PushLog(context.Context, *pushLogRequest) (*pushLogReply, error) | ||
// GetHeadLog from this peer | ||
GetHeadLog(context.Context, *getHeadLogRequest) (*getHeadLogReply, error) | ||
} | ||
|
||
func pushLogHandler( | ||
srv any, | ||
ctx context.Context, | ||
dec func(any) error, | ||
interceptor grpc.UnaryServerInterceptor, | ||
) (any, error) { | ||
in := new(pushLogRequest) | ||
if err := dec(in); err != nil { | ||
return nil, err | ||
} | ||
if interceptor == nil { | ||
return srv.(serviceServer).PushLog(ctx, in) | ||
} | ||
info := &grpc.UnaryServerInfo{ | ||
fredcarle marked this conversation as resolved.
Show resolved
Hide resolved
|
||
Server: srv, | ||
FullMethod: servicePushLogName, | ||
} | ||
handler := func(ctx context.Context, req any) (any, error) { | ||
return srv.(serviceServer).PushLog(ctx, req.(*pushLogRequest)) | ||
} | ||
return interceptor(ctx, in, info, handler) | ||
} | ||
|
||
func registerServiceServer(s grpc.ServiceRegistrar, srv serviceServer) { | ||
desc := &grpc.ServiceDesc{ | ||
ServiceName: grpcServiceName, | ||
HandlerType: (*serviceServer)(nil), | ||
Methods: []grpc.MethodDesc{ | ||
{ | ||
MethodName: "PushLog", | ||
Handler: pushLogHandler, | ||
}, | ||
}, | ||
Streams: []grpc.StreamDesc{}, | ||
Metadata: "defradb.cbor", | ||
} | ||
s.RegisterService(desc, srv) | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thought: not very common way of creating a value on heap.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You know that is your code right 😉