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.

Sign up for GitHub

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

Fix check reply argument type #53

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+31 −6
Open

Fix check reply argument type #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffbd7c8
Update geerpc-day1.md
imageslr May 25, 2021
3d95165
fix: fix reply arg check
HypenZou Feb 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion gee-rpc/day3-service/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (s *service) registerMethods() {
continue
}
argType, replyType := mType.In(1), mType.In(2)
if !isExportedOrBuiltinType(argType) || !isExportedOrBuiltinType(replyType) {
if !isExportedOrBuiltinType(argType) || !isExportedOrBuiltinType(replyType) || !isPtrType(replyType) {
continue
}
s.method[method.Name] = &methodType{
Expand All @@ -95,5 +95,10 @@ func (s *service) call(m *methodType, argv, replyv reflect.Value) error {
}

func isExportedOrBuiltinType(t reflect.Type) bool {

return ast.IsExported(t.Name()) || t.PkgPath() == ""
}

func isPtrType(t reflect.Type) bool {
return t.Kind() == reflect.Ptr
}
7 changes: 6 additions & 1 deletion gee-rpc/day4-timeout/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (s *service) registerMethods() {
continue
}
argType, replyType := mType.In(1), mType.In(2)
if !isExportedOrBuiltinType(argType) || !isExportedOrBuiltinType(replyType) {
if !isExportedOrBuiltinType(argType) || !isExportedOrBuiltinType(replyType) || !isPtrType(replyType) {
continue
}
s.method[method.Name] = &methodType{
Expand All @@ -95,5 +95,10 @@ func (s *service) call(m *methodType, argv, replyv reflect.Value) error {
}

func isExportedOrBuiltinType(t reflect.Type) bool {

return ast.IsExported(t.Name()) || t.PkgPath() == ""
}

func isPtrType(t reflect.Type) bool {
return t.Kind() == reflect.Ptr
}
7 changes: 6 additions & 1 deletion gee-rpc/day5-http-debug/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (s *service) registerMethods() {
continue
}
argType, replyType := mType.In(1), mType.In(2)
if !isExportedOrBuiltinType(argType) || !isExportedOrBuiltinType(replyType) {
if !isExportedOrBuiltinType(argType) || !isExportedOrBuiltinType(replyType) || !isPtrType(replyType) {
continue
}
s.method[method.Name] = &methodType{
Expand All @@ -95,5 +95,10 @@ func (s *service) call(m *methodType, argv, replyv reflect.Value) error {
}

func isExportedOrBuiltinType(t reflect.Type) bool {

return ast.IsExported(t.Name()) || t.PkgPath() == ""
}

func isPtrType(t reflect.Type) bool {
return t.Kind() == reflect.Ptr
}
7 changes: 6 additions & 1 deletion gee-rpc/day6-load-balance/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (s *service) registerMethods() {
continue
}
argType, replyType := mType.In(1), mType.In(2)
if !isExportedOrBuiltinType(argType) || !isExportedOrBuiltinType(replyType) {
if !isExportedOrBuiltinType(argType) || !isExportedOrBuiltinType(replyType) || !isPtrType(replyType) {
continue
}
s.method[method.Name] = &methodType{
Expand All @@ -95,5 +95,10 @@ func (s *service) call(m *methodType, argv, replyv reflect.Value) error {
}

func isExportedOrBuiltinType(t reflect.Type) bool {

return ast.IsExported(t.Name()) || t.PkgPath() == ""
}

func isPtrType(t reflect.Type) bool {
return t.Kind() == reflect.Ptr
}
7 changes: 6 additions & 1 deletion gee-rpc/day7-registry/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (s *service) registerMethods() {
continue
}
argType, replyType := mType.In(1), mType.In(2)
if !isExportedOrBuiltinType(argType) || !isExportedOrBuiltinType(replyType) {
if !isExportedOrBuiltinType(argType) || !isExportedOrBuiltinType(replyType) || !isPtrType(replyType) {
continue
}
s.method[method.Name] = &methodType{
Expand All @@ -95,5 +95,10 @@ func (s *service) call(m *methodType, argv, replyv reflect.Value) error {
}

func isExportedOrBuiltinType(t reflect.Type) bool {

return ast.IsExported(t.Name()) || t.PkgPath() == ""
}

func isPtrType(t reflect.Type) bool {
return t.Kind() == reflect.Ptr
}
2 changes: 1 addition & 1 deletion gee-rpc/doc/geerpc-day1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ var DefaultOption = &Option{
}
```

一般来说，涉及协议协商的这部分信息，需要设计固定的字节来传输的。但是为了实现上更简单，GeeRPC 客户端固定采用 JSON 编码 Option，后续的 header 和 body 的编码方式由 Option 中的 CodeType 指定，服务端首先使用 JSON 解码 Option，然后通过 Option 得 CodeType 解码剩余的内容。即报文将以这样的形式发送：
一般来说，涉及协议协商的这部分信息，需要设计固定的字节来传输的。但是为了实现上更简单，GeeRPC 客户端固定采用 JSON 编码 Option，后续的 header 和 body 的编码方式由 Option 中的 CodeType 指定，服务端首先使用 JSON 解码 Option，然后通过 Option 的 CodeType 解码剩余的内容。即报文将以这样的形式发送：

```bash
| Option{MagicNumber: xxx, CodecType: xxx} | Header{ServiceMethod ...} | Body interface{} |
Expand Down