diff --git a/query/graph/graphresponse.pb.go b/query/graph/graphresponse.pb.go
index fc069a54766f9c5db006518dc122b3051dbcb713..fefbbb2bb5a008e850922ce5325b4eeeb58062cf 100644
--- a/query/graph/graphresponse.pb.go
+++ b/query/graph/graphresponse.pb.go
@@ -43,7 +43,7 @@ func (*Request) ProtoMessage() {}
func (*Request) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
type Value struct {
- Binary []byte `protobuf:"bytes,1,opt,name=binary,proto3" json:"binary,omitempty"`
+ Str string `protobuf:"bytes,1,opt,name=str" json:"str,omitempty"`
}
func (m *Value) Reset() { *m = Value{} }
@@ -156,22 +156,22 @@ var _DGraph_serviceDesc = grpc.ServiceDesc{
}
var fileDescriptor0 = []byte{
- // 272 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x5c, 0x50, 0xc1, 0x4a, 0xc3, 0x40,
- 0x10, 0x35, 0x4d, 0x36, 0xda, 0x49, 0x51, 0x19, 0x45, 0x42, 0x15, 0x2c, 0x39, 0x68, 0x4f, 0x41,
- 0xe2, 0x45, 0xf4, 0xaa, 0x78, 0x10, 0x44, 0xf7, 0xe0, 0x3d, 0x31, 0x83, 0x5d, 0x2c, 0x49, 0xdc,
- 0x6c, 0xc4, 0x7e, 0xbb, 0x17, 0xb3, 0xd3, 0xb5, 0x06, 0x6f, 0x6f, 0xdf, 0x9b, 0x79, 0xfb, 0xe6,
- 0xc1, 0xc1, 0x9b, 0xce, 0x9b, 0x85, 0xa6, 0xb6, 0xa9, 0xab, 0x96, 0xd2, 0x46, 0xd7, 0xa6, 0x46,
- 0xc1, 0x64, 0x72, 0x0a, 0xdb, 0x92, 0x3e, 0x3a, 0x6a, 0x0d, 0x1e, 0x82, 0xe8, 0x81, 0x5e, 0xc5,
- 0xde, 0xcc, 0x9b, 0x8f, 0xe5, 0xfa, 0xd1, 0x0f, 0x88, 0x97, 0x7c, 0xd9, 0x11, 0x1e, 0x41, 0x58,
- 0xa8, 0x2a, 0x77, 0xfa, 0x44, 0xba, 0x57, 0xf2, 0xed, 0x41, 0xf0, 0x58, 0x97, 0x84, 0xfb, 0xe0,
- 0x77, 0xaa, 0x64, 0x35, 0x90, 0x16, 0x5a, 0xe6, 0xab, 0x67, 0x46, 0xec, 0x67, 0x21, 0x9e, 0xc0,
- 0x38, 0x37, 0x46, 0xab, 0xa2, 0x33, 0x14, 0xfb, 0xcc, 0xff, 0x11, 0x78, 0x03, 0xd0, 0x87, 0x6b,
- 0x48, 0x1b, 0x45, 0x6d, 0x1c, 0xcc, 0xfc, 0x79, 0x94, 0x1d, 0xa7, 0x1c, 0x34, 0xb5, 0x5f, 0xa4,
- 0x4f, 0x1b, 0xf5, 0xae, 0x32, 0x7a, 0x25, 0x07, 0xe3, 0x78, 0x0e, 0x3b, 0xaf, 0x0b, 0xb5, 0x2c,
- 0x35, 0x55, 0xb1, 0xe0, 0xd5, 0x68, 0xb0, 0x2a, 0x37, 0xe2, 0xf4, 0x01, 0xf6, 0xfe, 0xf9, 0xd8,
- 0xa0, 0xef, 0xf4, 0x7b, 0xb8, 0x85, 0x98, 0x80, 0xf8, 0xb4, 0x67, 0x73, 0xf8, 0x28, 0x9b, 0x38,
- 0x2b, 0xae, 0x42, 0xae, 0xa5, 0xeb, 0xd1, 0x95, 0x97, 0x5d, 0x40, 0x78, 0x7b, 0x6f, 0x25, 0x3c,
- 0x03, 0xf1, 0x6c, 0x1b, 0xc3, 0x5d, 0x37, 0xeb, 0x7a, 0x9d, 0x0e, 0x63, 0x24, 0x5b, 0x45, 0xc8,
- 0xfd, 0x5f, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0xb8, 0x91, 0x31, 0x0d, 0x96, 0x01, 0x00, 0x00,
+ // 268 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x5c, 0x90, 0x41, 0x4f, 0x83, 0x40,
+ 0x10, 0x85, 0xa5, 0xb0, 0xd5, 0x0e, 0x46, 0xcd, 0xea, 0x01, 0xab, 0x89, 0xcd, 0x1e, 0xb4, 0x27,
+ 0x62, 0xf0, 0x62, 0xf4, 0xaa, 0xf1, 0x60, 0x62, 0x74, 0x0f, 0xde, 0xa9, 0x4c, 0x2c, 0xb1, 0x01,
+ 0xdc, 0x5d, 0x8c, 0xfd, 0xed, 0x5e, 0x64, 0x06, 0x44, 0xd2, 0xdb, 0xe3, 0x7d, 0xb3, 0xc3, 0x9b,
+ 0x07, 0x87, 0xef, 0x26, 0xad, 0x96, 0x06, 0x6d, 0x55, 0x16, 0x16, 0xe3, 0xca, 0x94, 0xae, 0x94,
+ 0x82, 0x4d, 0x75, 0x06, 0xdb, 0x1a, 0x3f, 0x6b, 0xb4, 0x4e, 0x1e, 0x81, 0x68, 0x84, 0x59, 0x47,
+ 0xde, 0xcc, 0x9b, 0x4f, 0x74, 0xfb, 0xa1, 0x8e, 0x41, 0xbc, 0xa6, 0xab, 0x1a, 0xe5, 0x01, 0xf8,
+ 0xd6, 0x99, 0x0e, 0x92, 0x54, 0x3f, 0x1e, 0x04, 0x4f, 0x65, 0xc6, 0xa8, 0xce, 0x33, 0x46, 0x81,
+ 0x26, 0x49, 0xce, 0x77, 0xe3, 0x8c, 0xda, 0xe1, 0x46, 0xca, 0x53, 0x98, 0xa4, 0xce, 0x99, 0x7c,
+ 0x51, 0x3b, 0x8c, 0x7c, 0xf6, 0xff, 0x0d, 0x79, 0x0b, 0xd0, 0xc4, 0xaa, 0xd0, 0xb8, 0x1c, 0x6d,
+ 0x14, 0xcc, 0xfc, 0x79, 0x98, 0x9c, 0xc4, 0x1c, 0x31, 0xa6, 0x5f, 0xc4, 0xcf, 0x3d, 0xbd, 0x2f,
+ 0x9c, 0x59, 0xeb, 0xc1, 0xb8, 0xbc, 0x80, 0x9d, 0xb7, 0x65, 0xbe, 0xca, 0x0c, 0x16, 0x91, 0xe0,
+ 0xa7, 0xe1, 0xe0, 0xa9, 0xee, 0xe1, 0xf4, 0x11, 0xf6, 0x37, 0xf6, 0x50, 0xd0, 0x0f, 0xfc, 0x3b,
+ 0x99, 0xa4, 0x54, 0x20, 0xbe, 0xe8, 0x60, 0x0e, 0x1f, 0x26, 0xbb, 0xdd, 0x2a, 0x2e, 0x41, 0xb7,
+ 0xe8, 0x66, 0x74, 0xed, 0x25, 0x97, 0x30, 0xbe, 0x7b, 0x20, 0x24, 0xcf, 0x41, 0xbc, 0x50, 0x57,
+ 0x72, 0xaf, 0x9b, 0xed, 0x1a, 0x9d, 0x0e, 0x63, 0xa8, 0xad, 0xc5, 0x98, 0x9b, 0xbf, 0xfa, 0x0d,
+ 0x00, 0x00, 0xff, 0xff, 0xe1, 0x8a, 0xe7, 0x89, 0x90, 0x01, 0x00, 0x00,
}
diff --git a/query/graph/graphresponse.proto b/query/graph/graphresponse.proto
index a9a4deee7d49efa6f6e2395b20134e55571a17f2..81545972f2a51f0f440d2746e5b544411ab79890 100644
--- a/query/graph/graphresponse.proto
+++ b/query/graph/graphresponse.proto
@@ -13,7 +13,7 @@ message Request {
}
message Value {
- bytes binary = 1;
+ string str = 1;
}
message Node {
diff --git a/query/query.go b/query/query.go
index 4a31ab5c4a889acf72eeea7fdbfb9eaee6a1f76d..d91d028bd542103546e75784c7e5fe29b47f2d01 100644
--- a/query/query.go
+++ b/query/query.go
@@ -332,12 +332,12 @@ func (g *SubGraph) preTraverse(uid uint64, dst *graph.Node) error {
ival = ""
}
- v.Binary = []byte(ival.(string))
+ v.Str = ival.(string)
properties[pc.Attr] = v
}
}
if val, ok := properties["_xid_"]; ok {
- dst.Xid = string(val.Binary)
+ dst.Xid = val.Str
delete(properties, "_xid_")
}
dst.Properties, dst.Children = properties, children
diff --git a/query/query_test.go b/query/query_test.go
index 4ca61bda399da0ee12c37bda4b5b104fcc714661..50e4373af639314a1dad8ccf7f3ae300e3e3b5f8 100644
--- a/query/query_test.go
+++ b/query/query_test.go
@@ -378,9 +378,9 @@ func TestToProtocolBuffer(t *testing.T) {
t.Errorf("Expected values map to contain 3 properties, Got: %v",
len(gr.Properties))
}
- if string(gr.Properties["name"].Binary) != "Michonne" {
+ if string(gr.Properties["name"].Str) != "Michonne" {
t.Errorf("Expected property name to have value Michonne, Got: %v",
- string(gr.Properties["name"].Binary))
+ string(gr.Properties["name"].Str))
}
if len(gr.Children) != 10 {
t.Errorf("Expected 10 children, Got: %v", len(gr.Children))
@@ -397,9 +397,9 @@ func TestToProtocolBuffer(t *testing.T) {
t.Errorf("Expected values map to contain 1 property, Got: %v",
len(child.Properties))
}
- if string(child.Properties["name"].Binary) != "Rick Grimes" {
+ if string(child.Properties["name"].Str) != "Rick Grimes" {
t.Errorf("Expected property name to have value Rick Grimes, Got: %v",
- string(child.Properties["name"].Binary))
+ string(child.Properties["name"].Str))
}
if len(child.Children) != 0 {
t.Errorf("Expected 0 children, Got: %v", len(child.Children))