Replace SelectFunc with Query as core

bench_test.go

@@ -31,89 +31,6 @@ func createNarrowTestData(b *testing.B, conn *pgx.Conn) {
 	mustPrepare(b, conn, "getMultipleNarrowByIdAsJSON", "select json_agg(row_to_json(narrow)) from narrow where id between $1 and $2")
 }
 
-func removeBinaryEncoders() (encoders map[pgx.Oid]func(*pgx.MessageReader, int32) interface{}) {
-	encoders = make(map[pgx.Oid]func(*pgx.MessageReader, int32) interface{})
-	for k, v := range pgx.ValueTranscoders {
-		encoders[k] = v.DecodeBinary
-		pgx.ValueTranscoders[k].DecodeBinary = nil
-	}
-	return
-}
-
-func restoreBinaryEncoders(encoders map[pgx.Oid]func(*pgx.MessageReader, int32) interface{}) {
-	for k, v := range encoders {
-		pgx.ValueTranscoders[k].DecodeBinary = v
-	}
-}
-
-func BenchmarkSelectRowSimpleNarrow(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createNarrowTestData(b, conn)
-
-	// Get random ids outside of timing
-	ids := make([]int32, b.N)
-	for i := 0; i < b.N; i++ {
-		ids[i] = 1 + rand.Int31n(9999)
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_ = mustSelectRow(b, conn, "select * from narrow where id=$1", ids[i])
-	}
-}
-
-func BenchmarkSelectRowPreparedNarrow(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createNarrowTestData(b, conn)
-
-	// Get random ids outside of timing
-	ids := make([]int32, b.N)
-	for i := 0; i < b.N; i++ {
-		ids[i] = 1 + rand.Int31n(9999)
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRow(b, conn, "getNarrowById", ids[i])
-	}
-}
-
-func BenchmarkSelectRowsSimpleNarrow(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createNarrowTestData(b, conn)
-
-	// Get random ids outside of timing
-	ids := make([]int32, b.N)
-	for i := 0; i < b.N; i++ {
-		ids[i] = 1 + rand.Int31n(9999)
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRows(b, conn, "select * from narrow where id between $1 and $2", ids[i], ids[i]+10)
-	}
-}
-
-func BenchmarkSelectRowsPreparedNarrow(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createNarrowTestData(b, conn)
-
-	// Get random ids outside of timing
-	ids := make([]int32, b.N)
-	for i := 0; i < b.N; i++ {
-		ids[i] = 1 + rand.Int31n(9999)
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRows(b, conn, "getMultipleNarrowById", ids[i], ids[i]+10)
-	}
-}
-
 func BenchmarkSelectValuePreparedNarrow(b *testing.B) {
 	conn := mustConnect(b, *defaultConnConfig)
 	defer closeConn(b, conn)
@@ -148,438 +65,6 @@ func BenchmarkSelectValueToPreparedNarrow(b *testing.B) {
 	}
 }
 
