modify schem

Author: bartliu827

pkg/data/usecases/iot/diagnostics.go

@@ -1,9 +1,10 @@
 package iot
 
 import (
+	"time"
+
 	"github.com/cnosdb/tsdb-comparisons/pkg/data"
 	"github.com/cnosdb/tsdb-comparisons/pkg/data/usecases/common"
-	"time"
 )
 
 const (
@@ -17,11 +18,16 @@ var (
 	labelFuelState   = []byte("fuel_state")
 	labelCurrentLoad = []byte("current_load")
 	labelStatus      = []byte("status")
-	fuelUD           = common.UD(-0.001, 0)
-	loadUD           = common.UD(0, maxLoad)
-	loadSaddleUD     = common.UD(0, 1)
-	statusND         = common.ND(0, 1)
-	
+
+	labelLoadCapacity           = []byte("load_capacity")
+	labelFuelCapacity           = []byte("fuel_capacity")
+	labelNominalFuelConsumption = []byte("nominal_fuel_consumption")
+
+	fuelUD       = common.UD(-0.001, 0)
+	loadUD       = common.UD(0, maxLoad)
+	loadSaddleUD = common.UD(0, 1)
+	statusND     = common.ND(0, 1)
+
 	diagnosticsFields = []common.LabeledDistributionMaker{
 		{
 			Label: labelFuelState,
@@ -50,6 +56,33 @@ var (
 				)
 			},
 		},
+		{
+			Label: labelLoadCapacity,
+			DistributionMaker: func() common.Distribution {
+				return common.FP(
+					common.CWD(statusND, 1500, 5000, 0),
+					0,
+				)
+			},
+		},
+		{
+			Label: labelFuelCapacity,
+			DistributionMaker: func() common.Distribution {
+				return common.FP(
+					common.CWD(statusND, 150, 300, 0),
+					0,
+				)
+			},
+		},
+		{
+			Label: labelNominalFuelConsumption,
+			DistributionMaker: func() common.Distribution {
+				return common.FP(
+					common.CWD(statusND, 12, 29, 0),
+					0,
+				)
+			},
+		},
 	}
 )
 
