Merge pull request #1174 from jbrill/universe-index-optimizations

tapdb: Add Universe indices, optimize SQL queries, `RWMutex` for cache

Author: guggero

make/testing_flags.mk

@@ -55,6 +55,11 @@ ifeq ($(dbbackend),postgres)
 DEV_TAGS += test_db_postgres
 endif
 
+# Run universe tests with increased scale for performance testing.
+ifneq ($(long-tests),)
+DEV_TAGS += longtests
+endif
+
 ifneq ($(tags),)
 DEV_TAGS += ${tags}
 endif

tapdb/migrations.go

@@ -22,7 +22,7 @@ const (
 	// daemon.
 	//
 	// NOTE: This MUST be updated when a new migration is added.
-	LatestMigrationVersion = 23
+	LatestMigrationVersion = 24
 )
 
 // MigrationTarget is a functional option that can be passed to applyMigrations

tapdb/sqlc/migrations/000024_universe_optimization_indexes_queries.down.sql

@@ -0,0 +1,5 @@
+DROP INDEX IF EXISTS idx_mssmt_nodes_stats;
+
+DROP INDEX IF EXISTS idx_universe_leaves_composite;
+
+DROP INDEX IF EXISTS idx_universe_roots_composite;

tapdb/sqlc/migrations/000024_universe_optimization_indexes_queries.up.sql

@@ -0,0 +1,14 @@
+-- Most impactful for query_asset_stats which currently has highest latency
+-- Supports the common join pattern and filters on proof_type.
+CREATE INDEX IF NOT EXISTS idx_universe_leaves_asset 
+ON universe_leaves(asset_genesis_id, universe_root_id);
+
+-- Helps with the join conditions we frequently see
+-- This is especially useful for query_universe_leaves and improves join efficiency.
+CREATE INDEX IF NOT EXISTS idx_mssmt_nodes_composite 
+ON mssmt_nodes(namespace, key, hash_key, sum);
+
+-- Optimizes the common namespace_root lookups along with proof_type filtering
+-- This helps with fetch_universe_root and roots-related queries.
+CREATE INDEX IF NOT EXISTS idx_universe_roots_composite
+ON universe_roots(namespace_root, proof_type, asset_id);

tapdb/sqlc/querier.go

@@ -6,10 +6,10 @@ FROM universe_roots
 JOIN mssmt_roots 
     ON universe_roots.namespace_root = mssmt_roots.namespace
 JOIN mssmt_nodes 
-    ON mssmt_nodes.hash_key = mssmt_roots.root_hash AND
-       mssmt_nodes.namespace = mssmt_roots.namespace
+    ON mssmt_nodes.hash_key = mssmt_roots.root_hash 
+       AND mssmt_nodes.namespace = mssmt_roots.namespace
 JOIN genesis_assets
-     ON genesis_assets.asset_id = universe_roots.asset_id
+    ON genesis_assets.asset_id = universe_roots.asset_id
 WHERE mssmt_nodes.namespace = @namespace;
 
 -- name: UpsertUniverseRoot :one
@@ -30,7 +30,7 @@ WITH root_id AS (
     WHERE namespace_root = @namespace_root
 )
 DELETE FROM universe_events
-WHERE universe_root_id = (SELECT id from root_id);
+WHERE universe_root_id = (SELECT id FROM root_id);
 
 -- name: DeleteUniverseRoot :exec
 DELETE FROM universe_roots
@@ -54,25 +54,23 @@ DELETE FROM universe_leaves
 WHERE leaf_node_namespace = @namespace;
 
 -- name: QueryUniverseLeaves :many
-SELECT leaves.script_key_bytes, gen.gen_asset_id, nodes.value genesis_proof, 
-       nodes.sum sum_amt, gen.asset_id
-FROM universe_leaves leaves
-JOIN mssmt_nodes nodes
-    ON leaves.leaf_node_key = nodes.key AND
-        leaves.leaf_node_namespace = nodes.namespace
-JOIN genesis_info_view gen
+SELECT leaves.script_key_bytes, gen.gen_asset_id, nodes.value AS genesis_proof, 
+       nodes.sum AS sum_amt, gen.asset_id
+FROM universe_leaves AS leaves
+JOIN mssmt_nodes AS nodes
+    ON leaves.leaf_node_key = nodes.key 
+       AND leaves.leaf_node_namespace = nodes.namespace
+JOIN genesis_info_view AS gen
     ON leaves.asset_genesis_id = gen.gen_asset_id
 WHERE leaves.leaf_node_namespace = @namespace 
