opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change function names

Browse Source
This commit is contained in:
Menghan Li
2016-07-27 15:46:27 -07:00
parent 5502cde528
commit 22c41c77e6
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
transport/handler_server.go
View File

@ -83,7 +83,7 @@ func NewServerHandlerTransport(w http.ResponseWriter, r *http.Request) (ServerTr
} }
if v := r.Header.Get("grpc-timeout"); v != "" { if v := r.Header.Get("grpc-timeout"); v != "" {
to, err := timeoutDecode(v) to, err := decodeTimeout(v)
if err != nil { if err != nil {
return nil, StreamErrorf(codes.Internal, "malformed time-out: %v", err) return nil, StreamErrorf(codes.Internal, "malformed time-out: %v", err)
} }
@ -194,7 +194,7 @@ func (ht *serverHandlerTransport) WriteStatus(s *Stream, statusCode codes.Code,
h := ht.rw.Header() h := ht.rw.Header()
h.Set("Grpc-Status", fmt.Sprintf("%d", statusCode)) h.Set("Grpc-Status", fmt.Sprintf("%d", statusCode))
if statusDesc != "" { if statusDesc != "" {
h.Set("Grpc-Message", grpcMessageEncode(statusDesc)) h.Set("Grpc-Message", encodeGrpcMessage(statusDesc))
} }
if md := s.Trailer(); len(md) > 0 { if md := s.Trailer(); len(md) > 0 {
for k, vv := range md { for k, vv := range md {

4
transport/handler_server_test.go
View File

@ -333,7 +333,7 @@ func handleStreamCloseBodyTest(t *testing.T, statusCode codes.Code, msg string)
"Content-Type": {"application/grpc"}, "Content-Type": {"application/grpc"},
"Trailer": {"Grpc-Status", "Grpc-Message"}, "Trailer": {"Grpc-Status", "Grpc-Message"},
"Grpc-Status": {fmt.Sprint(uint32(statusCode))}, "Grpc-Status": {fmt.Sprint(uint32(statusCode))},
"Grpc-Message": {grpcMessageEncode(msg)}, "Grpc-Message": {encodeGrpcMessage(msg)},
} }
if !reflect.DeepEqual(st.rw.HeaderMap, wantHeader) { if !reflect.DeepEqual(st.rw.HeaderMap, wantHeader) {
t.Errorf("Header+Trailer mismatch.\n got: %#v\nwant: %#v", st.rw.HeaderMap, wantHeader) t.Errorf("Header+Trailer mismatch.\n got: %#v\nwant: %#v", st.rw.HeaderMap, wantHeader)
@ -381,7 +381,7 @@ func TestHandlerTransport_HandleStreams_Timeout(t *testing.T) {
"Content-Type": {"application/grpc"}, "Content-Type": {"application/grpc"},
"Trailer": {"Grpc-Status", "Grpc-Message"}, "Trailer": {"Grpc-Status", "Grpc-Message"},
"Grpc-Status": {"4"}, "Grpc-Status": {"4"},
"Grpc-Message": {grpcMessageEncode("too slow")}, "Grpc-Message": {encodeGrpcMessage("too slow")},
} }
if !reflect.DeepEqual(rw.HeaderMap, wantHeader) { if !reflect.DeepEqual(rw.HeaderMap, wantHeader) {
t.Errorf("Header+Trailer Map mismatch.\n got: %#v\nwant: %#v", rw.HeaderMap, wantHeader) t.Errorf("Header+Trailer Map mismatch.\n got: %#v\nwant: %#v", rw.HeaderMap, wantHeader)

2
transport/http2_client.go
View File

@ -341,7 +341,7 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-encoding", Value: callHdr.SendCompress}) t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-encoding", Value: callHdr.SendCompress})
} }
if timeout > 0 { if timeout > 0 {
t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-timeout", Value: timeoutEncode(timeout)}) t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-timeout", Value: encodeTimeout(timeout)})
} }
for k, v := range authData { for k, v := range authData {
// Capital header names are illegal in HTTP/2. // Capital header names are illegal in HTTP/2.

2
transport/http2_server.go
View File

@ -507,7 +507,7 @@ func (t *http2Server) WriteStatus(s *Stream, statusCode codes.Code, statusDesc s
Name: "grpc-status", Name: "grpc-status",
Value: strconv.Itoa(int(statusCode)), Value: strconv.Itoa(int(statusCode)),
}) })
t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-message", Value: grpcMessageEncode(statusDesc)}) t.hEnc.WriteField(hpack.HeaderField{Name: "grpc-message", Value: encodeGrpcMessage(statusDesc)})
// Attach the trailer metadata. // Attach the trailer metadata.
for k, v := range s.trailer { for k, v := range s.trailer {
// Clients don't tolerate reading restricted headers after some non restricted ones were sent. // Clients don't tolerate reading restricted headers after some non restricted ones were sent.

24
transport/http_util.go
View File

@ -175,11 +175,11 @@ func (d *decodeState) processHeaderField(f hpack.HeaderField) {
} }
d.statusCode = codes.Code(code) d.statusCode = codes.Code(code)
case "grpc-message": case "grpc-message":
d.statusDesc = grpcMessageDecode(f.Value) d.statusDesc = decodeGrpcMessage(f.Value)
case "grpc-timeout": case "grpc-timeout":
d.timeoutSet = true d.timeoutSet = true
var err error var err error
d.timeout, err = timeoutDecode(f.Value) d.timeout, err = decodeTimeout(f.Value)
if err != nil { if err != nil {
d.setErr(StreamErrorf(codes.Internal, "transport: malformed time-out: %v", err)) d.setErr(StreamErrorf(codes.Internal, "transport: malformed time-out: %v", err))
return return
@ -252,7 +252,7 @@ func div(d, r time.Duration) int64 {
} }
// TODO(zhaoq): It is the simplistic and not bandwidth efficient. Improve it. // TODO(zhaoq): It is the simplistic and not bandwidth efficient. Improve it.
func timeoutEncode(t time.Duration) string { func encodeTimeout(t time.Duration) string {
if d := div(t, time.Nanosecond); d <= maxTimeoutValue { if d := div(t, time.Nanosecond); d <= maxTimeoutValue {
return strconv.FormatInt(d, 10) + "n" return strconv.FormatInt(d, 10) + "n"
} }
@ -272,7 +272,7 @@ func timeoutEncode(t time.Duration) string {
return strconv.FormatInt(div(t, time.Hour), 10) + "H" return strconv.FormatInt(div(t, time.Hour), 10) + "H"
} }
func timeoutDecode(s string) (time.Duration, error) { func decodeTimeout(s string) (time.Duration, error) {
size := len(s) size := len(s)
if size < 2 { if size < 2 {
return 0, fmt.Errorf("transport: timeout string is too short: %q", s) return 0, fmt.Errorf("transport: timeout string is too short: %q", s)
@ -295,13 +295,13 @@ const (
percentByte = '%' percentByte = '%'
) )
// grpcMessageEncode is used to encode status code in header field // encodeGrpcMessage is used to encode status code in header field
// "grpc-message". // "grpc-message".
// It checks to see if each individual byte in msg is an // It checks to see if each individual byte in msg is an
// allowable byte, and then either percent encoding or passing it through. // allowable byte, and then either percent encoding or passing it through.
// When percent encoding, the byte is converted into hexadecimal notation // When percent encoding, the byte is converted into hexadecimal notation
// with a '%' prepended. // with a '%' prepended.
func grpcMessageEncode(msg string) string { func encodeGrpcMessage(msg string) string {
if msg == "" { if msg == "" {
return "" return ""
} }
@ -309,13 +309,13 @@ func grpcMessageEncode(msg string) string {
for i := 0; i < lenMsg; i++ { for i := 0; i < lenMsg; i++ {
c := msg[i] c := msg[i]
if !(c >= spaceByte && c < tildaByte && c != percentByte) { if !(c >= spaceByte && c < tildaByte && c != percentByte) {
return grpcMessageEncodeUnchecked(msg) return encodeGrpcMessageUnchecked(msg)
} }
} }
return msg return msg
} }
func grpcMessageEncodeUnchecked(msg string) string { func encodeGrpcMessageUnchecked(msg string) string {
var buf bytes.Buffer var buf bytes.Buffer
lenMsg := len(msg) lenMsg := len(msg)
for i := 0; i < lenMsg; i++ { for i := 0; i < lenMsg; i++ {
@ -329,21 +329,21 @@ func grpcMessageEncodeUnchecked(msg string) string {
return buf.String() return buf.String()
} }
// grpcMessageDecode decodes the msg encoded by grpcMessageEncode. // decodeGrpcMessage decodes the msg encoded by encodeGrpcMessage.
func grpcMessageDecode(msg string) string { func decodeGrpcMessage(msg string) string {
if msg == "" { if msg == "" {
return "" return ""
} }
lenMsg := len(msg) lenMsg := len(msg)
for i := 0; i < lenMsg; i++ { for i := 0; i < lenMsg; i++ {
if msg[i] == percentByte && i+2 < lenMsg { if msg[i] == percentByte && i+2 < lenMsg {
return grpcMessageDecodeUnchecked(msg) return decodeGrpcMessageUnchecked(msg)
} }
} }
return msg return msg
} }
func grpcMessageDecodeUnchecked(msg string) string { func decodeGrpcMessageUnchecked(msg string) string {
var buf bytes.Buffer var buf bytes.Buffer
lenMsg := len(msg) lenMsg := len(msg)
for i := 0; i < lenMsg; i++ { for i := 0; i < lenMsg; i++ {

16
transport/http_util_test.go
View File

@ -59,7 +59,7 @@ func TestTimeoutEncode(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("failed to parse duration string %s: %v", test.in, err) t.Fatalf("failed to parse duration string %s: %v", test.in, err)
} }
out := timeoutEncode(d) out := encodeTimeout(d)
if out != test.out { if out != test.out {
t.Fatalf("timeoutEncode(%s) = %s, want %s", test.in, out, test.out) t.Fatalf("timeoutEncode(%s) = %s, want %s", test.in, out, test.out)
} }
@ -79,7 +79,7 @@ func TestTimeoutDecode(t *testing.T) {
{"1", 0, fmt.Errorf("transport: timeout string is too short: %q", "1")}, {"1", 0, fmt.Errorf("transport: timeout string is too short: %q", "1")},
{"", 0, fmt.Errorf("transport: timeout string is too short: %q", "")}, {"", 0, fmt.Errorf("transport: timeout string is too short: %q", "")},
} { } {
d, err := timeoutDecode(test.s) d, err := decodeTimeout(test.s)
if d != test.d || fmt.Sprint(err) != fmt.Sprint(test.err) { if d != test.d || fmt.Sprint(err) != fmt.Sprint(test.err) {
t.Fatalf("timeoutDecode(%q) = %d, %v, want %d, %v", test.s, int64(d), err, int64(test.d), test.err) t.Fatalf("timeoutDecode(%q) = %d, %v, want %d, %v", test.s, int64(d), err, int64(test.d), test.err)
} }
@ -108,7 +108,7 @@ func TestValidContentType(t *testing.T) {
} }
} }
func TestGrpcMessageEncode(t *testing.T) { func TestEncodeGrpcMessage(t *testing.T) {
for _, tt := range []struct { for _, tt := range []struct {
input string input string
expected string expected string
@ -118,14 +118,14 @@ func TestGrpcMessageEncode(t *testing.T) {
{"my favorite character is \u0000", "my favorite character is %00"}, {"my favorite character is \u0000", "my favorite character is %00"},
{"my favorite character is %", "my favorite character is %25"}, {"my favorite character is %", "my favorite character is %25"},
} { } {
actual := grpcMessageEncode(tt.input) actual := encodeGrpcMessage(tt.input)
if tt.expected != actual { if tt.expected != actual {
t.Errorf("grpcMessageEncode(%v) = %v, want %v", tt.input, actual, tt.expected) t.Errorf("encodeGrpcMessage(%v) = %v, want %v", tt.input, actual, tt.expected)
} }
} }
} }
func TestGrpcMessageDecode(t *testing.T) { func TestDecodeGrpcMessage(t *testing.T) {
for _, tt := range []struct { for _, tt := range []struct {
input string input string
expected string expected string
@ -136,9 +136,9 @@ func TestGrpcMessageDecode(t *testing.T) {
{"H%6", "H%6"}, {"H%6", "H%6"},
{"%G0", "%G0"}, {"%G0", "%G0"},
} { } {
actual := grpcMessageDecode(tt.input) actual := decodeGrpcMessage(tt.input)
if tt.expected != actual { if tt.expected != actual {
t.Errorf("grpcMessageDncode(%v) = %v, want %v", tt.input, actual, tt.expected) t.Errorf("dncodeGrpcMessage(%v) = %v, want %v", tt.input, actual, tt.expected)
} }
} }
} }