evt-message_store-postgres-database 0.5.0.0 → 0.6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c588c659a4212dc17462524446f968ccddf10998e8ac7d3c4a6ed0df4f76aba7
-  data.tar.gz: b1d06c04be9d5098f76084b6f2bd676fdc91888feadc03d23d26e76d59ace978
+  metadata.gz: d3a52a67d61c7b82f6dbdf1859bc19ba5c5cccee8f1b7463aa89fd2395ab7326
+  data.tar.gz: dd2b045c1bb470c3f5c160c36a0d21090fc522f79563d48abae1f8d7d83df112
 SHA512:
-  metadata.gz: 0bc24c1182bf2c4db4c9b0da6b9011a33f3592307d53c8c7eec1a89759f6d41dbf028bf7b301d124bd1e3dc64787e35de008ede6c82c3ddd51ba63aca6e65176
-  data.tar.gz: 5292fc4bbfc8ccdaa5578f146dfcf2f46ce0b75d93021f8df88528878ac1821995affba56900323df1ab12501f6976ba922ed8202f295db170728ffd52397bfb
+  metadata.gz: 2e934f4216be131a030905f6db71448213b8688256c218379fad8ed46b73c05dbdf08d39c995d5c52e5a1014ebe5fa476ade52842bfbfdf2727e06c46970b5ee
+  data.tar.gz: 5e98034583a8ea74581ab0d032a619f3c50927e21b9bd430536d1f466c47e89ba9d25a2770c34d21831b2f5a9b1ff2596257b72bfef046049a345b4392415b1d

data/database/install-functions.sh

@@ -50,12 +50,6 @@ 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-views.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+set -e
+
+default_name=message_store
+
+if [ -z ${DATABASE_NAME+x} ]; then
+  echo "(DATABASE_NAME is not set. Default will be used.)"
+  database=$default_name
+else
+  database=$DATABASE_NAME
+fi
+echo "Database name is: $database"
+
+function script_dir {
+  val="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+  echo "$val"
+}
+
+function create-views {
+  base=$(script_dir)
+
+  echo "stream_summary view"
+  psql $database -f $base/views/stream-summary.sql
+
+  echo "type_summary view"
+  psql $database -f $base/views/type-summary.sql
+
+  echo "type_stream_summary view"
+  psql $database -f $base/views/stream-type-summary.sql
+
+  echo "type_stream_summary view"
+  psql $database -f $base/views/type-stream-summary.sql
+
+  echo
+}
+
+echo
+echo "Creating Views"
+echo "- - -"
+create-views

data/database/install.sh

@@ -78,21 +78,23 @@ echo "Creating Database: $database"
 echo "- - -"
 create-database
 
-
 echo
 echo "Creating Extensions"
 echo "- - -"
 create-extensions
 
-
 echo
 echo "Creating Table"
 echo "- - -"
 create-table
 
+# Install functions
 source $base/install-functions.sh
 
 echo
 echo "Creating Indexes"
 echo "- - -"
 create-indexes
+
+# Install views
+source $base/install-views.sh

data/database/print-messages.sh

@@ -38,7 +38,7 @@ fi
 echo
 
 if [ -z $stream_name ]; then
-  psql $database -U $user -x -c "SELECT * FROM messages"
+  psql $database -U $user -x -P pager=off -c "SELECT * FROM messages"
 else
-  psql $database -U $user -x -c "SELECT * FROM messages WHERE stream_name = '$stream_name'"
+  psql $database -U $user -x -P pager=off -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 * FROM get_stream_summary();"
+  psql $database -U $user -P pager=off -c "SELECT * FROM stream_summary ORDER BY message_count DESC;"
   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 * FROM get_stream_summary('$stream_name');"
