Moving benchmarks to more appropriate places.

util/sqlgen/benchmark_test.go

@@ -4,72 +4,6 @@ import (
 	"testing"
 )
 
-func BenchmarkColumn(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		_ = Column{Name: "a"}
-	}
-}
-
-func BenchmarkCompileColumnNoCache(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		_ = (&Column{Name: "a"}).Compile(defaultTemplate)
-	}
-}
-
-/*
-func BenchmarkValues(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		_ = Values{{"a"}, {"b"}, {"c"}, {1}, {2}, {3}}
-	}
-}
-
-func BenchmarkCompileValues(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		_ = Values{{"a"}, {"b"}, {"c"}, {1}, {2}, {3}}.Compile(defaultTemplate)
-	}
-}
-
-func BenchmarkValueRaw(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		_ = NewValue(Raw{Value: "a"}}
-	}
-}
-*/
-
-func BenchmarkColumnValue(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		_ = ColumnValue{Column: Column{Name: "a"}, Operator: "=", Value: NewValue(Raw{Value: "7"})}
-	}
-}
-
-func BenchmarkCompileColumnValue(b *testing.B) {
-	cv := ColumnValue{Column: Column{Name: "a"}, Operator: "=", Value: NewValue(Raw{Value: "7"})}
-	for i := 0; i < b.N; i++ {
-		cv.Compile(defaultTemplate)
-	}
-}
-
-func BenchmarkColumnValues(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		_ = NewColumnValues(
-			ColumnValue{Column: Column{Name: "a"}, Operator: "=", Value: NewValue(Raw{Value: "7"})},
-		)
-	}
-}
-
-func BenchmarkCompileColumnValues(b *testing.B) {
-	cv := NewColumnValues(ColumnValue{Column: Column{Name: "a"}, Operator: "=", Value: NewValue(Raw{Value: "7"})})
-	for i := 0; i < b.N; i++ {
-		cv.Compile(defaultTemplate)
-	}
-}
-
-func BenchmarkTable(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		_ = NewTable("foo")
-	}
-}
-
 func BenchmarkCompileSelect(b *testing.B) {
 	var stmt Statement
 

util/sqlgen/column.go

@@ -15,6 +15,10 @@ type Column struct {
 	hash string
 }
 
+func NewColumn(name string) *Column {
+	return &Column{Name: name}
+}
+
 func (c *Column) Hash() string {
 	if c.hash == "" {
 		var s string

util/sqlgen/column_test.go

@@ -70,6 +70,12 @@ func TestColumnRaw(t *testing.T) {
 	}
 }
 
+func BenchmarkNewColumn(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		_ = NewColumn("a")
+	}
+}
+
 func BenchmarkColumnHash(b *testing.B) {
 	c := Column{Name: "name"}
 	for i := 0; i < b.N; i++ {
@@ -84,6 +90,13 @@ func BenchmarkColumnCompile(b *testing.B) {
 	}
 }
 
+func BenchmarkColumnCompileNoCache(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		c := Column{Name: "name"}
+		c.Compile(defaultTemplate)
+	}
+}
+
 func BenchmarkColumnWithDotCompile(b *testing.B) {
 	c := Column{Name: "role.name"}
 	for i := 0; i < b.N; i++ {

util/sqlgen/column_value_test.go

@@ -77,6 +77,12 @@ func TestColumnValues(t *testing.T) {
 	}
 }
 
+func BenchmarkNewColumnValue(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		_ = ColumnValue{Column: Column{Name: "a"}, Operator: "=", Value: NewValue(Raw{Value: "7"})}
+	}
+}
+
 func BenchmarkColumnValueHash(b *testing.B) {
 	cv := ColumnValue{Column: Column{Name: "id"}, Operator: "=", Value: NewValue(1)}
 	for i := 0; i < b.N; i++ {
@@ -91,6 +97,25 @@ func BenchmarkColumnValueCompile(b *testing.B) {
 	}
 }
 
+func BenchmarkColumnValueCompileNoCache(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		cv := ColumnValue{Column: Column{Name: "id"}, Operator: "=", Value: NewValue(1)}
+		cv.Compile(defaultTemplate)
+	}
+}
+
+func BenchmarkNewColumnValues(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		_ = NewColumnValues(
+			ColumnValue{Column: Column{Name: "id"}, Operator: ">", Value: NewValue(8)},
+			ColumnValue{Column: Column{Name: "other.id"}, Operator: "<", Value: NewValue(Raw{Value: "100"})},
+			ColumnValue{Column: Column{Name: "name"}, Operator: "=", Value: NewValue("Haruki Murakami")},
+			ColumnValue{Column: Column{Name: "created"}, Operator: ">=", Value: NewValue(Raw{Value: "NOW()"})},
+			ColumnValue{Column: Column{Name: "modified"}, Operator: "<=", Value: NewValue(Raw{Value: "NOW()"})},
+		)
+	}
+}
+
 func BenchmarkColumnValuesHash(b *testing.B) {
 	cvs := NewColumnValues(
 		ColumnValue{Column: Column{Name: "id"}, Operator: ">", Value: NewValue(8)},
@@ -116,3 +141,16 @@ func BenchmarkColumnValuesCompile(b *testing.B) {
 		cvs.Compile(defaultTemplate)
 	}
 }
+
+func BenchmarkColumnValuesCompileNoCache(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		cvs := NewColumnValues(
+			ColumnValue{Column: Column{Name: "id"}, Operator: ">", Value: NewValue(8)},
+			ColumnValue{Column: Column{Name: "other.id"}, Operator: "<", Value: NewValue(Raw{Value: "100"})},
+			ColumnValue{Column: Column{Name: "name"}, Operator: "=", Value: NewValue("Haruki Murakami")},
+			ColumnValue{Column: Column{Name: "created"}, Operator: ">=", Value: NewValue(Raw{Value: "NOW()"})},
+			ColumnValue{Column: Column{Name: "modified"}, Operator: "<=", Value: NewValue(Raw{Value: "NOW()"})},
+		)
+		cvs.Compile(defaultTemplate)
+	}
+}

util/sqlgen/table_test.go

@@ -108,6 +108,12 @@ func TestTableEmpty(t *testing.T) {
 	}
 }
 
+func BenchmarkNewTable(b *testing.B) {
+	for i := 0; i < b.N; i++ {
+		_ = NewTable("foo")
+	}
+}
+
 func BenchmarkTableHash(b *testing.B) {
 	t := NewTable("name")
 	for i := 0; i < b.N; i++ {