Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(GODT-3183): Add missing indices to db #402

Merged
merged 3 commits into from
Jan 2, 2024
Merged

fix(GODT-3183): Add missing indices to db #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1675148
fix(GODT-3183): Add missing indices
LBeernaertProton Dec 27, 2023
4169b08
chore: Log command errors
LBeernaertProton Dec 27, 2023
759b010
fix(GODT-3183): Fix mailbox flags tables
LBeernaertProton Dec 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions internal/db_impl/sqlite3/migrations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
v0 "github.com/ProtonMail/gluon/internal/db_impl/sqlite3/v0"
v1 "github.com/ProtonMail/gluon/internal/db_impl/sqlite3/v1"
v2 "github.com/ProtonMail/gluon/internal/db_impl/sqlite3/v2"
v3 "github.com/ProtonMail/gluon/internal/db_impl/sqlite3/v3"
"github.com/sirupsen/logrus"
)

Expand All @@ -22,6 +23,7 @@ var migrationList = []Migration{
&v0.Migration{},
&v1.Migration{},
&v2.Migration{},
&v3.Migration{},
}

func RunMigrations(ctx context.Context, tx utils.QueryWrapper, generator imap.UIDValidityGenerator) error {
Expand Down
193 changes: 193 additions & 0 deletions internal/db_impl/sqlite3/v3/migration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
package v3

import (
"context"
"fmt"

"github.com/ProtonMail/gluon/imap"
"github.com/ProtonMail/gluon/internal/db_impl/sqlite3/utils"
v1 "github.com/ProtonMail/gluon/internal/db_impl/sqlite3/v1"
)

type Migration struct{}

const MailboxFlagsTableNameTmp = "tmp_mailbox_flags"

const MailboxPermFlagsTableNameTmp = "tmp_mailbox_perm_flags"

const MailboxAttrsTableNameTmp = "tmp_mailbox_attr"

func (m Migration) Run(ctx context.Context, tx utils.QueryWrapper, _ imap.UIDValidityGenerator) error {
// Create mailboxes flags table.
{
query := fmt.Sprintf("CREATE TABLE `%[1]v` (`%[3]v` integer NOT NULL, `%[2]v` text NOT NULL, "+
"CONSTRAINT `mailbox_flags_mailbox_id` FOREIGN KEY (`%[3]v`) REFERENCES `%[4]v` (`%[5]v`) ON DELETE CASCADE, "+
"PRIMARY KEY (%[2]v, %[3]v)"+
")",
MailboxFlagsTableNameTmp,
v1.MailboxFlagsFieldValue,
v1.MailboxFlagsFieldMailboxID,
v1.MailboxesTableName,
v1.MailboxesFieldID,
)

if _, err := utils.ExecQuery(ctx, tx, query); err != nil {
return fmt.Errorf("failed to create mailboxes flags table: %w", err)
}

if err := migrateMailboxFlags(
ctx,
tx,
v1.MailboxFlagsTableName,
MailboxFlagsTableNameTmp,
v1.MailboxFlagsFieldMailboxID,
v1.MailboxFlagsFieldValue,
); err != nil {
return fmt.Errorf("failed to migrate mailbox flags table: %w", err)
}
}

// Create perm mailboxes flags table.
{
query := fmt.Sprintf("CREATE TABLE `%[1]v` (`%[3]v` integer NOT NULL, `%[2]v` text NOT NULL, "+
"CONSTRAINT `perm_mailbox_flags_mailbox_id` FOREIGN KEY (`%[3]v`) REFERENCES `%[4]v` (`%[5]v`) ON DELETE CASCADE, "+
"PRIMARY KEY (%[2]v, %[3]v)"+
")",
MailboxPermFlagsTableNameTmp,
v1.MailboxPermFlagsFieldValue,
v1.MailboxPermFlagsFieldMailboxID,
v1.MailboxesTableName,
v1.MailboxesFieldID,
)

if _, err := utils.ExecQuery(ctx, tx, query); err != nil {
return fmt.Errorf("failed to create mailboxes perm flags table: %w", err)
}

if err := migrateMailboxFlags(
ctx,
tx,
v1.MailboxPermFlagsTableName,
MailboxPermFlagsTableNameTmp,
v1.MailboxPermFlagsFieldMailboxID,
v1.MailboxPermFlagsFieldValue,
); err != nil {
return fmt.Errorf("failed to migrate mailbox perm flags table: %w", err)
}
}

// Create Mailbox Attributes table.
{
query := fmt.Sprintf("CREATE TABLE `%[1]v` (`%[3]v` integer NOT NULL, `%[2]v` text NOT NULL, "+
"CONSTRAINT `perm_attrs_flags_mailbox_id` FOREIGN KEY (`%[3]v`) REFERENCES `%[4]v` (`%[5]v`) ON DELETE CASCADE, "+
"PRIMARY KEY (%[2]v, %[3]v)"+
")",
MailboxAttrsTableNameTmp,
v1.MailboxAttrsFieldValue,
v1.MailboxAttrsFieldMailboxID,
v1.MailboxesTableName,
v1.MailboxesFieldID,
)

if _, err := utils.ExecQuery(ctx, tx, query); err != nil {
return fmt.Errorf("failed to create mailboxes attr table: %w", err)
}

if err := migrateMailboxFlags(
ctx,
tx,
v1.MailboxAttrsTableName,
MailboxAttrsTableNameTmp,
v1.MailboxAttrsFieldMailboxID,
v1.MailboxAttrsFieldValue,
); err != nil {
return fmt.Errorf("failed to migrate mailbox perm flags table: %w", err)
}
}

{
// Create an index on message id field to speed up lookup queries for message flags.
query := fmt.Sprintf("create index message_flags_message_id_index on %v (%v)",
v1.MessageFlagsTableName,
v1.MessageFlagsFieldMessageID,
)

if _, err := utils.ExecQuery(ctx, tx, query); err != nil {
return fmt.Errorf("failed to create message flags index: %w", err)
}
}

{
// Create an index on message id field to speed up lookup queries for message flags.
query := fmt.Sprintf("create index mailbox_flags_mailbox_id_index on %v (%v)",
v1.MailboxFlagsTableName,
v1.MailboxFlagsFieldMailboxID,
)

if _, err := utils.ExecQuery(ctx, tx, query); err != nil {
return fmt.Errorf("failed to create mailbox flags index : %w", err)
}
}

{
// Create an index on message id field to speed up lookup queries for message flags.
query := fmt.Sprintf("create index mailbox_perm_flags_mailbox_id_index on %v (%v)",
v1.MailboxPermFlagsTableName,
v1.MailboxPermFlagsFieldMailboxID,
)

if _, err := utils.ExecQuery(ctx, tx, query); err != nil {
return fmt.Errorf("failed to create mailbox perm flags index : %w", err)
}
}

{
// Create an index on message id field to speed up lookup queries for message flags.
query := fmt.Sprintf("create index mailbox_attr_mailbox_id_index on %v (%v)",
v1.MailboxAttrsTableName,
v1.MailboxAttrsFieldMailboxID,
)

if _, err := utils.ExecQuery(ctx, tx, query); err != nil {
return fmt.Errorf("failed to create mailbox attr flags index : %w", err)
}
}

return nil
}

func migrateMailboxFlags(ctx context.Context,
tx utils.QueryWrapper,
fromTableName string,
toTableName string,
fieldID string,
fieldValue string,
) error {
query := fmt.Sprintf("INSERT INTO %v (`%v`, `%v`) SELECT `%v`,`%v` FROM %v ORDER BY `%v`",
toTableName,
fieldID,
fieldValue,
fieldID,
fieldValue,
fromTableName,
fieldID,
)

if _, err := utils.ExecQuery(ctx, tx, query); err != nil {
return err
}

dropQuery := fmt.Sprintf("DROP TABLE %v", fromTableName)

if _, err := utils.ExecQuery(ctx, tx, dropQuery); err != nil {
return err
}

renameQuery := fmt.Sprintf("ALTER TABLE %v RENAME TO %v", toTableName, fromTableName)

if _, err := utils.ExecQuery(ctx, tx, renameQuery); err != nil {
return err
}

return nil
}
2 changes: 2 additions & 0 deletions internal/session/handle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/ProtonMail/gluon/internal/response"
"github.com/ProtonMail/gluon/internal/state"
"github.com/ProtonMail/gluon/logging"
"github.com/sirupsen/logrus"
)

func (s *Session) handleOther(
Expand All @@ -22,6 +23,7 @@ func (s *Session) handleOther(
defer close(resCh)

if err := s.handleCommand(ctx, tag, cmd, resCh); err != nil {
logrus.WithError(err).WithField("cmd", cmd.SanitizedString()).Error("Command failed")
if res, ok := response.FromError(err); ok {
resCh <- res
} else {
Expand Down