test: changed database performance teststo reference functions

Author: adrianprelipcean

db/tests/performance/aggregated_ip.test.sql

@@ -26,62 +26,38 @@ VALUES ('test-update', '00000000-0000-0000-0000-000000000000'::uuid, 20),
 ('test-decrement', '00000000-0000-0000-0000-000000000000'::uuid, 30),
 ('test-reset-key', '00000000-0000-0000-0000-000000000000'::uuid, 40);
 
-PREPARE update_aggregation as
-INSERT INTO rate_limit.records_aggregated (key, session_id)
-VALUES ('test-update', '00000000-0000-0000-0000-000000000000')
-ON CONFLICT ON CONSTRAINT unique_session_key DO UPDATE
-SET count = records_aggregated.count + 1
-RETURNING count;
-
 SELECT performs_ok(
-    'update_aggregation',
+    $bd$
+    SELECT agg_increment as count FROM rate_limit.agg_increment('test-update', '00000000-0000-0000-0000-000000000000');
+    $bd$,
     250,
     'inserting record should execute under 250ms'
 );
 
-
-PREPARE decrement_records as
-UPDATE rate_limit.records_aggregated
-SET count = greatest(0, count - 1)
-WHERE
-    key = 'test-decrement'
-    AND session_id = '00000000-0000-0000-0000-000000000000';
-
 SELECT performs_ok(
-    'decrement_records',
+    $bd$
+    SELECT * FROM rate_limit.agg_decrement('test-decrement', '00000000-0000-0000-0000-000000000000');
+    $bd$,
     250,
     'decrementing query execute under 250ms'
 );
 
-PREPARE reset_key as 
-DELETE FROM rate_limit.records_aggregated
-WHERE
-    key = 'test-reset-key'
-    AND session_id = '00000000-0000-0000-0000-000000000000';
-
-
 SELECT performs_ok(
-    'reset_key',
+    $bd$
+    SELECT * FROM rate_limit.agg_reset_key('test-reset-key', '00000000-0000-0000-0000-000000000000')
+    $bd$,
     250,
     'resetting a key should execute under 250ms'
 );
 
-PREPARE reset_all as 
-DELETE FROM rate_limit.records_aggregated
-WHERE session_id = '00000000-0000-0000-0000-000000000000';
-
-
 SELECT performs_ok(
-    'reset_all',
+    $bd$
+    SELECT * FROM rate_limit.agg_reset_session('00000000-0000-0000-0000-000000000000');
+    $bd$,
     250,
     'resetting a session should execute under 250ms'
 );
 
-DEALLOCATE update_aggregation;
-DEALLOCATE decrement_records;
-DEALLOCATE reset_key;
-DEALLOCATE reset_all;
-
 -- Finish the tests and clean up.
 SELECT finish FROM finish();
 ROLLBACK;

db/tests/performance/individual_ip.test.sql

@@ -1,6 +1,6 @@
 BEGIN;
 -- Plan the tests.
-SELECT plan(5);
+SELECT plan(4);
 
 INSERT INTO rate_limit.sessions (name_, type_)
 SELECT
@@ -26,79 +26,38 @@ VALUES ('test-count', '00000000-0000-0000-0000-000000000000'::uuid),
 ('test-decrement', '00000000-0000-0000-0000-000000000000'::uuid),
 ('test-reset-key', '00000000-0000-0000-0000-000000000000'::uuid);
 
-PREPARE insert_individual_record as
-INSERT INTO rate_limit.individual_records (key, session_id)
-VALUES ('test', '00000000-0000-0000-0000-000000000000'::uuid);
-
 SELECT performs_ok(
-    'insert_individual_record',
+    $bd$
+    SELECT ind_increment as count FROM rate_limit.ind_increment('test-count', '00000000-0000-0000-0000-000000000000')
+    $bd$,
     250,
     'inserting record should execute under 250ms'
 );
 
