nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-13 22:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

breaking(sqlite): Add metadata into calendar store for more efficient queries in the future

Browse Source
This commit is contained in:
Lennart
2025-01-15 21:33:25 +01:00
parent e6c09074d3
commit 808deabad3
8 changed files with 85 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.sqlx/query-2068bc20fbe8a95bccb9910b62408dec56c6910d1fb1d0811c005e3aa51dce5f.json generated Normal file
View File

@@ -0,0 +1,12 @@
{
"db_name": "SQLite",
"query": "REPLACE INTO calendarobjects (principal, cal_id, id, ics, first_occurence, last_occurence, etag, object_type) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
"describe": {
"columns": [],
"parameters": {
"Right": 8
},
"nullable": []
},
"hash": "2068bc20fbe8a95bccb9910b62408dec56c6910d1fb1d0811c005e3aa51dce5f"
}

12
.sqlx/query-450d5f1324ef2bcbded66215e37994f38f079c93d8240acbda10bb7a3f066d20.json generated Normal file
View File

@@ -0,0 +1,12 @@
{
"db_name": "SQLite",
"query": "INSERT INTO calendarobjects (principal, cal_id, id, ics, first_occurence, last_occurence, etag, object_type) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
"describe": {
"columns": [],
"parameters": {
"Right": 8
},
"nullable": []
},
"hash": "450d5f1324ef2bcbded66215e37994f38f079c93d8240acbda10bb7a3f066d20"
}

12
.sqlx/query-754b0274e0d180f39c3d4bcf4f0b69e6c0603e73e383bc040735c5d39376408d.json generated
View File

@@ -1,12 +0,0 @@
{
"db_name": "SQLite",
"query": "INSERT INTO calendarobjects (principal, cal_id, id, ics) VALUES (?, ?, ?, ?)",
"describe": {
"columns": [],
"parameters": {
"Right": 4
},
"nullable": []
},
"hash": "754b0274e0d180f39c3d4bcf4f0b69e6c0603e73e383bc040735c5d39376408d"
}

12
.sqlx/query-f158acc3d2de055093df796d1712fd840165e807d17dd99078e54732f8d009c7.json generated
View File

@@ -1,12 +0,0 @@
{
"db_name": "SQLite",
"query": "REPLACE INTO calendarobjects (principal, cal_id, id, ics) VALUES (?, ?, ?, ?)",
"describe": {
"columns": [],
"parameters": {
"Right": 4
},
"nullable": []
},
"hash": "f158acc3d2de055093df796d1712fd840165e807d17dd99078e54732f8d009c7"
}

14
crates/store/src/calendar/object.rs
View File

@@ -8,9 +8,9 @@ use std::{collections::HashMap, io::BufReader};
#[derive(Debug, Clone)]
// specified in https://datatracker.ietf.org/doc/html/rfc5545#section-3.6
pub enum CalendarObjectType {
Event,
Journal,
Todo,
Event = 0,
Todo = 1,
Journal = 2,
}
#[derive(Debug, Clone)]
@@ -114,6 +114,14 @@ impl CalendarObject {
}
}
pub fn get_object_type(&self) -> CalendarObjectType {
match self.data {
CalendarObjectComponent::Todo(_) => CalendarObjectType::Todo,
CalendarObjectComponent::Event(_) => CalendarObjectType::Event,
CalendarObjectComponent::Journal(_) => CalendarObjectType::Journal,
}
}
pub fn get_first_occurence(&self) -> Result<Option<CalDateTime>, Error> {
match &self.data {
CalendarObjectComponent::Event(event) => event.get_first_occurence(),

14
crates/store_sqlite/migrations/1_calendar.sql
View File

@@ -21,11 +21,23 @@ CREATE TABLE calendarobjects (
ics TEXT NOT NULL,
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
deleted_at DATETIME,
-- For more efficient calendar-queries
first_occurence DATE,
last_occurence DATE,
etag TEXT,
object_type INTEGER NOT NULL, -- VEVENT(0)/VTODO(1)/VJOURNAL(2)
PRIMARY KEY (principal, cal_id, id),
FOREIGN KEY (principal, cal_id)
REFERENCES calendars (principal, id) ON DELETE CASCADE
);
CREATE INDEX idx_calobjs_first_occurence ON calendarobjects (first_occurence);
CREATE INDEX idx_calobjs_last_occurence ON calendarobjects (last_occurence);
CREATE INDEX idx_calobjs_etag ON calendarobjects (etag);
CREATE INDEX idx_calobjs_obj_type ON calendarobjects (object_type);
CREATE TABLE calendarobjectchangelog (
principal TEXT NOT NULL,
cal_id TEXT NOT NULL,
@@ -37,3 +49,5 @@ CREATE TABLE calendarobjectchangelog (
FOREIGN KEY (principal, cal_id)
REFERENCES calendars (principal, id) ON DELETE CASCADE
);
CREATE INDEX idx_calobj_log_cal ON calendarobjectchangelog (cal_id);

2
crates/store_sqlite/migrations/2_addressbook.sql
View File

@@ -32,3 +32,5 @@ CREATE TABLE addressobjectchangelog (
FOREIGN KEY (principal, addressbook_id)
REFERENCES addressbooks (principal, id) ON DELETE CASCADE
);
CREATE INDEX idx_addrobj_log_cal ON addressobjectchangelog (addressbook_id);

44
crates/store_sqlite/src/calendar_store.rs
View File

@@ -1,6 +1,7 @@
use super::ChangeOperation;
use async_trait::async_trait;
use derive_more::derive::Constructor;
use rustical_store::calendar::CalDateTime;
use rustical_store::synctoken::format_synctoken;
use rustical_store::{Calendar, CalendarObject, CalendarStore, Error};
use rustical_store::{CollectionOperation, CollectionOperationType};
@@ -277,22 +278,45 @@ impl CalendarStore for SqliteCalendarStore {
let (object_id, ics) = (object.get_id(), object.get_ics());
let first_occurence = object
.get_first_occurence()
.ok()
.flatten()
.as_ref()
.map(CalDateTime::date);
let last_occurence = object
.get_last_occurence()
.ok()
.flatten()
.as_ref()
.map(CalDateTime::date);
let etag = object.get_etag();
let object_type = object.get_object_type() as u8;
(if overwrite {
sqlx::query!(
"REPLACE INTO calendarobjects (principal, cal_id, id, ics) VALUES (?, ?, ?, ?)",
principal,
cal_id,
object_id,
ics
)
} else {
// If the object already exists a database error is thrown and handled in error.rs
sqlx::query!(
"INSERT INTO calendarobjects (principal, cal_id, id, ics) VALUES (?, ?, ?, ?)",
"REPLACE INTO calendarobjects (principal, cal_id, id, ics, first_occurence, last_occurence, etag, object_type) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
principal,
cal_id,
object_id,
ics,
first_occurence,
last_occurence,
etag,
object_type,
)
} else {
// If the object already exists a database error is thrown and handled in error.rs
sqlx::query!(
"INSERT INTO calendarobjects (principal, cal_id, id, ics, first_occurence, last_occurence, etag, object_type) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
principal,
cal_id,
object_id,
ics,
first_occurence,
last_occurence,
etag,
object_type,
)
})
.execute(&mut *tx)