+  psql $database -U $user -P pager=off -c "SELECT * FROM stream_summary WHERE stream_name LIKE '%$stream_name%' ORDER BY message_count DESC;"
   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-stream-type-summary.sh

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo
+
+default_name=message_store
+
+if [ -z ${DATABASE_USER+x} ]; then
+  echo "(DATABASE_USER is not set)"
+  user=$default_name
+else
+  user=$DATABASE_USER
+fi
+echo "Database user is: $user"
+
+if [ -z ${DATABASE_NAME+x} ]; then
+  echo "(DATABASE_NAME is not set)"
+  database=$default_name
+else
+  database=$DATABASE_NAME
+fi
+echo "Database name is: $database"
+
+if [ -z ${STREAM_NAME+x} ]; then
+  echo "(STREAM_NAME is not set)"
+  stream_name=''
+else
+  stream_name=$STREAM_NAME
+  echo "Stream name is: $STREAM_NAME"
+fi
+
+echo
+echo "Stream Stream Summary"
+echo "= = ="
+echo
+
+if [ -z $stream_name ]; then
+  psql $database -U $user -P pager=off -c "SELECT * FROM stream_type_summary ORDER BY stream_name, message_count DESC, type;"
+  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 * FROM stream_type_summary WHERE stream_name LIKE '%$stream_name%' ORDER BY stream_name, message_count DESC;"
+  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-stream-summary.sh

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo
+
+default_name=message_store
+
+if [ -z ${DATABASE_USER+x} ]; then
+  echo "(DATABASE_USER is not set)"
+  user=$default_name
+else
+  user=$DATABASE_USER
+fi
+echo "Database user is: $user"
+
+if [ -z ${DATABASE_NAME+x} ]; then
+  echo "(DATABASE_NAME is not set)"
+  database=$default_name
+else
+  database=$DATABASE_NAME
+fi
+echo "Database name is: $database"
+
+if [ -z ${TYPE+x} ]; then
+  echo "(TYPE is not set)"
+  type=''
+else
+  type=$TYPE
+  echo "Type is: $TYPE"
+fi
+
+echo
+echo "Type Stream Summary"
+echo "= = ="
+echo
+
+if [ -z $type ]; then
+  psql $database -U $user -P pager=off -c "SELECT * FROM type_stream_summary ORDER BY type, message_count DESC, stream_name;"
+  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 * FROM type_stream_summary WHERE type LIKE '%$type%' ORDER BY type, message_count DESC, stream_name;"
+  psql $database -U $user -P pager=off -c "SELECT COUNT(*) AS total_count FROM messages WHERE type LIKE '%$type%';"
+fi

data/database/print-type-summary.sh

@@ -27,7 +27,7 @@ if [ -z ${TYPE+x} ]; then
   type=''
 else
   type=$TYPE
-  echo "Stream name is: $TYPE"
+  echo "Type is: $TYPE"
 fi
 
 echo
@@ -36,9 +36,9 @@ echo "= = ="
 echo
 
 if [ -z $type ]; then
-  psql $database -U $user -P pager=off -c "SELECT * FROM get_type_summary();"
+  psql $database -U $user -P pager=off -c "SELECT * FROM type_summary ORDER BY message_count DESC;"
   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 * FROM get_type_summary('$type');"
+  psql $database -U $user -P pager=off -c "SELECT * FROM type_summary WHERE type LIKE '%$type%' ORDER BY message_count DESC;"
   psql $database -U $user -P pager=off -c "SELECT COUNT(*) AS total_count FROM messages WHERE type LIKE '%$type%';"
 fi

data/database/views/stream-summary.sql

@@ -0,0 +1,28 @@
+CREATE OR REPLACE VIEW stream_summary AS
+  WITH
+    stream_count AS (
+      SELECT
+        stream_name,
+        COUNT(id) AS message_count
+      FROM
+        messages
+      GROUP BY
+        stream_name
+    ),
+
+    total_count AS (
+      SELECT
+        COUNT(id)::decimal AS total_count
+      FROM
+        messages
+    )
+
+  SELECT
+    stream_name,
+    message_count,
+    ROUND((message_count / total_count)::decimal * 100, 2) AS percent
+  FROM
+    stream_count,
+    total_count
+  ORDER BY
+    stream_name;

data/database/views/stream-type-summary.sql

@@ -0,0 +1,32 @@
+CREATE OR REPLACE VIEW stream_type_summary AS
+  WITH
+    type_count AS (
+      SELECT
+        stream_name,
+        type,
+        COUNT(id) AS message_count
+      FROM
+        messages
+      GROUP BY
+        stream_name,
+        type
+    ),
+
+    total_count AS (
+      SELECT
+        COUNT(id)::decimal AS total_count
+      FROM
+        messages
+    )
+
+  SELECT
+    stream_name,
+    type,
+    message_count,
+    ROUND((message_count / total_count)::decimal * 100, 2) AS percent
+  FROM
+    type_count,
+    total_count
+  ORDER BY
+    stream_name,
+    type;

data/database/views/type-stream-summary.sql

@@ -0,0 +1,32 @@
+CREATE OR REPLACE VIEW type_stream_summary AS
+  WITH
+    type_count AS (
+      SELECT
+        type,
+        stream_name,
+        COUNT(id) AS message_count
+      FROM
+        messages
+      GROUP BY
+        type,
+        stream_name
+    ),
+
+    total_count AS (
+      SELECT
+        COUNT(id)::decimal AS total_count
+      FROM
+        messages
+    )
+
+  SELECT
+    type,
+    stream_name,
+    message_count,
+    ROUND((message_count / total_count)::decimal * 100, 2) AS percent
+  FROM
+    type_count,
+    total_count
+  ORDER BY
+    type,
+    stream_name;

