Skip to content

chore(sqlite): Remove a useless indentation #4661

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

Merged
merged 1 commit into from
Feb 12, 2025
Merged

chore(sqlite): Remove a useless indentation #4661

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
278 changes: 139 additions & 139 deletions crates/matrix-sdk-sqlite/src/event_cache_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,181 +390,181 @@ impl EventCacheStore for SqliteEventCacheStore {
let this = self.clone();

with_immediate_transaction(self.acquire().await?, move |txn| {
for up in updates {
match up {
Update::NewItemsChunk { previous, new, next } => {
let previous = previous.as_ref().map(ChunkIdentifier::index);
let new = new.index();
let next = next.as_ref().map(ChunkIdentifier::index);

trace!(
%room_id,
"new events chunk (prev={previous:?}, i={new}, next={next:?})",
);

insert_chunk(
txn,
&hashed_room_id,
previous,
new,
next,
CHUNK_TYPE_EVENT_TYPE_STRING,
)?;
}

Update::NewGapChunk { previous, new, next, gap } => {
let serialized = serde_json::to_vec(&gap.prev_token)?;
let prev_token = this.encode_value(serialized)?;

let previous = previous.as_ref().map(ChunkIdentifier::index);
let new = new.index();
let next = next.as_ref().map(ChunkIdentifier::index);

trace!(
%room_id,
"new gap chunk (prev={previous:?}, i={new}, next={next:?})",
);

// Insert the chunk as a gap.
insert_chunk(
txn,
&hashed_room_id,
previous,
new,
next,
CHUNK_TYPE_GAP_TYPE_STRING,
)?;

// Insert the gap's value.
txn.execute(
r#"
INSERT INTO gaps(chunk_id, room_id, prev_token)
VALUES (?, ?, ?)
"#,
(new, &hashed_room_id, prev_token),
)?;
}
for up in updates {
match up {
Update::NewItemsChunk { previous, new, next } => {
let previous = previous.as_ref().map(ChunkIdentifier::index);
let new = new.index();
let next = next.as_ref().map(ChunkIdentifier::index);

trace!(
%room_id,
"new events chunk (prev={previous:?}, i={new}, next={next:?})",
);

insert_chunk(
txn,
&hashed_room_id,
previous,
new,
next,
CHUNK_TYPE_EVENT_TYPE_STRING,
)?;
}

Update::RemoveChunk(chunk_identifier) => {
let chunk_id = chunk_identifier.index();
Update::NewGapChunk { previous, new, next, gap } => {
let serialized = serde_json::to_vec(&gap.prev_token)?;
let prev_token = this.encode_value(serialized)?;

let previous = previous.as_ref().map(ChunkIdentifier::index);
let new = new.index();
let next = next.as_ref().map(ChunkIdentifier::index);

trace!(
%room_id,
"new gap chunk (prev={previous:?}, i={new}, next={next:?})",
);

// Insert the chunk as a gap.
insert_chunk(
txn,
&hashed_room_id,
previous,
new,
next,
CHUNK_TYPE_GAP_TYPE_STRING,
)?;

trace!(%room_id, "removing chunk @ {chunk_id}");
// Insert the gap's value.
txn.execute(
r#"
INSERT INTO gaps(chunk_id, room_id, prev_token)
VALUES (?, ?, ?)
"#,
(new, &hashed_room_id, prev_token),
)?;
}

// Find chunk to delete.
let (previous, next): (Option<usize>, Option<usize>) = txn.query_row(
"SELECT previous, next FROM linked_chunks WHERE id = ? AND room_id = ?",
(chunk_id, &hashed_room_id),
|row| Ok((row.get(0)?, row.get(1)?))
)?;
Update::RemoveChunk(chunk_identifier) => {
let chunk_id = chunk_identifier.index();

// Replace its previous' next to its own next.
if let Some(previous) = previous {
txn.execute("UPDATE linked_chunks SET next = ? WHERE id = ? AND room_id = ?", (next, previous, &hashed_room_id))?;
}
trace!(%room_id, "removing chunk @ {chunk_id}");

// Replace its next' previous to its own previous.
if let Some(next) = next {
txn.execute("UPDATE linked_chunks SET previous = ? WHERE id = ? AND room_id = ?", (previous, next, &hashed_room_id))?;
}
// Find chunk to delete.
let (previous, next): (Option<usize>, Option<usize>) = txn.query_row(
"SELECT previous, next FROM linked_chunks WHERE id = ? AND room_id = ?",
(chunk_id, &hashed_room_id),
|row| Ok((row.get(0)?, row.get(1)?))
)?;

// Now delete it, and let cascading delete corresponding entries in the
// other data tables.
txn.execute("DELETE FROM linked_chunks WHERE id = ? AND room_id = ?", (chunk_id, &hashed_room_id))?;
// Replace its previous' next to its own next.
if let Some(previous) = previous {
txn.execute("UPDATE linked_chunks SET next = ? WHERE id = ? AND room_id = ?", (next, previous, &hashed_room_id))?;
}

Update::PushItems { at, items } => {
let chunk_id = at.chunk_identifier().index();

trace!(%room_id, "pushing {} items @ {chunk_id}", items.len());

for (i, event) in items.into_iter().enumerate() {
let serialized = serde_json::to_vec(&event)?;
let content = this.encode_value(serialized)?;

let event_id = event.event_id().map(|event_id| event_id.to_string());
let index = at.index() + i;

txn.execute(
r#"
INSERT INTO events(chunk_id, room_id, event_id, content, position)
VALUES (?, ?, ?, ?, ?)
"#,
(chunk_id, &hashed_room_id, event_id, content, index),
)?;
}
// Replace its next' previous to its own previous.
if let Some(next) = next {
txn.execute("UPDATE linked_chunks SET previous = ? WHERE id = ? AND room_id = ?", (previous, next, &hashed_room_id))?;
}

Update::ReplaceItem { at, item: event } => {
let chunk_id = at.chunk_identifier().index();
let index = at.index();
// Now delete it, and let cascading delete corresponding entries in the
// other data tables.
txn.execute("DELETE FROM linked_chunks WHERE id = ? AND room_id = ?", (chunk_id, &hashed_room_id))?;
}

Update::PushItems { at, items } => {
let chunk_id = at.chunk_identifier().index();

trace!(%room_id, "replacing item @ {chunk_id}:{index}");
trace!(%room_id, "pushing {} items @ {chunk_id}", items.len());

for (i, event) in items.into_iter().enumerate() {
let serialized = serde_json::to_vec(&event)?;
let content = this.encode_value(serialized)?;

// The event id should be the same, but just in case it changed…
let event_id = event.event_id().map(|event_id| event_id.to_string());
let index = at.index() + i;

txn.execute(
r#"
UPDATE events
SET content = ?, event_id = ?
WHERE room_id = ? AND chunk_id = ? AND position = ?
INSERT INTO events(chunk_id, room_id, event_id, content, position)
VALUES (?, ?, ?, ?, ?)
"#,
(content, event_id, &hashed_room_id, chunk_id, index,)
(chunk_id, &hashed_room_id, event_id, content, index),
)?;
}
}

Update::RemoveItem { at } => {
let chunk_id = at.chunk_identifier().index();
let index = at.index();
Update::ReplaceItem { at, item: event } => {
let chunk_id = at.chunk_identifier().index();
let index = at.index();

trace!(%room_id, "removing item @ {chunk_id}:{index}");
trace!(%room_id, "replacing item @ {chunk_id}:{index}");

// Remove the entry.
txn.execute("DELETE FROM events WHERE room_id = ? AND chunk_id = ? AND position = ?", (&hashed_room_id, chunk_id, index))?;
let serialized = serde_json::to_vec(&event)?;
let content = this.encode_value(serialized)?;

// Decrement the index of each item after the one we're going to remove.
txn.execute(
r#"
UPDATE events
SET position = position - 1
WHERE room_id = ? AND chunk_id = ? AND position > ?
"#,
(&hashed_room_id, chunk_id, index)
)?;
// The event id should be the same, but just in case it changed…
let event_id = event.event_id().map(|event_id| event_id.to_string());

}
txn.execute(
r#"
UPDATE events
SET content = ?, event_id = ?
WHERE room_id = ? AND chunk_id = ? AND position = ?
"#,
(content, event_id, &hashed_room_id, chunk_id, index,)
)?;
}

Update::DetachLastItems { at } => {
let chunk_id = at.chunk_identifier().index();
let index = at.index();
Update::RemoveItem { at } => {
let chunk_id = at.chunk_identifier().index();
let index = at.index();

trace!(%room_id, "truncating items >= {chunk_id}:{index}");
trace!(%room_id, "removing item @ {chunk_id}:{index}");

// Remove these entries.
txn.execute("DELETE FROM events WHERE room_id = ? AND chunk_id = ? AND position >= ?", (&hashed_room_id, chunk_id, index))?;
}
// Remove the entry.
txn.execute("DELETE FROM events WHERE room_id = ? AND chunk_id = ? AND position = ?", (&hashed_room_id, chunk_id, index))?;

Update::Clear => {
trace!(%room_id, "clearing items");
// Decrement the index of each item after the one we're going to remove.
txn.execute(
r#"
UPDATE events
SET position = position - 1
WHERE room_id = ? AND chunk_id = ? AND position > ?
"#,
(&hashed_room_id, chunk_id, index)
)?;

// Remove chunks, and let cascading do its job.
txn.execute(
"DELETE FROM linked_chunks WHERE room_id = ?",
(&hashed_room_id,),
)?;
}
}

Update::StartReattachItems | Update::EndReattachItems => {
// Nothing.
}
Update::DetachLastItems { at } => {
let chunk_id = at.chunk_identifier().index();
let index = at.index();

trace!(%room_id, "truncating items >= {chunk_id}:{index}");

// Remove these entries.
txn.execute("DELETE FROM events WHERE room_id = ? AND chunk_id = ? AND position >= ?", (&hashed_room_id, chunk_id, index))?;
}

Update::Clear => {
trace!(%room_id, "clearing items");

// Remove chunks, and let cascading do its job.
txn.execute(
"DELETE FROM linked_chunks WHERE room_id = ?",
(&hashed_room_id,),
)?;
}

Update::StartReattachItems | Update::EndReattachItems => {
// Nothing.
}
}
}

Ok(())
})
Ok(())
})
.await?;

Ok(())
Expand Down
Loading