mirror of
https://github.com/meilisearch/meilisearch.git
synced 2024-11-27 04:25:06 +08:00
fix rebase errors
This commit is contained in:
parent
0bfdf9a785
commit
763ee521be
@ -103,7 +103,6 @@ impl Index {
|
|||||||
|
|
||||||
let displayed_ids = self
|
let displayed_ids = self
|
||||||
.displayed_fields_ids(&rtxn)?
|
.displayed_fields_ids(&rtxn)?
|
||||||
.map_err(|e| IndexError::Internal(Box::new(e)))?
|
|
||||||
.map(|fields| fields.into_iter().collect::<BTreeSet<_>>())
|
.map(|fields| fields.into_iter().collect::<BTreeSet<_>>())
|
||||||
.unwrap_or_else(|| fields_ids_map.iter().map(|(id, _)| id).collect());
|
.unwrap_or_else(|| fields_ids_map.iter().map(|(id, _)| id).collect());
|
||||||
|
|
||||||
@ -165,7 +164,7 @@ impl Index {
|
|||||||
|
|
||||||
let documents_iter = self.documents(&rtxn, documents_ids)?;
|
let documents_iter = self.documents(&rtxn, documents_ids)?;
|
||||||
|
|
||||||
for (_id, obkv) in self.documents(&rtxn, documents_ids)? {
|
for (_id, obkv) in documents_iter {
|
||||||
let document = make_document(&to_retrieve_ids, &fields_ids_map, obkv)?;
|
let document = make_document(&to_retrieve_ids, &fields_ids_map, obkv)?;
|
||||||
let formatted = format_fields(
|
let formatted = format_fields(
|
||||||
&fields_ids_map,
|
&fields_ids_map,
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
use std::collections::{BTreeSet, HashSet};
|
use std::collections::{BTreeSet, HashSet};
|
||||||
use std::convert::{TryFrom, TryInto};
|
|
||||||
|
|
||||||
use actix_web::{get, post, web, HttpResponse};
|
use actix_web::{get, post, web, HttpResponse};
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
Loading…
Reference in New Issue
Block a user