Made changes to proto file for GraphResponse

query/pb/graphresponse.pb.go

@@ -29,7 +29,7 @@ var _ = math.Inf
 const _ = proto.ProtoPackageIsVersion1
 
 type UidList struct {
-	Uids []uint64 `protobuf:"fixed64,1,rep,name=uids" json:"uids,omitempty"`
+	Uids []uint64 `protobuf:"varint,1,rep,name=uids" json:"uids,omitempty"`
 }
 
 func (m *UidList) Reset()                    { *m = UidList{} }
@@ -56,8 +56,8 @@ func (m *Result) GetUidmatrix() []*UidList {
 
 type GraphResponse struct {
 	Attribute string           `protobuf:"bytes,1,opt,name=attribute" json:"attribute,omitempty"`
-	Children  []*GraphResponse `protobuf:"bytes,2,rep,name=children" json:"children,omitempty"`
-	Result    *Result          `protobuf:"bytes,3,opt,name=result" json:"result,omitempty"`
+	Result    *Result          `protobuf:"bytes,2,opt,name=result" json:"result,omitempty"`
+	Children  []*GraphResponse `protobuf:"bytes,3,rep,name=children" json:"children,omitempty"`
 }
 
 func (m *GraphResponse) Reset()                    { *m = GraphResponse{} }
@@ -65,16 +65,16 @@ func (m *GraphResponse) String() string            { return proto.CompactTextStr
 func (*GraphResponse) ProtoMessage()               {}
 func (*GraphResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
 
-func (m *GraphResponse) GetChildren() []*GraphResponse {
+func (m *GraphResponse) GetResult() *Result {
 	if m != nil {
-		return m.Children
+		return m.Result
 	}
 	return nil
 }
 
-func (m *GraphResponse) GetResult() *Result {
+func (m *GraphResponse) GetChildren() []*GraphResponse {
 	if m != nil {
-		return m.Result
+		return m.Children
 	}
 	return nil
 }
@@ -86,18 +86,19 @@ func init() {
 }
 
 var fileDescriptor0 = []byte{
-	// 207 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x54, 0x8f, 0xcd, 0x4a, 0xc4, 0x30,
-	0x14, 0x46, 0x69, 0x2b, 0xd1, 0xde, 0xea, 0xc2, 0x2b, 0x48, 0x17, 0x0a, 0x92, 0x55, 0x5d, 0xd8,
-	0x45, 0x7d, 0x08, 0x17, 0xba, 0xba, 0xe0, 0x03, 0x24, 0x36, 0xd8, 0x40, 0x6d, 0x43, 0x7e, 0x64,
-	0x96, 0xf3, 0xe8, 0x93, 0xb6, 0x61, 0xca, 0xec, 0x92, 0x9c, 0x8f, 0xc3, 0x09, 0x3c, 0xfc, 0x5a,
-	0x61, 0x06, 0xab, 0x9c, 0x99, 0x27, 0xa7, 0x5a, 0x63, 0x67, 0x3f, 0x63, 0x6e, 0x24, 0x7f, 0x86,
-	0xeb, 0x6f, 0xdd, 0x7f, 0x69, 0xe7, 0x11, 0xe1, 0x2a, 0xe8, 0xde, 0xd5, 0xd9, 0x4b, 0xd1, 0x30,
-	0x5a, 0xcf, 0xfc, 0x13, 0x18, 0x29, 0x17, 0x46, 0x8f, 0x8f, 0xc0, 0xfe, 0xc5, 0x18, 0xd4, 0xc6,
-	0x6f, 0x29, 0xdd, 0xf0, 0x15, 0xca, 0xb8, 0xfc, 0x13, 0xde, 0xea, 0x43, 0x9d, 0x47, 0x54, 0x75,
-	0x55, 0x6b, 0x64, 0x9b, 0xac, 0xb4, 0x53, 0x7e, 0xcc, 0xe0, 0xee, 0x63, 0xe9, 0xa0, 0xd4, 0x81,
-	0x4f, 0x50, 0x0a, 0x1f, 0x99, 0x0c, 0x5e, 0x45, 0x6f, 0xd6, 0x94, 0xb4, 0x3f, 0xe0, 0x1b, 0xdc,
-	0xfc, 0x0c, 0x7a, 0xec, 0xad, 0x9a, 0x92, 0xf9, 0x7e, 0x31, 0x5f, 0x28, 0xe8, 0x3c, 0x41, 0x0e,
-	0xcc, 0xae, 0xad, 0x75, 0x11, 0x4d, 0x55, 0x07, 0xcb, 0x78, 0xab, 0xa7, 0x44, 0x24, 0x5b, 0x7f,
-	0xfe, 0x7e, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x26, 0xe5, 0x36, 0x59, 0x10, 0x01, 0x00, 0x00,
+	// 209 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x54, 0x8f, 0xbf, 0x4a, 0xc5, 0x30,
+	0x14, 0xc6, 0xc9, 0xbd, 0x25, 0xda, 0x53, 0x1d, 0x3c, 0x82, 0x74, 0x50, 0x90, 0x4c, 0x75, 0xb0,
+	0x83, 0x3e, 0x84, 0x83, 0x4e, 0x07, 0x7c, 0x80, 0xc4, 0x06, 0x1b, 0xa8, 0x6d, 0xc8, 0x1f, 0x71,
+	0xf4, 0xd1, 0x4d, 0xd3, 0x60, 0xb9, 0x5b, 0x92, 0xdf, 0xc7, 0xef, 0xfb, 0x02, 0xd7, 0x9f, 0x4e,
+	0xda, 0xd1, 0x69, 0x6f, 0x97, 0xd9, 0xeb, 0xde, 0xba, 0x25, 0x2c, 0x78, 0xb0, 0x4a, 0xdc, 0xc1,
+	0xd9, 0xbb, 0x19, 0xde, 0x8c, 0x0f, 0x88, 0x50, 0x45, 0x33, 0xf8, 0x96, 0xdd, 0x1f, 0xbb, 0x8a,
+	0xf2, 0x59, 0xbc, 0x02, 0x27, 0xed, 0xe3, 0x14, 0xf0, 0x06, 0xf8, 0xb7, 0x9c, 0xa2, 0xde, 0xf8,
+	0x05, 0x95, 0x1b, 0x3e, 0x40, 0x9d, 0x92, 0x5f, 0x32, 0x38, 0xf3, 0xd3, 0x1e, 0x12, 0x6a, 0x9e,
+	0x9a, 0xde, 0xaa, 0xbe, 0x58, 0x69, 0xa7, 0xe2, 0x97, 0xc1, 0xe5, 0xcb, 0xba, 0x83, 0xca, 0x0e,
+	0xbc, 0x85, 0x5a, 0x86, 0xc4, 0x54, 0x0c, 0x3a, 0x79, 0x59, 0x57, 0xd3, 0xfe, 0x80, 0x02, 0xb8,
+	0xcb, 0xe5, 0xc9, 0xcb, 0x92, 0x17, 0x56, 0xef, 0x36, 0x87, 0x0a, 0xc1, 0x47, 0x38, 0xff, 0x18,
+	0xcd, 0x34, 0x38, 0x3d, 0xb7, 0xc7, 0xdc, 0x7e, 0xb5, 0xa6, 0x4e, 0x6a, 0xe8, 0x3f, 0xa2, 0x78,
+	0xfe, 0xf9, 0xf3, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc1, 0x1f, 0x18, 0x20, 0x10, 0x01, 0x00,
+	0x00,
 }

query/pb/graphresponse.proto

@@ -2,7 +2,7 @@ syntax="proto3";
 package pb;
 
 message UidList {
-  repeated fixed64 uids = 1;
+  repeated uint64 uids = 1;
 }
 
 message Result {
@@ -12,6 +12,6 @@ message Result {
 
 message GraphResponse {
   string attribute = 1;
-  repeated GraphResponse children = 2; //Each node can have multiple children
-  Result result = 3;
+  Result result = 2;
+  repeated GraphResponse children = 3; // Each node can have multiple children
 }

query/query_test.go

@@ -375,7 +375,8 @@ func TestToProtocolBuffer(t *testing.T) {
 		t.Errorf("Expected attr name. Got: %v", child.Attribute)
 	}
 	if string(child.Result.Values[0]) != "Michonne" {
-		t.Errorf("Expected value Michonne. Got %v", string(child.Result.Values[0]))
+		t.Errorf("Expected value Michonne. Got %v",
+			string(child.Result.Values[0]))
 	}
 	child = ugr.Children[3]
 	if child.Attribute != "friend" {