fix(hubble): improve max height performance (#2062)

unionlabs · Jun 7, 2024 · c04af33 · c04af33
2 parents 2ac5c5b + 0e7e3d8
commit c04af33
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 34 deletions.
diff --git a/hubble/.sqlx/query-5bb8cc7883163790bbbd234b5f4393065ea4d48c45767e9efbf17b09b8cf1493.json b/hubble/.sqlx/query-5bb8cc7883163790bbbd234b5f4393065ea4d48c45767e9efbf17b09b8cf1493.json
diff --git a/...e6c4d38292c17098eca23070dec007f066fb.json → ...6f3c912498e8b77c17c46063153e63e9f7b6.json b/...e6c4d38292c17098eca23070dec007f066fb.json → ...6f3c912498e8b77c17c46063153e63e9f7b6.json
diff --git a/hubble/.sqlx/query-aac17724ad7b68938c6820c8b479c0757b54cd2e8f467827e08c951553da20d6.json b/hubble/.sqlx/query-aac17724ad7b68938c6820c8b479c0757b54cd2e8f467827e08c951553da20d6.json
diff --git a/hubble/src/eth.rs b/hubble/src/eth.rs
@@ -74,18 +74,13 @@ impl Config {
                 .get_inner_logged();
 
             let current = sqlx::query!(
-                r#"SELECT height 
-            FROM "v0"."logs" 
-            WHERE chain_id = $1 
-            ORDER BY height DESC 
-            NULLS LAST 
-            LIMIT 1"#,
+                r#"SELECT MAX(height) height FROM "v0"."logs" WHERE chain_id = $1"#,
                 chain_id.db
             )
             .fetch_optional(&pool)
             .await?
             .map(|block| {
-                if block.height == 0 {
+                if block.height.unwrap_or(0) == 0 {
                     info!(
                         self.start_height,
                         "no block found, starting at configured start height, or 0 if not defined"
@@ -96,7 +91,7 @@ impl Config {
                         self.start_height,
                         block.height, "block found, starting max(start_height, block_height + 1)"
                     );
-                    (block.height + 1).max(self.start_height.unwrap_or_default())
+                    (block.height.unwrap_or(0) + 1).max(self.start_height.unwrap_or_default())
                 }
             })
             .unwrap_or(self.start_height.unwrap_or_default()) as u64;

diff --git a/hubble/src/tm.rs b/hubble/src/tm.rs
@@ -156,7 +156,14 @@ where
     let chain_id = postgres::fetch_or_insert_chain_id(pool, chain_id)
         .await?
         .get_inner_logged();
-    let height = sqlx::query!("SELECT height FROM \"v0\".blocks WHERE chain_id = $1 ORDER BY time DESC NULLS LAST LIMIT 1", chain_id.db).fetch_optional(pool).await?.map(|block| block.height + 1).map(|h| Height::from(h as u32));
+    let height = sqlx::query!(
+        r#"SELECT MAX(height) height FROM "v0".blocks WHERE chain_id = $1"#,
+        chain_id.db
+    )
+    .fetch_optional(pool)
+    .await?
+    .map(|block| block.height.unwrap_or(0) + 1)
+    .map(|h| Height::from(h as u32));
     Ok((chain_id, height))
 }