Merge pull request #919 from codysoyland/875-value-importer-bug

Fix field value import: Use signed int and respect field minimum

client.go

@@ -1131,7 +1131,7 @@ func (p Bits) GroupBySlice() map[uint64][]Bit {
 // range-encoded frame.
 type FieldValue struct {
 	ColumnID uint64
-	Value    uint64
+	Value    int64
 }
 
 // FieldValues represents a slice of field values.
@@ -1154,8 +1154,8 @@ func (p FieldValues) ColumnIDs() []uint64 {
 }
 
 // Values returns a slice of all the values.
-func (p FieldValues) Values() []uint64 {
-	other := make([]uint64, len(p))
+func (p FieldValues) Values() []int64 {
+	other := make([]int64, len(p))
 	for i := range p {
 		other[i] = p[i].Value
 	}

client_test.go

@@ -299,7 +299,7 @@ func TestClient_ImportValue(t *testing.T) {
 	fld := pilosa.Field{
 		Name: "fld",
 		Type: pilosa.FieldTypeInt,
-		Min:  0,
+		Min:  -100,
 		Max:  100,
 	}
 
@@ -320,7 +320,7 @@ func TestClient_ImportValue(t *testing.T) {
 	// Send import request.
 	c := test.MustNewClient(s.Host())
 	if err := c.ImportValue(context.Background(), "i", "f", fld.Name, 0, []pilosa.FieldValue{
-		{ColumnID: 1, Value: 10},
+		{ColumnID: 1, Value: -10},
 		{ColumnID: 2, Value: 20},
 		{ColumnID: 3, Value: 40},
 	}); err != nil {
@@ -333,7 +333,7 @@ func TestClient_ImportValue(t *testing.T) {
 	}
 
 	// Verify data.
-	if sum != 70 || cnt != 3 {
+	if sum != 50 || cnt != 3 {
 		t.Fatalf("unexpected values: got sum=%v, count=%v; expected sum=70, cnt=3", sum, cnt)
 	}
 }

ctl/import.go

@@ -293,7 +293,7 @@ func (cmd *ImportCommand) bufferFieldValues(ctx context.Context, path string) er
 		val.ColumnID = columnID
 
 		// Parse field value.
-		value, err := strconv.ParseUint(record[1], 10, 64)
+		value, err := strconv.ParseInt(record[1], 10, 64)
 		if err != nil {
 			return fmt.Errorf("invalid value on row %d: %q", rnum, record[1])
 		}

frame.go

@@ -882,7 +882,7 @@ func (f *Frame) Import(rowIDs, columnIDs []uint64, timestamps []*time.Time) erro
 }
 
 // ImportValue bulk imports range-encoded value data.
-func (f *Frame) ImportValue(fieldName string, columnIDs, values []uint64) error {
+func (f *Frame) ImportValue(fieldName string, columnIDs []uint64, values []int64) error {
 	// Verify that this frame is range-encoded.
 	if !f.RangeEnabled() {
 		return fmt.Errorf("Frame not RangeEnabled: %s", f.name)
@@ -930,7 +930,12 @@ func (f *Frame) ImportValue(fieldName string, columnIDs, values []uint64) error
 			return err
 		}
 
-		if err := frag.ImportValue(data.ColumnIDs, data.Values, field.BitDepth()); err != nil {
+		baseValues := make([]uint64, len(data.Values))
+		for i, value := range data.Values {
+			baseValues[i] = uint64(value - field.Min)
+		}
+
+		if err := frag.ImportValue(data.ColumnIDs, baseValues, field.BitDepth()); err != nil {
 			return err
 		}
 	}

index.go

@@ -668,7 +668,7 @@ type importData struct {
 
 type importValueData struct {
 	ColumnIDs []uint64
-	Values    []uint64
+	Values    []int64
 }
 
 // CreateInputDefinition creates a new input definition.

internal/public.proto

@@ -79,5 +79,5 @@ message ImportValueRequest {
 	uint64 Slice = 3;
 	string Field = 4;
 	repeated uint64 ColumnIDs = 5;
-	repeated uint64 Values = 6;
+	repeated int64 Values = 6;
 }