-func createJoinsTestData(b *testing.B, conn *pgx.Conn) {
-	mustExec(b, conn, `
-		drop table if exists product_component;
-		drop table if exists component;
-		drop table if exists product;
-
-		create table component(
-			id serial primary key,
-			filler1 varchar not null default '01234567890123456789',
-			filler2 varchar not null default '01234567890123456789',
-			filler3 varchar not null default '01234567890123456789',
-			weight int not null,
-			cost int not null
-		);
-
-		insert into component(weight, cost)
-		select (random()*100)::int, (random()*1000)::int
-		from generate_series(1, 1000) n;
-
-		create index on component (weight);
-		create index on component (cost);
-
-		create table product(
-			id serial primary key,
-			filler1 varchar not null default '01234567890123456789',
-			filler2 varchar not null default '01234567890123456789',
-			filler3 varchar not null default '01234567890123456789',
-			filler4 varchar not null default '01234567890123456789',
-			filler5 varchar not null default '01234567890123456789'
-		);
-
-		insert into product(id)
-		select n
-		from generate_series(1, 10000) n;
-
-		create table product_component(
-			id serial primary key,
-			product_id int not null references product,
-			component_id int not null references component,
-			quantity int not null
-		);
-
-		insert into product_component(product_id, component_id, quantity)
-		select product.id, component.id, 1 + (random()*10)::int
-		from product
-		  join component on (random() * 200)::int = 1;
-
-		create unique index on product_component(product_id, component_id);
-		create index on product_component(product_id);
-		create index on product_component(component_id);
-
-		analyze;
-	`)
-
-	mustPrepare(b, conn, "joinAggregate", `
-		select product.id, sum(cost*quantity) as total_cost
-		from product
-			join product_component on product.id=product_component.product_id
-			join component on component.id=product_component.component_id
-		group by product.id
-		having sum(weight*quantity) > 10
-		order by total_cost desc
-	`)
-}
-
-func BenchmarkSelectRowsSimpleJoins(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createJoinsTestData(b, conn)
-
-	sql := `
-		select product.id, sum(cost*quantity) as total_cost
-		from product
-			join product_component on product.id=product_component.product_id
-			join component on component.id=product_component.component_id
-		group by product.id
-		having sum(weight*quantity) > 10
-		order by total_cost desc
-	`
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRows(b, conn, sql)
-	}
-}
-
-func BenchmarkSelectRowsPreparedJoins(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createJoinsTestData(b, conn)
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRows(b, conn, "joinAggregate")
-	}
-}
-
-func createInt2TextVsBinaryTestData(b *testing.B, conn *pgx.Conn) {
-	mustExec(b, conn, `
-		drop table if exists t;
-
-		create temporary table t(
-			a int2 not null,
-			b int2 not null,
-			c int2 not null,
-			d int2 not null,
-			e int2 not null
-		);
-
-		insert into t(a, b, c, d, e)
-		select
-			(random() * 32000)::int2, (random() * 32000)::int2, (random() * 32000)::int2, (random() * 32000)::int2, (random() * 32000)::int2
-		from generate_series(1, 10);
-	`)
-}
-
-func BenchmarkInt2Text(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createInt2TextVsBinaryTestData(b, conn)
-
-	encoders := removeBinaryEncoders()
-	defer func() { restoreBinaryEncoders(encoders) }()
-
-	mustPrepare(b, conn, "selectInt16", "select * from t")
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRows(b, conn, "selectInt16")
-	}
-}
-
-func BenchmarkInt2Binary(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createInt2TextVsBinaryTestData(b, conn)
-
-	mustPrepare(b, conn, "selectInt16", "select * from t")
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRows(b, conn, "selectInt16")
-	}
-}
-
-func createInt4TextVsBinaryTestData(b *testing.B, conn *pgx.Conn) {
-	mustExec(b, conn, `
-		drop table if exists t;
-
-		create temporary table t(
-			a int4 not null,
-			b int4 not null,
-			c int4 not null,
-			d int4 not null,
-			e int4 not null
-		);
-
-		insert into t(a, b, c, d, e)
-		select
-			(random() * 1000000)::int4, (random() * 1000000)::int4, (random() * 1000000)::int4, (random() * 1000000)::int4, (random() * 1000000)::int4
-		from generate_series(1, 10);
-	`)
-}
-
-func BenchmarkInt4Text(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createInt4TextVsBinaryTestData(b, conn)
-
-	encoders := removeBinaryEncoders()
-	defer func() { restoreBinaryEncoders(encoders) }()
-
-	mustPrepare(b, conn, "selectInt32", "select * from t")
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRows(b, conn, "selectInt32")
-	}
-}
-
-func BenchmarkInt4Binary(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createInt4TextVsBinaryTestData(b, conn)
-
-	mustPrepare(b, conn, "selectInt32", "select * from t")
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRows(b, conn, "selectInt32")
-	}
-}
-
-func createInt8TextVsBinaryTestData(b *testing.B, conn *pgx.Conn) {
-	mustExec(b, conn, `
-		drop table if exists t;
-
-		create temporary table t(
-			a int8 not null,
-			b int8 not null,
-			c int8 not null,
-			d int8 not null,
-			e int8 not null
-		);
-
-		insert into t(a, b, c, d, e)
-		select
-			(random() * 1000000)::int8, (random() * 1000000)::int8, (random() * 1000000)::int8, (random() * 1000000)::int8, (random() * 1000000)::int8
-		from generate_series(1, 10);
-	`)
-}
-
-func BenchmarkInt8Text(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createInt8TextVsBinaryTestData(b, conn)
-
-	encoders := removeBinaryEncoders()
-	defer func() { restoreBinaryEncoders(encoders) }()
-
-	mustPrepare(b, conn, "selectInt64", "select * from t")
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRows(b, conn, "selectInt64")
-	}
-}
-
-func BenchmarkInt8Binary(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createInt8TextVsBinaryTestData(b, conn)
-	mustPrepare(b, conn, "selectInt64", "select * from t")
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRows(b, conn, "selectInt64")
-	}
-}
-
-func createFloat4TextVsBinaryTestData(b *testing.B, conn *pgx.Conn) {
-	mustExec(b, conn, `
-		drop table if exists t;
-
-		create temporary table t(
-			a float4 not null,
-			b float4 not null,
-			c float4 not null,
-			d float4 not null,
-			e float4 not null
-		);
-
-		insert into t(a, b, c, d, e)
-		select
-			(random() * 1000000)::float4, (random() * 1000000)::float4, (random() * 1000000)::float4, (random() * 1000000)::float4, (random() * 1000000)::float4
-		from generate_series(1, 10);
-	`)
-}
-
-func BenchmarkFloat4Text(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createFloat4TextVsBinaryTestData(b, conn)
-
-	encoders := removeBinaryEncoders()
-	defer func() { restoreBinaryEncoders(encoders) }()
-
-	mustPrepare(b, conn, "selectFloat32", "select * from t")
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRows(b, conn, "selectFloat32")
-	}
-}
-
-func BenchmarkFloat4Binary(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createFloat4TextVsBinaryTestData(b, conn)
-	mustPrepare(b, conn, "selectFloat32", "select * from t")
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRows(b, conn, "selectFloat32")
-	}
-}
-
-func createFloat8TextVsBinaryTestData(b *testing.B, conn *pgx.Conn) {
-	mustExec(b, conn, `
-		drop table if exists t;
-
-		create temporary table t(
-			a float8 not null,
-			b float8 not null,
-			c float8 not null,
-			d float8 not null,
-			e float8 not null
-		);
-
-		insert into t(a, b, c, d, e)
-		select
-			(random() * 1000000)::float8, (random() * 1000000)::float8, (random() * 1000000)::float8, (random() * 1000000)::float8, (random() * 1000000)::float8
-		from generate_series(1, 10);
-	`)
-}
-
-func BenchmarkFloat8Text(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createFloat8TextVsBinaryTestData(b, conn)
-
-	encoders := removeBinaryEncoders()
-	defer func() { restoreBinaryEncoders(encoders) }()
-
-	mustPrepare(b, conn, "selectFloat32", "select * from t")
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRows(b, conn, "selectFloat32")
-	}
-}
-
-func BenchmarkFloat8Binary(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createFloat8TextVsBinaryTestData(b, conn)
-	mustPrepare(b, conn, "selectFloat32", "select * from t")
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRows(b, conn, "selectFloat32")
-	}
-}
-
-func createBoolTextVsBinaryTestData(b *testing.B, conn *pgx.Conn) {
-	mustExec(b, conn, `
-		drop table if exists t;
-
-		create temporary table t(
-			a bool not null,
-			b bool not null,
-			c bool not null,
-			d bool not null,
-			e bool not null
-		);
-
-		insert into t(a, b, c, d, e)
-		select
-			random() > 0.5, random() > 0.5, random() > 0.5, random() > 0.5, random() > 0.5
-		from generate_series(1, 10);
-	`)
-}
-
-func BenchmarkBoolText(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createBoolTextVsBinaryTestData(b, conn)
-
-	encoders := removeBinaryEncoders()
-	defer func() { restoreBinaryEncoders(encoders) }()
-
-	mustPrepare(b, conn, "selectBool", "select * from t")
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRows(b, conn, "selectBool")
-	}
-}
-
-func BenchmarkBoolBinary(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createBoolTextVsBinaryTestData(b, conn)
-	mustPrepare(b, conn, "selectBool", "select * from t")
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRows(b, conn, "selectBool")
-	}
-}
-
-func createTimestampTzTextVsBinaryTestData(b *testing.B, conn *pgx.Conn) {
-	mustExec(b, conn, `
-		drop table if exists t;
-
-		create temporary table t(
-			a timestamptz not null,
-			b timestamptz not null,
-			c timestamptz not null,
-			d timestamptz not null,
-			e timestamptz not null
-		);
-
-		insert into t(a, b, c, d, e)
-		select
-			now() - '10 years'::interval * random(),
-			now() - '10 years'::interval * random(),
-			now() - '10 years'::interval * random(),
-		  now() - '10 years'::interval * random(),
-		  now() - '10 years'::interval * random()
-		from generate_series(1, 10);
-	`)
-}
-
-func BenchmarkTimestampTzText(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createTimestampTzTextVsBinaryTestData(b, conn)
-
-	encoders := removeBinaryEncoders()
-	defer func() { restoreBinaryEncoders(encoders) }()
-
-	mustPrepare(b, conn, "selectTimestampTz", "select * from t")
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRows(b, conn, "selectTimestampTz")
-	}
-}
-
-func BenchmarkTimestampTzBinary(b *testing.B) {
-	conn := mustConnect(b, *defaultConnConfig)
-	defer closeConn(b, conn)
-	createTimestampTzTextVsBinaryTestData(b, conn)
-	mustPrepare(b, conn, "selectTimestampTz", "select * from t")
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		mustSelectRows(b, conn, "selectTimestampTz")
-	}
-}
-
 func BenchmarkConnPool(b *testing.B) {
 	config := pgx.ConnPoolConfig{ConnConfig: *defaultConnConfig, MaxConnections: 5}
 	pool, err := pgx.NewConnPool(config)