diff --git a/field.go b/field.go index daddbf010..811786def 100644 --- a/field.go +++ b/field.go @@ -717,8 +717,25 @@ func (f *Field) loadMeta() error { } } - min := pql.NewDecimal(pb.Min.Value, pb.Min.Scale) - max := pql.NewDecimal(pb.Max.Value, pb.Max.Scale) + // Since pb.Min and pb.Max were changed to pql.Decimal, + // and since they now have a different protobuf field + // number, an existing meta file may have values in the + // old min/max fields which need to be converted to + // pql.Decimal. + // TODO: we can remove the OldMin/OldMax once we're + // confident no one is still using the older version. + var min pql.Decimal + if pb.Min != nil { + min = pql.NewDecimal(pb.Min.Value, pb.Min.Scale) + } else { + min = pql.NewDecimal(pb.OldMin, 0) + } + var max pql.Decimal + if pb.Max != nil { + max = pql.NewDecimal(pb.Max.Value, pb.Max.Scale) + } else { + max = pql.NewDecimal(pb.OldMax, 0) + } // Initialize "base" to "min" when upgrading from v1 BSI format. if pb.BitDepth == 0 { diff --git a/internal/private.pb.go b/internal/private.pb.go index e0ad9ea0c..c78b91ff5 100644 --- a/internal/private.pb.go +++ b/internal/private.pb.go @@ -82,6 +82,8 @@ type FieldOptions struct { CacheType string `protobuf:"bytes,3,opt,name=CacheType,proto3" json:"CacheType,omitempty"` CacheSize uint32 `protobuf:"varint,4,opt,name=CacheSize,proto3" json:"CacheSize,omitempty"` TimeQuantum string `protobuf:"bytes,5,opt,name=TimeQuantum,proto3" json:"TimeQuantum,omitempty"` + OldMin int64 `protobuf:"varint,9,opt,name=OldMin,proto3" json:"OldMin,omitempty"` + OldMax int64 `protobuf:"varint,10,opt,name=OldMax,proto3" json:"OldMax,omitempty"` Keys bool `protobuf:"varint,11,opt,name=Keys,proto3" json:"Keys,omitempty"` NoStandardView bool `protobuf:"varint,12,opt,name=NoStandardView,proto3" json:"NoStandardView,omitempty"` Base int64 `protobuf:"varint,13,opt,name=Base,proto3" json:"Base,omitempty"` @@ -156,6 +158,20 @@ func (m *FieldOptions) GetTimeQuantum() string { return "" } +func (m *FieldOptions) GetOldMin() int64 { + if m != nil { + return m.OldMin + } + return 0 +} + +func (m *FieldOptions) GetOldMax() int64 { + if m != nil { + return m.OldMax + } + return 0 +} + func (m *FieldOptions) GetKeys() bool { if m != nil { return m.Keys @@ -2213,87 +2229,89 @@ func init() { func init() { proto.RegisterFile("private.proto", fileDescriptor_d2a91b51c7bdc125) } var fileDescriptor_d2a91b51c7bdc125 = []byte{ - // 1275 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4b, 0x73, 0xdb, 0x44, - 0x1c, 0x47, 0x92, 0x93, 0xd8, 0x7f, 0xc7, 0xa9, 0xb3, 0x7d, 0xa9, 0x85, 0x09, 0x66, 0xe9, 0x50, - 0xd3, 0x19, 0x42, 0xa7, 0xe5, 0xc0, 0xab, 0x33, 0x25, 0x71, 0x5a, 0x4c, 0x49, 0x68, 0xd7, 0x69, - 0x6f, 0x1c, 0x36, 0xf2, 0x4e, 0xa3, 0x89, 0x2c, 0x09, 0x69, 0x95, 0x26, 0x3d, 0x70, 0x85, 0x19, - 0xbe, 0x00, 0x1f, 0x89, 0x23, 0x1f, 0x81, 0x29, 0x5f, 0x80, 0x2b, 0x37, 0x66, 0xff, 0xbb, 0xab, - 0x87, 0x9b, 0x90, 0xd2, 0x72, 0xdb, 0xff, 0xfb, 0xb7, 0xff, 0xd7, 0x4a, 0xd0, 0x4b, 0xb3, 0xf0, - 0x90, 0x4b, 0xb1, 0x9e, 0x66, 0x89, 0x4c, 0x48, 0x3b, 0x8c, 0xa5, 0xc8, 0x62, 0x1e, 0x5d, 0x5d, - 0x4e, 0x8b, 0xbd, 0x28, 0x0c, 0x34, 0x9f, 0xde, 0x87, 0xce, 0x38, 0x9e, 0x8a, 0xa3, 0x6d, 0x21, - 0x39, 0x21, 0xd0, 0x7a, 0x20, 0x8e, 0x73, 0xdf, 0x1b, 0x38, 0xc3, 0x36, 0xc3, 0x33, 0xf9, 0x00, - 0x56, 0x76, 0x33, 0x1e, 0x1c, 0x6c, 0x1d, 0x85, 0xb9, 0x14, 0x71, 0x20, 0xfc, 0x16, 0x4a, 0xe7, - 0xb8, 0xf4, 0x2f, 0x17, 0x96, 0xef, 0x85, 0x22, 0x9a, 0x7e, 0x97, 0xca, 0x30, 0x89, 0x73, 0xe5, - 0x6c, 0xf7, 0x38, 0x15, 0x7e, 0x7b, 0xe0, 0x0c, 0x3b, 0x0c, 0xcf, 0xe4, 0x1d, 0xe8, 0x6c, 0xf2, - 0x60, 0x5f, 0xa0, 0xc0, 0x43, 0x41, 0xc5, 0x28, 0xa5, 0x93, 0xf0, 0xb9, 0x8e, 0xd2, 0x63, 0x15, - 0x83, 0x0c, 0xa0, 0xbb, 0x1b, 0xce, 0xc4, 0xa3, 0x82, 0xc7, 0xb2, 0x98, 0xf9, 0x0b, 0x68, 0x5d, - 0x67, 0x95, 0xf0, 0xbb, 0x4d, 0xf8, 0x3b, 0xc9, 0x44, 0xf2, 0x78, 0xca, 0xb3, 0xe9, 0x93, 0x50, - 0x3c, 0xf3, 0x97, 0x35, 0xfc, 0x26, 0x57, 0xd9, 0x6e, 0xf0, 0x5c, 0xf8, 0xbd, 0x81, 0x33, 0xf4, - 0x18, 0x9e, 0xc9, 0x55, 0x68, 0x6f, 0x84, 0x72, 0x24, 0x52, 0xb9, 0xef, 0xaf, 0x0c, 0x9c, 0x61, - 0x8b, 0x95, 0x34, 0xb9, 0x00, 0x0b, 0x93, 0x80, 0x47, 0xc2, 0x3f, 0x87, 0x06, 0x9a, 0x20, 0x14, - 0x96, 0xef, 0x25, 0x99, 0x08, 0x9f, 0xc6, 0x98, 0x54, 0xbf, 0x8f, 0x20, 0x1b, 0x3c, 0xf2, 0x3e, - 0x78, 0xdb, 0x61, 0xec, 0xaf, 0x0e, 0x9c, 0x61, 0xf7, 0xd6, 0xea, 0xba, 0xad, 0xcb, 0xfa, 0x48, - 0x04, 0xe1, 0x8c, 0x47, 0x4c, 0x49, 0x51, 0x89, 0x1f, 0xf9, 0xe4, 0x74, 0x25, 0x7e, 0x44, 0x29, - 0xac, 0x8c, 0x67, 0x69, 0x92, 0x49, 0x26, 0xf2, 0x34, 0x89, 0x73, 0x41, 0xfa, 0xe0, 0x6d, 0x65, - 0x99, 0xef, 0x60, 0x58, 0x75, 0xa4, 0x3f, 0x42, 0x7f, 0x23, 0x4a, 0x82, 0x83, 0x11, 0x97, 0x9c, - 0x89, 0x1f, 0x0a, 0x91, 0x4b, 0x85, 0x5d, 0xc3, 0xd3, 0x7a, 0x9a, 0x50, 0x5c, 0xac, 0x9f, 0xef, - 0x6a, 0x2e, 0x12, 0x2a, 0x2f, 0x98, 0x35, 0x9d, 0x6e, 0x3c, 0xe3, 0xdd, 0xf7, 0x79, 0x36, 0xc5, - 0x1a, 0xb5, 0x98, 0x26, 0x14, 0x17, 0x23, 0x61, 0x5d, 0x5b, 0x4c, 0x13, 0x74, 0x0c, 0xab, 0xb5, - 0xf8, 0x06, 0xe6, 0x25, 0x58, 0x64, 0xc9, 0xb3, 0xf1, 0x28, 0xf7, 0x9d, 0x81, 0x37, 0x6c, 0x31, - 0x43, 0x61, 0x03, 0x24, 0x51, 0x31, 0x8b, 0x95, 0xc8, 0x45, 0x51, 0xc5, 0xa0, 0x57, 0x60, 0x01, - 0xbb, 0x41, 0xdd, 0xb2, 0xb2, 0x55, 0x47, 0xfa, 0x93, 0x03, 0x9d, 0x6d, 0x7e, 0x84, 0x40, 0x72, - 0x72, 0x07, 0xda, 0xb6, 0xb6, 0xa8, 0xd4, 0xbd, 0xf5, 0x5e, 0x95, 0xc1, 0x52, 0x6d, 0xdd, 0xea, - 0x6c, 0xc5, 0x32, 0x3b, 0x66, 0xa5, 0xc9, 0xd5, 0x2f, 0xa0, 0xd7, 0x10, 0xa9, 0x78, 0x07, 0xe2, - 0xd8, 0x66, 0xf5, 0x40, 0x1c, 0xab, 0xbb, 0x1e, 0xf2, 0xa8, 0x10, 0x98, 0xab, 0x16, 0xd3, 0xc4, - 0xe7, 0xee, 0xa7, 0x0e, 0x7d, 0x02, 0x64, 0x33, 0x13, 0x5c, 0x0a, 0x0c, 0xb2, 0x2d, 0xf2, 0x9c, - 0x3f, 0x15, 0x67, 0x65, 0xdc, 0xab, 0x67, 0xbc, 0xcc, 0xae, 0x5b, 0xcb, 0x2e, 0xbd, 0x01, 0x64, - 0x24, 0x22, 0x21, 0x85, 0x99, 0xd6, 0x7f, 0xf1, 0x4b, 0x27, 0x16, 0xc3, 0xd9, 0xba, 0xe4, 0x3a, - 0xb4, 0xd4, 0xe8, 0x63, 0xb0, 0xee, 0xad, 0xf3, 0x55, 0x9e, 0xca, 0xad, 0xc0, 0x50, 0x81, 0x46, - 0xd6, 0x29, 0xa2, 0x7c, 0xc5, 0x8b, 0x35, 0x5a, 0xe9, 0x86, 0x09, 0xe5, 0x61, 0xa8, 0x4b, 0x55, - 0xa8, 0xfa, 0xda, 0x30, 0xd1, 0xee, 0xda, 0xeb, 0xbe, 0x6e, 0x34, 0x1a, 0xc0, 0xdb, 0xda, 0xc3, - 0x57, 0x87, 0x3c, 0x8c, 0xf8, 0x5e, 0xf4, 0x9f, 0x2a, 0xd2, 0x00, 0xee, 0xc3, 0x12, 0xda, 0x8e, - 0x47, 0xa6, 0xb7, 0x2d, 0x49, 0xbf, 0x87, 0x6a, 0x4c, 0x76, 0xf8, 0x4c, 0x18, 0x6f, 0x78, 0x2e, - 0xef, 0xeb, 0x9e, 0x7d, 0x5f, 0x15, 0x58, 0x8d, 0x96, 0x5a, 0xbd, 0x9e, 0x0a, 0x8c, 0x04, 0xbd, - 0x0d, 0x8b, 0x93, 0x60, 0x5f, 0xcc, 0x38, 0xf9, 0x10, 0x96, 0x10, 0xa1, 0xc8, 0x4d, 0x47, 0x9f, - 0x9b, 0xab, 0x14, 0xb3, 0x72, 0x9a, 0x9b, 0x9b, 0x9d, 0x88, 0xe9, 0x23, 0x58, 0x32, 0x81, 0x71, - 0xa2, 0x4f, 0xa9, 0xb8, 0xd5, 0x21, 0xd7, 0x61, 0x11, 0xc1, 0xe6, 0x7e, 0x6b, 0x3e, 0x2a, 0xf2, - 0x99, 0x11, 0xd3, 0x2d, 0xf0, 0x1e, 0xb3, 0xb1, 0x1a, 0x6c, 0x04, 0x6c, 0x83, 0x1a, 0x4a, 0x41, - 0xf9, 0x3a, 0xc9, 0xa5, 0x49, 0x2b, 0x9e, 0x15, 0xef, 0x61, 0x92, 0x49, 0x4c, 0x69, 0x8f, 0xe1, - 0x99, 0xe6, 0xd0, 0xda, 0x49, 0xa6, 0x82, 0xac, 0x80, 0x3b, 0x1e, 0x19, 0x1f, 0xee, 0x78, 0x44, - 0xde, 0x45, 0xf7, 0x26, 0x93, 0xbd, 0x0a, 0xc4, 0x63, 0x36, 0x66, 0x18, 0xf8, 0x1a, 0xf4, 0xc6, - 0xf9, 0x66, 0x92, 0x64, 0xd3, 0x30, 0xe6, 0x32, 0xc9, 0xcc, 0x13, 0xd6, 0x64, 0xe2, 0x68, 0x49, - 0x2e, 0xf5, 0xe3, 0xd2, 0x61, 0x9a, 0xa0, 0x77, 0xa1, 0xaf, 0x82, 0x22, 0x61, 0xdb, 0xe3, 0x12, - 0x2c, 0x2a, 0x5e, 0x09, 0xc2, 0x50, 0x95, 0x07, 0xb7, 0xee, 0xe1, 0x5b, 0xed, 0x61, 0xeb, 0x50, - 0xc4, 0xb2, 0xd6, 0x60, 0x48, 0xa3, 0x83, 0x1e, 0xd3, 0x04, 0xa1, 0xfa, 0x82, 0xe6, 0x26, 0x2b, - 0xd5, 0x4d, 0x14, 0x97, 0xa1, 0x8c, 0xfe, 0xe2, 0x00, 0x58, 0x40, 0x45, 0x5e, 0x9a, 0x38, 0xa7, - 0x9b, 0x90, 0xa1, 0x6d, 0x14, 0x33, 0x5c, 0xfd, 0x4a, 0x4b, 0xf3, 0x99, 0x6d, 0xa4, 0x8f, 0xab, - 0x46, 0xd2, 0x25, 0xbd, 0x38, 0xd7, 0x00, 0x3a, 0x6a, 0xd5, 0x4e, 0x0f, 0xa1, 0x5b, 0xe3, 0x9f, - 0xd2, 0x54, 0xb6, 0x4b, 0xdc, 0x79, 0x97, 0xc8, 0x37, 0x2e, 0x6d, 0xaf, 0x3c, 0x80, 0x6e, 0x8d, - 0x7d, 0xa2, 0xc7, 0x21, 0x9c, 0x6b, 0x8e, 0xad, 0x7d, 0x0e, 0xe6, 0xd9, 0x34, 0x84, 0xde, 0x66, - 0x54, 0xe4, 0x52, 0x64, 0xc6, 0x9d, 0x7a, 0x43, 0x34, 0xa3, 0x2c, 0x5e, 0xc5, 0x38, 0xb9, 0x7e, - 0xe4, 0x1a, 0x2c, 0xa8, 0x34, 0xea, 0xe9, 0x7b, 0x39, 0xc7, 0x5a, 0x48, 0x9f, 0x40, 0x7b, 0x63, - 0x32, 0xbe, 0x9f, 0x25, 0x45, 0x7a, 0x22, 0x68, 0xfb, 0xc1, 0xe3, 0xd6, 0x3e, 0x78, 0xfa, 0xfa, - 0xb1, 0xf7, 0xf0, 0x23, 0x01, 0x5f, 0xf6, 0xbe, 0x7e, 0xd9, 0x5b, 0x86, 0xc3, 0xd5, 0xba, 0x5e, - 0xd5, 0x9b, 0x55, 0x0d, 0xfd, 0xeb, 0xec, 0x27, 0xfb, 0x46, 0x7b, 0xd5, 0x1b, 0xad, 0x9c, 0xea, - 0xf5, 0xf7, 0x7f, 0x3a, 0xfd, 0xdb, 0x85, 0x55, 0x26, 0xf2, 0xf0, 0xb9, 0x18, 0xc7, 0xb9, 0xcc, - 0x8a, 0x40, 0x6d, 0x09, 0x65, 0xff, 0x4d, 0xb2, 0x67, 0xb2, 0xed, 0x31, 0x4d, 0xbc, 0x4a, 0xa7, - 0x93, 0x9b, 0xd0, 0x9d, 0x9f, 0xd9, 0x97, 0x55, 0xeb, 0x2a, 0xe4, 0x26, 0x2c, 0x4d, 0x92, 0x22, - 0x0b, 0xca, 0xf6, 0xad, 0xad, 0x55, 0x8d, 0x4c, 0x8b, 0x99, 0x55, 0x23, 0x8f, 0x80, 0xec, 0x66, - 0x3c, 0xce, 0x23, 0xae, 0xc0, 0x5a, 0xe3, 0xf6, 0xfc, 0x67, 0x41, 0x4d, 0xa7, 0xe1, 0xe7, 0x04, - 0x63, 0xf2, 0x49, 0x7d, 0x3e, 0xfd, 0x25, 0x44, 0x7d, 0xa1, 0x89, 0xda, 0xb4, 0x7c, 0x7d, 0x8e, - 0xef, 0xcc, 0x75, 0xaa, 0xbf, 0x88, 0x86, 0x97, 0x2b, 0xc3, 0x86, 0x98, 0x35, 0xb5, 0xe9, 0xcf, - 0x0e, 0x2c, 0xd7, 0x91, 0xbd, 0xd2, 0x5e, 0x28, 0x0b, 0xee, 0x9e, 0xfd, 0xdd, 0x61, 0x0b, 0xde, - 0x3a, 0xe9, 0x4b, 0x6f, 0xa1, 0xfe, 0x2d, 0x52, 0xc0, 0xe5, 0x53, 0xd2, 0xf5, 0x06, 0xa0, 0x06, - 0xd0, 0x7d, 0xc8, 0x33, 0x19, 0x2a, 0x97, 0xe6, 0xa1, 0x5d, 0x60, 0x75, 0x16, 0x3d, 0x80, 0x2b, - 0x2f, 0x35, 0xdf, 0x66, 0x32, 0x4b, 0x55, 0x97, 0xbf, 0x41, 0x13, 0xaa, 0x45, 0x9d, 0x65, 0xa6, - 0xfd, 0x3a, 0x4c, 0x13, 0xf4, 0x33, 0xb8, 0x38, 0x11, 0xb2, 0xd6, 0x7a, 0x76, 0x86, 0x06, 0xe0, - 0xed, 0x88, 0x67, 0xa7, 0x5c, 0x50, 0x89, 0xe8, 0x97, 0xe0, 0x3f, 0x4e, 0xa7, 0x5c, 0x8a, 0xd7, - 0xb2, 0xde, 0x80, 0xf6, 0x6e, 0x92, 0x26, 0x51, 0xf2, 0xf4, 0xf8, 0x8c, 0x5d, 0xe6, 0xc3, 0x92, - 0x7e, 0x95, 0xf4, 0x72, 0xec, 0x30, 0x4b, 0xd2, 0xf3, 0x6a, 0x4c, 0x03, 0x1e, 0x05, 0x45, 0xa4, - 0x60, 0xa8, 0x8f, 0xe6, 0x7c, 0xa3, 0xff, 0xdb, 0x8b, 0x35, 0xe7, 0xf7, 0x17, 0x6b, 0xce, 0x1f, - 0x2f, 0xd6, 0x9c, 0x5f, 0xff, 0x5c, 0x7b, 0x6b, 0x6f, 0x11, 0x7f, 0x01, 0x6f, 0xff, 0x13, 0x00, - 0x00, 0xff, 0xff, 0x60, 0x9d, 0x52, 0x8c, 0x2b, 0x0e, 0x00, 0x00, + // 1298 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcd, 0x72, 0x1b, 0xc5, + 0x13, 0xff, 0xaf, 0x56, 0x96, 0xa5, 0x96, 0xe5, 0xc8, 0x93, 0xc4, 0xd9, 0xe4, 0x4f, 0x19, 0x31, + 0xa4, 0x88, 0x48, 0x15, 0x26, 0x95, 0x70, 0xe0, 0x2b, 0x55, 0xc1, 0x96, 0x13, 0x44, 0xb0, 0x93, + 0x8c, 0x9c, 0xdc, 0x38, 0x8c, 0x57, 0x53, 0xf1, 0x96, 0x57, 0xbb, 0x62, 0x77, 0xd6, 0x91, 0x73, + 0xe0, 0x0a, 0x55, 0xbc, 0x00, 0x47, 0x1e, 0x87, 0x23, 0x8f, 0x40, 0x85, 0xa7, 0xe0, 0x46, 0x4d, + 0xcf, 0xcc, 0x7e, 0x28, 0x16, 0x0e, 0x0e, 0xb7, 0xe9, 0x5f, 0xf7, 0xf4, 0x77, 0xf7, 0xec, 0x42, + 0x67, 0x9a, 0x04, 0xc7, 0x5c, 0x8a, 0xcd, 0x69, 0x12, 0xcb, 0x98, 0x34, 0x83, 0x48, 0x8a, 0x24, + 0xe2, 0xe1, 0xb5, 0x95, 0x69, 0x76, 0x10, 0x06, 0xbe, 0xc6, 0xe9, 0x03, 0x68, 0x0d, 0xa3, 0xb1, + 0x98, 0xed, 0x0a, 0xc9, 0x09, 0x81, 0xfa, 0x43, 0x71, 0x92, 0x7a, 0x6e, 0xcf, 0xe9, 0x37, 0x19, + 0x9e, 0xc9, 0x07, 0xb0, 0xba, 0x9f, 0x70, 0xff, 0x68, 0x67, 0x16, 0xa4, 0x52, 0x44, 0xbe, 0xf0, + 0xea, 0xc8, 0x9d, 0x43, 0xe9, 0xaf, 0x2e, 0xac, 0xdc, 0x0f, 0x44, 0x38, 0x7e, 0x34, 0x95, 0x41, + 0x1c, 0xa5, 0x4a, 0xd9, 0xfe, 0xc9, 0x54, 0x78, 0xcd, 0x9e, 0xd3, 0x6f, 0x31, 0x3c, 0x93, 0x77, + 0xa0, 0xb5, 0xcd, 0xfd, 0x43, 0x81, 0x0c, 0x17, 0x19, 0x05, 0x90, 0x73, 0x47, 0xc1, 0x4b, 0x6d, + 0xa5, 0xc3, 0x0a, 0x80, 0xf4, 0xa0, 0xbd, 0x1f, 0x4c, 0xc4, 0x93, 0x8c, 0x47, 0x32, 0x9b, 0x78, + 0x4b, 0x78, 0xbb, 0x0c, 0x91, 0x75, 0x68, 0x3c, 0x0a, 0xc7, 0xbb, 0x41, 0xe4, 0xb5, 0x7a, 0x4e, + 0xdf, 0x65, 0x86, 0xb2, 0x38, 0x9f, 0x79, 0x50, 0xe0, 0x7c, 0x96, 0x87, 0xdb, 0xae, 0x86, 0xbb, + 0x17, 0x8f, 0x24, 0x8f, 0xc6, 0x3c, 0x19, 0x3f, 0x0b, 0xc4, 0x0b, 0x6f, 0x45, 0x87, 0x5b, 0x45, + 0xd5, 0xdd, 0x2d, 0x9e, 0x0a, 0xaf, 0x83, 0x1a, 0xf1, 0x4c, 0xae, 0x41, 0x73, 0x2b, 0x90, 0x03, + 0x31, 0x95, 0x87, 0xde, 0x6a, 0xcf, 0xe9, 0xd7, 0x59, 0x4e, 0x93, 0x4b, 0xb0, 0x34, 0xf2, 0x79, + 0x28, 0xbc, 0x0b, 0x78, 0x41, 0x13, 0x84, 0xc2, 0xca, 0xfd, 0x38, 0x11, 0xc1, 0xf3, 0x08, 0x8b, + 0xe0, 0x75, 0x31, 0xa8, 0x0a, 0x46, 0xde, 0x07, 0x57, 0x85, 0xb4, 0xd6, 0x73, 0xfa, 0xed, 0xdb, + 0x6b, 0x9b, 0xb6, 0x8e, 0x9b, 0x03, 0xe1, 0x07, 0x13, 0x1e, 0x32, 0xc5, 0x45, 0x21, 0x3e, 0xf3, + 0xc8, 0x62, 0x21, 0x3e, 0xa3, 0x14, 0x56, 0x87, 0x93, 0x69, 0x9c, 0x48, 0x26, 0xd2, 0x69, 0x1c, + 0xa5, 0x82, 0x74, 0xc1, 0xdd, 0x49, 0x12, 0xcf, 0x41, 0xb3, 0xea, 0x48, 0x7f, 0x80, 0xee, 0x56, + 0x18, 0xfb, 0x47, 0x03, 0x2e, 0x39, 0x13, 0xdf, 0x67, 0x22, 0x95, 0xca, 0x77, 0xed, 0x9e, 0x96, + 0xd3, 0x84, 0x42, 0xb1, 0xde, 0x5e, 0x4d, 0xa3, 0x48, 0xa8, 0xbc, 0x60, 0xd6, 0x74, 0x79, 0xf0, + 0x8c, 0xb1, 0x1f, 0xf2, 0x64, 0x8c, 0x35, 0xad, 0x33, 0x4d, 0x28, 0x14, 0x2d, 0x61, 0x1f, 0xd4, + 0x99, 0x26, 0xe8, 0x10, 0xd6, 0x4a, 0xf6, 0x8d, 0x9b, 0xeb, 0xd0, 0x60, 0xf1, 0x8b, 0xe1, 0x20, + 0xf5, 0x9c, 0x9e, 0xdb, 0xaf, 0x33, 0x43, 0x61, 0xc3, 0xc4, 0x61, 0x36, 0x89, 0x14, 0xab, 0x86, + 0xac, 0x02, 0xa0, 0x57, 0x61, 0x09, 0xbb, 0x47, 0x45, 0x59, 0xdc, 0x55, 0x47, 0xfa, 0xa3, 0x03, + 0xad, 0x5d, 0x3e, 0x43, 0x47, 0x52, 0x72, 0x17, 0x9a, 0xb6, 0xb6, 0x28, 0xd4, 0xbe, 0xfd, 0x5e, + 0x91, 0xc1, 0x5c, 0x6c, 0xd3, 0xca, 0xec, 0x44, 0x32, 0x39, 0x61, 0xf9, 0x95, 0x6b, 0x5f, 0x40, + 0xa7, 0xc2, 0x52, 0xf6, 0x8e, 0xc4, 0x89, 0xcd, 0xea, 0x91, 0x38, 0x51, 0xb1, 0x1e, 0xf3, 0x30, + 0x13, 0x98, 0xab, 0x3a, 0xd3, 0xc4, 0xe7, 0xb5, 0x4f, 0x1d, 0xfa, 0x0c, 0xc8, 0x76, 0x22, 0xb8, + 0x14, 0x68, 0x64, 0x57, 0xa4, 0x29, 0x7f, 0x2e, 0xce, 0xca, 0xb8, 0x5b, 0xce, 0x78, 0x9e, 0xdd, + 0x5a, 0x29, 0xbb, 0xf4, 0x26, 0x90, 0x81, 0x08, 0x85, 0x14, 0x66, 0xba, 0xff, 0x41, 0x2f, 0x1d, + 0x59, 0x1f, 0xce, 0x96, 0x25, 0x37, 0xa0, 0xae, 0x56, 0x05, 0x1a, 0x6b, 0xdf, 0xbe, 0x58, 0xe4, + 0x29, 0xdf, 0x22, 0x0c, 0x05, 0x68, 0x68, 0x95, 0xa2, 0x97, 0x6f, 0x18, 0x58, 0xa5, 0x95, 0x6e, + 0x1a, 0x53, 0x2e, 0x9a, 0x5a, 0x2f, 0x4c, 0x95, 0xd7, 0x8c, 0xb1, 0x76, 0xcf, 0x86, 0x7b, 0x5e, + 0x6b, 0xd4, 0x87, 0xff, 0x6b, 0x0d, 0x5f, 0x1d, 0xf3, 0x20, 0xe4, 0x07, 0xe1, 0xbf, 0xaa, 0x48, + 0xc5, 0x71, 0x0f, 0x96, 0xf1, 0xee, 0x70, 0x60, 0x7a, 0xdb, 0x92, 0xf4, 0x3b, 0x28, 0xc6, 0x64, + 0x8f, 0x4f, 0x84, 0xd1, 0x86, 0xe7, 0x3c, 0xde, 0xda, 0xd9, 0xf1, 0x2a, 0xc3, 0x6a, 0xb4, 0xd4, + 0xaa, 0x76, 0x95, 0x61, 0x24, 0xe8, 0x1d, 0x68, 0x8c, 0xfc, 0x43, 0x31, 0xe1, 0xe4, 0x43, 0x58, + 0x46, 0x0f, 0x45, 0x6a, 0x3a, 0xfa, 0xc2, 0x5c, 0xa5, 0x98, 0xe5, 0xd3, 0xd4, 0x44, 0x76, 0xaa, + 0x4f, 0x1f, 0xc1, 0xb2, 0x31, 0x8c, 0x13, 0xbd, 0xa0, 0xe2, 0x56, 0x86, 0xdc, 0x80, 0x06, 0x3a, + 0x9b, 0x7a, 0xf5, 0x79, 0xab, 0x88, 0x33, 0xc3, 0xa6, 0x3b, 0xe0, 0x3e, 0x65, 0x43, 0x35, 0xd8, + 0xe8, 0xb0, 0x35, 0x6a, 0x28, 0xe5, 0xca, 0xd7, 0x71, 0x2a, 0x4d, 0x5a, 0xf1, 0xac, 0xb0, 0xc7, + 0x71, 0x22, 0x31, 0xa5, 0x1d, 0x86, 0x67, 0x9a, 0x42, 0x7d, 0x2f, 0x1e, 0x0b, 0xb2, 0x0a, 0xb5, + 0xe1, 0xc0, 0xe8, 0xa8, 0x0d, 0x07, 0xe4, 0x5d, 0x54, 0x6f, 0x32, 0xd9, 0x29, 0x9c, 0x78, 0xca, + 0x86, 0x0c, 0x0d, 0x5f, 0x87, 0xce, 0x30, 0xdd, 0x8e, 0xe3, 0x64, 0x1c, 0x44, 0x5c, 0xc6, 0x89, + 0x79, 0xf2, 0xaa, 0x20, 0x8e, 0x96, 0xe4, 0x52, 0x3f, 0x46, 0x2d, 0xa6, 0x09, 0x7a, 0x0f, 0xba, + 0xca, 0x28, 0x12, 0xb6, 0x3d, 0xd6, 0xa1, 0xa1, 0xb0, 0xdc, 0x09, 0x43, 0x15, 0x1a, 0x6a, 0x65, + 0x0d, 0xdf, 0x6a, 0x0d, 0x3b, 0xc7, 0x22, 0x92, 0xa5, 0x06, 0x43, 0x1a, 0x15, 0x74, 0x98, 0x26, + 0x08, 0xd5, 0x01, 0x9a, 0x48, 0x56, 0x8b, 0x48, 0x14, 0xca, 0x90, 0x47, 0x7f, 0x76, 0x00, 0xac, + 0x43, 0x59, 0x9a, 0x5f, 0x71, 0x16, 0x5f, 0x21, 0x7d, 0xdb, 0x28, 0x66, 0xb8, 0xba, 0x85, 0x94, + 0xc6, 0x99, 0x6d, 0xa4, 0x8f, 0x8b, 0x46, 0xd2, 0x25, 0xbd, 0x3c, 0xd7, 0x00, 0xda, 0x6a, 0xd1, + 0x4e, 0x8f, 0xa1, 0x5d, 0xc2, 0x17, 0x34, 0x95, 0xed, 0x92, 0xda, 0xbc, 0x4a, 0xc4, 0x8d, 0x4a, + 0xdb, 0x2b, 0x0f, 0xa1, 0x5d, 0x82, 0x4f, 0xd5, 0xd8, 0x87, 0x0b, 0xd5, 0xb1, 0xb5, 0xcf, 0xc1, + 0x3c, 0x4c, 0x03, 0xe8, 0x6c, 0x87, 0x59, 0x2a, 0x45, 0x62, 0xd4, 0xa9, 0x37, 0x44, 0x03, 0x79, + 0xf1, 0x0a, 0xe0, 0xf4, 0xfa, 0x91, 0xeb, 0xb0, 0xa4, 0xd2, 0xa8, 0xa7, 0xef, 0xf5, 0x1c, 0x6b, + 0x26, 0x7d, 0x06, 0xcd, 0xad, 0xd1, 0xf0, 0x41, 0x12, 0x67, 0xd3, 0x53, 0x9d, 0xb6, 0x1f, 0x48, + 0xb5, 0xd2, 0x07, 0x52, 0x57, 0x3f, 0xf6, 0x2e, 0x7e, 0x24, 0xe0, 0xcb, 0xde, 0xd5, 0x2f, 0x7b, + 0xdd, 0x20, 0x5c, 0xad, 0xeb, 0x35, 0xbd, 0x59, 0xd5, 0xd0, 0x9f, 0x67, 0x3f, 0xd9, 0x37, 0xda, + 0x2d, 0xde, 0x68, 0xa5, 0x54, 0xaf, 0xbf, 0xff, 0x52, 0xe9, 0x5f, 0x35, 0x58, 0x63, 0x22, 0x0d, + 0x5e, 0x8a, 0x61, 0x94, 0xca, 0x24, 0xf3, 0xd5, 0x96, 0x50, 0xf7, 0xbf, 0x89, 0x0f, 0x4c, 0xb6, + 0x5d, 0xa6, 0x89, 0x37, 0xe9, 0x74, 0x72, 0x0b, 0xda, 0xf3, 0x33, 0xfb, 0xba, 0x68, 0x59, 0x84, + 0xdc, 0x82, 0xe5, 0x51, 0x9c, 0x25, 0x7e, 0xde, 0xbe, 0xa5, 0xb5, 0xaa, 0x3d, 0xd3, 0x6c, 0x66, + 0xc5, 0xc8, 0x13, 0x20, 0xfb, 0x09, 0x8f, 0xd2, 0x90, 0x2b, 0x67, 0xed, 0xe5, 0xe6, 0xfc, 0x67, + 0x41, 0x49, 0xa6, 0xa2, 0xe7, 0x94, 0xcb, 0xe4, 0x93, 0xf2, 0x7c, 0x7a, 0xcb, 0xe8, 0xf5, 0xa5, + 0xaa, 0xd7, 0xa6, 0xe5, 0xcb, 0x73, 0x7c, 0x77, 0xae, 0x53, 0xbd, 0x06, 0x5e, 0xbc, 0x52, 0x5c, + 0xac, 0xb0, 0x59, 0x55, 0x9a, 0xfe, 0xe4, 0xc0, 0x4a, 0xd9, 0xb3, 0x37, 0xda, 0x0b, 0x79, 0xc1, + 0x6b, 0x67, 0x7f, 0x77, 0xd8, 0x82, 0xd7, 0x4f, 0xfb, 0xd2, 0x5b, 0x2a, 0x7f, 0x8b, 0x64, 0x70, + 0x65, 0x41, 0xba, 0xde, 0xc2, 0xa9, 0x1e, 0xb4, 0x1f, 0xf3, 0x44, 0x06, 0x4a, 0xa5, 0x79, 0x68, + 0x97, 0x58, 0x19, 0xa2, 0x47, 0x70, 0xf5, 0xb5, 0xe6, 0xdb, 0x8e, 0x27, 0x53, 0xd5, 0xe5, 0x6f, + 0xd1, 0x84, 0x6a, 0x51, 0x27, 0x89, 0x69, 0xbf, 0x16, 0xd3, 0x04, 0xfd, 0x0c, 0x2e, 0x8f, 0x84, + 0x2c, 0xb5, 0x9e, 0x9d, 0xa1, 0x1e, 0xb8, 0x7b, 0xe2, 0xc5, 0x82, 0x00, 0x15, 0x8b, 0x7e, 0x09, + 0xde, 0xd3, 0xe9, 0x98, 0x4b, 0x71, 0xae, 0xdb, 0x5b, 0xd0, 0xdc, 0x8f, 0xa7, 0x71, 0x18, 0x3f, + 0x3f, 0x39, 0x63, 0x97, 0x79, 0xb0, 0xac, 0x5f, 0x25, 0xbd, 0x1c, 0x5b, 0xcc, 0x92, 0xf4, 0xa2, + 0x1a, 0x53, 0x9f, 0x87, 0x7e, 0x16, 0x2a, 0x37, 0xd4, 0x47, 0x73, 0xba, 0xd5, 0xfd, 0xed, 0xd5, + 0x86, 0xf3, 0xfb, 0xab, 0x0d, 0xe7, 0x8f, 0x57, 0x1b, 0xce, 0x2f, 0x7f, 0x6e, 0xfc, 0xef, 0xa0, + 0x81, 0xbf, 0x8c, 0x77, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xa0, 0xbb, 0xce, 0xd0, 0x5b, 0x0e, + 0x00, 0x00, } func (m *IndexMeta) Marshal() (dAtA []byte, err error) { @@ -2439,6 +2457,16 @@ func (m *FieldOptions) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x58 } + if m.OldMax != 0 { + i = encodeVarintPrivate(dAtA, i, uint64(m.OldMax)) + i-- + dAtA[i] = 0x50 + } + if m.OldMin != 0 { + i = encodeVarintPrivate(dAtA, i, uint64(m.OldMin)) + i-- + dAtA[i] = 0x48 + } if len(m.Type) > 0 { i -= len(m.Type) copy(dAtA[i:], m.Type) @@ -4168,6 +4196,12 @@ func (m *FieldOptions) Size() (n int) { if l > 0 { n += 1 + l + sovPrivate(uint64(l)) } + if m.OldMin != 0 { + n += 1 + sovPrivate(uint64(m.OldMin)) + } + if m.OldMax != 0 { + n += 1 + sovPrivate(uint64(m.OldMax)) + } if m.Keys { n += 2 } @@ -5198,6 +5232,44 @@ func (m *FieldOptions) Unmarshal(dAtA []byte) error { } m.Type = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 9: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field OldMin", wireType) + } + m.OldMin = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPrivate + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.OldMin |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 10: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field OldMax", wireType) + } + m.OldMax = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPrivate + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.OldMax |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } case 11: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Keys", wireType) diff --git a/internal/private.proto b/internal/private.proto index 81c72dde6..989428756 100644 --- a/internal/private.proto +++ b/internal/private.proto @@ -14,6 +14,8 @@ message FieldOptions { string CacheType = 3; uint32 CacheSize = 4; string TimeQuantum = 5; + int64 OldMin = 9; + int64 OldMax = 10; bool Keys = 11; bool NoStandardView = 12; int64 Base = 13;