-        AND 
-    (leaves.minting_point = sqlc.narg('minting_point_bytes') OR 
-        sqlc.narg('minting_point_bytes') IS NULL) 
-        AND
-    (leaves.script_key_bytes = sqlc.narg('script_key_bytes') OR 
-        sqlc.narg('script_key_bytes') IS NULL);
+      AND (leaves.minting_point = sqlc.narg('minting_point_bytes') OR 
+           sqlc.narg('minting_point_bytes') IS NULL) 
+      AND (leaves.script_key_bytes = sqlc.narg('script_key_bytes') OR 
+           sqlc.narg('script_key_bytes') IS NULL);
 
 -- name: FetchUniverseKeys :many
 SELECT leaves.minting_point, leaves.script_key_bytes
-FROM universe_leaves leaves
+FROM universe_leaves AS leaves
 WHERE leaves.leaf_node_namespace = @namespace
 ORDER BY 
     CASE WHEN sqlc.narg('sort_direction') = 0 THEN leaves.id END ASC,
@@ -84,14 +82,14 @@ SELECT * FROM universe_leaves;
 
 -- name: UniverseRoots :many
 SELECT universe_roots.asset_id, group_key, proof_type,
-       mssmt_roots.root_hash root_hash, mssmt_nodes.sum root_sum,
-       genesis_assets.asset_tag asset_name
+       mssmt_roots.root_hash AS root_hash, mssmt_nodes.sum AS root_sum,
+       genesis_assets.asset_tag AS asset_name
 FROM universe_roots
 JOIN mssmt_roots
     ON universe_roots.namespace_root = mssmt_roots.namespace
 JOIN mssmt_nodes
-    ON mssmt_nodes.hash_key = mssmt_roots.root_hash AND
-       mssmt_nodes.namespace = mssmt_roots.namespace
+    ON mssmt_nodes.hash_key = mssmt_roots.root_hash 
+       AND mssmt_nodes.namespace = mssmt_roots.namespace
 JOIN genesis_assets
     ON genesis_assets.asset_id = universe_roots.asset_id
 ORDER BY 
@@ -329,8 +327,9 @@ SELECT
     SUM(CASE WHEN event_type = 'SYNC' THEN 1 ELSE 0 END) AS sync_events,
     SUM(CASE WHEN event_type = 'NEW_PROOF' THEN 1 ELSE 0 END) AS new_proof_events
 FROM universe_events
-WHERE event_type IN ('SYNC', 'NEW_PROOF') AND
-      event_timestamp >= @start_time AND event_timestamp <= @end_time
+-- BETWEEN is inclusive for both start and end values.
+WHERE event_type IN ('SYNC', 'NEW_PROOF') 
+      AND event_timestamp BETWEEN @start_time AND @end_time
 GROUP BY day
 ORDER BY day;
 
@@ -367,7 +366,7 @@ FROM federation_uni_sync_config
 ORDER BY group_key NULLS LAST, asset_id NULLS LAST, proof_type;
 
 -- name: UpsertFederationProofSyncLog :one
