update again to latest MT version

in particular
grafana/metrictank#894
grafana/metrictank#911

Author: Dieterbe

archive.go

@@ -10,14 +10,14 @@ import (
 // Archive represents a metric archive
 // the zero value represents a raw metric
 // any non-zero value represents a certain
-// aggregation method (lower 4 bits) and
-// aggregation span (higher 4 bits)
-type Archive uint8
+// aggregation method (lower 8 bits) and
+// aggregation span (higher 8 bits)
+type Archive uint16
 
 // important: caller must make sure to call IsSpanValid first
 func NewArchive(method Method, span uint32) Archive {
-	code := spanHumanToCode[span]
-	return Archive(uint8(method) | code<<4)
+	code := uint16(spanHumanToCode[span])
+	return Archive(uint16(method) | code<<8)
 }
 
 // String returns the traditional key suffix like sum_600 etc
@@ -31,7 +31,7 @@ func (a Archive) Method() Method {
 }
 
 func (a Archive) Span() uint32 {
-	return spanCodeToHuman[uint8(a>>4)]
+	return spanCodeToHuman[uint8(a>>8)]
 }
 
 func IsSpanValid(span uint32) bool {
@@ -76,7 +76,7 @@ var spanCodeToHuman map[uint8]uint32
 
 func init() {
 	// all the aggregation spans we support, their index position in this slice is their code
-	spans := []uint32{2, 5, 10, 15, 30, 60, 90, 120, 150, 300, 600, 900, 1200, 1800, 45 * 60, 3600, 3600 + 30*60, 2 * 3600, 3 * 3600, 4 * 3600, 5 * 3600, 6 * 3600}
+	spans := []uint32{2, 5, 10, 15, 30, 60, 90, 120, 150, 300, 600, 900, 1200, 1800, 45 * 60, 3600, 3600 + 30*60, 2 * 3600, 3 * 3600, 4 * 3600, 5 * 3600, 6 * 3600, 8 * 3600, 12 * 3600, 24 * 3600}
 
 	spanHumanToCode = make(map[uint32]uint8)
 	spanCodeToHuman = make(map[uint8]uint32)

archive_test.go

@@ -10,8 +10,14 @@ func TestArchive(t *testing.T) {
 		expStr     string
 	}
 	cases := []c{
-		{Avg, 15, 0x31, "avg_15"},
-		{Cnt, 120, 0x76, "cnt_120"},
+		{Avg, 15, 0x301, "avg_15"},
+		{Cnt, 120, 0x706, "cnt_120"},
+		{Cnt, 3600, 0xF06, "cnt_3600"},
+		{Lst, 7200, 0x1103, "lst_7200"},
+		{Min, 6 * 3600, 0x1505, "min_21600"},
+		{Cnt, 2, 0x6, "cnt_2"},
+		{Avg, 5, 0x101, "avg_5"},
+		{Cnt, 3600 + 30*60, 0x1006, "cnt_5400"},
 	}
 	for i, cas := range cases {
 		arch := NewArchive(cas.method, cas.span)
@@ -22,5 +28,13 @@ func TestArchive(t *testing.T) {
 		if str != cas.expStr {
 			t.Fatalf("case %d: expected string %q, got %q", i, cas.expStr, str)
 		}
+		method := arch.Method()
+		if method != cas.method {
+			t.Fatalf("case %d: expected method %v, got %v", i, cas.method, method)
+		}
+		span := arch.Span()
+		if span != cas.span {
+			t.Fatalf("case %d: expected span %v, got %v", i, cas.span, span)
+		}
 	}
 }

metric.go

@@ -107,7 +107,7 @@ type MetricDataArray []*MetricData
 
 type MetricDefinition struct {
 	Id       MKey   `json:"mkey"`
-	OrgId    int    `json:"org_id"`
+	OrgId    uint32 `json:"org_id"`
 	Name     string `json:"name"`
 	Interval int    `json:"interval"`
 	Unit     string `json:"unit"`
@@ -235,7 +235,7 @@ func MetricDefinitionFromMetricData(d *MetricData) *MetricDefinition {
 	md := &MetricDefinition{
 		Id:         mkey,
 		Name:       d.Name,
-		OrgId:      d.OrgId,
+		OrgId:      uint32(d.OrgId),
 		Mtype:      d.Mtype,
 		Interval:   d.Interval,
 		LastUpdate: d.Time,

metric_gen.go

@@ -453,7 +453,7 @@ func (z *MetricDefinition) DecodeMsg(dc *msgp.Reader) (err error) {
 				return
 			}
 		case "OrgId":
-			z.OrgId, err = dc.ReadInt()
+			z.OrgId, err = dc.ReadUint32()
 			if err != nil {
 				return
 			}
@@ -531,7 +531,7 @@ func (z *MetricDefinition) EncodeMsg(en *msgp.Writer) (err error) {
 	if err != nil {
 		return
 	}
-	err = en.WriteInt(z.OrgId)
+	err = en.WriteUint32(z.OrgId)
 	if err != nil {
 		return
 	}
@@ -619,7 +619,7 @@ func (z *MetricDefinition) MarshalMsg(b []byte) (o []byte, err error) {
 	}
 	// string "OrgId"
 	o = append(o, 0xa5, 0x4f, 0x72, 0x67, 0x49, 0x64)
-	o = msgp.AppendInt(o, z.OrgId)
+	o = msgp.AppendUint32(o, z.OrgId)
 	// string "Name"
 	o = append(o, 0xa4, 0x4e, 0x61, 0x6d, 0x65)
 	o = msgp.AppendString(o, z.Name)
@@ -669,7 +669,7 @@ func (z *MetricDefinition) UnmarshalMsg(bts []byte) (o []byte, err error) {
 				return
 			}
 		case "OrgId":
-			z.OrgId, bts, err = msgp.ReadIntBytes(bts)
+			z.OrgId, bts, err = msgp.ReadUint32Bytes(bts)
 			if err != nil {
 				return
 			}
@@ -733,7 +733,7 @@ func (z *MetricDefinition) UnmarshalMsg(bts []byte) (o []byte, err error) {
 
 // Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message
 func (z *MetricDefinition) Msgsize() (s int) {
-	s = 1 + 3 + z.Id.Msgsize() + 6 + msgp.IntSize + 5 + msgp.StringPrefixSize + len(z.Name) + 9 + msgp.IntSize + 5 + msgp.StringPrefixSize + len(z.Unit) + 6 + msgp.StringPrefixSize + len(z.Mtype) + 5 + msgp.ArrayHeaderSize
+	s = 1 + 3 + z.Id.Msgsize() + 6 + msgp.Uint32Size + 5 + msgp.StringPrefixSize + len(z.Name) + 9 + msgp.IntSize + 5 + msgp.StringPrefixSize + len(z.Unit) + 6 + msgp.StringPrefixSize + len(z.Mtype) + 5 + msgp.ArrayHeaderSize
 	for za0001 := range z.Tags {
 		s += msgp.StringPrefixSize + len(z.Tags[za0001])
 	}

msg/msg.go

@@ -111,10 +111,19 @@ func WritePointMsg(point schema.MetricPoint, buf []byte, version Format) (o []by
 	return nil, fmt.Errorf(errFmtUnsupportedFormat, version)
 }
 
-func IsPointMsg(data []byte) bool {
+func IsPointMsg(data []byte) (Format, bool) {
 	l := len(data)
+	if l == 0 {
+		return 0, false
+	}
 	version := Format(data[0])
-	return (l == 29 && version == FormatMetricPointWithoutOrg) || (l == 33 && version == FormatMetricPoint)
+	if l == 29 && version == FormatMetricPointWithoutOrg {
+		return FormatMetricPointWithoutOrg, true
+	}
+	if l == 33 && version == FormatMetricPoint {
+		return FormatMetricPoint, true
+	}
+	return 0, false
 }
 
 func ReadPointMsg(data []byte, defaultOrg uint32) ([]byte, schema.MetricPoint, error) {