evt-message_store-postgres-database 0.4.0.0 → 0.4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fee61d1167444b80c9b38b26b0f26f1ebdc604c354c5f2acd744d4d7f77867b7
-  data.tar.gz: 8af326596da6f662bd3ab8090c8fb187331e600f6169353ff7cf4c3cdfae8cf5
+  metadata.gz: 604e3e9dd41d52af97049bce34b923de1f54d7295ca225de0cc1ce7cc4476dc6
+  data.tar.gz: 4c8f7eddd2654732b7b8173af70c45f8eb7ae48eaf82f064a79d6c51963c79d6
 SHA512:
-  metadata.gz: 92ade25f7017c6455ae7350efbb73b30128445ad44458936b3c2b009d39f60d0b749d61802a630a61efe4f8b8a6ee9a6194f39771011f86de49b091d2dcdcbdb
-  data.tar.gz: 8585cb96a901fcdda4c9835c394d47d546f21c2c45500c45a18f3c527b408831e021985efb7bde436e7979e554725a75ee72b4e4022a48e5a8c0610f4d59ff6d
+  metadata.gz: 8edddd7a0cc4d9bd68e6b1db51a576196703fe4afce43886cdb03909664ffdbff1f1e266ca1ba7f6c78cd391734e7063de756db927250e519acd070f26300f8d
+  data.tar.gz: 2833db92e4a33d1f0a193aeadbddb4739d92e4b9254103f5f2be97c31e5068bd66f69ebfd81f8775661d7b9287efc7d5d80fed56adcbce996b93d821bee3edc3

data/database/functions/get-stream-summary.sql

@@ -0,0 +1,52 @@
+CREATE OR REPLACE FUNCTION get_stream_summary(
+  _stream_name varchar DEFAULT NULL
+)
+RETURNS TABLE (
+  stream_name varchar,
+  message_count bigint,
+  percent decimal
+)
+AS $$
+DECLARE
+  command text;
+BEGIN
+  command := '
+    SELECT
+      stream_name,
+      message_count,
+      ROUND((SELECT (message_count::decimal / count(*)::decimal * 100.0) FROM messages)::decimal, 2) AS percent
+    FROM
+      (
+        SELECT
+          DISTINCT stream_name,
+          count(stream_name) AS message_count
+        FROM
+          messages';
+
+    command := command || '
+        GROUP BY
+          stream_name
+      ) summary';
+
+
+  IF _stream_name is not null THEN
+    _stream_name := '%' || _stream_name || '%';
+    command := command || '
+    WHERE
+      stream_name LIKE $1';
+  END IF;
+
+  command := command || '
+    ORDER BY
+      message_count DESC';
+
+  -- RAISE NOTICE '%', command;
+
+  IF _stream_name is not null THEN
+    RETURN QUERY EXECUTE command USING _stream_name;
+  ELSE
+    RETURN QUERY EXECUTE command;
+  END IF;
+END;
+$$ LANGUAGE plpgsql
+VOLATILE;

data/database/functions/get-type-summary.sql

@@ -0,0 +1,52 @@
+CREATE OR REPLACE FUNCTION get_type_summary(
+  _type varchar DEFAULT NULL
+)
+RETURNS TABLE (
+  type varchar,
+  message_count bigint,
+  percent decimal
+)
+AS $$
+DECLARE
+  command text;
+BEGIN
+  command := '
+    SELECT
+      type,
+      message_count,
+      ROUND((SELECT (message_count::decimal / count(*)::decimal * 100.0) FROM messages)::decimal, 2) AS percent
+    FROM
+      (
+        SELECT
+          DISTINCT type,
+          count(type) AS message_count
+        FROM
+          messages';
+
+    command := command || '
+        GROUP BY
+          type
+      ) summary';
+
+
+  IF _type is not null THEN
+    _type := '%' || _type || '%';
+    command := command || '
+    WHERE
+      type LIKE $1';
+  END IF;
+
+  command := command || '
+    ORDER BY
+      message_count DESC';
+
+  -- RAISE NOTICE '%', command;
+
+  IF _type is not null THEN
+    RETURN QUERY EXECUTE command USING _type;
+  ELSE
+    RETURN QUERY EXECUTE command;
+  END IF;
+END;
+$$ LANGUAGE plpgsql
+VOLATILE;

data/database/install-functions.sh

@@ -50,6 +50,12 @@ function create-functions {
   echo "get_last_message function"
   psql $database -f $base/functions/get-last-message.sql
 
+  echo "get_stream_summary function"
+  psql $database -f $base/functions/get-stream-summary.sql
+
+  echo "get_type_summary function"
+  psql $database -f $base/functions/get-type-summary.sql
+
   echo
 }
 

data/database/install.sh

@@ -53,15 +53,6 @@ function create-table {
   echo
 }
 
