projectmoon
/
tenebrous-dicebot
1
0
Fork 1
Code Issues 12 Pull Requests 1 Projects Releases 10 Wiki Activity

Room State Management #44

Manually merged
projectmoon merged 11 commits from room-state-management into master 2020-11-10 20:58:50 +00:00
Conversation 2 Commits 11 Files Changed 8 +7 -9
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0e04e67f6e - Show all commits

16
src/db/rooms.rs
View File

@ -1,7 +1,7 @@
use crate::db::errors::DataError; use crate::db::errors::DataError;
use crate::db::schema::convert_u64; use crate::db::schema::convert_u64;
use byteorder::BigEndian; use byteorder::BigEndian;
use log::{debug, error, log_enabled, trace}; use log::{debug, error, log_enabled};
use sled::transaction::TransactionalTree; use sled::transaction::TransactionalTree;
use sled::Transactional; use sled::Transactional;
use sled::{CompareAndSwapError, Tree}; use sled::{CompareAndSwapError, Tree};
@ -134,14 +134,12 @@ mod timestamp_index {
) -> Result<(), DataError> { ) -> Result<(), DataError> {
let parts: Vec<&[u8]> = key.split(|&b| b == 0xff).collect(); let parts: Vec<&[u8]> = key.split(|&b| b == 0xff).collect();
if let [room_id, event_id] = parts[..] { if let [room_id, event_id] = parts[..] {
let event_id = str::from_utf8(event_id)?;
debug!("Adding event ID {} to timestamp index", event_id);
let mut ts_key = room_id.to_vec(); let mut ts_key = room_id.to_vec();
ts_key.push(0xff); ts_key.push(0xff);
ts_key.extend_from_slice(&timestamp_bytes); ts_key.extend_from_slice(&timestamp_bytes);
trace_index_record(room_id, event_id, &timestamp_bytes); log_index_record(room_id, event_id, &timestamp_bytes);
let event_id = str::from_utf8(event_id)?;
hashset_tree::add_to_set(roomtimestamp_eventid, &ts_key, event_id.to_owned())?; hashset_tree::add_to_set(roomtimestamp_eventid, &ts_key, event_id.to_owned())?;
Ok(()) Ok(())
} else { } else {
@ -149,10 +147,10 @@ mod timestamp_index {
} }
} }
/// Log a trace message. /// Log a debug message.
fn trace_index_record(room_id: &[u8], event_id: &[u8], timestamp: &[u8]) { fn log_index_record(room_id: &[u8], event_id: &[u8], timestamp: &[u8]) {
if log_enabled!(log::Level::Trace) { if log_enabled!(log::Level::Debug) {
trace!( debug!(
"Recording event {} | {} received at {} in timestamp index.", "Recording event {} | {} received at {} in timestamp index.",
str::from_utf8(room_id).unwrap_or("[invalid room id]"), str::from_utf8(room_id).unwrap_or("[invalid room id]"),
str::from_utf8(event_id).unwrap_or("[invalid event id]"), str::from_utf8(event_id).unwrap_or("[invalid event id]"),