Merge pull request #14 from jf-tech/bench

add minify json helpers to jsons package and add timetrie initiailization benchmark (so that it won't become too slow before too late)

Author: jf-tech

jsons/jsons.go

@@ -65,3 +65,28 @@ func BestEffortPrettyJSON(jsonStr string) string {
 
 // BPJ is a shortcut (mostly used in tests) to BestEffortPrettyJSON.
 var BPJ = BestEffortPrettyJSON
+
+// BestEffortMinifyMarshal returns a mninified JSON encoding of v. Any error countered will cause "{}" be returned.
+func BestEffortMinifyMarshal(v interface{}) string {
+	b, err := json.Marshal(v)
+	if err != nil {
+		return "{}"
+	}
+	return string(b)
+}
+
+// BMM is a shortcut to BestEffortMinifyMarshal
+var BMM = BestEffortMinifyMarshal
+
+// BestEffortMinifyJSON reformats a json string to be minimal, ignoring any error.
+func BestEffortMinifyJSON(jsonStr string) string {
+	var v interface{}
+	err := json.Unmarshal([]byte(jsonStr), &v)
+	if err != nil {
+		return "{}"
+	}
+	return BestEffortMinifyMarshal(v)
+}
+
+// BMJ is a shortcut to BestEffortMinifyJSON
+var BMJ = BestEffortMinifyJSON

jsons/jsons_test.go

@@ -126,3 +126,25 @@ func TestBPJ_Success(t *testing.T) {
 	pretty := BPJ(`{"Name":"John","Age":65,"Smoker":false,"Hobbies":["flying","fishing","reading"]}`)
 	cupaloy.SnapshotT(t, pretty)
 }
+
+func TestBestEffortMinifyMarshal(t *testing.T) {
+	assert.Equal(t,
+		`{"a":1,"b":false,"c":null,"d":3.14}`,
+		BestEffortMinifyMarshal(map[string]interface{}{"a": 1, "b": false, "c": nil, "d": 3.14}))
+	assert.Equal(t,
+		`{}`,
+		BMM(struct{ Unmarshallable func() }{nil}))
+}
+
+func TestBestEffortMinifyJSON(t *testing.T) {
+	assert.Equal(t,
+		`{"a":1,"b":false,"c":null,"d":3.14}`,
+		BestEffortMinifyJSON(`
+			{
+				"a":	1,
+				"b":    false,
+				"c":	null,
+				"d":	3.14
+			}`))
+	assert.Equal(t, `{}`, BMJ("invalid json"))
+}

times/timetrie.go

@@ -243,6 +243,7 @@ var dateTimeTrie *strs.RuneTrie
 var allTimezones map[string]bool
 
 func init() {
+	// These two initialization routes take in total at about 10s of milliseconds. See benchmark in test.
 	dateTimeTrie = initDateTimeTrie()
 	allTimezones = initTimezones()
 }

times/timetrie_test.go

@@ -31,3 +31,17 @@ func TestInitTimezones(t *testing.T) {
 	t.Logf("total timezones: %d", len(m))
 	cupaloy.SnapshotT(t, jsons.BPM(m))
 }
+
+// BenchmarkInitDateTimeTrie-8   	     100	  18147722 ns/op	 6505165 B/op	  129455 allocs/op
+func BenchmarkInitDateTimeTrie(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		_ = initDateTimeTrie()
+	}
+}
+
+// BenchmarkInitTimezones-8      	   10000	    109394 ns/op	   45532 B/op	      24 allocs/op
+func BenchmarkInitTimezones(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		_ = initTimezones()
+	}
+}