From 1f257aab9cc4fbd278b7686dba2dfda266a23639 Mon Sep 17 00:00:00 2001 From: kcrodgers24 Date: Thu, 7 Oct 2021 13:56:06 -0700 Subject: [PATCH 1/3] adds more detail to CSV ingest error message --- client/batch.go | 4 ++-- field.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/batch.go b/client/batch.go index d847c80c1..19cdc52d9 100644 --- a/client/batch.go +++ b/client/batch.go @@ -1277,7 +1277,7 @@ func (b *Batch) importValueData() error { start := time.Now() err := b.client.DoImportValues(b.index.Name(), shard, path, data) b.log.Debugf("imp-vals %s,shard:%d,data:%d %v", field, shard, len(data), time.Since(start)) - return errors.Wrapf(err, "importing values for %s", field) + return errors.Wrapf(err, "importing values for field = %s", field) }) startIdx = i curShard = recordID / shardWidth @@ -1350,7 +1350,7 @@ func (b *Batch) importMutexData() error { start := time.Now() err := b.client.DoImport(b.index.Name(), shard, path, data) b.log.Debugf("imp-mux %s,shard:%d,data:%d %v", field.Name(), shard, len(data), time.Since(start)) - return errors.Wrapf(err, "importing values for %s", field) + return errors.Wrapf(err, "importing values for field = %s", field) }) startIdx = i curShard = recordID / shardWidth diff --git a/field.go b/field.go index 4edccfb3f..b516e129d 100644 --- a/field.go +++ b/field.go @@ -1683,9 +1683,9 @@ func (f *Field) importValue(qcx *Qcx, columnIDs []uint64, values []int64, shard for i := range columnIDs { columnID, value := columnIDs[i], values[i] if value > bsig.Max { - return fmt.Errorf("%v, columnID=%v, value=%v", ErrBSIGroupValueTooHigh, columnID, value) + return fmt.Errorf("%v, value=%v, columnID=%v", ErrBSIGroupValueTooHigh, value, columnID) } else if value < bsig.Min { - return fmt.Errorf("%v, columnID=%v, value=%v", ErrBSIGroupValueTooLow, columnID, value) + return fmt.Errorf("%v, value=%v, columnID=%v", ErrBSIGroupValueTooLow, value, columnID) } if value > max { max = value From b2c73b6a41698962fb1d8fdf84d74c6bd677b08c Mon Sep 17 00:00:00 2001 From: kcrodgers24 Date: Fri, 8 Oct 2021 09:47:16 -0700 Subject: [PATCH 2/3] changes error message text for additional clarity --- field.go | 4 ++-- pilosa.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/field.go b/field.go index b516e129d..519a3c0d5 100644 --- a/field.go +++ b/field.go @@ -1683,9 +1683,9 @@ func (f *Field) importValue(qcx *Qcx, columnIDs []uint64, values []int64, shard for i := range columnIDs { columnID, value := columnIDs[i], values[i] if value > bsig.Max { - return fmt.Errorf("%v, value=%v, columnID=%v", ErrBSIGroupValueTooHigh, value, columnID) + return fmt.Errorf("%v, imported value = %v, columnID = %v", ErrBSIGroupValueTooHigh, value, columnID) } else if value < bsig.Min { - return fmt.Errorf("%v, value=%v, columnID=%v", ErrBSIGroupValueTooLow, value, columnID) + return fmt.Errorf("%v, imported value = %v, columnID = %v", ErrBSIGroupValueTooLow, value, columnID) } if value > max { max = value diff --git a/pilosa.go b/pilosa.go index 6359871a1..ac089fbe7 100644 --- a/pilosa.go +++ b/pilosa.go @@ -50,8 +50,8 @@ var ( ErrInvalidBSIGroupType = errors.New("invalid bsigroup type") ErrInvalidBSIGroupRange = errors.New("invalid bsigroup range") ErrInvalidBSIGroupValueType = errors.New("invalid bsigroup value type") - ErrBSIGroupValueTooLow = errors.New("bsigroup value too low") - ErrBSIGroupValueTooHigh = errors.New("bsigroup value too high") + ErrBSIGroupValueTooLow = errors.New("imported value too low for configured field range") + ErrBSIGroupValueTooHigh = errors.New("imported value too high for configured field range") ErrInvalidRangeOperation = errors.New("invalid range operation") ErrInvalidBetweenValue = errors.New("invalid value for between operation") ErrDecimalOutOfRange = errors.New("decimal value out of range") From ded60af8c33c11b74722b74b8a80494bbdab622e Mon Sep 17 00:00:00 2001 From: "Kasey C. Rodgers" <49999391+kcrodgers24@users.noreply.github.com> Date: Fri, 8 Oct 2021 13:46:17 -0700 Subject: [PATCH 3/3] Update pilosa.go Co-authored-by: Matthew Jaffee --- pilosa.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pilosa.go b/pilosa.go index ac089fbe7..fec834603 100644 --- a/pilosa.go +++ b/pilosa.go @@ -50,8 +50,8 @@ var ( ErrInvalidBSIGroupType = errors.New("invalid bsigroup type") ErrInvalidBSIGroupRange = errors.New("invalid bsigroup range") ErrInvalidBSIGroupValueType = errors.New("invalid bsigroup value type") - ErrBSIGroupValueTooLow = errors.New("imported value too low for configured field range") - ErrBSIGroupValueTooHigh = errors.New("imported value too high for configured field range") + ErrBSIGroupValueTooLow = errors.New("value too low for configured field range") + ErrBSIGroupValueTooHigh = errors.New("value too high for configured field range") ErrInvalidRangeOperation = errors.New("invalid range operation") ErrInvalidBetweenValue = errors.New("invalid value for between operation") ErrDecimalOutOfRange = errors.New("decimal value out of range")