@@ -76,16 +109,19 @@ func (m *DiagnosticsMeasurement) ToPoint(p *data.Point) {
 	p.SetMeasurementName(labelDiagnostics)
 	copy := m.Timestamp
 	p.SetTimestamp(&copy)
-	
+
 	p.AppendField(diagnosticsFields[0].Label, float64(m.Distributions[0].Get()))
 	p.AppendField(diagnosticsFields[1].Label, float64(m.Distributions[1].Get()))
 	p.AppendField(diagnosticsFields[2].Label, int64(m.Distributions[2].Get()))
+	p.AppendField(diagnosticsFields[3].Label, float64(m.Distributions[3].Get()))
+	p.AppendField(diagnosticsFields[4].Label, float64(m.Distributions[4].Get()))
+	p.AppendField(diagnosticsFields[5].Label, float64(m.Distributions[5].Get()))
 }
 
 // NewDiagnosticsMeasurement creates a DiagnosticsMeasurement with start time.
 func NewDiagnosticsMeasurement(start time.Time) *DiagnosticsMeasurement {
 	sub := common.NewSubsystemMeasurementWithDistributionMakers(start, diagnosticsFields)
-	
+
 	return &DiagnosticsMeasurement{
 		SubsystemMeasurement: sub,
 	}

pkg/data/usecases/iot/readings.go

@@ -1,10 +1,11 @@
 package iot
 
 import (
-	"github.com/cnosdb/tsdb-comparisons/pkg/data"
-	"github.com/cnosdb/tsdb-comparisons/pkg/data/usecases/common"
 	"math/rand"
 	"time"
+
+	"github.com/cnosdb/tsdb-comparisons/pkg/data"
+	"github.com/cnosdb/tsdb-comparisons/pkg/data/usecases/common"
 )
 
 const (
@@ -26,11 +27,12 @@ var (
 	labelHeading         = []byte("heading")
 	labelGrade           = []byte("grade")
 	labelFuelConsumption = []byte("fuel_consumption")
-	geoStepUD            = common.UD(-0.005, 0.005)
-	
+
+	geoStepUD = common.UD(-0.005, 0.005)
+
 	bigUD   = common.UD(-10, 10)
 	smallUD = common.UD(-5, 5)
-	
+
 	readingsFields = []common.LabeledDistributionMaker{
 		{
 			Label: labelLatitude,
@@ -95,6 +97,33 @@ var (
 				)
 			},
 		},
+		{
+			Label: labelLoadCapacity,
+			DistributionMaker: func() common.Distribution {
+				return common.FP(
+					common.CWD(statusND, 1500, 5000, 0),
+					0,
+				)
+			},
+		},
+		{
+			Label: labelFuelCapacity,
+			DistributionMaker: func() common.Distribution {
+				return common.FP(
+					common.CWD(statusND, 150, 300, 0),
+					0,
+				)
+			},
+		},
+		{
+			Label: labelNominalFuelConsumption,
+			DistributionMaker: func() common.Distribution {
+				return common.FP(
+					common.CWD(statusND, 12, 29, 0),
+					0,
+				)
+			},
+		},
 	}
 )
 
@@ -108,7 +137,7 @@ func (m *ReadingsMeasurement) ToPoint(p *data.Point) {
 	p.SetMeasurementName(labelReadings)
 	copy := m.Timestamp
 	p.SetTimestamp(&copy)
-	
+
 	for i, d := range m.Distributions {
 		p.AppendField(readingsFields[i].Label, float64(d.Get()))
 	}
@@ -117,7 +146,7 @@ func (m *ReadingsMeasurement) ToPoint(p *data.Point) {
 // NewReadingsMeasurement creates a new ReadingsMeasurement with start time.
 func NewReadingsMeasurement(start time.Time) *ReadingsMeasurement {
 	sub := common.NewSubsystemMeasurementWithDistributionMakers(start, readingsFields)
-	
+
 	return &ReadingsMeasurement{
 		SubsystemMeasurement: sub,
 	}

pkg/data/usecases/iot/truck.go

@@ -2,9 +2,10 @@ package iot
 
 import (
 	"fmt"
-	"github.com/cnosdb/tsdb-comparisons/pkg/data/usecases/common"
 	"math/rand"
 	"time"
+
+	"github.com/cnosdb/tsdb-comparisons/pkg/data/usecases/common"
 )
 
 const (
@@ -27,7 +28,7 @@ var (
 		"Seth",
 		"Trish",
 	}
-	
+
 	modelChoices = []model{
 		{
 			Name:            "F-150",
@@ -48,14 +49,14 @@ var (
 			FuelConsumption: 12,
 		},
 	}
-	
+
 	deviceVersionChoices = []string{
 		"v1.0",
 		"v1.5",
 		"v2.0",
 		"v2.3",
 	}
-	
+
 	// FleetChoices contains all the fleet name values for the IoT use case
 	FleetChoices = []string{
 		"East",
@@ -103,22 +104,22 @@ func NewTruck(i int, start time.Time) common.Generator {
 
 func newTruckWithMeasurementGenerator(i int, start time.Time, generator func(time.Time) []common.SimulatedMeasurement) Truck {
 	sm := generator(start)
-	
+
 	m := modelChoices[rand.Intn(len(modelChoices))]
-	
+
 	h := Truck{
 		tags: []common.Tag{
 			{Key: []byte("name"), Value: fmt.Sprintf(truckNameFmt, i)},
 			{Key: []byte("fleet"), Value: common.RandomStringSliceChoice(FleetChoices)},
 			{Key: []byte("driver"), Value: common.RandomStringSliceChoice(driverChoices)},
 			{Key: []byte("model"), Value: m.Name},
 			{Key: []byte("device_version"), Value: common.RandomStringSliceChoice(deviceVersionChoices)},
-			{Key: []byte("load_capacity"), Value: m.LoadCapacity},
-			{Key: []byte("fuel_capacity"), Value: m.FuelCapacity},
-			{Key: []byte("nominal_fuel_consumption"), Value: m.FuelConsumption},
+			// {Key: []byte("load_capacity"), Value: m.LoadCapacity},
+			// {Key: []byte("fuel_capacity"), Value: m.FuelCapacity},
+			// {Key: []byte("nominal_fuel_consumption"), Value: m.FuelConsumption},
 		},
 		simulatedMeasurements: sm,
 	}
-	
+
 	return h
 }