Skip to content

Commit 2fe0cbb

Browse files
committed
tapdb: replace queries with named ones
We replace the queries that are re-used 1:1 from our main query file with the now exported ones from sqlc.
1 parent 9987758 commit 2fe0cbb

File tree

1 file changed

+2
-41
lines changed

1 file changed

+2
-41
lines changed

tapdb/universe_perf_test.go

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -75,45 +75,6 @@ func dropIndices(t *testing.T, db *BaseDB) {
7575

7676
// Query definitions for performance testing.
7777
const (
78-
// fetchUniverseRootQuery returns root info for a given namespace.
79-
// This corresponds to the FetchUniverseRoot query.
80-
fetchUniverseRootQuery = `
81-
SELECT
82-
universe_roots.asset_id,
83-
group_key,
84-
proof_type,
85-
mssmt_nodes.hash_key root_hash,
86-
mssmt_nodes.sum root_sum,
87-
genesis_assets.asset_tag asset_name
88-
FROM universe_roots
89-
JOIN mssmt_roots
90-
ON universe_roots.namespace_root = mssmt_roots.namespace
91-
JOIN mssmt_nodes
92-
ON mssmt_nodes.hash_key = mssmt_roots.root_hash
93-
AND mssmt_nodes.namespace = mssmt_roots.namespace
94-
JOIN genesis_assets
95-
ON genesis_assets.asset_id = universe_roots.asset_id
96-
WHERE mssmt_nodes.namespace = $1`
97-
98-
// queryUniverseLeavesQuery gets leaf info for a namespace. This
99-
// corresponds to the QueryUniverseLeaves query.
100-
queryUniverseLeavesQuery = `
101-
SELECT
102-
leaves.script_key_bytes,
103-
gen.gen_asset_id,
104-
nodes.value AS genesis_proof,
105-
nodes.sum AS sum_amt,
106-
gen.asset_id
107-
FROM universe_leaves AS leaves
108-
JOIN mssmt_nodes AS nodes
109-
ON leaves.leaf_node_key = nodes.key
110-
AND leaves.leaf_node_namespace = nodes.namespace
111-
JOIN genesis_info_view AS gen
112-
ON leaves.asset_genesis_id = gen.gen_asset_id
113-
WHERE leaves.leaf_node_namespace = $1
114-
AND (leaves.minting_point = $2 OR $2 IS NULL)
115-
AND (leaves.script_key_bytes = $3 OR $3 IS NULL)`
116-
11778
// queryAssetStatsQuery gets aggregated stats for assets. This
11879
// corresponds to the first part of the QueryUniverseAssetStats query.
11980
queryAssetStatsQuery = `
@@ -149,7 +110,7 @@ type queryTest struct {
149110
var testQueries = []queryTest{
150111
{
151112
name: "fetch_universe_root",
152-
query: fetchUniverseRootQuery,
113+
query: sqlc.FetchUniverseRoot,
153114
args: func(h *uniStatsHarness) []interface{} {
154115
return []interface{}{h.assetUniverses[0].id.String()}
155116
},
@@ -161,7 +122,7 @@ var testQueries = []queryTest{
161122

162123
{
163124
name: "query_universe_leaves",
164-
query: queryUniverseLeavesQuery,
125+
query: sqlc.QueryUniverseLeaves,
165126
args: func(h *uniStatsHarness) []interface{} {
166127
return []interface{}{
167128
h.assetUniverses[0].id.String(),

0 commit comments

Comments
 (0)