Remove redundant chat columns (#652)

Author: duogenesis

Diff for: init-api.sql

@@ -1477,11 +1477,9 @@ FOR EACH ROW EXECUTE FUNCTION
 --------------------------------------------------------------------------------
 
 CREATE TABLE IF NOT EXISTS last (
-    server varchar(250),
     username varchar(250),
     seconds integer NOT NULL,
-    state text NOT NULL,
-    PRIMARY KEY (server, username)
+    PRIMARY KEY (username)
 );
 
 DO $$ BEGIN
@@ -1492,14 +1490,12 @@ END $$;
 
 CREATE TABLE IF NOT EXISTS mam_server_user(
   id SERIAL UNIQUE PRIMARY KEY,
-  server    varchar(250) NOT NULL,
   user_name varchar(250) NOT NULL
 );
 
-CREATE UNIQUE INDEX IF NOT EXISTS i_mam_server_user_name
-    ON mam_server_user
-    USING BTREE
-    (server, user_name);
+CREATE UNIQUE INDEX IF NOT EXISTS
+    idx__mam_server_user__user_name
+    ON mam_server_user(user_name);
 
 CREATE TABLE IF NOT EXISTS mam_message(
   -- Message UID (64 bits)
@@ -1512,15 +1508,13 @@ CREATE TABLE IF NOT EXISTS mam_message(
   -- The remote JID that the stanza is to (for an outgoing message) or from (for an incoming message).
   -- This field is for sorting and filtering.
   remote_bare_jid varchar(250) NOT NULL,
-  remote_resource varchar(250) NOT NULL,
   -- I - incoming, remote_jid is a value from From.
   -- O - outgoing, remote_jid is a value from To.
   -- Has no meaning for MUC-rooms.
   direction mam_direction NOT NULL,
   -- Term-encoded message packet
   message bytea NOT NULL,
   search_body text,
-  origin_id varchar,
   PRIMARY KEY(user_id, id)
 );
 
@@ -1529,28 +1523,24 @@ CREATE INDEX IF NOT EXISTS i_mam_message_username_jid_id
     USING BTREE
     (user_id, remote_bare_jid, id);
 
-CREATE INDEX IF NOT EXISTS i_mam_message_username_jid_origin_id
-    ON mam_message
-    USING BTREE
-    (user_id, remote_bare_jid, origin_id);
-
-
 CREATE TABLE IF NOT EXISTS inbox (
     luser VARCHAR(250)               NOT NULL,
-    lserver VARCHAR(250)             NOT NULL,
     remote_bare_jid VARCHAR(250)     NOT NULL,
     msg_id VARCHAR(250),
     box VARCHAR(64)                  NOT NULL DEFAULT 'inbox',
     content BYTEA                    NOT NULL,
     timestamp BIGINT                 NOT NULL,
-    muted_until BIGINT               DEFAULT 0,
     unread_count INT                 NOT NULL,
-    PRIMARY KEY(lserver, luser, remote_bare_jid)
+    PRIMARY KEY(luser, remote_bare_jid)
 );
 
-CREATE INDEX IF NOT EXISTS i_inbox_timestamp ON inbox USING BTREE(lserver, luser, timestamp);
-CREATE INDEX IF NOT EXISTS i_inbox_us_box ON inbox USING BTREE(lserver, luser, box);
-CREATE INDEX IF NOT EXISTS i_inbox_box ON inbox (box) WHERE (box = 'bin');
+CREATE INDEX IF NOT EXISTS
+    idx__inbox__luser__timestamp
+    ON inbox(luser, timestamp);
+
+CREATE INDEX IF NOT EXISTS
+    idx__inbox__luser__box
+    ON inbox(luser, box);
 
 CREATE TABLE IF NOT EXISTS intro_hash (
     hash TEXT PRIMARY KEY
@@ -1575,16 +1565,21 @@ CREATE INDEX IF NOT EXISTS duo_idx__inbox__timestamp__unread_count
 ON inbox(timestamp, unread_count)
 WHERE unread_count > 0;
 
-CREATE INDEX IF NOT EXISTS duo_idx__last__username
-ON last(username);
-
 CREATE INDEX IF NOT EXISTS duo_idx__last__seconds
 ON last(seconds);
 
 CREATE INDEX IF NOT EXISTS duo_idx__mam_message__remote_bare_jid__id
 ON mam_message(remote_bare_jid, id)
 WHERE direction = 'I';
 
-CREATE INDEX IF NOT EXISTS duo__idx__inbox__remote_bare_jid
-ON inbox
-USING BTREE(lserver, luser, remote_bare_jid);
+CREATE UNIQUE INDEX IF NOT EXISTS
+    idx__mam_server_user__user_name
+    ON mam_server_user(user_name);
+
+CREATE INDEX IF NOT EXISTS
+    idx__inbox__luser__timestamp
+    ON inbox(luser, timestamp);
+
+CREATE INDEX IF NOT EXISTS
+    idx__inbox__luser__box
+    ON inbox(luser, box);

Diff for: migrations.sql

@@ -1 +1,75 @@
-DROP TABLE IF EXISTS question_order CASCADE;
+DO $$
+BEGIN
+  IF EXISTS (
+    SELECT 1
+    FROM pg_constraint
+    WHERE conname = 'last_pkey'
+  ) THEN
+    ALTER TABLE last DROP CONSTRAINT last_pkey;
+    ALTER TABLE last ADD  CONSTRAINT last_pkey PRIMARY KEY (username);
+  END IF;
+END$$;
+
+DROP INDEX IF EXISTS duo_idx__last__username;
+
+
+
+DROP INDEX IF EXISTS i_mam_server_user_name;
+
+CREATE UNIQUE INDEX IF NOT EXISTS
+    idx__mam_server_user__user_name
+    ON mam_server_user(user_name);
+
+
+
+DROP INDEX IF EXISTS i_mam_message_username_jid_origin_id;
+
+
+
+DO $$
+BEGIN
+  IF EXISTS (
+    SELECT 1
+    FROM pg_constraint
+    WHERE conname = 'inbox_pkey'
+  ) THEN
+    ALTER TABLE inbox DROP CONSTRAINT inbox_pkey;
+    ALTER TABLE inbox ADD  CONSTRAINT inbox_pkey PRIMARY KEY (luser, remote_bare_jid);
+  END IF;
+END$$;
+
+
+DROP INDEX IF EXISTS duo__idx__inbox__remote_bare_jid;
+
+
+
+DROP INDEX IF EXISTS i_inbox_timestamp;
+
+CREATE INDEX IF NOT EXISTS
+    idx__inbox__luser__timestamp
+    ON inbox(luser, timestamp);
+
+
+
+DROP INDEX IF EXISTS i_inbox_us_box;
+
+CREATE INDEX IF NOT EXISTS
+    idx__inbox__luser__box
+    ON inbox(luser, box);
+
+
+
+DROP INDEX IF EXISTS i_inbox_box;
+
+
+
+ALTER TABLE last DROP COLUMN IF EXISTS server;
+ALTER TABLE last DROP COLUMN IF EXISTS state;
+
+ALTER TABLE mam_server_user DROP COLUMN IF EXISTS server;
+
+ALTER TABLE mam_message DROP COLUMN IF EXISTS remote_resource;
+ALTER TABLE mam_message DROP COLUMN IF EXISTS origin_id;
+
+ALTER TABLE inbox DROP COLUMN IF EXISTS lserver;
+ALTER TABLE inbox DROP COLUMN IF EXISTS muted_until;

Diff for: service/chat/__init__.py

@@ -57,17 +57,6 @@
         port=REDIS_PORT,
         decode_responses=True)
 
-# TODO: Tables to migrate to monolithic DB:
-#
-#  public.last
-#  public.mam_message
-#  public.mam_server_user
-#  public.inbox
-#  public.mongoose_cluster_id
-#  public.intro_hash
-#  public.duo_last_notification
-#  public.duo_push_token
-
 Q_SELECT_INTRO_HASH = """
 SELECT
     1

Diff for: service/chat/inbox/__init__.py

@@ -16,8 +16,6 @@
 FROM
     inbox
 WHERE
-    lserver = '{LSERVER}'
-AND
     luser = %(username)s
 ORDER BY
     timestamp
@@ -28,64 +26,54 @@
 WITH upsert_sender AS (
     INSERT INTO inbox (
         luser,
-        lserver,
         remote_bare_jid,
         msg_id,
         box,
         content,
         timestamp,
-        muted_until,
         unread_count
     )
     VALUES (
         %(from_username)s,
-        '{LSERVER}',
         %(recipient_jid)s,
         %(msg_id)s,
         'chats',
         %(content)s,
         EXTRACT(EPOCH FROM NOW()) * 1e6,
-        0,
         0
     )
-    ON CONFLICT (lserver, luser, remote_bare_jid)
+    ON CONFLICT (luser, remote_bare_jid)
     DO UPDATE SET
         msg_id = EXCLUDED.msg_id,
         box = 'chats',
         content = EXCLUDED.content,
         timestamp = EXCLUDED.timestamp,
-        muted_until = EXCLUDED.muted_until,
         unread_count = 0
 ), upsert_recipient AS (
     INSERT INTO inbox (
         luser,
-        lserver,
         remote_bare_jid,
         msg_id,
         box,
         content,
         timestamp,
-        muted_until,
         unread_count
     )
     VALUES (
         %(to_username)s,
-        '{LSERVER}',
         %(sender_jid)s,
         %(msg_id)s,
         'inbox',
         %(content)s,
         EXTRACT(EPOCH FROM NOW()) * 1e6,
-        0,
         1
     )
-    ON CONFLICT (lserver, luser, remote_bare_jid)
+    ON CONFLICT (luser, remote_bare_jid)
     DO UPDATE SET
         msg_id = EXCLUDED.msg_id,
         box = 'chats',
         content = EXCLUDED.content,
         timestamp = EXCLUDED.timestamp,
-        muted_until = EXCLUDED.muted_until,
         unread_count = COALESCE(inbox.unread_count, 0) + 1
 )
 SELECT 1
@@ -98,8 +86,6 @@
 SET
     unread_count = 0
 WHERE
-    lserver = '{LSERVER}'
-AND
     luser = %(luser)s
 AND
     remote_bare_jid = %(remote_bare_jid)s

Diff for: service/chat/mam/__init__.py

@@ -23,10 +23,10 @@
 
 Q_INSERT_SERVER_USER = f"""
 INSERT INTO
-    mam_server_user (server, user_name)
+    mam_server_user (user_name)
 VALUES
-    ('{LSERVER}', %(user_name)s)
-ON CONFLICT (server, user_name) DO NOTHING
+    (%(user_name)s)
+ON CONFLICT (user_name) DO NOTHING
 """
 
 
@@ -37,35 +37,29 @@
         user_id,
         from_jid,
         remote_bare_jid,
-        remote_resource,
         direction,
         message,
-        search_body,
-        origin_id
+        search_body
     )
 VALUES
     (
         %(id)s,
         (SELECT id FROM mam_server_user WHERE user_name = %(from_username)s),
         '', -- from_jid is ignored
         %(to_username)s,
-        '', -- remote_resource is ignored
         'O',
         %(message)s,
-        %(search_body)s,
-        NULL
+        %(search_body)s
     ),
 
     (
         %(id)s + 1,
         (SELECT id FROM mam_server_user WHERE user_name = %(to_username)s),
         '', -- from_jid is ignored
         %(from_username)s,
-        '', -- remote_resource is ignored
         'I',
         %(message)s,
-        %(search_body)s,
-        NULL
+        %(search_body)s
     )
 """
 
@@ -82,8 +76,6 @@
     ON
         mam_server_user.id = mam_message.user_id
     WHERE
-        mam_server_user.server = '{LSERVER}'
-    AND
         mam_server_user.user_name = %(from_username)s
     AND
         mam_message.remote_bare_jid = %(to_username)s

Diff for: service/person/sql/__init__.py

@@ -1452,19 +1452,17 @@
         mam_server_user
     WHERE
         mam_message.user_id = mam_server_user.id
-    AND
-        mam_server_user.server = 'duolicious.app'
     AND
         mam_server_user.user_name = %(person_uuid)s
 ), q2 AS (
     DELETE FROM last
     WHERE username = %(person_uuid)s
 ), q3 AS (
     DELETE FROM inbox
-    WHERE luser = %(person_uuid)s AND lserver = 'duolicious.app'
+    WHERE luser = %(person_uuid)s
 ), q4 AS (
     DELETE FROM mam_server_user
-    WHERE server = 'duolicious.app' AND user_name = %(person_uuid)s
+    WHERE user_name = %(person_uuid)s
 ), q5 AS (
     DELETE FROM duo_last_notification
     WHERE username = %(person_uuid)s
@@ -2073,8 +2071,6 @@
         mam_server_user
     ON
         mam_server_user.id = mam_message.user_id
-    AND
-        mam_server_user.server = 'duolicious.app'
     AND
         mam_server_user.user_name = %(subject_person_uuid)s
     WHERE
@@ -2768,8 +2764,6 @@
 ON
     mam_message.user_id = mam_server_user.id
 WHERE
-    mam_server_user.server = 'duolicious.app'
-AND
     mam_server_user.user_name = %(person_uuid)s::TEXT
 ORDER BY
     mam_message.id