Improvements on docs, benching & analytics recording

Author: elpiel

sentry/Makefile.toml

@@ -52,7 +52,7 @@ args = [
   "-t3",
   "-c100",
   "-d30s",
-  "-R2000",
+  "-R3000",
   "--latency",
   "http://127.0.0.1:8005/v5/campaign",
 ]

sentry/migrations/20190806011140_initial-tables/up.sql

@@ -72,7 +72,7 @@ CREATE TABLE accounting (
     side AccountingSide NOT NULL,
     "address" varchar(42) NOT NULL,
     amount bigint NOT NULL,
-    updated timestamp(2) with time zone DEFAULT NULL NULL,
+    updated timestamp(2) with time zone DEFAULT NULL,
     created timestamp(2) with time zone NOT NULL,
     -- Do not rename the Primary key constraint (`accounting_pkey`)!
     PRIMARY KEY (channel_id, side, "address"),

sentry/src/access.rs

@@ -42,6 +42,7 @@ pub async fn check_access(
         return Err(Error::ForbiddenReferrer);
     }
 
+    // Used when `Campaign::event_submission` is `None`
     let default_rules = [
         Rule {
             uids: Some(vec![campaign.creator.to_string()]),
@@ -84,7 +85,7 @@ pub async fn check_access(
 }
 
 async fn apply_rule(
-    redis: MultiplexedConnection,
+    mut redis: MultiplexedConnection,
     rule: &Rule,
     events: &[Event],
     campaign: &Campaign,
@@ -116,7 +117,7 @@ async fn apply_rule(
 
             if redis::cmd("EXISTS")
                 .arg(&key)
-                .query_async::<_, i8>(&mut redis.clone())
+                .query_async::<_, i8>(&mut redis)
                 .await
                 .map(|exists| exists == 1)
                 .map_err(|error| format!("{}", error))?
@@ -129,7 +130,7 @@ async fn apply_rule(
                 .arg(&key)
                 .arg(seconds as i32)
                 .arg("1")
-                .query_async::<_, ()>(&mut redis.clone())
+                .query_async::<_, ()>(&mut redis)
                 .await
                 .map_err(|error| format!("{}", error))
         }

sentry/src/analytics.rs

@@ -2,6 +2,7 @@ use crate::{
     db::{analytics::update_analytics, DbPool, PoolError},
     Session,
 };
+use futures::future::join_all;
 use primitives::{
     analytics::OperatingSystem,
     sentry::{DateHour, Event, UpdateAnalytics},
@@ -14,7 +15,7 @@ pub async fn record(
     pool: &DbPool,
     campaign_context: &ChainOf<Campaign>,
     session: &Session,
-    events_with_payouts: Vec<(Event, Address, UnifiedNum)>,
+    events_with_payouts: &[(Event, Address, UnifiedNum)],
 ) -> Result<(), PoolError> {
     let os_name = session
         .os
@@ -65,7 +66,7 @@ pub async fn record(
         };
 
         batch_update
-            .entry(event)
+            .entry(event.clone())
             .and_modify(|analytics| {
                 analytics.amount_to_add += &payout_amount;
                 analytics.count_to_add += 1;
@@ -83,14 +84,24 @@ pub async fn record(
                 os_name: os_name.clone(),
                 chain_id: campaign_context.chain.chain_id,
                 event_type,
-                amount_to_add: payout_amount,
+                amount_to_add: *payout_amount,
                 count_to_add: 1,
             });
     }
 
-    for (_event, update) in batch_update.into_iter() {
-        update_analytics(pool, update).await?;
-    }
+    let batch_futures = join_all(
+        batch_update
+            .into_iter()
+            .map(|(_event, update)| update_analytics(pool, update)),
+    );
+
+    // execute the batched futures, collect the result afterwards,
+    // in order execute all futures first and then return an error if occurred
+    batch_futures
+        .await
+        .into_iter()
+        .collect::<Result<Vec<_>, _>>()?;
+
     Ok(())
 }
 
@@ -192,7 +203,7 @@ mod test {
         let channel_context = channel_chain.with_channel(dummy_channel);
         let campaign_context = channel_context.clone().with(campaign);
 
-        record(&app.pool, &campaign_context, &session, input_events.clone())
+        record(&app.pool, &campaign_context, &session, &input_events)
             .await
             .expect("should record");
 
@@ -256,7 +267,7 @@ mod test {
             .expect("Channel token should be whitelisted in config!");
         let channel_context = channel_chain.with_channel(dummy_channel);
         let campaign_context = channel_context.clone().with(campaign);
-        record(&app.pool, &campaign_context, &session, input_events.clone())
+        record(&app.pool, &campaign_context, &session, &input_events)
             .await
             .expect("should record");