From ac26b964663405521077c7710212a58c37a041c7 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 25 Mar 2008 15:08:19 -0400
Subject: [PATCH] Optimize database schema; get rid of unnecessary indexes
---
SQL/postgres.initial.sql | 215 ++++++++++++++++++++---------------------------------
1 files changed, 80 insertions(+), 135 deletions(-)
diff --git a/SQL/postgres.initial.sql b/SQL/postgres.initial.sql
old mode 100755
new mode 100644
index 554614e..e8513af
--- a/SQL/postgres.initial.sql
+++ b/SQL/postgres.initial.sql
@@ -1,27 +1,45 @@
-
--
--- Sequence "cache_ids"
--- Name: cache_ids; Type: SEQUENCE; Schema: public; Owner: postgres
+-- Sequence "user_ids"
+-- Name: user_ids; Type: SEQUENCE; Schema: public; Owner: postgres
--
-CREATE SEQUENCE cache_ids
+CREATE SEQUENCE user_ids
INCREMENT BY 1
NO MAXVALUE
NO MINVALUE
CACHE 1;
-
--
--- Sequence "contact_ids"
--- Name: contact_ids; Type: SEQUENCE; Schema: public; Owner: postgres
+-- Table "users"
+-- Name: users; Type: TABLE; Schema: public; Owner: postgres
--
-CREATE SEQUENCE contact_ids
- START WITH 1
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
+CREATE TABLE users (
+ user_id integer DEFAULT nextval('user_ids'::text) PRIMARY KEY,
+ username character varying(128) DEFAULT ''::character varying NOT NULL,
+ mail_host character varying(128) DEFAULT ''::character varying NOT NULL,
+ alias character varying(128) DEFAULT ''::character varying NOT NULL,
+ created timestamp with time zone DEFAULT now() NOT NULL,
+ last_login timestamp with time zone DEFAULT now() NOT NULL,
+ "language" character varying(5) DEFAULT 'en'::character varying NOT NULL,
+ preferences text DEFAULT ''::text NOT NULL
+);
+
+
+
+--
+-- Table "session"
+-- Name: session; Type: TABLE; Schema: public; Owner: postgres
+--
+
+CREATE TABLE "session" (
+ sess_id character varying(40) DEFAULT ''::character varying PRIMARY KEY,
+ created timestamp with time zone DEFAULT now() NOT NULL,
+ changed timestamp with time zone DEFAULT now() NOT NULL,
+ ip character varying(41) NOT NULL,
+ vars text NOT NULL
+);
+
--
@@ -36,73 +54,14 @@
NO MINVALUE
CACHE 1;
-
---
--- Sequence "user_ids"
--- Name: user_ids; Type: SEQUENCE; Schema: public; Owner: postgres
---
-
-CREATE SEQUENCE user_ids
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-
-
---
--- Sequence "message_ids"
--- Name: message_ids; Type: SEQUENCE; Schema: public; Owner: postgres
---
-
-CREATE SEQUENCE message_ids
- INCREMENT BY 1
- NO MAXVALUE
- NO MINVALUE
- CACHE 1;
-
-
-
---
--- Table "users"
--- Name: users; Type: TABLE; Schema: public; Owner: postgres
---
-
-CREATE TABLE users (
- user_id integer DEFAULT nextval('user_ids'::text) NOT NULL,
- username character varying(128) DEFAULT ''::character varying NOT NULL,
- mail_host character varying(128) DEFAULT ''::character varying NOT NULL,
- alias character varying(128) DEFAULT ''::character varying NOT NULL,
- created timestamp with time zone DEFAULT now() NOT NULL,
- last_login timestamp with time zone DEFAULT now() NOT NULL,
- "language" character varying(5) DEFAULT 'en'::character varying NOT NULL,
- preferences text DEFAULT ''::text NOT NULL
-);
-
-
-
---
--- Table "session"
--- Name: session; Type: TABLE; Schema: public; Owner: postgres
---
-
-CREATE TABLE "session" (
- sess_id character varying(40) DEFAULT ''::character varying NOT NULL,
- created timestamp with time zone DEFAULT now() NOT NULL,
- changed timestamp with time zone DEFAULT now() NOT NULL,
- ip character varying(16) NOT NULL,
- vars text NOT NULL
-);
-
-
-
--
-- Table "identities"
-- Name: identities; Type: TABLE; Schema: public; Owner: postgres
--
CREATE TABLE identities (
- identity_id integer DEFAULT nextval('identity_ids'::text) NOT NULL,
- user_id integer DEFAULT 0 NOT NULL,
+ identity_id integer DEFAULT nextval('identity_ids'::text) PRIMARY KEY,
+ user_id integer NOT NULL REFERENCES users (user_id),
del integer DEFAULT 0 NOT NULL,
standard integer DEFAULT 0 NOT NULL,
name character varying(128) NOT NULL,
@@ -110,9 +69,23 @@
email character varying(128) NOT NULL,
"reply-to" character varying(128),
bcc character varying(128),
- signature text
+ signature text,
+ html_signature integer DEFAULT 0 NOT NULL
);
+
+
+--
+-- Sequence "contact_ids"
+-- Name: contact_ids; Type: SEQUENCE; Schema: public; Owner: postgres
+--
+
+CREATE SEQUENCE contact_ids
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
--
-- Table "contacts"
@@ -120,8 +93,8 @@
--
CREATE TABLE contacts (
- contact_id integer DEFAULT nextval('contact_ids'::text) NOT NULL,
- user_id integer DEFAULT 0 NOT NULL,
+ contact_id integer DEFAULT nextval('contact_ids'::text) PRIMARY KEY,
+ user_id integer NOT NULL REFERENCES users (user_id),
changed timestamp with time zone DEFAULT now() NOT NULL,
del integer DEFAULT 0 NOT NULL,
name character varying(128) DEFAULT ''::character varying NOT NULL,
@@ -134,20 +107,42 @@
--
+-- Sequence "cache_ids"
+-- Name: cache_ids; Type: SEQUENCE; Schema: public; Owner: postgres
+--
+
+CREATE SEQUENCE cache_ids
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
+
+--
-- Table "cache"
-- Name: cache; Type: TABLE; Schema: public; Owner: postgres
--
CREATE TABLE "cache" (
- cache_id integer DEFAULT nextval('cache_ids'::text) NOT NULL,
- user_id integer DEFAULT 0 NOT NULL,
- session_id character varying(40),
+ cache_id integer DEFAULT nextval('cache_ids'::text) PRIMARY KEY,
+ user_id integer NOT NULL REFERENCES users (user_id),
+ session_id character varying(40) REFERENCES "session" (sess_id),
cache_key character varying(128) DEFAULT ''::character varying NOT NULL,
created timestamp with time zone DEFAULT now() NOT NULL,
data text NOT NULL
);
+ALTER TABLE "cache" ADD INDEX (user_id, cache_key);
+--
+-- Sequence "message_ids"
+-- Name: message_ids; Type: SEQUENCE; Schema: public; Owner: postgres
+--
+
+CREATE SEQUENCE message_ids
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
--
-- Table "messages"
@@ -155,10 +150,11 @@
--
CREATE TABLE "messages" (
- message_id integer DEFAULT nextval('message_ids'::text) NOT NULL,
- user_id integer DEFAULT 0 NOT NULL,
+ message_id integer DEFAULT nextval('message_ids'::text) PRIMARY KEY,
+ user_id integer NOT NULL REFERENCES users (user_id),
del integer DEFAULT 0 NOT NULL,
cache_key character varying(128) DEFAULT ''::character varying NOT NULL,
+ created timestamp with time zone DEFAULT now() NOT NULL,
idx integer DEFAULT 0 NOT NULL,
uid integer DEFAULT 0 NOT NULL,
subject character varying(128) DEFAULT ''::character varying NOT NULL,
@@ -168,58 +164,7 @@
date timestamp with time zone NOT NULL,
size integer DEFAULT 0 NOT NULL,
headers text NOT NULL,
- body text
+ structure text
);
-
-
---
--- Add primary keys
---
-
-ALTER TABLE ONLY "cache"
- ADD CONSTRAINT cache_pkey PRIMARY KEY (cache_id);
-
-
-ALTER TABLE ONLY "contacts"
- ADD CONSTRAINT contacts_pkey PRIMARY KEY (contact_id);
-
-
-ALTER TABLE ONLY identities
- ADD CONSTRAINT identities_pkey PRIMARY KEY (identity_id);
-
-
-ALTER TABLE ONLY "session"
- ADD CONSTRAINT session_pkey PRIMARY KEY (sess_id);
-
-
-ALTER TABLE ONLY "users"
- ADD CONSTRAINT users_pkey PRIMARY KEY (user_id);
-
-
-ALTER TABLE ONLY "messages"
- ADD CONSTRAINT messages_pkey PRIMARY KEY (message_id);
-
-
---
--- Reference keys
---
-
-ALTER TABLE ONLY "cache"
- ADD CONSTRAINT "$1" FOREIGN KEY (user_id) REFERENCES users(user_id);
-
-ALTER TABLE ONLY "cache"
- ADD CONSTRAINT "$2" FOREIGN KEY (session_id) REFERENCES "session"(sess_id);
-
-
-ALTER TABLE ONLY "contacts"
- ADD CONSTRAINT "$1" FOREIGN KEY (user_id) REFERENCES users(user_id);
-
-
-ALTER TABLE ONLY "identities"
- ADD CONSTRAINT "$1" FOREIGN KEY (user_id) REFERENCES users(user_id);
-
-
-ALTER TABLE ONLY "messages"
- ADD CONSTRAINT "$1" FOREIGN KEY (user_id) REFERENCES users(user_id);
-
+ALTER TABLE "messages" ADD UNIQUE (user_id, cache_key, uid);
--
Gitblit v1.9.1