etcdserverpb: make RangeResponse.More an int64

clientv3/mirror/syncer.go

@@ -91,7 +91,7 @@ func (s *syncer) SyncBase(ctx context.Context) (<-chan clientv3.GetResponse, cha
 
 			respchan <- (clientv3.GetResponse)(*resp)
 
-			if !resp.More {
+			if resp.More == 0 {
 				return
 			}
 			// move to next key

contrib/recipes/priority_queue.go

@@ -55,7 +55,7 @@ func (q *PriorityQueue) Dequeue() (string, error) {
 		return "", err
 	} else if kv != nil {
 		return string(kv.Value), nil
-	} else if resp.More {
+	} else if resp.More > 0 {
 		// missed some items, retry to read in more
 		return q.Dequeue()
 	}

contrib/recipes/queue.go

@@ -51,7 +51,7 @@ func (q *Queue) Dequeue() (string, error) {
 		return "", err
 	} else if kv != nil {
 		return string(kv.Value), nil
-	} else if resp.More {
+	} else if resp.More > 0 {
 		// missed some items, retry to read in more
 		return q.Dequeue()
 	}

etcdserver/apply.go

@@ -233,7 +233,7 @@ func (a *applierV3backend) Range(txnID int64, r *pb.RangeRequest) (*pb.RangeResp
 
 	if r.Limit > 0 && len(kvs) > int(r.Limit) {
 		kvs = kvs[:r.Limit]
-		resp.More = true
+		resp.More = 1
 	}
 
 	resp.Header.Revision = rev

etcdserver/etcdserverpb/rpc.pb.go

@@ -234,7 +234,7 @@ type RangeResponse struct {
 	// kvs is the list of key-value pairs matched by the range request.
 	Kvs []*mvccpb.KeyValue `protobuf:"bytes,2,rep,name=kvs" json:"kvs,omitempty"`
 	// more indicates if there are more keys to return in the requested range.
-	More bool `protobuf:"varint,3,opt,name=more,proto3" json:"more,omitempty"`
+	More int64 `protobuf:"varint,3,opt,name=more,proto3" json:"more,omitempty"`
 }
 
 func (m *RangeResponse) Reset()                    { *m = RangeResponse{} }
@@ -3533,15 +3533,10 @@ func (m *RangeResponse) MarshalTo(data []byte) (int, error) {
 			i += n
 		}
 	}
-	if m.More {
+	if m.More != 0 {
 		data[i] = 0x18
 		i++
-		if m.More {
-			data[i] = 1
-		} else {
-			data[i] = 0
-		}
-		i++
+		i = encodeVarintRpc(data, i, uint64(m.More))
 	}
 	return i, nil
 }
@@ -5863,8 +5858,8 @@ func (m *RangeResponse) Size() (n int) {
 			n += 1 + l + sovRpc(uint64(l))
 		}
 	}
-	if m.More {
-		n += 2
+	if m.More != 0 {
+		n += 1 + sovRpc(uint64(m.More))
 	}
 	return n
 }
@@ -7236,7 +7231,7 @@ func (m *RangeResponse) Unmarshal(data []byte) error {
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field More", wireType)
 			}
-			var v int
+			m.More = 0
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowRpc
@@ -7246,12 +7241,11 @@ func (m *RangeResponse) Unmarshal(data []byte) error {
 				}
 				b := data[iNdEx]
 				iNdEx++
-				v |= (int(b) & 0x7F) << shift
+				m.More |= (int64(b) & 0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
-			m.More = bool(v != 0)
 		default:
 			iNdEx = preIndex
 			skippy, err := skipRpc(data[iNdEx:])
@@ -13969,7 +13963,7 @@ var (
 )
 
 var fileDescriptorRpc = []byte{
-	// 2576 bytes of a gzipped FileDescriptorProto
+	// 2575 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x5a, 0xcd, 0x72, 0x1b, 0xc7,
 	0x11, 0x26, 0x7e, 0x08, 0x10, 0x0d, 0x10, 0xa2, 0x86, 0x94, 0x4c, 0x41, 0xb6, 0x2c, 0xaf, 0x24,
 	0x5b, 0x89, 0x1d, 0x2a, 0x66, 0x9c, 0x43, 0x2a, 0x2e, 0xa5, 0x40, 0x02, 0x96, 0x68, 0x52, 0xa4,
@@ -14002,133 +13996,133 @@ var fileDescriptorRpc = []byte{
 	0x8b, 0x52, 0x7d, 0x11, 0x22, 0xe4, 0x33, 0x28, 0x9d, 0xf2, 0x30, 0xe1, 0x3b, 0x53, 0x5d, 0x7f,
 	0xd7, 0xb2, 0x35, 0x16, 0x4a, 0xae, 0xe4, 0x45, 0xf3, 0x0a, 0x2f, 0xce, 0x02, 0xdc, 0xb4, 0x02,
 	0x8a, 0x2c, 0xad, 0x89, 0x08, 0x5d, 0xdb, 0xa6, 0xe7, 0x87, 0xde, 0x60, 0x4a, 0x5d, 0x36, 0x49,
-	0x08, 0x14, 0x87, 0x63, 0x9f, 0xf2, 0x0d, 0x5c, 0x70, 0xf9, 0xb7, 0xf3, 0x25, 0xc0, 0xd3, 0x69,
-	0x98, 0x1e, 0x12, 0xb8, 0xeb, 0x67, 0x0c, 0x41, 0x86, 0x83, 0x18, 0xf0, 0x58, 0xa0, 0x5e, 0x40,
-	0x75, 0x2c, 0xb0, 0x81, 0xb3, 0x09, 0x55, 0x8e, 0x95, 0xc5, 0x10, 0x04, 0x21, 0x2d, 0x3a, 0xa0,
-	0x21, 0xcd, 0x10, 0xab, 0x0e, 0x85, 0xe5, 0x18, 0x48, 0x26, 0xd7, 0xae, 0x42, 0xb9, 0xc7, 0xc1,
-	0xc4, 0x3a, 0x05, 0x57, 0x0d, 0x9d, 0x7f, 0xe5, 0xf0, 0x48, 0x09, 0x0d, 0x0f, 0x46, 0x2c, 0xe2,
-	0x9b, 0xb0, 0xe8, 0x8b, 0xf1, 0x11, 0xd7, 0x45, 0xae, 0xd3, 0x48, 0x0f, 0xd7, 0xc7, 0x73, 0x6e,
-	0x4d, 0x8a, 0x70, 0x32, 0xf9, 0x29, 0x54, 0x15, 0xc4, 0x64, 0x1a, 0xf2, 0x15, 0xab, 0xeb, 0xab,
-	0x71, 0x80, 0x68, 0xc7, 0x50, 0x1c, 0x24, 0x3b, 0x12, 0x49, 0x07, 0x56, 0x94, 0xb0, 0xd0, 0x51,
-	0xaa, 0x51, 0xe0, 0x28, 0xb7, 0xe3, 0x28, 0xb3, 0x6e, 0x46, 0x34, 0x22, 0xe5, 0x8d, 0xc9, 0x8d,
-	0x0a, 0x94, 0x25, 0xd5, 0xf9, 0x77, 0x0e, 0xc3, 0x55, 0xba, 0x49, 0x98, 0xdc, 0x82, 0xba, 0x2f,
-	0x09, 0x31, 0x9b, 0x6f, 0x26, 0xda, 0x2c, 0x1d, 0x3c, 0xe7, 0x2e, 0x2a, 0x21, 0x61, 0xf5, 0x43,
-	0xa8, 0x69, 0x94, 0xc8, 0xec, 0x1b, 0x09, 0x66, 0x6b, 0x84, 0xaa, 0x12, 0x60, 0x86, 0x3f, 0x83,
-	0x6b, 0x5a, 0x3e, 0xc1, 0xf2, 0x0f, 0x2e, 0xb0, 0x5c, 0x03, 0x2e, 0x2b, 0x04, 0xd3, 0x76, 0x60,
-	0xf9, 0x4d, 0x90, 0x9d, 0xdf, 0x14, 0xa0, 0xbc, 0x39, 0x1e, 0x4e, 0x3c, 0x9f, 0x6d, 0x53, 0x09,
-	0xe9, 0xd3, 0x41, 0xc8, 0xcd, 0xad, 0xaf, 0xdf, 0x89, 0xaf, 0x20, 0xd9, 0xd4, 0x6f, 0x97, 0xb3,
-	0xba, 0x52, 0x84, 0x09, 0xcb, 0x74, 0x96, 0x7f, 0x0b, 0x61, 0x99, 0xcc, 0xa4, 0x88, 0x3a, 0x0a,
-	0x85, 0xe8, 0x28, 0x34, 0xa0, 0x8c, 0x82, 0x51, 0x0a, 0x46, 0x5b, 0x14, 0x81, 0x7c, 0x0f, 0xae,
-	0x74, 0x7d, 0xea, 0x31, 0x7f, 0xa8, 0x34, 0x3d, 0x2f, 0x79, 0xea, 0x62, 0xc2, 0x55, 0xe9, 0xfa,
-	0x0e, 0xd4, 0x86, 0xe3, 0x5e, 0xc4, 0x57, 0x92, 0x7c, 0x55, 0xa4, 0x6a, 0xa6, 0xeb, 0x2a, 0x1f,
-	0xb0, 0xfc, 0x59, 0xc3, 0x59, 0x31, 0x74, 0x3e, 0x85, 0xc5, 0x98, 0xad, 0x2c, 0xc5, 0xb5, 0xbf,
-	0x3a, 0x68, 0xee, 0x88, 0x7c, 0xf8, 0x88, 0xa7, 0x40, 0x17, 0xf3, 0x21, 0xa6, 0xd5, 0x9d, 0xf6,
-	0xfe, 0x3e, 0x66, 0xcf, 0xcf, 0xb5, 0x88, 0x4c, 0xa0, 0x46, 0xde, 0x9c, 0x33, 0xf2, 0x66, 0x4e,
-	0xe5, 0xcd, 0x7c, 0x94, 0x37, 0x0b, 0x1b, 0x75, 0xa8, 0x09, 0x87, 0x1c, 0x4d, 0x59, 0x1c, 0x3a,
-	0xbf, 0xcb, 0x01, 0x74, 0x5e, 0x8d, 0x54, 0xc2, 0x78, 0x00, 0xe5, 0xae, 0x00, 0xc7, 0x0d, 0x62,
-	0x39, 0xf1, 0x5a, 0xa2, 0x8f, 0x5d, 0xc5, 0x85, 0xb9, 0xa1, 0x1c, 0x4c, 0xbb, 0x5d, 0x1a, 0xa8,
-	0x24, 0x6a, 0x1f, 0x5a, 0xe3, 0x9c, 0xbb, 0x8a, 0x95, 0x49, 0x3d, 0xf7, 0xfa, 0x83, 0x29, 0xcf,
-	0xaa, 0x6f, 0x94, 0x92, 0xac, 0xce, 0x6f, 0x73, 0x50, 0xe5, 0xba, 0x66, 0xca, 0x4b, 0xef, 0x42,
-	0x85, 0xab, 0x41, 0x7b, 0x32, 0x33, 0x2d, 0xb8, 0x11, 0x81, 0xfc, 0x04, 0xf3, 0xa3, 0x94, 0x0b,
-	0xa4, 0x6e, 0x37, 0x93, 0x61, 0x85, 0x72, 0x11, 0xb7, 0xb3, 0x0d, 0x57, 0xb9, 0x7b, 0xba, 0x21,
-	0x9b, 0x90, 0x0e, 0x35, 0x2f, 0xfa, 0x9c, 0x75, 0xd1, 0xe3, 0xdc, 0xe4, 0xf4, 0x3c, 0xe8, 0x77,
-	0xbd, 0x81, 0x54, 0x44, 0x8f, 0xf1, 0x82, 0x21, 0x26, 0x58, 0xa6, 0xbb, 0x61, 0x11, 0xaa, 0x8f,
-	0xbd, 0xe0, 0x54, 0xaa, 0xe4, 0xfc, 0x1c, 0x6a, 0x62, 0x98, 0xc9, 0x8d, 0x78, 0x2b, 0x9e, 0x22,
-	0x0a, 0x57, 0x7c, 0xd1, 0xe5, 0xdf, 0xce, 0x55, 0xb8, 0xb2, 0x3f, 0xf2, 0x26, 0xc1, 0xe9, 0x58,
-	0x25, 0x5a, 0x56, 0xc6, 0x2d, 0x45, 0xb4, 0x4c, 0x2b, 0x7e, 0x04, 0x57, 0x7c, 0x3a, 0xf4, 0xfa,
-	0xa3, 0xfe, 0xe8, 0xe4, 0xe8, 0xf8, 0x3c, 0xa4, 0x81, 0xac, 0xf2, 0xea, 0x9a, 0xbc, 0xc1, 0xa8,
-	0x4c, 0xb5, 0xe3, 0xc1, 0xf8, 0x58, 0x9e, 0x75, 0xfe, 0xed, 0xfc, 0x1e, 0xef, 0x9c, 0x67, 0x5e,
-	0xd8, 0x55, 0x5e, 0x20, 0x5b, 0x50, 0xd7, 0x27, 0x9c, 0x53, 0xa4, 0x2e, 0x56, 0xb6, 0xe7, 0x32,
-	0x9b, 0xf2, 0xc4, 0xab, 0x6c, 0xbf, 0xd8, 0x35, 0x09, 0x1c, 0xca, 0x1b, 0x75, 0xe9, 0x40, 0x43,
-	0xe5, 0xd3, 0xa1, 0x38, 0xa3, 0x09, 0x65, 0x12, 0x36, 0xae, 0x44, 0x37, 0xa1, 0x38, 0x9f, 0xdf,
-	0xe6, 0x80, 0xcc, 0xea, 0xf0, 0x5d, 0x8b, 0xd0, 0x7b, 0x50, 0x0f, 0xf0, 0xd8, 0x87, 0x47, 0x56,
-	0x0d, 0xbc, 0xc8, 0xa9, 0x3a, 0x4b, 0xa1, 0x87, 0xb1, 0xf8, 0x3e, 0xc1, 0x90, 0x0e, 0x8e, 0x46,
-	0xe3, 0xb0, 0xff, 0xfc, 0x9c, 0x67, 0xc6, 0x05, 0xb7, 0xae, 0xc8, 0xbb, 0x9c, 0xea, 0x3c, 0x50,
-	0x4a, 0x99, 0xca, 0x93, 0x1b, 0xb0, 0xf0, 0x92, 0x51, 0x55, 0x75, 0x8e, 0x57, 0x3e, 0x1f, 0x6f,
-	0xf5, 0x9c, 0x7f, 0xe0, 0x05, 0x28, 0xdd, 0x9f, 0x29, 0x06, 0xcc, 0x25, 0xf2, 0xb1, 0x25, 0x58,
-	0xbd, 0x21, 0xb6, 0xa5, 0x27, 0x2b, 0x35, 0x35, 0x64, 0xe7, 0x4c, 0x78, 0x19, 0xa7, 0x84, 0x3d,
-	0x7a, 0x8c, 0x89, 0x7e, 0xa9, 0x2b, 0xce, 0x99, 0x95, 0xe9, 0xdd, 0x2b, 0x92, 0xae, 0xbd, 0x73,
-	0x0f, 0x4a, 0xf4, 0x8c, 0x8e, 0xc2, 0x60, 0xb5, 0xca, 0xf3, 0xc2, 0xa2, 0x2a, 0x17, 0xdb, 0x8c,
-	0xea, 0xca, 0x49, 0xe7, 0xc7, 0x70, 0x75, 0x87, 0xd5, 0x75, 0x8f, 0xd0, 0xfb, 0x66, 0x85, 0xd8,
-	0xe9, 0xec, 0x48, 0xaf, 0x14, 0xc2, 0xce, 0x0e, 0xa9, 0x43, 0x7e, 0xab, 0x25, 0x6d, 0xc8, 0xf7,
-	0x5b, 0xce, 0x2f, 0x71, 0xa3, 0x4d, 0xb9, 0x4c, 0x6e, 0xb2, 0xc0, 0xd5, 0xf2, 0x85, 0x68, 0x79,
-	0x2c, 0x45, 0xa9, 0xef, 0x8f, 0x7d, 0xee, 0x90, 0x8a, 0x2b, 0x06, 0xce, 0x5d, 0xa9, 0x03, 0xda,
-	0x3c, 0x7e, 0xa1, 0x83, 0x4d, 0xa0, 0xe5, 0xb4, 0xaa, 0xdb, 0xb0, 0x1c, 0xe3, 0xca, 0x94, 0x9c,
-	0x3e, 0x82, 0x6b, 0x1c, 0x6c, 0x9b, 0xd2, 0x49, 0x73, 0xd0, 0x3f, 0x4b, 0x5d, 0x75, 0x02, 0xd7,
-	0x6d, 0xc6, 0xff, 0xaf, 0x8f, 0x9c, 0x53, 0x28, 0x3d, 0xe1, 0xfd, 0xa3, 0xa1, 0x4b, 0x91, 0xf3,
-	0x62, 0x86, 0x19, 0x79, 0x43, 0x51, 0xdd, 0x57, 0x5c, 0xfe, 0xcd, 0xb3, 0x39, 0xa5, 0xfe, 0x81,
-	0xbb, 0x23, 0x2e, 0x8e, 0x8a, 0xab, 0xc7, 0xe4, 0x16, 0xeb, 0x5c, 0xfb, 0x18, 0x1e, 0x7c, 0xb6,
-	0xc8, 0x67, 0x0d, 0x0a, 0x76, 0x50, 0x4b, 0x62, 0xa5, 0x66, 0xaf, 0x67, 0xdc, 0x1c, 0x1a, 0x2f,
-	0x17, 0xc7, 0x73, 0x5e, 0xc2, 0x55, 0x83, 0x3f, 0x93, 0x1b, 0x3e, 0x81, 0x92, 0x68, 0x92, 0x65,
-	0xd2, 0x5a, 0x89, 0x4b, 0x89, 0x65, 0x5c, 0xc9, 0xe3, 0xdc, 0x83, 0x65, 0x49, 0xa1, 0xc3, 0x71,
-	0xd2, 0x5e, 0x71, 0xff, 0x38, 0x3b, 0xb0, 0x12, 0x67, 0xcb, 0x14, 0x22, 0x4d, 0xb5, 0xe8, 0xc1,
-	0xa4, 0x67, 0xe4, 0x40, 0x7b, 0x53, 0x4c, 0x87, 0xe5, 0x2d, 0x87, 0x69, 0x85, 0x14, 0x44, 0x26,
-	0x85, 0x96, 0x95, 0xfb, 0x77, 0xfa, 0x81, 0xbe, 0xe9, 0x5e, 0x03, 0x31, 0x89, 0x99, 0x36, 0x65,
-	0x0d, 0xca, 0xc2, 0xe1, 0xaa, 0xaa, 0x4a, 0xde, 0x15, 0xc5, 0xc4, 0x14, 0x6a, 0xd1, 0xe7, 0xbe,
-	0x77, 0x32, 0xa4, 0x3a, 0xe7, 0xb0, 0x12, 0xc2, 0x24, 0x66, 0xb2, 0xf8, 0x4f, 0x78, 0x7d, 0x36,
-	0x07, 0x9e, 0x3f, 0x54, 0xce, 0x7f, 0x08, 0x25, 0x51, 0x9b, 0xc8, 0x42, 0xfe, 0xc3, 0x38, 0x8c,
-	0xc9, 0x2b, 0x06, 0x4d, 0x51, 0xc9, 0x48, 0x29, 0xb6, 0x59, 0xf2, 0x6d, 0xa6, 0x65, 0xbd, 0xd5,
-	0xb4, 0xc8, 0x0f, 0x60, 0xde, 0x63, 0x22, 0xfc, 0x2c, 0xd6, 0xd7, 0xdf, 0x49, 0x80, 0xee, 0x9c,
-	0x4f, 0xa8, 0x2b, 0xb8, 0x9c, 0xcf, 0xa0, 0x6a, 0xac, 0xc0, 0xaa, 0xde, 0x47, 0xed, 0x0e, 0x96,
-	0xc2, 0x35, 0x58, 0x68, 0x6e, 0x76, 0xb6, 0x0e, 0x45, 0x31, 0x5c, 0x07, 0x68, 0xb5, 0xf5, 0x38,
-	0x8f, 0x55, 0x90, 0x90, 0x92, 0x27, 0xdc, 0xd4, 0x27, 0x97, 0xa6, 0x4f, 0xfe, 0xad, 0xf4, 0x79,
-	0x05, 0x8b, 0xd2, 0xfc, 0x4c, 0x31, 0xf0, 0x29, 0x7a, 0x98, 0xc1, 0xa8, 0x10, 0xb8, 0x91, 0xb0,
-	0xac, 0x3a, 0x9d, 0x82, 0xd1, 0xc1, 0xea, 0x61, 0x3f, 0xf4, 0xc2, 0x69, 0xa0, 0x42, 0xe0, 0x8f,
-	0x39, 0xa8, 0x2b, 0x4a, 0xd6, 0x66, 0x5e, 0xf5, 0x4a, 0x22, 0xe7, 0xe9, 0x4e, 0xe9, 0x3a, 0x94,
-	0x7a, 0xc7, 0xfb, 0xfd, 0xd7, 0xea, 0x51, 0x43, 0x8e, 0x18, 0x7d, 0x20, 0xd6, 0x11, 0x2f, 0x6a,
-	0x72, 0xc4, 0xca, 0x6f, 0xf6, 0xb6, 0xb6, 0x35, 0xea, 0xd1, 0x57, 0xfc, 0xa6, 0x2d, 0xba, 0x11,
-	0x81, 0x97, 0xcb, 0xf2, 0xe5, 0x8d, 0x37, 0x52, 0xe6, 0x4b, 0x1c, 0x06, 0x79, 0x73, 0x1a, 0x9e,
-	0xb6, 0x47, 0xec, 0xd1, 0x49, 0x59, 0xb8, 0x02, 0x84, 0x11, 0x5b, 0xfd, 0xc0, 0xa4, 0xb6, 0x61,
-	0x99, 0x51, 0x31, 0xee, 0xb1, 0x98, 0x8e, 0x32, 0x86, 0x4a, 0xdb, 0x39, 0x2b, 0x6d, 0x7b, 0x41,
-	0xf0, 0x72, 0xec, 0xf7, 0xa4, 0x69, 0x7a, 0xec, 0xb4, 0x04, 0xf8, 0x41, 0x10, 0x4b, 0xcc, 0xdf,
-	0x15, 0x65, 0x25, 0x42, 0x79, 0x44, 0xf5, 0xe9, 0xfc, 0x18, 0xae, 0x29, 0xaa, 0x6c, 0x9c, 0xd3,
-	0xe1, 0x9d, 0x3d, 0x78, 0x4f, 0x31, 0x6f, 0x9e, 0xb2, 0xa2, 0xee, 0xa9, 0x04, 0xff, 0x5f, 0x75,
-	0x7a, 0x08, 0x2b, 0x5a, 0x27, 0xb3, 0x4e, 0x41, 0x9c, 0x69, 0x20, 0x63, 0x03, 0x71, 0xd8, 0x37,
-	0xa3, 0xf9, 0xe3, 0x81, 0xbe, 0xec, 0xd8, 0xb7, 0xf3, 0x4e, 0xa4, 0x7d, 0xac, 0x56, 0x70, 0xee,
-	0x0b, 0x63, 0x5d, 0x64, 0xba, 0xd8, 0x65, 0xca, 0x2d, 0x8c, 0xd3, 0x70, 0x8b, 0x04, 0x66, 0xd4,
-	0x98, 0x5b, 0x1c, 0x57, 0x68, 0xcc, 0xd9, 0x2d, 0x8d, 0x67, 0x2c, 0xff, 0x10, 0x8a, 0x13, 0x2a,
-	0xcf, 0x6b, 0x75, 0x9d, 0xac, 0x89, 0xd7, 0xe5, 0xb5, 0xa7, 0x48, 0xeb, 0x07, 0x2c, 0x6a, 0x5d,
-	0x3e, 0x6f, 0x2e, 0x16, 0xb7, 0xe2, 0x4b, 0xa1, 0x9b, 0x0a, 0xb5, 0x4c, 0xa9, 0x73, 0x5b, 0xc4,
-	0xa2, 0x8e, 0xd0, 0x4c, 0x60, 0xc7, 0xc2, 0x0b, 0x51, 0x60, 0x67, 0x3a, 0xd5, 0x58, 0x04, 0x86,
-	0x68, 0xb5, 0x3a, 0xd3, 0x62, 0xa0, 0x14, 0xd6, 0x51, 0x7f, 0x19, 0xd6, 0xeb, 0xe0, 0xcf, 0x04,
-	0xb6, 0x0b, 0xd7, 0xed, 0x33, 0x93, 0x09, 0xef, 0x10, 0x6e, 0xa5, 0x1d, 0xab, 0x4c, 0xb8, 0x4f,
-	0xa2, 0xd3, 0x71, 0x09, 0xd5, 0xbc, 0x69, 0xf6, 0xa5, 0x94, 0xdc, 0x72, 0x4f, 0xf4, 0x19, 0xbd,
-	0x2c, 0xb0, 0x4b, 0xdb, 0x60, 0xf3, 0xf4, 0x5f, 0xc6, 0x46, 0x18, 0x49, 0xe3, 0xb2, 0xd4, 0xbb,
-	0x8c, 0x8d, 0xf8, 0xbe, 0x03, 0x15, 0x5d, 0x3d, 0x18, 0x7f, 0x38, 0xa9, 0x42, 0x79, 0x77, 0x6f,
-	0xff, 0x69, 0x73, 0x13, 0xeb, 0x96, 0xf5, 0x7f, 0xe6, 0x21, 0xbf, 0x7d, 0x48, 0x36, 0x60, 0x5e,
-	0x3c, 0xf9, 0x5e, 0xf0, 0x28, 0xde, 0xb8, 0xe8, 0xf1, 0xd8, 0x99, 0x23, 0x9f, 0x43, 0x81, 0x3d,
-	0xfa, 0xa6, 0xbe, 0x8a, 0x37, 0xd2, 0x1f, 0x8e, 0x51, 0xba, 0x03, 0x55, 0xe3, 0x85, 0x97, 0xbc,
-	0xf1, 0x55, 0xbc, 0xf1, 0xe6, 0xd7, 0x63, 0xa1, 0x53, 0xe7, 0xd5, 0xc8, 0xd6, 0x29, 0x7a, 0x91,
-	0xb4, 0x75, 0x32, 0xde, 0xff, 0x50, 0x7a, 0x57, 0xbe, 0x2c, 0x77, 0x43, 0xf2, 0x7e, 0xc2, 0x43,
-	0xa5, 0xf9, 0x12, 0xd7, 0xb8, 0x9d, 0xce, 0xa0, 0xf0, 0xd6, 0xf7, 0x60, 0x9e, 0xbf, 0x52, 0x90,
-	0x2f, 0xd4, 0x47, 0x23, 0xe1, 0x0d, 0x27, 0xc5, 0xdd, 0xb1, 0xf7, 0x0d, 0x67, 0xee, 0x7e, 0xee,
-	0x87, 0xb9, 0xf5, 0x6f, 0xf3, 0x30, 0xcf, 0xbb, 0x56, 0xf2, 0x15, 0x40, 0xd4, 0xde, 0xdb, 0xda,
-	0xce, 0x3c, 0x18, 0xd8, 0xda, 0xce, 0xbe, 0x0c, 0x88, 0x1d, 0x31, 0xfa, 0x70, 0x92, 0x24, 0x12,
-	0xbb, 0xd6, 0xec, 0x1d, 0x49, 0x68, 0xe2, 0x11, 0xd5, 0x83, 0x7a, 0xbc, 0xcf, 0x26, 0x77, 0x12,
-	0xc4, 0xec, 0x76, 0xbd, 0x71, 0xf7, 0x62, 0xa6, 0x98, 0x57, 0xfe, 0x92, 0xc7, 0x7d, 0x13, 0x7f,
-	0xb7, 0xc5, 0x2d, 0xac, 0xe8, 0x56, 0x96, 0xdc, 0x4a, 0x6a, 0x73, 0xa2, 0x3a, 0xa2, 0xf1, 0x7e,
-	0xea, 0xbc, 0x56, 0xff, 0x19, 0xd4, 0xcc, 0xd6, 0x93, 0x7c, 0x90, 0xd8, 0x39, 0x99, 0xdd, 0x6b,
-	0xc3, 0xb9, 0x88, 0x65, 0x16, 0x58, 0xb4, 0x90, 0xc9, 0xc0, 0xb1, 0x0e, 0x35, 0x19, 0x38, 0xde,
-	0x81, 0x22, 0x30, 0x46, 0x46, 0xd4, 0x38, 0x92, 0x44, 0x13, 0x8d, 0x3e, 0xd3, 0x8e, 0x8c, 0xd9,
-	0x9e, 0x13, 0xe3, 0xf8, 0x3f, 0x79, 0xa8, 0x3e, 0xf1, 0xfa, 0xa3, 0x90, 0x8e, 0xd8, 0x43, 0x17,
-	0xcb, 0x1e, 0x3c, 0xd1, 0xd8, 0xe1, 0x6c, 0xb6, 0x69, 0x76, 0x38, 0xc7, 0x7a, 0x18, 0x54, 0xb3,
-	0x0d, 0x25, 0xd1, 0x4a, 0x10, 0x8b, 0x31, 0xd6, 0x72, 0x34, 0xde, 0x4d, 0x9e, 0x34, 0xad, 0x8d,
-	0xba, 0x52, 0xdb, 0xda, 0x99, 0x26, 0xb6, 0x71, 0x3b, 0x9d, 0x41, 0x43, 0xfe, 0x0c, 0x8a, 0xec,
-	0x41, 0x9b, 0x58, 0xa9, 0xc2, 0x78, 0xf3, 0x6e, 0x34, 0x92, 0xa6, 0x34, 0xc0, 0x13, 0x58, 0x50,
-	0x6f, 0xd4, 0xe4, 0x3d, 0x4b, 0xff, 0xf8, 0x7b, 0x76, 0xe3, 0x56, 0xda, 0xb4, 0x02, 0xc3, 0xf0,
-	0xfe, 0x6b, 0x05, 0x8a, 0xec, 0x9e, 0x60, 0xb6, 0x46, 0x65, 0xa4, 0x6d, 0xeb, 0x4c, 0x2f, 0x63,
-	0xdb, 0x3a, 0x5b, 0x81, 0x8a, 0x33, 0x6f, 0x54, 0x93, 0x24, 0x41, 0x24, 0xde, 0x0a, 0xd9, 0x67,
-	0x3e, 0xa1, 0x14, 0x15, 0xb1, 0x6d, 0x96, 0x95, 0x24, 0x41, 0xc8, 0xea, 0xa5, 0xec, 0xd8, 0x4e,
-	0xaa, 0x4a, 0x11, 0xf8, 0x29, 0x94, 0x65, 0x1d, 0x99, 0xa4, 0x6a, 0xbc, 0xb1, 0x4a, 0x52, 0xd5,
-	0x2a, 0x42, 0x23, 0x44, 0xac, 0x35, 0xd2, 0x10, 0xa3, 0x6e, 0x22, 0x0d, 0xd1, 0x28, 0x54, 0x10,
-	0xf1, 0x6b, 0x80, 0xa8, 0xa2, 0xb4, 0x93, 0x5d, 0x62, 0x8f, 0x66, 0x27, 0xbb, 0xe4, 0xa2, 0x14,
-	0xa1, 0xbf, 0x01, 0x32, 0x5b, 0x5c, 0x92, 0x8f, 0x93, 0xa5, 0x13, 0x3b, 0xbb, 0xc6, 0x27, 0x6f,
-	0xc7, 0xac, 0x97, 0x3c, 0x84, 0x8a, 0xae, 0x3b, 0x89, 0x93, 0x62, 0xbf, 0x79, 0xd3, 0xdc, 0xb9,
-	0x90, 0xc7, 0xf6, 0x92, 0xbc, 0x6b, 0x52, 0x84, 0xe2, 0xd7, 0xcd, 0xdd, 0x8b, 0x99, 0xcc, 0x2d,
-	0x95, 0xb5, 0x68, 0xd2, 0x96, 0xc6, 0x5b, 0xc9, 0xa4, 0x2d, 0xb5, 0x0a, 0xd9, 0x08, 0x31, 0x25,
-	0x48, 0xe2, 0x2d, 0x67, 0x1a, 0xe2, 0x4c, 0x90, 0x44, 0x55, 0x69, 0x92, 0xf9, 0x33, 0x1d, 0x6b,
-	0x92, 0xf9, 0xb3, 0x85, 0xad, 0xd8, 0x31, 0x5d, 0xa0, 0x26, 0xed, 0x98, 0xdd, 0xf2, 0x36, 0xee,
-	0x5c, 0xc8, 0x63, 0xab, 0x9c, 0xbe, 0x63, 0x33, 0x7d, 0x6f, 0x9a, 0xca, 0xf6, 0x8e, 0x6d, 0xd4,
-	0xfe, 0xf0, 0xf7, 0x5b, 0xb9, 0x3f, 0xe3, 0xbf, 0xbf, 0xe1, 0xbf, 0xe3, 0x12, 0xff, 0x1f, 0x5b,
-	0x3f, 0xfa, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xf4, 0xad, 0xd4, 0x1a, 0x26, 0x00, 0x00,
+	0x08, 0x14, 0x87, 0x63, 0x9f, 0xca, 0x0d, 0xe4, 0xdf, 0xce, 0x97, 0x00, 0x4f, 0xa7, 0x61, 0x7a,
+	0x48, 0xe0, 0xae, 0x9f, 0x31, 0x04, 0x19, 0x0e, 0x62, 0xc0, 0x63, 0x81, 0x7a, 0x01, 0xd5, 0xb1,
+	0xc0, 0x06, 0xce, 0x26, 0x54, 0x39, 0x56, 0x16, 0x43, 0x10, 0x84, 0xb4, 0xe8, 0x80, 0x86, 0x34,
+	0x43, 0xac, 0x3a, 0x14, 0x96, 0x63, 0x20, 0x99, 0x5c, 0xbb, 0x0a, 0xe5, 0x1e, 0x07, 0x13, 0xeb,
+	0x14, 0x5c, 0x35, 0x74, 0xfe, 0x95, 0xc3, 0x23, 0x25, 0x34, 0x3c, 0x18, 0xb1, 0x88, 0x6f, 0xc2,
+	0xa2, 0x2f, 0xc6, 0x47, 0x5c, 0x17, 0xb9, 0x4e, 0x23, 0x3d, 0x5c, 0x1f, 0xcf, 0xb9, 0x35, 0x29,
+	0xc2, 0xc9, 0xe4, 0xa7, 0x50, 0x55, 0x10, 0x93, 0x69, 0xc8, 0x57, 0xac, 0xae, 0xaf, 0xc6, 0x01,
+	0xa2, 0x1d, 0x43, 0x71, 0x90, 0xec, 0x48, 0x24, 0x1d, 0x58, 0x51, 0xc2, 0x42, 0x47, 0xa9, 0x46,
+	0x81, 0xa3, 0xdc, 0x8e, 0xa3, 0xcc, 0xba, 0x19, 0xd1, 0x88, 0x94, 0x37, 0x26, 0x37, 0x2a, 0x50,
+	0x96, 0x54, 0xe7, 0xdf, 0x39, 0x0c, 0x57, 0xe9, 0x26, 0x61, 0x72, 0x0b, 0xea, 0xbe, 0x24, 0xc4,
+	0x6c, 0xbe, 0x99, 0x68, 0xb3, 0x74, 0xf0, 0x9c, 0xbb, 0xa8, 0x84, 0x84, 0xd5, 0x0f, 0xa1, 0xa6,
+	0x51, 0x22, 0xb3, 0x6f, 0x24, 0x98, 0xad, 0x11, 0xaa, 0x4a, 0x80, 0x19, 0xfe, 0x0c, 0xae, 0x69,
+	0xf9, 0x04, 0xcb, 0x3f, 0xb8, 0xc0, 0x72, 0x0d, 0xb8, 0xac, 0x10, 0x4c, 0xdb, 0x81, 0xe5, 0x37,
+	0x41, 0x76, 0x7e, 0x53, 0x80, 0xf2, 0xe6, 0x78, 0x38, 0xf1, 0x7c, 0xb6, 0x4d, 0x25, 0xa4, 0x4f,
+	0x07, 0x21, 0x37, 0xb7, 0xbe, 0x7e, 0x27, 0xbe, 0x82, 0x64, 0x53, 0xbf, 0x5d, 0xce, 0xea, 0x4a,
+	0x11, 0x26, 0x2c, 0xd3, 0x59, 0xfe, 0x2d, 0x84, 0x65, 0x32, 0x93, 0x22, 0xea, 0x28, 0x14, 0xa2,
+	0xa3, 0xd0, 0x80, 0x32, 0x0a, 0x46, 0x29, 0x18, 0x6d, 0x51, 0x04, 0xf2, 0x3d, 0xb8, 0xd2, 0xf5,
+	0xa9, 0xc7, 0xfc, 0xa1, 0xd2, 0xf4, 0xbc, 0xe4, 0xa9, 0x8b, 0x09, 0x57, 0xa5, 0xeb, 0x3b, 0x50,
+	0x1b, 0x8e, 0x7b, 0x11, 0x5f, 0x49, 0xf2, 0x55, 0x91, 0xaa, 0x99, 0xae, 0xab, 0x7c, 0xc0, 0xf2,
+	0x67, 0x0d, 0x67, 0xc5, 0xd0, 0xf9, 0x14, 0x16, 0x63, 0xb6, 0xb2, 0x14, 0xd7, 0xfe, 0xea, 0xa0,
+	0xb9, 0x23, 0xf2, 0xe1, 0x23, 0x9e, 0x02, 0x5d, 0xcc, 0x87, 0x98, 0x56, 0x77, 0xda, 0xfb, 0xfb,
+	0x98, 0x3d, 0x3f, 0xd7, 0x22, 0x32, 0x81, 0x1a, 0x79, 0x73, 0xce, 0xc8, 0x9b, 0x39, 0x95, 0x37,
+	0xf3, 0x51, 0xde, 0x2c, 0x6c, 0xd4, 0xa1, 0x26, 0x1c, 0x72, 0x34, 0x65, 0x71, 0xe8, 0xfc, 0x2e,
+	0x07, 0xd0, 0x79, 0x35, 0x52, 0x09, 0xe3, 0x01, 0x94, 0xbb, 0x02, 0x1c, 0x37, 0x88, 0xe5, 0xc4,
+	0x6b, 0x89, 0x3e, 0x76, 0x15, 0x17, 0xe6, 0x86, 0x72, 0x30, 0xed, 0x76, 0x69, 0xa0, 0x92, 0xa8,
+	0x7d, 0x68, 0x8d, 0x73, 0xee, 0x2a, 0x56, 0x26, 0xf5, 0xdc, 0xeb, 0x0f, 0xa6, 0x3c, 0xab, 0xbe,
+	0x51, 0x4a, 0xb2, 0x3a, 0xbf, 0xcd, 0x41, 0x95, 0xeb, 0x9a, 0x29, 0x2f, 0xbd, 0x0b, 0x15, 0xae,
+	0x06, 0xed, 0xc9, 0xcc, 0xb4, 0xe0, 0x46, 0x04, 0xf2, 0x13, 0xcc, 0x8f, 0x52, 0x2e, 0x90, 0xba,
+	0xdd, 0x4c, 0x86, 0x15, 0xca, 0x45, 0xdc, 0xce, 0x36, 0x5c, 0xe5, 0xee, 0xe9, 0x86, 0x6c, 0x42,
+	0x3a, 0xd4, 0xbc, 0xe8, 0x73, 0xd6, 0x45, 0x8f, 0x73, 0x93, 0xd3, 0xf3, 0xa0, 0xdf, 0xf5, 0x06,
+	0x52, 0x11, 0x3d, 0xc6, 0x0b, 0x86, 0x98, 0x60, 0x99, 0xee, 0x86, 0x45, 0xa8, 0x3e, 0xf6, 0x82,
+	0x53, 0xa9, 0x92, 0xf3, 0x73, 0xa8, 0x89, 0x61, 0x26, 0x37, 0xe2, 0xad, 0x78, 0x8a, 0x28, 0x5c,
+	0xf1, 0x45, 0x97, 0x7f, 0x3b, 0x57, 0xe1, 0xca, 0xfe, 0xc8, 0x9b, 0x04, 0xa7, 0x63, 0x95, 0x68,
+	0x59, 0x19, 0xb7, 0x14, 0xd1, 0x32, 0xad, 0xf8, 0x11, 0x5c, 0xf1, 0xe9, 0xd0, 0xeb, 0x8f, 0xfa,
+	0xa3, 0x93, 0xa3, 0xe3, 0xf3, 0x90, 0x06, 0xb2, 0xca, 0xab, 0x6b, 0xf2, 0x06, 0xa3, 0x32, 0xd5,
+	0x8e, 0x07, 0xe3, 0x63, 0x79, 0xd6, 0xf9, 0xb7, 0xf3, 0x7b, 0xbc, 0x73, 0x9e, 0x79, 0x61, 0x57,
+	0x79, 0x81, 0x6c, 0x41, 0x5d, 0x9f, 0x70, 0x4e, 0x91, 0xba, 0x58, 0xd9, 0x9e, 0xcb, 0x6c, 0xca,
+	0x13, 0xaf, 0xb2, 0xfd, 0x62, 0xd7, 0x24, 0x70, 0x28, 0x6f, 0xd4, 0xa5, 0x03, 0x0d, 0x95, 0x4f,
+	0x87, 0xe2, 0x8c, 0x26, 0x94, 0x49, 0xd8, 0xb8, 0x12, 0xdd, 0x84, 0xe2, 0x7c, 0x7e, 0x9b, 0x03,
+	0x32, 0xab, 0xc3, 0x77, 0x2d, 0x42, 0xef, 0x41, 0x3d, 0xc0, 0x63, 0x1f, 0x1e, 0x59, 0x35, 0xf0,
+	0x22, 0xa7, 0xea, 0x2c, 0x85, 0x1e, 0xc6, 0xe2, 0xfb, 0x04, 0x43, 0x3a, 0x38, 0x1a, 0x8d, 0xc3,
+	0xfe, 0xf3, 0x73, 0x9e, 0x19, 0x17, 0xdc, 0xba, 0x22, 0xef, 0x72, 0xaa, 0xf3, 0x40, 0x29, 0x65,
+	0x2a, 0x4f, 0x6e, 0xc0, 0xc2, 0x4b, 0x46, 0x55, 0xd5, 0x39, 0x5e, 0xf9, 0x7c, 0xbc, 0xd5, 0x73,
+	0xfe, 0x81, 0x17, 0xa0, 0x74, 0x7f, 0xa6, 0x18, 0x30, 0x97, 0xc8, 0xc7, 0x96, 0x60, 0xf5, 0x86,
+	0xd8, 0x96, 0x1e, 0x37, 0x6e, 0xc1, 0x55, 0x43, 0x76, 0xce, 0x84, 0x97, 0x71, 0x4a, 0xd8, 0xa3,
+	0xc7, 0x98, 0xe8, 0x97, 0xba, 0xe2, 0x9c, 0x59, 0x99, 0xde, 0xbd, 0x22, 0xe9, 0xda, 0x3b, 0xf7,
+	0xa0, 0x44, 0xcf, 0xe8, 0x28, 0x0c, 0x56, 0xab, 0x3c, 0x2f, 0x2c, 0xaa, 0x72, 0xb1, 0xcd, 0xa8,
+	0xae, 0x9c, 0x74, 0x7e, 0x0c, 0x57, 0x77, 0x58, 0x5d, 0xf7, 0x08, 0xbd, 0x6f, 0x56, 0x88, 0x9d,
+	0xce, 0x8e, 0xf4, 0x4a, 0x21, 0xec, 0xec, 0x90, 0x3a, 0xe4, 0xb7, 0x5a, 0xd2, 0x86, 0x7c, 0xbf,
+	0xe5, 0xfc, 0x12, 0x37, 0xda, 0x94, 0xcb, 0xe4, 0x26, 0x0b, 0x5c, 0x2d, 0x5f, 0x88, 0x96, 0xc7,
+	0x52, 0x94, 0xfa, 0xfe, 0xd8, 0xe7, 0x0e, 0xa9, 0xb8, 0x62, 0xe0, 0xdc, 0x95, 0x3a, 0xa0, 0xcd,
+	0xe3, 0x17, 0x3a, 0xd8, 0x04, 0x5a, 0x4e, 0xab, 0xba, 0x0d, 0xcb, 0x31, 0xae, 0x4c, 0xc9, 0xe9,
+	0x23, 0xb8, 0xc6, 0xc1, 0xb6, 0x29, 0x9d, 0x34, 0x07, 0xfd, 0xb3, 0xd4, 0x55, 0x27, 0x70, 0xdd,
+	0x66, 0xfc, 0xff, 0xfa, 0xc8, 0x39, 0x85, 0xd2, 0x13, 0xde, 0x3f, 0x1a, 0xba, 0x14, 0x39, 0x2f,
+	0x66, 0x98, 0x91, 0x37, 0x14, 0xd5, 0x7d, 0xc5, 0xe5, 0xdf, 0x3c, 0x9b, 0x53, 0xea, 0x1f, 0xb8,
+	0x3b, 0xe2, 0xe2, 0xa8, 0xb8, 0x7a, 0x4c, 0x6e, 0xb1, 0xce, 0xb5, 0x8f, 0xe1, 0xc1, 0x67, 0x8b,
+	0x7c, 0xd6, 0xa0, 0x60, 0x07, 0xb5, 0x24, 0x56, 0x6a, 0xf6, 0x7a, 0xc6, 0xcd, 0xa1, 0xf1, 0x72,
+	0x71, 0x3c, 0xe7, 0x25, 0x5c, 0x35, 0xf8, 0x33, 0xb9, 0xe1, 0x13, 0x28, 0x89, 0x26, 0x59, 0x26,
+	0xad, 0x95, 0xb8, 0x94, 0x58, 0xc6, 0x95, 0x3c, 0xce, 0x3d, 0x58, 0x96, 0x14, 0x3a, 0x1c, 0x27,
+	0xed, 0x15, 0xf7, 0x8f, 0xb3, 0x03, 0x2b, 0x71, 0xb6, 0x4c, 0x21, 0xd2, 0x54, 0x8b, 0x1e, 0x4c,
+	0x7a, 0x46, 0x0e, 0xb4, 0x37, 0xc5, 0x74, 0x58, 0xde, 0x72, 0x98, 0x56, 0x48, 0x41, 0x64, 0x52,
+	0x68, 0x59, 0xb9, 0x7f, 0xa7, 0x1f, 0xe8, 0x9b, 0xee, 0x35, 0x10, 0x93, 0x98, 0x69, 0x53, 0xd6,
+	0xa0, 0x2c, 0x1c, 0xae, 0xaa, 0xaa, 0xe4, 0x5d, 0x51, 0x4c, 0x4c, 0xa1, 0x16, 0x7d, 0xee, 0x7b,
+	0x27, 0x43, 0xaa, 0x73, 0x0e, 0x2b, 0x21, 0x4c, 0x62, 0x26, 0x8b, 0xff, 0x84, 0xd7, 0x67, 0x73,
+	0xe0, 0xf9, 0x43, 0xe5, 0xfc, 0x87, 0x50, 0x12, 0xb5, 0x89, 0x2c, 0xe4, 0x3f, 0x8c, 0xc3, 0x98,
+	0xbc, 0x62, 0xd0, 0x14, 0x95, 0x8c, 0x94, 0x62, 0x9b, 0x25, 0xdf, 0x66, 0x5a, 0xd6, 0x5b, 0x4d,
+	0x8b, 0xfc, 0x00, 0xe6, 0x3d, 0x26, 0xc2, 0xcf, 0x62, 0x7d, 0xfd, 0x9d, 0x04, 0xe8, 0xce, 0xf9,
+	0x84, 0xba, 0x82, 0xcb, 0xf9, 0x0c, 0xaa, 0xc6, 0x0a, 0xac, 0xea, 0x7d, 0xd4, 0xee, 0x60, 0x29,
+	0x5c, 0x83, 0x85, 0xe6, 0x66, 0x67, 0xeb, 0x50, 0x14, 0xc3, 0x75, 0x80, 0x56, 0x5b, 0x8f, 0xf3,
+	0x58, 0x05, 0x09, 0x29, 0x79, 0xc2, 0x4d, 0x7d, 0x72, 0x69, 0xfa, 0xe4, 0xdf, 0x4a, 0x9f, 0x57,
+	0xb0, 0x28, 0xcd, 0xcf, 0x14, 0x03, 0x9f, 0xa2, 0x87, 0x19, 0x8c, 0x0a, 0x81, 0x1b, 0x09, 0xcb,
+	0xaa, 0xd3, 0x29, 0x18, 0x1d, 0xac, 0x1e, 0xf6, 0x43, 0x2f, 0x9c, 0x06, 0x2a, 0x04, 0xfe, 0x98,
+	0x83, 0xba, 0xa2, 0x64, 0x6d, 0xe6, 0x55, 0xaf, 0x24, 0x72, 0x9e, 0xee, 0x94, 0xae, 0x43, 0xa9,
+	0x77, 0xbc, 0xdf, 0x7f, 0xad, 0x1e, 0x35, 0xe4, 0x88, 0xd1, 0x07, 0x62, 0x1d, 0xf1, 0xa2, 0x26,
+	0x47, 0xac, 0xfc, 0x66, 0x6f, 0x6b, 0x5b, 0xa3, 0x1e, 0x7d, 0xc5, 0x6f, 0xda, 0xa2, 0x1b, 0x11,
+	0x78, 0xb9, 0x2c, 0x5f, 0xde, 0x78, 0x23, 0x65, 0xbe, 0xc4, 0x61, 0x90, 0x37, 0xa7, 0xe1, 0x69,
+	0x7b, 0xc4, 0x1e, 0x9d, 0x94, 0x85, 0x2b, 0x40, 0x18, 0xb1, 0xd5, 0x0f, 0x4c, 0x6a, 0x1b, 0x96,
+	0x19, 0x15, 0xe3, 0x1e, 0x8b, 0xe9, 0x28, 0x63, 0xa8, 0xb4, 0x9d, 0xb3, 0xd2, 0xb6, 0x17, 0x04,
+	0x2f, 0xc7, 0x7e, 0x4f, 0x9a, 0xa6, 0xc7, 0x4e, 0x4b, 0x80, 0x1f, 0x04, 0xb1, 0xc4, 0xfc, 0x5d,
+	0x51, 0x56, 0x22, 0x94, 0x47, 0x54, 0x9f, 0xce, 0x8f, 0xe1, 0x9a, 0xa2, 0xca, 0xc6, 0x39, 0x1d,
+	0xde, 0xd9, 0x83, 0xf7, 0x14, 0xf3, 0xe6, 0x29, 0x2b, 0xea, 0x9e, 0x4a, 0xf0, 0xff, 0x55, 0xa7,
+	0x87, 0xb0, 0xa2, 0x75, 0x32, 0xeb, 0x14, 0xc4, 0x99, 0x06, 0x32, 0x36, 0x10, 0x87, 0x7d, 0x33,
+	0x9a, 0x3f, 0x1e, 0xe8, 0xcb, 0x8e, 0x7d, 0x3b, 0xef, 0x44, 0xda, 0xc7, 0x6a, 0x05, 0xe7, 0xbe,
+	0x30, 0xd6, 0x45, 0xa6, 0x8b, 0x5d, 0xa6, 0xdc, 0xc2, 0x38, 0x0d, 0xb7, 0x48, 0x60, 0x46, 0x8d,
+	0xb9, 0xc5, 0x71, 0x85, 0xc6, 0x9c, 0xdd, 0xd2, 0x78, 0xc6, 0xf2, 0x0f, 0xa1, 0x38, 0xa1, 0xf2,
+	0xbc, 0x56, 0xd7, 0xc9, 0x9a, 0x78, 0x5d, 0x5e, 0x7b, 0x8a, 0xb4, 0x7e, 0xc0, 0xa2, 0xd6, 0xe5,
+	0xf3, 0xe6, 0x62, 0x71, 0x2b, 0xbe, 0x14, 0xba, 0xa9, 0x50, 0xcb, 0x94, 0x3a, 0xb7, 0x45, 0x2c,
+	0xea, 0x08, 0xcd, 0x04, 0x76, 0x2c, 0xbc, 0x10, 0x05, 0x76, 0xa6, 0x53, 0x8d, 0x45, 0x60, 0x88,
+	0x56, 0xab, 0x33, 0x2d, 0x06, 0x4a, 0x61, 0x1d, 0xf5, 0x97, 0x61, 0xbd, 0x0e, 0xfe, 0x4c, 0x60,
+	0xbb, 0x70, 0xdd, 0x3e, 0x33, 0x99, 0xf0, 0x0e, 0xe1, 0x56, 0xda, 0xb1, 0xca, 0x84, 0xfb, 0x24,
+	0x3a, 0x1d, 0x97, 0x50, 0xcd, 0x9b, 0x66, 0x5f, 0x4a, 0xc9, 0x2d, 0xf7, 0x44, 0x9f, 0xd1, 0xcb,
+	0x02, 0xbb, 0xb4, 0x0d, 0x36, 0x4f, 0xff, 0x65, 0x6c, 0x84, 0x91, 0x34, 0x2e, 0x4b, 0xbd, 0xcb,
+	0xd8, 0x88, 0xef, 0x3b, 0x50, 0xd1, 0xd5, 0x83, 0xf1, 0x87, 0x93, 0x2a, 0x94, 0x77, 0xf7, 0xf6,
+	0x9f, 0x36, 0x37, 0xb1, 0x6e, 0x59, 0xff, 0x67, 0x1e, 0xf2, 0xdb, 0x87, 0x64, 0x03, 0xe6, 0xc5,
+	0x93, 0xef, 0x05, 0x8f, 0xe2, 0x8d, 0x8b, 0x1e, 0x8f, 0x9d, 0x39, 0xf2, 0x39, 0x14, 0xd8, 0xa3,
+	0x6f, 0xea, 0xab, 0x78, 0x23, 0xfd, 0xe1, 0x18, 0xa5, 0x3b, 0x50, 0x35, 0x5e, 0x78, 0xc9, 0x1b,
+	0x5f, 0xc5, 0x1b, 0x6f, 0x7e, 0x3d, 0x16, 0x3a, 0x75, 0x5e, 0x8d, 0x6c, 0x9d, 0xa2, 0x17, 0x49,
+	0x5b, 0x27, 0xe3, 0xfd, 0x0f, 0xa5, 0x77, 0xe5, 0xcb, 0x72, 0x37, 0x24, 0xef, 0x27, 0x3c, 0x54,
+	0x9a, 0x2f, 0x71, 0x8d, 0xdb, 0xe9, 0x0c, 0x0a, 0x6f, 0x7d, 0x0f, 0xe6, 0xf9, 0x2b, 0x05, 0xf9,
+	0x42, 0x7d, 0x34, 0x12, 0xde, 0x70, 0x52, 0xdc, 0x1d, 0x7b, 0xdf, 0x70, 0xe6, 0xee, 0xe7, 0x7e,
+	0x98, 0x5b, 0xff, 0x36, 0x0f, 0xf3, 0xbc, 0x6b, 0x25, 0x5f, 0x01, 0x44, 0xed, 0xbd, 0xad, 0xed,
+	0xcc, 0x83, 0x81, 0xad, 0xed, 0xec, 0xcb, 0x80, 0xd8, 0x11, 0xa3, 0x0f, 0x27, 0x49, 0x22, 0xb1,
+	0x6b, 0xcd, 0xde, 0x91, 0x84, 0x26, 0x1e, 0x51, 0x3d, 0xa8, 0xc7, 0xfb, 0x6c, 0x72, 0x27, 0x41,
+	0xcc, 0x6e, 0xd7, 0x1b, 0x77, 0x2f, 0x66, 0x8a, 0x79, 0xe5, 0x2f, 0x79, 0xdc, 0x37, 0xf1, 0x77,
+	0x5b, 0xdc, 0xc2, 0x8a, 0x6e, 0x65, 0xc9, 0xad, 0xa4, 0x36, 0x27, 0xaa, 0x23, 0x1a, 0xef, 0xa7,
+	0xce, 0x6b, 0xf5, 0x9f, 0x41, 0xcd, 0x6c, 0x3d, 0xc9, 0x07, 0x89, 0x9d, 0x93, 0xd9, 0xbd, 0x36,
+	0x9c, 0x8b, 0x58, 0x66, 0x81, 0x45, 0x0b, 0x99, 0x0c, 0x1c, 0xeb, 0x50, 0x93, 0x81, 0xe3, 0x1d,
+	0x28, 0x02, 0x63, 0x64, 0x44, 0x8d, 0x23, 0x49, 0x34, 0xd1, 0xe8, 0x33, 0xed, 0xc8, 0x98, 0xed,
+	0x39, 0x31, 0x8e, 0xff, 0x93, 0x87, 0xea, 0x13, 0xaf, 0x3f, 0x0a, 0xe9, 0x88, 0x3d, 0x74, 0xb1,
+	0xec, 0xc1, 0x13, 0x8d, 0x1d, 0xce, 0x66, 0x9b, 0x66, 0x87, 0x73, 0xac, 0x87, 0x41, 0x35, 0xdb,
+	0x50, 0x12, 0xad, 0x04, 0xb1, 0x18, 0x63, 0x2d, 0x47, 0xe3, 0xdd, 0xe4, 0x49, 0xd3, 0xda, 0xa8,
+	0x2b, 0xb5, 0xad, 0x9d, 0x69, 0x62, 0x1b, 0xb7, 0xd3, 0x19, 0x34, 0xe4, 0xcf, 0xa0, 0xc8, 0x1e,
+	0xb4, 0x89, 0x95, 0x2a, 0x8c, 0x37, 0xef, 0x46, 0x23, 0x69, 0x4a, 0x03, 0x3c, 0x81, 0x05, 0xf5,
+	0x46, 0x4d, 0xde, 0xb3, 0xf4, 0x8f, 0xbf, 0x67, 0x37, 0x6e, 0xa5, 0x4d, 0x2b, 0x30, 0x0c, 0xef,
+	0xbf, 0x56, 0xa0, 0xc8, 0xee, 0x09, 0x66, 0x6b, 0x54, 0x46, 0xda, 0xb6, 0xce, 0xf4, 0x32, 0xb6,
+	0xad, 0xb3, 0x15, 0xa8, 0x38, 0xf3, 0x46, 0x35, 0x49, 0x12, 0x44, 0xe2, 0xad, 0x90, 0x7d, 0xe6,
+	0x13, 0x4a, 0x51, 0x11, 0xdb, 0x66, 0x59, 0x49, 0x12, 0x84, 0xac, 0x5e, 0xca, 0x8e, 0xed, 0xa4,
+	0xaa, 0x14, 0x81, 0x9f, 0x42, 0x59, 0xd6, 0x91, 0x49, 0xaa, 0xc6, 0x1b, 0xab, 0x24, 0x55, 0xad,
+	0x22, 0x34, 0x42, 0xc4, 0x5a, 0x23, 0x0d, 0x31, 0xea, 0x26, 0xd2, 0x10, 0x8d, 0x42, 0x05, 0x11,
+	0xbf, 0x06, 0x88, 0x2a, 0x4a, 0x3b, 0xd9, 0x25, 0xf6, 0x68, 0x76, 0xb2, 0x4b, 0x2e, 0x4a, 0x11,
+	0xfa, 0x1b, 0x20, 0xb3, 0xc5, 0x25, 0xf9, 0x38, 0x59, 0x3a, 0xb1, 0xb3, 0x6b, 0x7c, 0xf2, 0x76,
+	0xcc, 0x7a, 0xc9, 0x43, 0xa8, 0xe8, 0xba, 0x93, 0x38, 0x29, 0xf6, 0x9b, 0x37, 0xcd, 0x9d, 0x0b,
+	0x79, 0x6c, 0x2f, 0xc9, 0xbb, 0x26, 0x45, 0x28, 0x7e, 0xdd, 0xdc, 0xbd, 0x98, 0xc9, 0xdc, 0x52,
+	0x59, 0x8b, 0x26, 0x6d, 0x69, 0xbc, 0x95, 0x4c, 0xda, 0x52, 0xab, 0x90, 0x8d, 0x10, 0x53, 0x82,
+	0x24, 0xde, 0x72, 0xa6, 0x21, 0xce, 0x04, 0x49, 0x54, 0x95, 0x26, 0x99, 0x3f, 0xd3, 0xb1, 0x26,
+	0x99, 0x3f, 0x5b, 0xd8, 0x8a, 0x1d, 0xd3, 0x05, 0x6a, 0xd2, 0x8e, 0xd9, 0x2d, 0x6f, 0xe3, 0xce,
+	0x85, 0x3c, 0xb6, 0xca, 0xe9, 0x3b, 0x36, 0xd3, 0xf7, 0xa6, 0xa9, 0x6c, 0xef, 0xd8, 0x46, 0xed,
+	0x0f, 0x7f, 0xbf, 0x95, 0xfb, 0x33, 0xfe, 0xfb, 0x1b, 0xfe, 0x3b, 0x2e, 0xf1, 0xff, 0xb1, 0xf5,
+	0xa3, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x97, 0xa5, 0xda, 0xd3, 0x1a, 0x26, 0x00, 0x00,
 }

etcdserver/etcdserverpb/rpc.proto

@@ -197,7 +197,7 @@ message RangeResponse {
   // kvs is the list of key-value pairs matched by the range request.
   repeated mvccpb.KeyValue kvs = 2;
   // more indicates if there are more keys to return in the requested range.
-  bool more = 3;
+  int64 more = 3;
 }
 
 message PutRequest {

integration/v3_grpc_test.go

@@ -715,7 +715,7 @@ func TestV3RangeRequest(t *testing.T) {
 		reqs    []pb.RangeRequest
 
 		wresps [][]string
-		wmores []bool
+		wmores []int64
 	}{
 		// single key
 		{
@@ -731,7 +731,7 @@ func TestV3RangeRequest(t *testing.T) {
 				{"foo"},
 				{},
 			},
-			[]bool{false, false},
+			[]int64{0, 0},
 		},
 		// multi-key
 		{
@@ -759,7 +759,7 @@ func TestV3RangeRequest(t *testing.T) {
 				{},
 				{"a", "b", "c", "d", "e"},
 			},
-			[]bool{false, false, false, false, false, false},
+			[]int64{0, 0, 0, 0, 0, 0},
 		},
 		// revision
 		{
@@ -777,7 +777,7 @@ func TestV3RangeRequest(t *testing.T) {
 				{"a"},
 				{"a", "b"},
 			},
-			[]bool{false, false, false, false},
+			[]int64{0, 0, 0, 0},
 		},
 		// limit
 		{
@@ -793,7 +793,7 @@ func TestV3RangeRequest(t *testing.T) {
 				{"bar"},
 				{"bar", "foo"},
 			},
-			[]bool{true, false},
+			[]int64{1, 0},
 		},
 		// sort
 		{
@@ -838,7 +838,7 @@ func TestV3RangeRequest(t *testing.T) {
 				{"c"},
 				{},
 			},
-			[]bool{true, true, true, true, false},
+			[]int64{1, 1, 1, 1, 0},
 		},
 	}