-PREPARE retrieve_count AS
-SELECT count(id) AS count
-FROM rate_limit.individual_records
-WHERE
-    key = 'test-count'
-    AND session_id = '00000000-0000-0000-0000-000000000000'::uuid;
-
-SELECT performs_ok(
-    'retrieve_count',
-    250,
-    'retrieving count should execute under 250ms'
-);
-
-
-PREPARE decrement_records as
-WITH
-rows_to_delete AS (
-    SELECT id FROM rate_limit.individual_records
-    WHERE
-        key = 'test-decrement'
-        AND session_id = '00000000-0000-0000-0000-000000000000'
-    ORDER BY event_time
-    LIMIT 1
-)
-DELETE FROM rate_limit.individual_records
-USING rows_to_delete WHERE individual_records.id = rows_to_delete.id;
-
 SELECT performs_ok(
-    'decrement_records',
+    $bd$
+    SELECT * FROM rate_limit.ind_decrement('test-decrement', '00000000-0000-0000-0000-000000000000');
+    $bd$,
     250,
     'decrementing query execute under 250ms'
 );
 
-PREPARE reset_key as 
-DELETE FROM rate_limit.individual_records
-WHERE
-    key = 'test-reset-key'
-    AND session_id = '00000000-0000-0000-0000-000000000000';
-
-
 SELECT performs_ok(
-    'reset_key',
+    $bd$
+    SELECT * FROM rate_limit.ind_reset_key('test-reset-key', '00000000-0000-0000-0000-000000000000');
+    $bd$,
     250,
     'resetting a key should execute under 250ms'
 );
 
-PREPARE reset_all as 
-DELETE FROM rate_limit.individual_records
-WHERE session_id = '00000000-0000-0000-0000-000000000000';
-
-
 SELECT performs_ok(
-    'reset_all',
+    $bd$
+    SELECT * FROM rate_limit.ind_reset_session('00000000-0000-0000-0000-000000000000');
+    $bd$,
     250,
     'resetting a session should execute under 250ms'
 );
 
-DEALLOCATE insert_individual_record;
-DEALLOCATE retrieve_count;
-DEALLOCATE decrement_records;
-DEALLOCATE reset_key;
-DEALLOCATE reset_all;
-
 -- Finish the tests and clean up.
 SELECT finish FROM finish();
 ROLLBACK;

source/migrations/3-add-db-functions-ind.sql

@@ -3,7 +3,7 @@ RETURNS int AS
 $bd$
     INSERT INTO rate_limit.individual_records(key, session_id) VALUES ($1, $2);
 
-    SELECT count(id) AS count FROM rate_limit.individual_records WHERE key = $1 AND session_id = $2;
+    SELECT count(id)::int AS count FROM rate_limit.individual_records WHERE key = $1 AND session_id = $2;
 $bd$
 LANGUAGE SQL;
 

source/migrations/4-add-db-functions-sessions.sql

@@ -1,21 +1,23 @@
-CREATE OR REPLACE FUNCTION rate_limit.session_select(name_ text, type_ text)
-RETURNS TABLE(id uuid, name_ text, type_ text, expires_at timestamptz) AS
+CREATE OR REPLACE FUNCTION rate_limit.session_select(name_ TEXT, type_ TEXT)
+RETURNS TABLE (id UUID, name_ TEXT, type_ TEXT, expires_at TIMESTAMPTZ) AS
 $bd$
     SELECT id, name_, type_, expires_at
     FROM rate_limit.sessions
-    WHERE name_ = $1 and type_ = $2
+    WHERE name_ = $1 AND type_ = $2
     LIMIT 1;
 $bd$
-LANGUAGE SQL;
+LANGUAGE sql;
 
-CREATE OR REPLACE FUNCTION rate_limit.session_reset(name_ text, type_ text, expires_at_ timestamptz)
-RETURNS TABLE(id uuid, name_ text, type_ text) AS
+CREATE OR REPLACE FUNCTION rate_limit.session_reset(
+    name_ TEXT, type_ TEXT, expires_at_ TIMESTAMPTZ
+)
+RETURNS TABLE (id UUID, name_ TEXT, type_ TEXT) AS
 $bd$
     DELETE FROM rate_limit.sessions 
-    WHERE name_ = $1 and type_ = $2;
+    WHERE name_ = $1 AND type_ = $2;
 
     INSERT INTO rate_limit.sessions(name_, type_, expires_at) 
     SELECT $1, $2, $3 
     RETURNING id, name_, type_;
 $bd$
-LANGUAGE SQL;
+LANGUAGE sql;