mirror of
				https://github.com/meilisearch/meilisearch.git
				synced 2025-11-04 09:56:28 +00:00 
			
		
		
		
	Specify WithoutTls everywhere
This commit is contained in:
		@@ -3,7 +3,7 @@ use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 | 
			
		||||
use std::fs::File;
 | 
			
		||||
use std::path::Path;
 | 
			
		||||
 | 
			
		||||
use heed::types::*;
 | 
			
		||||
use heed::{types::*, WithoutTls};
 | 
			
		||||
use heed::{CompactionOption, Database, RoTxn, RwTxn, Unspecified};
 | 
			
		||||
use roaring::RoaringBitmap;
 | 
			
		||||
use rstar::RTree;
 | 
			
		||||
@@ -110,7 +110,7 @@ pub mod db_name {
 | 
			
		||||
#[derive(Clone)]
 | 
			
		||||
pub struct Index {
 | 
			
		||||
    /// The LMDB environment which this index is associated with.
 | 
			
		||||
    pub(crate) env: heed::Env,
 | 
			
		||||
    pub(crate) env: heed::Env<WithoutTls>,
 | 
			
		||||
 | 
			
		||||
    /// Contains many different types (e.g. the fields ids map).
 | 
			
		||||
    pub(crate) main: Database<Unspecified, Unspecified>,
 | 
			
		||||
@@ -177,7 +177,7 @@ pub struct Index {
 | 
			
		||||
 | 
			
		||||
impl Index {
 | 
			
		||||
    pub fn new_with_creation_dates<P: AsRef<Path>>(
 | 
			
		||||
        mut options: heed::EnvOpenOptions,
 | 
			
		||||
        mut options: heed::EnvOpenOptions<WithoutTls>,
 | 
			
		||||
        path: P,
 | 
			
		||||
        created_at: time::OffsetDateTime,
 | 
			
		||||
        updated_at: time::OffsetDateTime,
 | 
			
		||||
@@ -275,7 +275,7 @@ impl Index {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    pub fn new<P: AsRef<Path>>(
 | 
			
		||||
        options: heed::EnvOpenOptions,
 | 
			
		||||
        options: heed::EnvOpenOptions<WithoutTls>,
 | 
			
		||||
        path: P,
 | 
			
		||||
        creation: bool,
 | 
			
		||||
    ) -> Result<Index> {
 | 
			
		||||
@@ -284,7 +284,7 @@ impl Index {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fn set_creation_dates(
 | 
			
		||||
        env: &heed::Env,
 | 
			
		||||
        env: &heed::Env<WithoutTls>,
 | 
			
		||||
        main: Database<Unspecified, Unspecified>,
 | 
			
		||||
        created_at: time::OffsetDateTime,
 | 
			
		||||
        updated_at: time::OffsetDateTime,
 | 
			
		||||
@@ -306,12 +306,12 @@ impl Index {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /// Create a read transaction to be able to read the index.
 | 
			
		||||
    pub fn read_txn(&self) -> heed::Result<RoTxn<'_>> {
 | 
			
		||||
    pub fn read_txn(&self) -> heed::Result<RoTxn<'_, WithoutTls>> {
 | 
			
		||||
        self.env.read_txn()
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /// Create a static read transaction to be able to read the index without keeping a reference to it.
 | 
			
		||||
    pub fn static_read_txn(&self) -> heed::Result<RoTxn<'static>> {
 | 
			
		||||
    pub fn static_read_txn(&self) -> heed::Result<RoTxn<'static, WithoutTls>> {
 | 
			
		||||
        self.env.clone().static_read_txn()
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -352,7 +352,7 @@ pub(crate) mod test_helpers {
 | 
			
		||||
 | 
			
		||||
    use grenad::MergerBuilder;
 | 
			
		||||
    use heed::types::Bytes;
 | 
			
		||||
    use heed::{BytesDecode, BytesEncode, Env, RoTxn, RwTxn};
 | 
			
		||||
    use heed::{BytesDecode, BytesEncode, Env, RoTxn, RwTxn, WithoutTls};
 | 
			
		||||
    use roaring::RoaringBitmap;
 | 
			
		||||
 | 
			
		||||
    use super::bulk::FacetsUpdateBulkInner;
 | 
			
		||||
@@ -390,7 +390,7 @@ pub(crate) mod test_helpers {
 | 
			
		||||
        for<'a> BoundCodec:
 | 
			
		||||
            BytesEncode<'a> + BytesDecode<'a, DItem = <BoundCodec as BytesEncode<'a>>::EItem>,
 | 
			
		||||
    {
 | 
			
		||||
        pub env: Env,
 | 
			
		||||
        pub env: Env<WithoutTls>,
 | 
			
		||||
        pub content: heed::Database<FacetGroupKeyCodec<BytesRefCodec>, FacetGroupValueCodec>,
 | 
			
		||||
        pub group_size: Cell<u8>,
 | 
			
		||||
        pub min_level_size: Cell<u8>,
 | 
			
		||||
 
 | 
			
		||||
@@ -3,7 +3,7 @@ use std::sync::atomic::Ordering;
 | 
			
		||||
use std::sync::{Arc, RwLock};
 | 
			
		||||
 | 
			
		||||
use bumpalo::Bump;
 | 
			
		||||
use heed::RoTxn;
 | 
			
		||||
use heed::{RoTxn, WithoutTls};
 | 
			
		||||
use rayon::iter::IndexedParallelIterator;
 | 
			
		||||
 | 
			
		||||
use super::super::document_change::DocumentChange;
 | 
			
		||||
@@ -28,7 +28,7 @@ pub struct DocumentChangeContext<
 | 
			
		||||
    /// inside of the DB.
 | 
			
		||||
    pub db_fields_ids_map: &'indexer FieldsIdsMap,
 | 
			
		||||
    /// A transaction providing data from the DB before all indexing operations
 | 
			
		||||
    pub rtxn: RoTxn<'indexer>,
 | 
			
		||||
    pub rtxn: RoTxn<'indexer, WithoutTls>,
 | 
			
		||||
 | 
			
		||||
    /// Global field id map that is up to date with the current state of the indexing process.
 | 
			
		||||
    ///
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user