data/database/views/type-summary.sql

@@ -0,0 +1,28 @@
+CREATE OR REPLACE VIEW type_summary AS
+  WITH
+    type_count AS (
+      SELECT
+        type,
+        COUNT(id) AS message_count
+      FROM
+        messages
+      GROUP BY
+        type
+    ),
+
+    total_count AS (
+      SELECT
+        COUNT(id)::decimal AS total_count
+      FROM
+        messages
+    )
+
+  SELECT
+    type,
+    message_count,
+    ROUND((message_count / total_count)::decimal * 100, 2) AS percent
+  FROM
+    type_count,
+    total_count
+  ORDER BY
+    type;

data/scripts/evt-pg-print-stream-type-summary

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+root = File.expand_path '../database', __dir__
+script_filename = 'print-stream-type-summary.sh'
+script_filepath = File.join root, script_filename
+
+system script_filepath

data/scripts/evt-pg-print-type-stream-summary

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+root = File.expand_path '../database', __dir__
+script_filename = 'print-type-stream-summary.sh'
+script_filepath = File.join root, script_filename
+
+system script_filepath

metadata

@@ -1,26 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: evt-message_store-postgres-database
 version: !ruby/object:Gem::Version
-  version: 0.5.0.0
+  version: 0.6.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: scripts
 cert_chain: []
-date: 2018-07-19 00:00:00.000000000 Z
+date: 2018-07-20 00:00:00.000000000 Z
 dependencies: []
 description: " "
 email: opensource@eventide-project.org
 executables:
 - evt-pg-print-messages
 - evt-pg-delete-db
+- evt-pg-print-stream-type-summary
 - evt-pg-write-test-message
 - evt-pg-create-db
 - evt-pg-install-database-functions
 - evt-pg-open-database-scripts-dir
 - evt-pg-clear-messages
 - evt-pg-recreate-db
+- evt-pg-print-type-stream-summary
 - evt-pg-print-type-summary
 - evt-pg-print-stream-summary
 extensions: []
@@ -35,8 +37,6 @@ 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
@@ -45,13 +45,20 @@ files:
 - database/indexes/messages-id-uniq.sql
 - database/indexes/messages-stream-name-position-uniq.sql
 - database/install-functions.sh
+- database/install-views.sh
 - database/install.sh
 - database/print-messages.sh
 - database/print-stream-summary.sh
+- database/print-stream-type-summary.sh
+- database/print-type-stream-summary.sh
 - database/print-type-summary.sh
 - database/table/messages-table.sql
 - database/types/message.sql
 - database/uninstall.sh
+- database/views/stream-summary.sql
+- database/views/stream-type-summary.sql
+- database/views/type-stream-summary.sql
+- database/views/type-summary.sql
 - database/write-test-message.sh
 - scripts/evt-pg-clear-messages
 - scripts/evt-pg-create-db
@@ -60,6 +67,8 @@ files:
 - scripts/evt-pg-open-database-scripts-dir
 - scripts/evt-pg-print-messages
 - scripts/evt-pg-print-stream-summary
+- scripts/evt-pg-print-stream-type-summary
+- scripts/evt-pg-print-type-stream-summary
 - scripts/evt-pg-print-type-summary
 - scripts/evt-pg-recreate-db
 - scripts/evt-pg-write-test-message

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

@@ -1,60 +0,0 @@
-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 := '
-    WITH
-      stream_count AS (
-        SELECT
-          stream_name,
-          COUNT(id) AS message_count
-        FROM
-          messages
-        GROUP BY
-          stream_name
-      ),
-
-      total_count AS (
-        SELECT
-          COUNT(id)::decimal AS total_count
-        FROM
-          messages
-      )
-
-    SELECT
-      stream_name,
-      message_count,
-      ROUND((message_count / total_count)::decimal * 100, 2) AS percent
-    FROM
-      stream_count,
-      total_count';
-
-  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

@@ -1,60 +0,0 @@
-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 := '
-    WITH
-      type_count AS (
-        SELECT
-          type,
-          COUNT(id) AS message_count
-        FROM
-          messages
-        GROUP BY
-          type
-      ),
-
-      total_count AS (
-        SELECT
-          COUNT(id)::decimal AS total_count
-        FROM
-          messages
-      )
-
-    SELECT
-      type,
-      message_count,
-      ROUND((message_count / total_count)::decimal * 100, 2) AS percent
-    FROM
-      type_count,
-      total_count';
-
-  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;