mirror of
https://github.com/meilisearch/MeiliSearch
synced 2024-11-26 23:04:26 +01:00
implement retrieve all documents
This commit is contained in:
parent
f44f8a823a
commit
8fd9dc231c
@ -1,8 +1,9 @@
|
|||||||
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;
|
use anyhow::{bail, Context};
|
||||||
use meilisearch_tokenizer::{Analyzer, AnalyzerConfig};
|
use meilisearch_tokenizer::{Analyzer, AnalyzerConfig};
|
||||||
use milli::{Index, obkv_to_json, FacetCondition};
|
use milli::{Index, obkv_to_json, FacetCondition};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
@ -70,7 +71,7 @@ impl SearchQuery {
|
|||||||
let highlighter = Highlighter::new(&stop_words);
|
let highlighter = Highlighter::new(&stop_words);
|
||||||
|
|
||||||
for (_id, obkv) in index.documents(&rtxn, documents_ids).unwrap() {
|
for (_id, obkv) in index.documents(&rtxn, documents_ids).unwrap() {
|
||||||
let mut object = obkv_to_json(&displayed_fields, &fields_ids_map, obkv).unwrap();
|
let mut object = obkv_to_json(&displayed_fields, &fields_ids_map, obkv)?;
|
||||||
if let Some(ref attributes_to_highlight) = self.attributes_to_highlight {
|
if let Some(ref attributes_to_highlight) = self.attributes_to_highlight {
|
||||||
highlighter.highlight_record(&mut object, &found_words, attributes_to_highlight);
|
highlighter.highlight_record(&mut object, &found_words, attributes_to_highlight);
|
||||||
}
|
}
|
||||||
@ -165,4 +166,42 @@ impl Data {
|
|||||||
None => bail!("index {:?} doesn't exists", index.as_ref()),
|
None => bail!("index {:?} doesn't exists", index.as_ref()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn retrieve_documents(
|
||||||
|
&self,
|
||||||
|
index: impl AsRef<str>,
|
||||||
|
offset: usize,
|
||||||
|
count: usize,
|
||||||
|
attributes_to_retrieve: Option<&[&str]>,
|
||||||
|
) -> anyhow::Result<Vec<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 mut documents = Vec::new();
|
||||||
|
|
||||||
|
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 iter = index.documents.range(&txn, &(..))?
|
||||||
|
.skip(offset)
|
||||||
|
.take(count);
|
||||||
|
|
||||||
|
for entry in iter {
|
||||||
|
let (_id, obkv) = entry?;
|
||||||
|
let object = obkv_to_json(&attributes_to_retrieve_ids, &fields_ids_map, obkv)?;
|
||||||
|
documents.push(object);
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(documents)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -12,6 +12,9 @@ use crate::error::ResponseError;
|
|||||||
use crate::helpers::Authentication;
|
use crate::helpers::Authentication;
|
||||||
use crate::routes::IndexParam;
|
use crate::routes::IndexParam;
|
||||||
|
|
||||||
|
const DEFAULT_RETRIEVE_DOCUMENTS_OFFSET: usize = 0;
|
||||||
|
const DEFAULT_RETRIEVE_DOCUMENTS_LIMIT: usize = 20;
|
||||||
|
|
||||||
macro_rules! guard_content_type {
|
macro_rules! guard_content_type {
|
||||||
($fn_name:ident, $guard_value:literal) => {
|
($fn_name:ident, $guard_value:literal) => {
|
||||||
fn $fn_name(head: &actix_web::dev::RequestHead) -> bool {
|
fn $fn_name(head: &actix_web::dev::RequestHead) -> bool {
|
||||||
@ -69,18 +72,35 @@ async fn delete_document(
|
|||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
struct BrowseQuery {
|
struct BrowseQuery {
|
||||||
_offset: Option<usize>,
|
offset: Option<usize>,
|
||||||
_limit: Option<usize>,
|
limit: Option<usize>,
|
||||||
_attributes_to_retrieve: Option<String>,
|
attributes_to_retrieve: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[get("/indexes/{index_uid}/documents", wrap = "Authentication::Public")]
|
#[get("/indexes/{index_uid}/documents", wrap = "Authentication::Public")]
|
||||||
async fn get_all_documents(
|
async fn get_all_documents(
|
||||||
_data: web::Data<Data>,
|
data: web::Data<Data>,
|
||||||
_path: web::Path<IndexParam>,
|
path: web::Path<IndexParam>,
|
||||||
_params: web::Query<BrowseQuery>,
|
params: web::Query<BrowseQuery>,
|
||||||
) -> Result<HttpResponse, ResponseError> {
|
) -> Result<HttpResponse, ResponseError> {
|
||||||
todo!()
|
let attributes_to_retrieve = params
|
||||||
|
.attributes_to_retrieve
|
||||||
|
.as_ref()
|
||||||
|
.map(|attrs| attrs
|
||||||
|
.split(",")
|
||||||
|
.collect::<Vec<_>>());
|
||||||
|
|
||||||
|
match data.retrieve_documents(
|
||||||
|
&path.index_uid,
|
||||||
|
params.offset.unwrap_or(DEFAULT_RETRIEVE_DOCUMENTS_OFFSET),
|
||||||
|
params.limit.unwrap_or(DEFAULT_RETRIEVE_DOCUMENTS_LIMIT),
|
||||||
|
attributes_to_retrieve.as_deref()) {
|
||||||
|
Ok(docs) => {
|
||||||
|
let json = serde_json::to_string(&docs).unwrap();
|
||||||
|
Ok(HttpResponse::Ok().body(json))
|
||||||
|
}
|
||||||
|
Err(_) => { todo!() }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
|
@ -32,7 +32,6 @@ async fn list_indexes(data: web::Data<Data>) -> Result<HttpResponse, ResponseErr
|
|||||||
unimplemented!()
|
unimplemented!()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[get("/indexes/{index_uid}", wrap = "Authentication::Private")]
|
#[get("/indexes/{index_uid}", wrap = "Authentication::Private")]
|
||||||
|
Loading…
Reference in New Issue
Block a user