mirror of
https://github.com/meilisearch/MeiliSearch
synced 2024-11-04 20:18:55 +01:00
implement get document
This commit is contained in:
parent
8fd9dc231c
commit
6766de437f
@ -1,7 +1,6 @@
|
|||||||
use std::collections::HashSet;
|
use std::collections::HashSet;
|
||||||
use std::mem;
|
use std::mem;
|
||||||
use std::time::Instant;
|
use std::time::Instant;
|
||||||
use std::ops::RangeBounds;
|
|
||||||
|
|
||||||
use anyhow::{bail, Context};
|
use anyhow::{bail, Context};
|
||||||
use meilisearch_tokenizer::{Analyzer, AnalyzerConfig};
|
use meilisearch_tokenizer::{Analyzer, AnalyzerConfig};
|
||||||
@ -171,15 +170,14 @@ impl Data {
|
|||||||
&self,
|
&self,
|
||||||
index: impl AsRef<str>,
|
index: impl AsRef<str>,
|
||||||
offset: usize,
|
offset: usize,
|
||||||
count: usize,
|
limit: usize,
|
||||||
attributes_to_retrieve: Option<&[&str]>,
|
attributes_to_retrieve: Option<&[&str]>,
|
||||||
) -> anyhow::Result<Vec<Map<String, Value>>> {
|
) -> anyhow::Result<Vec<Map<String, Value>>> {
|
||||||
let index = self.index_controller
|
let index = self.index_controller
|
||||||
.index(&index)?
|
.index(&index)?
|
||||||
.with_context(|| format!("Index {:?} doesn't exist", index.as_ref()))?;
|
.with_context(|| format!("Index {:?} doesn't exist", index.as_ref()))?;
|
||||||
let txn = index.read_txn()?;
|
|
||||||
|
|
||||||
let mut documents = Vec::new();
|
let txn = index.read_txn()?;
|
||||||
|
|
||||||
let fields_ids_map = index.fields_ids_map(&txn)?;
|
let fields_ids_map = index.fields_ids_map(&txn)?;
|
||||||
|
|
||||||
@ -194,7 +192,9 @@ impl Data {
|
|||||||
|
|
||||||
let iter = index.documents.range(&txn, &(..))?
|
let iter = index.documents.range(&txn, &(..))?
|
||||||
.skip(offset)
|
.skip(offset)
|
||||||
.take(count);
|
.take(limit);
|
||||||
|
|
||||||
|
let mut documents = Vec::new();
|
||||||
|
|
||||||
for entry in iter {
|
for entry in iter {
|
||||||
let (_id, obkv) = entry?;
|
let (_id, obkv) = entry?;
|
||||||
@ -204,4 +204,42 @@ impl Data {
|
|||||||
|
|
||||||
Ok(documents)
|
Ok(documents)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn retrieve_document(
|
||||||
|
&self,
|
||||||
|
index: impl AsRef<str>,
|
||||||
|
document_id: impl AsRef<str>,
|
||||||
|
attributes_to_retrieve: Option<&[&str]>,
|
||||||
|
) -> anyhow::Result<Map<String, Value>> {
|
||||||
|
let index = self.index_controller
|
||||||
|
.index(&index)?
|
||||||
|
.with_context(|| format!("Index {:?} doesn't exist", index.as_ref()))?;
|
||||||
|
let txn = index.read_txn()?;
|
||||||
|
|
||||||
|
let fields_ids_map = index.fields_ids_map(&txn)?;
|
||||||
|
|
||||||
|
let attributes_to_retrieve_ids = match attributes_to_retrieve {
|
||||||
|
Some(attrs) => attrs
|
||||||
|
.as_ref()
|
||||||
|
.iter()
|
||||||
|
.filter_map(|f| fields_ids_map.id(f))
|
||||||
|
.collect::<Vec<_>>(),
|
||||||
|
None => fields_ids_map.iter().map(|(id, _)| id).collect(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let internal_id = index
|
||||||
|
.external_documents_ids(&txn)?
|
||||||
|
.get(document_id.as_ref().as_bytes())
|
||||||
|
.with_context(|| format!("Document with id {} not found", document_id.as_ref()))?;
|
||||||
|
|
||||||
|
let document = index.documents(&txn, std::iter::once(internal_id))?
|
||||||
|
.into_iter()
|
||||||
|
.next()
|
||||||
|
.map(|(_, d)| d);
|
||||||
|
|
||||||
|
match document {
|
||||||
|
Some(document) => Ok(obkv_to_json(&attributes_to_retrieve_ids, &fields_ids_map, document)?),
|
||||||
|
None => bail!("Document with id {} not found", document_id.as_ref()),
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -254,6 +254,7 @@ where
|
|||||||
/// Trying to abort an update that is currently being processed, an update
|
/// Trying to abort an update that is currently being processed, an update
|
||||||
/// that as already been processed or which doesn't actually exist, will
|
/// that as already been processed or which doesn't actually exist, will
|
||||||
/// return `None`.
|
/// return `None`.
|
||||||
|
#[allow(dead_code)]
|
||||||
pub fn abort_update(&self, update_id: u64) -> heed::Result<Option<Aborted<M>>> {
|
pub fn abort_update(&self, update_id: u64) -> heed::Result<Option<Aborted<M>>> {
|
||||||
let mut wtxn = self.env.write_txn()?;
|
let mut wtxn = self.env.write_txn()?;
|
||||||
let key = BEU64::new(update_id);
|
let key = BEU64::new(update_id);
|
||||||
@ -281,6 +282,7 @@ where
|
|||||||
|
|
||||||
/// Aborts all the pending updates, and not the one being currently processed.
|
/// Aborts all the pending updates, and not the one being currently processed.
|
||||||
/// Returns the update metas and ids that were successfully aborted.
|
/// Returns the update metas and ids that were successfully aborted.
|
||||||
|
#[allow(dead_code)]
|
||||||
pub fn abort_pendings(&self) -> heed::Result<Vec<(u64, Aborted<M>)>> {
|
pub fn abort_pendings(&self) -> heed::Result<Vec<(u64, Aborted<M>)>> {
|
||||||
let mut wtxn = self.env.write_txn()?;
|
let mut wtxn = self.env.write_txn()?;
|
||||||
let mut aborted_updates = Vec::new();
|
let mut aborted_updates = Vec::new();
|
||||||
|
@ -33,8 +33,8 @@ type Document = IndexMap<String, Value>;
|
|||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
struct DocumentParam {
|
struct DocumentParam {
|
||||||
_index_uid: String,
|
index_uid: String,
|
||||||
_document_id: String,
|
document_id: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn services(cfg: &mut web::ServiceConfig) {
|
pub fn services(cfg: &mut web::ServiceConfig) {
|
||||||
@ -52,10 +52,21 @@ pub fn services(cfg: &mut web::ServiceConfig) {
|
|||||||
wrap = "Authentication::Public"
|
wrap = "Authentication::Public"
|
||||||
)]
|
)]
|
||||||
async fn get_document(
|
async fn get_document(
|
||||||
_data: web::Data<Data>,
|
data: web::Data<Data>,
|
||||||
_path: web::Path<DocumentParam>,
|
path: web::Path<DocumentParam>,
|
||||||
) -> Result<HttpResponse, ResponseError> {
|
) -> Result<HttpResponse, ResponseError> {
|
||||||
todo!()
|
let index = &path.index_uid;
|
||||||
|
let id = &path.document_id;
|
||||||
|
match data.retrieve_document(index, id, None) {
|
||||||
|
Ok(document) => {
|
||||||
|
let json = serde_json::to_string(&document).unwrap();
|
||||||
|
Ok(HttpResponse::Ok().body(json))
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
error!("{}", e);
|
||||||
|
unimplemented!()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[delete(
|
#[delete(
|
||||||
|
Loading…
Reference in New Issue
Block a user