From 32b46932e19604202a3e9bb81860a038f4aca1c4 Mon Sep 17 00:00:00 2001 From: Michael Baird Date: Mon, 3 Jul 2017 10:32:20 -0500 Subject: [PATCH] remove redundant errors from conflict --- pilosa.go | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pilosa.go b/pilosa.go index 48dd3c488..bdce7a3d8 100644 --- a/pilosa.go +++ b/pilosa.go @@ -36,12 +36,6 @@ var ( ErrFrameInverseDisabled = errors.New("frame inverse disabled") ErrColumnRowLabelEqual = errors.New("column and row labels cannot be equal") - ErrFieldNameRequired = errors.New("field name required") - ErrInvalidFieldType = errors.New("invalid field type") - ErrInvalidFieldRange = errors.New("invalid field range") - ErrInverseRangeNotAllowed = errors.New("inverse range not allowed") - ErrRangeCacheNotAllowed = errors.New("range cache not allowed") - ErrFrameFieldsNotAllowed = errors.New("frame fields not allowed") ErrInputDefinitionExists = errors.New("input-definition already exists") ErrInputDefinitionHasPrimaryKey = errors.New("input-definition must contain one PrimaryKey") ErrInputDefinitionDupePrimaryKey = errors.New("input-definition can only contain one PrimaryKey") @@ -50,14 +44,8 @@ var ( ErrInputDefinitionAttrsRequired = errors.New("frames and fields are required") ErrInputDefinitionValueMap = errors.New("valueMap required for map") ErrInputDefinitionActionRequired = errors.New("field definitions require an action") + ErrInputDefinitionNotFound = errors.New("input-definition not found") - ErrFieldNameRequired = errors.New("field name required") - ErrInvalidFieldType = errors.New("invalid field type") - ErrInvalidFieldRange = errors.New("invalid field range") - ErrInverseRangeNotAllowed = errors.New("inverse range not allowed") - ErrRangeCacheNotAllowed = errors.New("range cache not allowed") - ErrFrameFieldsNotAllowed = errors.New("frame fields not allowed") - ErrInputDefinitionNotFound = errors.New("input-definition not found") ErrFieldNotFound = errors.New("field not found") ErrFieldNameRequired = errors.New("field name required") ErrInvalidFieldType = errors.New("invalid field type")