-INSERT INTO federation_proof_sync_log as log (
+INSERT INTO federation_proof_sync_log AS log (
     status, timestamp, sync_direction, proof_leaf_id, universe_root_id,
     servers_id
 ) VALUES (
@@ -401,66 +400,47 @@ DO UPDATE SET
     timestamp = EXCLUDED.timestamp,
     -- Increment the attempt counter.
     attempt_counter = CASE
-       WHEN @bump_sync_attempt_counter = true THEN log.attempt_counter + 1
+       WHEN @bump_sync_attempt_counter = TRUE THEN log.attempt_counter + 1
        ELSE log.attempt_counter
     END
 RETURNING id;
 
 -- name: QueryFederationProofSyncLog :many
 SELECT
     log.id, status, timestamp, sync_direction, attempt_counter,
-
     -- Select fields from the universe_servers table.
-    server.id as server_id,
+    server.id AS server_id,
     server.server_host,
-
     -- Select universe leaf related fields.
-    leaf.minting_point as leaf_minting_point_bytes,
-    leaf.script_key_bytes as leaf_script_key_bytes,
-    mssmt_node.value as leaf_genesis_proof,
-    genesis.gen_asset_id as leaf_gen_asset_id,
-    genesis.asset_id as leaf_asset_id,
-
+    leaf.minting_point AS leaf_minting_point_bytes,
+    leaf.script_key_bytes AS leaf_script_key_bytes,
+    mssmt_node.value AS leaf_genesis_proof,
+    genesis.gen_asset_id AS leaf_gen_asset_id,
+    genesis.asset_id AS leaf_asset_id,
     -- Select fields from the universe_roots table.
-    root.asset_id as uni_asset_id,
-    root.group_key as uni_group_key,
-    root.proof_type as uni_proof_type
-
-FROM federation_proof_sync_log as log
-
-JOIN universe_leaves as leaf
+    root.asset_id AS uni_asset_id,
+    root.group_key AS uni_group_key,
+    root.proof_type AS uni_proof_type
+FROM federation_proof_sync_log AS log
+JOIN universe_leaves AS leaf
     ON leaf.id = log.proof_leaf_id
-
 -- Join on mssmt_nodes to get leaf related fields.
-JOIN mssmt_nodes mssmt_node
-     ON leaf.leaf_node_key = mssmt_node.key AND
-        leaf.leaf_node_namespace = mssmt_node.namespace
-
+JOIN mssmt_nodes AS mssmt_node
+     ON leaf.leaf_node_key = mssmt_node.key 
+        AND leaf.leaf_node_namespace = mssmt_node.namespace
 -- Join on genesis_info_view to get leaf related fields.
-JOIN genesis_info_view genesis
+JOIN genesis_info_view AS genesis
      ON leaf.asset_genesis_id = genesis.gen_asset_id
-
-JOIN universe_servers as server
+JOIN universe_servers AS server
     ON server.id = log.servers_id
-
-JOIN universe_roots as root
+JOIN universe_roots AS root
     ON root.id = log.universe_root_id
-
-WHERE (log.sync_direction = sqlc.narg('sync_direction')
-           OR sqlc.narg('sync_direction') IS NULL)
-        AND
-      (log.status = sqlc.narg('status') OR sqlc.narg('status') IS NULL)
-        AND
-
+WHERE (log.sync_direction = sqlc.narg('sync_direction') OR sqlc.narg('sync_direction') IS NULL)
+      AND (log.status = sqlc.narg('status') OR sqlc.narg('status') IS NULL)
       -- Universe leaves WHERE clauses.
-      (leaf.leaf_node_namespace = sqlc.narg('leaf_namespace')
-           OR sqlc.narg('leaf_namespace') IS NULL)
-        AND
-      (leaf.minting_point = sqlc.narg('leaf_minting_point_bytes')
-           OR sqlc.narg('leaf_minting_point_bytes') IS NULL)
-        AND
-      (leaf.script_key_bytes = sqlc.narg('leaf_script_key_bytes')
-           OR sqlc.narg('leaf_script_key_bytes') IS NULL);
+      AND (leaf.leaf_node_namespace = sqlc.narg('leaf_namespace') OR sqlc.narg('leaf_namespace') IS NULL)
+      AND (leaf.minting_point = sqlc.narg('leaf_minting_point_bytes') OR sqlc.narg('leaf_minting_point_bytes') IS NULL)
+      AND (leaf.script_key_bytes = sqlc.narg('leaf_script_key_bytes') OR sqlc.narg('leaf_script_key_bytes') IS NULL);
 
 -- name: DeleteFederationProofSyncLog :exec
 WITH selected_server_id AS (