-function create-types {
-  base=$(script_dir)
-
-  echo "message type"
-  psql $database -f $base/types/message.sql
-
-  echo
-}
-
 function create-indexes {
   base=$(script_dir)
 

data/database/print-messages.sh

@@ -27,14 +27,6 @@ echo "Database name is: $database"
 
 default_table_name=messages
 
-if [ -z ${TABLE_NAME+x} ]; then
-  echo "(TABLE_NAME is not set)"
-  table=$default_table_name
-else
-  table=$TABLE_NAME
-fi
-echo "Table name is: $table"
-
 if [ -z ${STREAM_NAME+x} ]; then
   echo "(STREAM_NAME is not set)"
   stream_name=''
@@ -46,7 +38,7 @@ fi
 echo
 
 if [ -z $stream_name ]; then
-  psql $database -x -c "SELECT * FROM $table"
+  psql $database -U $user -x -c "SELECT * FROM messages"
 else
-  psql $database -x -c "SELECT * FROM $table WHERE stream_name = '$stream_name'"
+  psql $database -U $user -x -c "SELECT * FROM messages WHERE stream_name = '$stream_name'"
 fi

data/database/print-stream-summary.sh

@@ -36,9 +36,9 @@ echo "= = ="
 echo
 
 if [ -z $stream_name ]; then
-  psql $database -U $user -P pager=off -c "SELECT DISTINCT stream_name, count(stream_name) FROM messages GROUP BY stream_name ORDER BY count DESC;"
-  psql $database -U $user -P pager=off -c "SELECT count(*) FROM messages;"
+  psql $database -U $user -P pager=off -c "SELECT * FROM get_stream_summary();"
+  psql $database -U $user -P pager=off -c "SELECT COUNT(*) AS total_count FROM messages;"
 else
-  psql $database -U $user -P pager=off -c "SELECT DISTINCT stream_name, count(stream_name) FROM messages WHERE stream_name LIKE '%$stream_name%' GROUP BY stream_name ORDER BY count DESC;"
-  psql $database -U $user -P pager=off -c "SELECT count(*) FROM messages WHERE stream_name LIKE '%$stream_name%';"
+  psql $database -U $user -P pager=off -c "SELECT * FROM get_stream_summary('$stream_name');"
+  psql $database -U $user -P pager=off -c "SELECT COUNT(*) AS total_count FROM messages WHERE stream_name LIKE '%$stream_name%';"
 fi

data/database/print-type-summary.sh

@@ -36,9 +36,9 @@ echo "= = ="
 echo
 
 if [ -z $stream_name ]; then
-  psql $database -U $user -P pager=off -c "SELECT DISTINCT type, count(type) FROM messages GROUP BY type ORDER BY count DESC;"
-  psql $database -U $user -P pager=off -c "SELECT count(*) FROM messages;"
+  psql $database -U $user -P pager=off -c "SELECT * FROM get_type_summary();"
+  psql $database -U $user -P pager=off -c "SELECT COUNT(*) AS total_count FROM messages;"
 else
-  psql $database -U $user -P pager=off -c "SELECT DISTINCT type, count(type) FROM messages WHERE stream_name LIKE '%$stream_name%' GROUP BY type ORDER BY count DESC;"
-  psql $database -U $user -P pager=off -c "SELECT count(*) FROM messages WHERE stream_name LIKE '%$stream_name%';"
+  psql $database -U $user -P pager=off -c "SELECT * FROM get_type_summary('$stream_name');"
+  psql $database -U $user -P pager=off -c "SELECT COUNT(*) AS total_count FROM messages WHERE stream_name LIKE '%$stream_name%';"
 fi

data/database/types/message.sql

@@ -1,15 +1,17 @@
 DO $$
 BEGIN
-  IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'message') THEN
-    CREATE TYPE message AS (
-      id varchar,
-      stream_name varchar,
-      type varchar,
-      position bigint,
-      global_position bigint,
-      data varchar,
-      metadata varchar,
-      time timestamp
-    );
+  IF EXISTS (SELECT 1 FROM pg_type WHERE typname = 'message') THEN
+    DROP TYPE message CASCADE;
   END IF;
+
+  CREATE TYPE message AS (
+    id varchar,
+    stream_name varchar,
+    type varchar,
+    position bigint,
+    global_position bigint,
+    data varchar,
+    metadata varchar,
+    time timestamp
+  );
 END$$;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-message_store-postgres-database
 version: !ruby/object:Gem::Version
-  version: 0.4.0.0
+  version: 0.4.1.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: scripts
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies: []
 description: " "
 email: opensource@eventide-project.org
@@ -35,6 +35,8 @@ files:
 - database/functions/get-category-messages.sql
 - database/functions/get-last-message.sql
 - database/functions/get-stream-messages.sql
+- database/functions/get-stream-summary.sql
+- database/functions/get-type-summary.sql
 - database/functions/hash-64.sql
 - database/functions/scratch.sql
 - database/functions/stream-version.sql