Merge remote-tracking branch 'origin/feat/elasticsearch' into feat/elasticsearch
Signed-off-by: Zomatree <me@zomatree.live> # Conflicts: # Cargo.lock # compose.yml # crates/core/config/src/lib.rs # crates/core/database/src/models/messages/ops.rs # crates/core/database/src/models/messages/ops/mongodb.rs # crates/core/database/src/models/messages/ops/reference.rs # crates/delta/src/routes/servers/server_delete.rs
This commit is contained in:
@@ -416,7 +416,7 @@ impl AbstractMessages for MongoDb {
|
|||||||
|
|
||||||
Ok(deleted_messages)
|
Ok(deleted_messages)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn fetch_all_messages(&self) -> Result<ChunkedDatabaseGenerator<Message>> {
|
async fn fetch_all_messages(&self) -> Result<ChunkedDatabaseGenerator<Message>> {
|
||||||
let mut session = self
|
let mut session = self
|
||||||
.start_session()
|
.start_session()
|
||||||
|
|||||||
@@ -353,7 +353,7 @@ impl AbstractMessages for ReferenceDb {
|
|||||||
|
|
||||||
Ok(deleted_messages)
|
Ok(deleted_messages)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn fetch_all_messages(&self) -> Result<ChunkedDatabaseGenerator<Message>> {
|
async fn fetch_all_messages(&self) -> Result<ChunkedDatabaseGenerator<Message>> {
|
||||||
Ok(ChunkedDatabaseGenerator::new_reference(
|
Ok(ChunkedDatabaseGenerator::new_reference(
|
||||||
self.messages.lock().await.values().cloned().collect(),
|
self.messages.lock().await.values().cloned().collect(),
|
||||||
|
|||||||
Reference in New Issue
Block a user