Merge pull request #1 from stadiamaps/upgrade-sqlx

Upgrade SQLx

Author: Ian Wagner

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tile_sorcerer"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Ian Wagner <[email protected]>", "Luke Seelenbinder <[email protected]>"]
 license = "BSD-3-Clause"
 repository = "https://github.com/stadiamaps/tile_sorcerer"
@@ -22,7 +22,7 @@ version = "~1.0"
 features = ["derive"]
 
 [dependencies.sqlx]
-version = "~0.2.5"  # Minimum version 0.2.5, as earlier ones had a critical connection leaking issue
+version = "~0.3"
 default-features = false
 features = ["runtime-tokio", "postgres", "chrono", "uuid"]
 

src/lib.rs

@@ -17,7 +17,13 @@ use sqlx::PgPool;
 #[async_trait]
 pub trait TileSource: Sized {
     /// Renders the Mapbox vector tile for a slippy map tile in XYZ format.
-    async fn render_mvt(&self, pool: &PgPool, zoom: u8, x: i32, y: i32) -> Result<Vec<u8>, sqlx::Error>;
+    async fn render_mvt(
+        &self,
+        pool: &PgPool,
+        zoom: u8,
+        x: i32,
+        y: i32,
+    ) -> Result<Vec<u8>, sqlx::Error>;
 }
 
 pub mod tm2;
@@ -117,4 +123,4 @@ mod tests {
         };
         assert_approx_eq!(correct_bounds.north, computed_bounds.north);
     }
-}
+}

src/tm2.rs

@@ -10,9 +10,7 @@ use serde::Deserialize;
 // TODO: remove once async fn in traits become stable
 use async_trait::async_trait;
 
-use sqlx::{query, PgPool, Row};
-
-use futures::stream::StreamExt;
+use sqlx::{cursor::Cursor, query, PgPool, Row};
 
 /// A TileMill (.tm2source) data structure.
 ///
@@ -120,7 +118,13 @@ impl TM2Source {
 
 #[async_trait]
 impl TileSource for TM2Source {
-    async fn render_mvt(&self, pool: &PgPool, zoom: u8, x: i32, y: i32) -> Result<Vec<u8>, sqlx::Error> {
+    async fn render_mvt(
+        &self,
+        pool: &PgPool,
+        zoom: u8,
+        x: i32,
+        y: i32,
+    ) -> Result<Vec<u8>, sqlx::Error> {
         let z: i32 = zoom.into();
         let tile_bounds = get_epsg_3857_tile_bounds(self.pixel_scale, zoom, x, y, 0);
         let buffer_sizes = self.buffer_sizes();
@@ -147,14 +151,9 @@ impl TileSource for TM2Source {
 
         let mut raw_tile: Vec<u8> = Vec::new();
         let mut stream = query.fetch(&mut conn);
-        while let Some(result) = stream.next().await {
-            match result {
-                Ok(row) => {
-                    let layer: Vec<u8> = row.get(0);
-                    raw_tile.extend_from_slice(&layer);
-                }
-                Err(e) => return Err(e),
-            }
+        while let Some(row) = stream.next().await? {
+            let layer: Vec<u8> = row.get(0);
+            raw_tile.extend_from_slice(&layer);
         }
 
         Ok(raw_tile)