Parser refactor

database.go

@@ -1540,7 +1540,6 @@ func (m *Measurement) tagValuesByKeyAndSeriesID(tagKeys []string, ids seriesIDs)
 		// Iterate the tag keys we're interested in and collect values
 		// from this series, if they exist.
 		for _, tagKey := range tagKeys {
-			tagKey = strings.Trim(tagKey, `"`)
 			if tagVal, ok := s.Tags[tagKey]; ok {
 				if _, ok = tagValues[tagKey]; !ok {
 					tagValues[tagKey] = newStringSet()

httpd/handler_test.go

@@ -11,6 +11,7 @@ import (
 	"net/http/httptest"
 	"net/url"
 	"os"
+	"regexp"
 	"strings"
 	"testing"
 	"time"
@@ -151,13 +152,13 @@ func TestHandler_ShowMeasurementsNotFound(t *testing.T) {
 	status, body := MustHTTP("GET", s.URL+`/query`, map[string]string{"q": "SHOW SERIES from bin", "db": "foo"}, nil, "")
 	if status != http.StatusOK {
 		t.Fatalf("unexpected status: %d", status)
-	} else if body != `{"results":[{"error":"measurement \"bin\" not found"}]}` {
+	} else if !matchRegex(`measurement not found: .*bin`, body) {
 		t.Fatalf("unexpected body: %s", body)
 	}
 	status, body = MustHTTP("GET", s.URL+`/query`, map[string]string{"q": "SELECT * FROM bin", "db": "foo"}, nil, "")
 	if status != http.StatusOK {
 		t.Fatalf("unexpected status: %d", status)
-	} else if body != `{"results":[{"error":"measurement not found: \"foo\".\"bar\".\"bin\""}]}` {
+	} else if !matchRegex(`measurement not found: .*bin`, body) {
 		t.Fatalf("unexpected body: %s", body)
 	}
 }
@@ -256,7 +257,7 @@ func TestHandler_DropDatabase_NotFound(t *testing.T) {
 	status, body := MustHTTP("GET", s.URL+`/query`, map[string]string{"q": "DROP DATABASE bar"}, nil, "")
 	if status != http.StatusInternalServerError {
 		t.Fatalf("unexpected status: %d", status)
-	} else if body != `{"results":[{"error":"database not found"}]}` {
+	} else if !matchRegex(`database not found: bar.*`, body) {
 		t.Fatalf("unexpected body: %s", body)
 	}
 }
@@ -290,7 +291,7 @@ func TestHandler_RetentionPolicies_DatabaseNotFound(t *testing.T) {
 
 	if status != http.StatusInternalServerError {
 		t.Fatalf("unexpected status: %d", status)
-	} else if body != `{"results":[{"error":"database not found"}]}` {
+	} else if !matchRegex(`database not found: foo.*`, body) {
 		t.Fatalf("unexpected body: %s", body)
 	}
 }
@@ -502,7 +503,7 @@ func TestHandler_DeleteRetentionPolicy_DatabaseNotFound(t *testing.T) {
 
 	if status != http.StatusInternalServerError {
 		t.Fatalf("unexpected status: %d", status)
-	} else if body != `{"results":[{"error":"database not found"}]}` {
+	} else if !matchRegex(`database not found: .*qux.*`, body) {
 		t.Fatalf("unexpected body: %s", body)
 	}
 }
@@ -1859,3 +1860,8 @@ func mustMarshalJSON(i interface{}) string {
 	}
 	return string(b)
 }
+
+// matchRegex tests that the string matches the pattern
+func matchRegex(pattern, s string) bool {
+	return regexp.MustCompile(pattern).MatchString(s)
+}

influxdb.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"runtime"
 	"time"
 
 	"github.com/influxdb/influxdb/client"
@@ -48,9 +49,6 @@ var (
 	// ErrDatabaseExists is returned when creating a duplicate database.
 	ErrDatabaseExists = errors.New("database exists")
 
-	// ErrDatabaseNotFound is returned when dropping a non-existent database.
-	ErrDatabaseNotFound = errors.New("database not found")
-
 	// ErrDatabaseRequired is returned when using a blank database name.
 	ErrDatabaseRequired = errors.New("database required")
 
@@ -107,9 +105,6 @@ var (
 	// ErrMeasurementNameRequired is returned when a point does not contain a name.
 	ErrMeasurementNameRequired = errors.New("measurement name required")
 
-	// ErrMeasurementNotFound is returned when a measurement does not exist.
-	ErrMeasurementNotFound = errors.New("measurement not found")
-
 	// ErrFieldsRequired is returned when a point does not any fields.
 	ErrFieldsRequired = errors.New("fields required")
 
@@ -147,6 +142,20 @@ var (
 	ErrContinuousQueryNotFound = errors.New("continuous query not found")
 )
 
+func ErrDatabaseNotFound(name string) error { return Errorf("database not found: %s", name) }
+
+func ErrMeasurementNotFound(name string) error { return Errorf("measurement not found: %s", name) }
+
+func Errorf(format string, a ...interface{}) (err error) {
+	if _, file, line, ok := runtime.Caller(2); ok {
+		a = append(a, file, line)
+		err = fmt.Errorf(format+" (%s:%d)", a...)
+	} else {
+		err = fmt.Errorf(format, a...)
+	}
+	return
+}
+
 // ErrAuthorize represents an authorization error.
 type ErrAuthorize struct {
 	text string