Merge branch 'master' of github.com:jjeffery/kv

# Conflicts:
#	logfmt_test.go

logfmt.go

@@ -11,9 +11,11 @@ import (
 
 // constant byte values
 var (
-	bytesNull  = []byte("null")
-	bytesPanic = []byte(`<PANIC>`)
-	bytesError = []byte(`<ERROR>`)
+	bytesNull   = []byte("null")
+	bytesPanic  = []byte(`<PANIC>`)
+	bytesError  = []byte(`<ERROR>`)
+	bytesEmptyK = []byte(`<EMPTY>`)
+	bytesEmptyV = []byte(`""`)
 
 	escapeSequences = map[rune]string{
 		'\t': `\t`,
@@ -83,17 +85,12 @@ func writeBytesKey(buf *bytes.Buffer, b []byte) {
 		buf.Write(bytesNull)
 		return
 	}
-	index := bytes.IndexFunc(b, invalidKey)
-	if index < 0 {
-		buf.Write(b)
+	if len(b) == 0 {
+		buf.Write(bytesEmptyK)
 		return
 	}
-	if index > 0 {
-		buf.Write(b[0:index])
-		b = b[index:]
-	}
 	for {
-		index = bytes.IndexFunc(b, invalidKey)
+		index := bytes.IndexFunc(b, invalidKey)
 		if index < 0 {
 			break
 		}
@@ -109,6 +106,10 @@ func writeBytesKey(buf *bytes.Buffer, b []byte) {
 }
 
 func writeStringKey(buf *bytes.Buffer, s string) {
+	if s == "" {
+		buf.Write(bytesEmptyK)
+		return
+	}
 	index := strings.IndexFunc(s, invalidKey)
 	if index < 0 {
 		buf.WriteString(s)
@@ -182,6 +183,10 @@ func writeBytesValue(buf *bytes.Buffer, b []byte) {
 		buf.Write(bytesNull)
 		return
 	}
+	if len(b) == 0 {
+		buf.Write(bytesEmptyV)
+		return
+	}
 	index := bytes.IndexFunc(b, needsQuote)
 	if index < 0 {
 		buf.Write(b)
@@ -210,6 +215,10 @@ func writeBytesValue(buf *bytes.Buffer, b []byte) {
 }
 
 func writeStringValue(buf *bytes.Buffer, s string) {
+	if s == "" {
+		buf.Write(bytesEmptyV)
+		return
+	}
 	index := strings.IndexFunc(s, needsQuote)
 	if index < 0 {
 		buf.WriteString(s)

logfmt_test.go

@@ -42,6 +42,11 @@ func TestWriteKeyValue(t *testing.T) {
 			value: complex(float64(100.99), float64(1.19e23)),
 			want:  "(1+4i)=(100.99+1.19e+23i)",
 		},
+		{
+			key:   "",
+			value: "",
+			want:  `<EMPTY>=""`,
+		},
 		{
 			key:   nil,
 			value: nil,
@@ -121,7 +126,7 @@ func TestWriteKeyValue(t *testing.T) {
 			var buf bytes.Buffer
 			writeKeyValue(&buf, key, value)
 			if got := buf.String(); got != want {
-				t.Errorf("%d: got=%s want=%s", i, got, want)
+				t.Errorf("%d: got `%s` want `%s`", i, got, want)
 			}
 		}
 		doTest(tt.key, tt.value, tt.want)