runtime: rewrite query.go in new protoreflect

grpc-ecosystem · May 14, 2020 · 43ced79 · 43ced79
1 parent 77f9ac8
commit 43ced79
Show file tree

Hide file tree

Showing 7 changed files with 589 additions and 644 deletions.
diff --git a/repositories.bzl b/repositories.bzl
@@ -78,8 +78,8 @@ def go_repositories():
     go_repository(
         name = "org_golang_google_genproto",
         importpath = "google.golang.org/genproto",
-        sum = "h1:Bz1qTn2YRWV+9OKJtxHJiQKCiXIdf+kwuKXdt9cBxyU=",
-        version = "v0.0.0-20200507105951-43844f6eee31",
+        sum = "h1:fiNLklpBwWK1mth30Hlwk+fcdBmIALlgF5iy77O37Ig=",
+        version = "v0.0.0-20200513103714-09dca8ec2884",
     )
     go_repository(
         name = "org_golang_google_grpc",

diff --git a/runtime/BUILD.bazel b/runtime/BUILD.bazel
@@ -28,6 +28,7 @@ go_library(
         "@com_github_golang_protobuf//descriptor:go_default_library_gen",
         "@com_github_golang_protobuf//jsonpb:go_default_library_gen",
         "@com_github_golang_protobuf//proto:go_default_library",
+        "@com_github_golang_protobuf//ptypes:go_default_library_gen",
         "@go_googleapis//google/api:httpbody_go_proto",
         "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
         "@io_bazel_rules_go//proto/wkt:duration_go_proto",
@@ -38,6 +39,9 @@ go_library(
         "@org_golang_google_grpc//grpclog:go_default_library",
         "@org_golang_google_grpc//metadata:go_default_library",
         "@org_golang_google_grpc//status:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//reflect/protoreflect:go_default_library",
+        "@org_golang_google_protobuf//reflect/protoregistry:go_default_library",
     ],
 )
 
@@ -79,6 +83,7 @@ go_test(
         "@org_golang_google_grpc//codes:go_default_library",
         "@org_golang_google_grpc//metadata:go_default_library",
         "@org_golang_google_grpc//status:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
         "@org_golang_google_protobuf//testing/protocmp:go_default_library",
     ],
 )
diff --git a/runtime/internal/examplepb/proto3.pb.go b/runtime/internal/examplepb/proto3.pb.go
diff --git a/runtime/internal/examplepb/proto3.proto b/runtime/internal/examplepb/proto3.proto
@@ -10,6 +10,7 @@ import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
 
 message Proto3Message {
+  // Next number: 46
   Proto3Message nested = 41;
   float float_value = 42;
   double double_value = 43;
@@ -21,6 +22,7 @@ message Proto3Message {
   string string_value = 8;
   bytes bytes_value = 9;
   repeated string repeated_value = 10;
+  repeated google.protobuf.UInt64Value repeated_message = 44;
   EnumValue enum_value = 11;
   repeated EnumValue repeated_enum = 12;
   google.protobuf.Timestamp timestamp_value = 13;
@@ -52,6 +54,7 @@ message Proto3Message {
   map<string, double> map_value12 = 37;
   map<string, bool> map_value14 = 39;
   map<bool, string> map_value15 = 40;
+  map<string, google.protobuf.UInt64Value> map_value16 = 45;
 }
 
 enum EnumValue {

diff --git a/runtime/marshal_jsonpb.go b/runtime/marshal_jsonpb.go
@@ -260,3 +260,17 @@ var allowUnknownFields = true
 func DisallowUnknownFields() {
 	allowUnknownFields = false
 }
+
+var (
+	convFromType = map[reflect.Kind]reflect.Value{
+		reflect.String:  reflect.ValueOf(String),
+		reflect.Bool:    reflect.ValueOf(Bool),
+		reflect.Float64: reflect.ValueOf(Float64),
+		reflect.Float32: reflect.ValueOf(Float32),
+		reflect.Int64:   reflect.ValueOf(Int64),
+		reflect.Int32:   reflect.ValueOf(Int32),
+		reflect.Uint64:  reflect.ValueOf(Uint64),
+		reflect.Uint32:  reflect.ValueOf(Uint32),
+		reflect.Slice:   reflect.ValueOf(Bytes),
+	}
+)