add locks + file alloc in Writer::finish

.drone.yml

@@ -8,4 +8,30 @@ steps:
   - apk add --no-cache musl-dev
   - cargo build --verbose --all
   - cargo test --verbose --all
+  environment:
+    CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
 
+trigger:
+  event:
+  - push
+
+---
+kind: pipeline
+name: publish
+
+steps:
+- name: push
+  image: rust:1-alpine
+  commands:
+  - apk add --no-cache musl-dev
+  - cargo build -p chgk_ledb_lib
+  - cargo publish --registry gitea -p chgk_ledb_lib
+  environment:
+    CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
+    CARGO_REGISTRIES_GITEA_INDEX: https://gitea.b4tman.ru/b4tman/_cargo-index.git
+    CARGO_REGISTRIES_GITEA_TOKEN:
+      from_secret: cargo_gitea_token
+
+trigger:
+  event:
+  - tag

.gitignore

@@ -6,3 +6,4 @@ json.zip
 /exp
 /.vscode
 test*.bin
+db.dat

Cargo.toml

@@ -1,32 +1,8 @@
-[package]
-name = "chgk_ledb"
-version = "0.1.0"
-authors = ["Dmitry <b4tm4n@mail.ru>"]
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[[bench]]
-name = "db_bench"
-harness = false
-
-[dependencies]
-serde="1.0"
-serde_derive="1.0"
-serde_json="1.0"
-ledb = {git = "https://github.com/b4tman/ledb.git", rev="a646b90e", package="ledb"}
-ledb-derive = {git = "https://github.com/b4tman/ledb.git", rev="a646b90e", package="ledb-derive"}
-ledb-types = {git = "https://github.com/b4tman/ledb.git", rev="a646b90e", package="ledb-types"}
-zip="0.6"
-rand="0.8"
-clap = { version = "3.2.22", features = ["derive"] }
-bincode = "^2.0.0-rc.2"
-zstd = "^0.10"
-memmap = "0.7.0"
-
-[dev-dependencies]
-criterion = "0.4.0"
-tempfile = "3.3"
+[workspace]
+members = [
+  "app",
+  "lib"
+]
 
 [profile.release]
 opt-level = 3

app/Cargo.toml

@@ -0,0 +1,28 @@
+[package]
+name = "chgk_ledb"
+version = "1.1.0"
+authors = ["Dmitry <b4tm4n@mail.ru>"]
+edition = "2021"
+repository = "https://gitea.b4tman.ru/b4tman/chgk_ledb"
+license = "MIT"
+description = "Утилита загружающая базу данных ЧГК вопросов из ZIP файла в JSON формате в базу данных."
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[[bench]]
+name = "db_bench"
+harness = false
+
+[dependencies]
+chgk_ledb_lib = {path = "../lib"}
+serde_json="1.0"
+zip="0.6"
+rand="0.8"
+clap = { version = "3.2.22", features = ["derive"] }
+
+[dev-dependencies]
+criterion = "0.4.0"
+tempfile = "3.3"
+bincode = "^2.0.0-rc.2"
+serde="1.0"
+serde_derive="1.0"

app/benches/db_bench.rs

@@ -1,34 +1,50 @@
 #[macro_use]
 extern crate criterion;
+extern crate bincode;
+extern crate serde;
+extern crate serde_derive;
+extern crate serde_json;
+extern crate tempfile;
 
-#[path = "../src/db.rs"]
-mod db;
-use std::path::PathBuf;
+use chgk_ledb_lib::db;
+use std::path::Path;
 
 use db::{Reader, Writer, WriterOpts};
 
 use criterion::{BatchSize, Criterion};
-use tempfile::tempdir;
+use tempfile::{tempdir, NamedTempFile};
 
-#[derive(bincode::Encode, bincode::Decode, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+use serde_derive::{Deserialize, Serialize};
+
+#[derive(
+    bincode::Encode,
+    bincode::Decode,
+    Clone,
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Serialize,
+    Deserialize,
+)]
 struct TestData {
-    num: u128,
+    num1: u64,
+    num2: u64,
     test: String,
 }
 
 const N: usize = 4096;
 
 fn gen_data(count: usize) -> impl Iterator<Item = TestData> {
-    (0..count)
-        .into_iter()
-        .map(|i| 143 + i as u128)
-        .map(|i| TestData {
-            num: i,
-            test: "test ---- Test ____".repeat(123 + i as usize % 15),
-        })
+    (0..count).map(|i| 143 + i as u64).map(|i| TestData {
+        num1: i,
+        num2: (i * 100) ^ 0xDF0E441122334455,
+        test: "test ---- Test ____".repeat(123 + i as usize % 15),
+    })
 }
 
-fn prepare_db_writer(path: &PathBuf) -> Writer<TestData> {
+fn prepare_db_writer<P: AsRef<Path>>(path: P) -> Writer<TestData> {
     let opts = WriterOpts {
         compress_lvl: 1,
         data_buf_size: 100 * 1024 * 1024,
@@ -41,7 +57,9 @@ fn prepare_db_writer(path: &PathBuf) -> Writer<TestData> {
 
 fn db_read(c: &mut Criterion) {
     let dir = tempdir().expect("tempdir");
-    let tmpfile = dir.path().join("test.tmp");
+    let tmpfile = NamedTempFile::new_in(dir.path())
+        .expect("new tempfile")
+        .into_temp_path();
     let mut writer = prepare_db_writer(&tmpfile);
 
     let mut items_iter = gen_data(N).collect::<Vec<TestData>>().into_iter();
@@ -54,9 +72,8 @@ fn db_read(c: &mut Criterion) {
                 let reader: Reader<TestData> = Reader::new(&tmpfile, 2048).expect("new reader");
                 reader
             },
-            |mut reader| {
-                let mut reader_iter = reader.iter();
-                while let Some(item) = reader_iter.next() {
+            |reader| {
+                for item in reader {
                     drop(item);
                 }
             },
@@ -67,10 +84,13 @@ fn db_read(c: &mut Criterion) {
 
 fn db_write(c: &mut Criterion) {
     let dir = tempdir().expect("tempdir");
-    let tmpfile = dir.path().join("test.tmp");
+
     c.bench_function("write", |b| {
         b.iter_batched(
             || {
+                let tmpfile = NamedTempFile::new_in(dir.path())
+                    .expect("new tempfile")
+                    .into_temp_path();
                 let src = gen_data(N).collect::<Vec<TestData>>().into_iter();
                 let writer = prepare_db_writer(&tmpfile);
                 (src, writer)

app/src/main.rs

@@ -1,36 +1,24 @@
-extern crate serde;
-extern crate serde_derive;
-#[macro_use]
 extern crate serde_json;
-extern crate ledb;
-extern crate ledb_types;
-extern crate zip;
-
 use clap::{Parser, Subcommand};
 use rand::seq::IteratorRandom;
 
 use std::io;
-use std::path::PathBuf;
 use std::time::Instant;
 use std::{fs, sync::mpsc, thread};
 
-use ledb::{Options, Storage};
-
-mod db;
-mod questions;
-mod source;
+use chgk_ledb_lib::db;
+use chgk_ledb_lib::questions;
+use chgk_ledb_lib::source;
 
 use crate::questions::{Question, QuestionsConverter};
 use crate::source::ReadSourceQuestionsBatches;
 
 const ZIP_FILENAME: &str = "json.zip";
-const NEW_DB_FILENAME: &str = "test.bin";
-const DB_DIR: &str = "db";
+const NEW_DB_FILENAME: &str = "db.dat";
 
 #[derive(Subcommand, Debug)]
 enum Command {
     Write,
-    Compact,
     Print {
         #[clap(value_parser, default_value = "0")]
         id: u32,
@@ -41,11 +29,6 @@ enum Command {
         #[clap(value_parser, default_value = "0")]
         num: usize,
     },
-    Write2,
-    Print2 {
-        #[clap(value_parser, default_value = "0")]
-        id: u32,
-    },
 }
 
 #[derive(Parser, Debug)]
@@ -79,60 +62,12 @@ fn zip_reader_task(tx: mpsc::Sender<Question>) {
     }
     println!("read done");
 }
-fn db_writer_task(rx: mpsc::Receiver<Question>) {
-    let out_file: PathBuf = [DB_DIR, "data.mdb"].into_iter().collect();
-    match fs::metadata(&out_file) {
-        Ok(x) if x.is_file() => {
-            fs::remove_file(&out_file).unwrap();
-            println!(r#""{}" removed"#, out_file.to_str().unwrap());
-        }
-        _ => {}
-    };
-
-    let options: Options = serde_json::from_value(json!({
-        "map_size": 900 * 1024 * 1024, // 900mb
-        "write_map": true,
-        "map_async": true,
-        "no_lock": true,
-        "no_meta_sync": true,
-        "no_sync": true,
-    }))
-    .unwrap();
-
-    let storage = Storage::new(DB_DIR, options).unwrap();
-    let collection = storage.collection("questions").unwrap();
-
-    let count = collection.load(rx).expect("load");
-
-    println!("loaded {count}");
-
-    println!("syncing to disk...");
-    storage.sync(true).unwrap();
-
-    print!("stats: ");
-    let stats = storage.stat().unwrap();
-    println!("{:?}", stats);
-
-    drop(storage);
-    println!("write done");
-}
-
-fn write_db() {
-    let (tx, rx) = mpsc::channel::<Question>();
-    [
-        thread::spawn(move || zip_reader_task(tx)),
-        thread::spawn(move || db_writer_task(rx)),
-    ]
-    .into_iter()
-    .for_each(|handle| handle.join().expect("thread panic"));
-    println!("all done");
-}
 
 fn print_question_from<F>(get_q: F)
 where
     F: FnOnce() -> Option<Question>,
 {
-    let q = get_q().unwrap();
+    let q = get_q().expect("question not found");
     println!("{:#?}", q)
 }
 
@@ -157,45 +92,6 @@ fn read_from_zip(file_num: usize, mut num: usize) -> Option<Question> {
     Some(questions[num - 1].clone())
 }
 
-fn compact_db() {
-    let options: Options = serde_json::from_value(json!({
-        "write_map": true,
-        "map_async": true,
-        "no_lock": true,
-        "no_meta_sync": true,
-        "no_sync": true,
-        "compact": true,
-    }))
-    .unwrap();
-
-    let storage = Storage::new(DB_DIR, options).unwrap();
-
-    storage.sync(true).unwrap();
-    let stats = storage.stat().unwrap();
-    println!("{:?}", stats);
-    drop(storage);
-}
-
-fn read_from_db(mut id: u32) -> Option<Question> {
-    let options: Options = serde_json::from_value(json!({
-        "read_only": true,
-        "map_async": true,
-        "no_lock": true,
-    }))
-    .unwrap();
-
-    let storage = Storage::new(DB_DIR, options).unwrap();
-    let collection = storage.collection("questions").unwrap();
-    let mut rng = rand::thread_rng();
-
-    if id == 0 {
-        let last_id = collection.last_id().unwrap();
-        id = (1..=last_id).choose(&mut rng).unwrap();
-    }
-
-    collection.get::<Question>(id).unwrap()
-}
-
 // measure and return time elapsed in `func` in seconds
 pub fn measure<F: FnOnce()>(func: F) -> f64 {
     let start = Instant::now();
@@ -214,7 +110,6 @@ fn main() {
 
     let mut action: Box<dyn FnOnce()> = match &args.command {
         Command::Write => Box::new(write_db),
-        Command::Compact => Box::new(compact_db),
         Command::Print { id } => {
             let get_question = Box::new(|| read_from_db(*id));
             Box::new(|| print_question_from(get_question))
@@ -223,11 +118,6 @@ fn main() {
             let get_question = Box::new(|| read_from_zip(*file_num, *num));
             Box::new(|| print_question_from(get_question))
         }
-        Command::Write2 => Box::new(write_db2),
-        Command::Print2 { id } => {
-            let get_question = Box::new(|| read_from_db2(*id));
-            Box::new(|| print_question_from(get_question))
-        }
     };
 
     if args.measure {
@@ -237,11 +127,11 @@ fn main() {
     action();
 }
 
-fn read_from_db2(id: u32) -> Option<Question> {
-    let mut reader: db::Reader<Question> =
+fn read_from_db(id: u32) -> Option<Question> {
+    let reader: db::Reader<Question> =
         db::Reader::new(NEW_DB_FILENAME, 2048).expect("new db reader");
 
-    let mut questions = reader.iter();
+    let mut questions = reader.into_iter();
 
     match id {
         0 => {
@@ -251,17 +141,17 @@ fn read_from_db2(id: u32) -> Option<Question> {
         _ => questions.nth((id - 1) as usize),
     }
 }
-fn write_db2() {
+fn write_db() {
     let (tx, rx) = mpsc::channel::<Question>();
     [
         thread::spawn(move || zip_reader_task(tx)),
-        thread::spawn(move || db_writer2_task(rx)),
+        thread::spawn(move || db_writer_task(rx)),
     ]
     .into_iter()
     .for_each(|handle| handle.join().expect("thread panic"));
     println!("all done");
 }
-fn db_writer2_task(rx: mpsc::Receiver<Question>) {
+fn db_writer_task(rx: mpsc::Receiver<Question>) {
     let writer_opts = db::WriterOpts::default();
     let mut writer: db::Writer<Question> =
         db::Writer::new(NEW_DB_FILENAME, writer_opts).expect("new db writer");

lib/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "chgk_ledb_lib"
+version = "1.1.0"
+authors = ["Dmitry <b4tm4n@mail.ru>"]
+edition = "2021"
+repository = "https://gitea.b4tman.ru/b4tman/chgk_ledb"
+license = "MIT"
+description = "Библиотека для доступа к файлу базы данных вопросов ЧГК"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+serde="1.0"
+serde_derive="1.0"
+serde_json="1.0"
+zip="0.6"
+bincode = "^2.0.0-rc.2"
+zstd = "^0.10"
+memmap = "0.7.0"
+fs4 = { version = "0.6.3", features = ["sync"] }
+
+[dev-dependencies]
+tempfile = "3.3"

lib/src/db.rs

@@ -3,10 +3,13 @@ use std::{
     io::{self, Cursor, Read, Write},
     marker::PhantomData,
     path::Path,
+    sync::Arc,
 };
 
 use memmap::{Mmap, MmapOptions};
 
+use fs4::FileExt;
+
 type LSize = u32;
 const LEN_SIZE: usize = std::mem::size_of::<LSize>();
 const BINCODE_CFG: bincode::config::Configuration = bincode::config::standard();
@@ -62,6 +65,7 @@ where
 {
     pub fn new<P: AsRef<Path>>(path: P, opts: WriterOpts) -> Result<Self, String> {
         let out = fs::File::create(path).str_err()?;
+        out.try_lock_exclusive().str_err()?;
         let out = io::BufWriter::with_capacity(opts.out_buf_size, out);
         let data_buf: Vec<u8> = Vec::with_capacity(opts.data_buf_size);
         let data_buf = Cursor::new(data_buf);
@@ -132,6 +136,9 @@ where
         let pos: LSize = self.data_buf.position() as LSize;
         self.table.push(pos);
 
+        let output_size: u64 = (self.table.len() * LEN_SIZE) as u64 + self.data_buf.position();
+        self.out.get_ref().allocate(output_size).str_err()?;
+
         // write tab
         let tab_size = (self.table.len() * LEN_SIZE) as LSize;
         for pos in self.table {
@@ -146,6 +153,7 @@ where
         io::copy(&mut data, &mut self.out).str_err()?;
 
         self.out.flush().str_err()?;
+        self.out.get_ref().unlock().str_err()?;
         Ok(())
     }
 }
@@ -157,7 +165,7 @@ where
     mmap: Mmap,
     count: usize,
     first_pos: LSize,
-    _t: PhantomData<*const T>,
+    _t: Option<Arc<T>>, // PhantomData replacement
 }
 
 impl<T> Reader<T>
@@ -166,6 +174,7 @@ where
 {
     pub fn new<P: AsRef<Path>>(path: P, _buf_size: usize) -> Result<Self, String> {
         let file = fs::File::open(path).str_err()?;
+        file.try_lock_shared().str_err()?;
         let mmap = unsafe { MmapOptions::new().map(&file).str_err()? };
 
         // read first pos and records count
@@ -178,7 +187,7 @@ where
             mmap,
             count,
             first_pos,
-            _t: PhantomData,
+            _t: None,
         })
     }
 
@@ -186,7 +195,11 @@ where
         self.count
     }
 
-    pub fn get(&mut self, index: usize) -> Result<T, String> {
+    pub fn is_empty(&self) -> bool {
+        0 == self.len()
+    }
+
+    pub fn get(&self, index: usize) -> Result<T, String> {
         if index >= self.len() {
             return Err("index out of range".into());
         }
@@ -218,7 +231,7 @@ where
         Ok(item.0)
     }
 
-    pub fn iter(&mut self) -> ReaderIter<'_, T> {
+    pub fn iter(&self) -> ReaderIter<'_, T> {
         ReaderIter::new(self)
     }
 }
@@ -227,7 +240,7 @@ pub struct ReaderIter<'a, T>
 where
     T: bincode::Decode,
 {
-    reader: &'a mut Reader<T>,
+    reader: &'a Reader<T>,
     index: Option<usize>,
 }
 
@@ -235,7 +248,7 @@ impl<'a, T> ReaderIter<'a, T>
 where
     T: bincode::Decode,
 {
-    fn new(reader: &'a mut Reader<T>) -> Self {
+    fn new(reader: &'a Reader<T>) -> Self {
         ReaderIter {
             reader,
             index: None,
@@ -250,7 +263,7 @@ where
     type Item = T;
 
     fn next(&mut self) -> Option<Self::Item> {
-        if self.index.is_none() && self.reader.len() != 0 {
+        if self.index.is_none() && !self.reader.is_empty() {
             self.index = Some(0);
         }
 
@@ -305,6 +318,100 @@ where
     }
 }
 
+pub struct ReaderIntoIter<T>
+where
+    T: bincode::Decode,
+{
+    reader: Reader<T>,
+    index: Option<usize>,
+}
+
+impl<T> ReaderIntoIter<T>
+where
+    T: bincode::Decode,
+{
+    fn new(reader: Reader<T>) -> Self {
+        Self {
+            reader,
+            index: None,
+        }
+    }
+}
+
+impl<T> Iterator for ReaderIntoIter<T>
+where
+    T: bincode::Decode,
+{
+    type Item = T;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.index.is_none() && !self.reader.is_empty() {
+            self.index = Some(0);
+        }
+
+        match self.index {
+            Some(i) if i < self.reader.len() => self.nth(i),
+            _ => None,
+        }
+    }
+
+    fn nth(&mut self, n: usize) -> Option<Self::Item> {
+        if self.reader.len() <= n {
+            return None;
+        }
+        self.index = Some(n + 1);
+
+        let item = self.reader.get(n);
+        match item {
+            Ok(item) => Some(item),
+            Err(_) => None,
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let len = self.reader.len();
+        if self.index.is_none() {
+            return (len, Some(len));
+        }
+
+        let index = self.index.unwrap();
+        let rem = if len > index + 1 {
+            len - (index + 1)
+        } else {
+            0
+        };
+        (rem, Some(rem))
+    }
+
+    fn count(self) -> usize
+    where
+        Self: Sized,
+    {
+        self.reader.len()
+    }
+}
+
+impl<T> ExactSizeIterator for ReaderIntoIter<T>
+where
+    T: bincode::Decode,
+{
+    fn len(&self) -> usize {
+        self.reader.len()
+    }
+}
+
+impl<T> IntoIterator for Reader<T>
+where
+    T: bincode::Decode,
+{
+    type Item = T;
+    type IntoIter = ReaderIntoIter<Self::Item>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        Self::IntoIter::new(self)
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;
@@ -341,7 +448,7 @@ mod test {
         writer.load(&mut items.clone().into_iter()).expect("load");
         writer.finish().expect("finish write");
 
-        let mut reader: Reader<TestData> = Reader::new(&tmpfile, 2048).expect("new reader");
+        let reader: Reader<TestData> = Reader::new(&tmpfile, 2048).expect("new reader");
         assert_eq!(items.len(), reader.len());
 
         for (idx, item) in items.iter().enumerate() {
@@ -368,11 +475,76 @@ mod test {
         writer.load(&mut items.clone().into_iter()).expect("load");
         writer.finish().expect("finish write");
 
-        let mut reader: Reader<TestData> = Reader::new(&tmpfile, 2048).expect("new reader");
+        let reader: Reader<TestData> = Reader::new(&tmpfile, 2048).expect("new reader");
         assert_eq!(items.len(), reader.len());
 
         items.into_iter().zip(reader.iter()).for_each(|pair| {
             assert_eq!(pair.0, pair.1);
         });
     }
+
+    #[test]
+    fn test_write_read_into_iter() {
+        let dir = tempdir().expect("tempdir");
+        let tmpfile = dir.path().join("test.tmp");
+        let opts = WriterOpts {
+            compress_lvl: 1,
+            data_buf_size: 10 * 1024 * 1024,
+            out_buf_size: 10 * 1024 * 1024,
+            current_buf_size: 4096,
+        };
+        let mut writer: Writer<TestData> = Writer::new(&tmpfile, opts).expect("new writer");
+
+        let items_iter = gen_data(10);
+        let items: Vec<TestData> = items_iter.collect();
+
+        writer.load(&mut items.clone().into_iter()).expect("load");
+        writer.finish().expect("finish write");
+
+        let reader: Reader<TestData> = Reader::new(&tmpfile, 2048).expect("new reader");
+        assert_eq!(items.len(), reader.len());
+
+        items.into_iter().zip(reader).for_each(|pair| {
+            assert_eq!(pair.0, pair.1);
+        });
+    }
+
+    /// sharing Reader instance between threads
+    #[test]
+    fn test_share_reader() {
+        use std::thread;
+
+        let dir = tempdir().expect("tempdir");
+        let tmpfile = dir.path().join("test.tmp");
+        let opts = WriterOpts {
+            compress_lvl: 1,
+            data_buf_size: 10 * 1024 * 1024,
+            out_buf_size: 10 * 1024 * 1024,
+            current_buf_size: 4096,
+        };
+        let mut writer: Writer<TestData> = Writer::new(&tmpfile, opts).expect("new writer");
+
+        let items_iter = gen_data(10);
+        let items: Vec<TestData> = items_iter.collect();
+
+        writer.load(&mut items.clone().into_iter()).expect("load");
+        writer.finish().expect("finish write");
+
+        let reader: Reader<TestData> = Reader::new(&tmpfile, 2048).expect("new reader");
+        assert_eq!(items.len(), reader.len());
+
+        let reader = Arc::new(reader);
+        for _ in 0..=3 {
+            let cur_items = items.clone();
+            let cur_reader = Arc::clone(&reader);
+            thread::spawn(move || {
+                cur_items
+                    .into_iter()
+                    .zip(cur_reader.iter())
+                    .for_each(|pair| {
+                        assert_eq!(pair.0, pair.1);
+                    });
+            });
+        }
+    }
 }

lib/src/lib.rs

@@ -0,0 +1,3 @@
+pub mod db;
+pub mod questions;
+pub mod source;

lib/src/questions.rs

@@ -1,4 +1,3 @@
-use ledb::Document;
 use serde_derive::{Deserialize, Serialize};
 
 use crate::source::{SourceQuestion, SourceQuestionsBatch};
@@ -12,11 +11,8 @@ macro_rules! make {
     ),+ ,..$Target::default()}}
 }
 
-#[derive(
-    Debug, Default, Clone, Serialize, Deserialize, Document, bincode::Decode, bincode::Encode,
-)]
+#[derive(Debug, Default, Clone, Serialize, Deserialize, bincode::Decode, bincode::Encode)]
 pub struct BatchInfo {
-    #[document(primary)]
     #[serde(default)]
     pub filename: String,
     #[serde(default)]
@@ -45,14 +41,10 @@ pub struct BatchInfo {
     pub rating: String,
 }
 
-#[derive(
-    Debug, Default, Clone, Serialize, Deserialize, Document, bincode::Decode, bincode::Encode,
-)]
+#[derive(Debug, Default, Clone, Serialize, Deserialize, bincode::Decode, bincode::Encode)]
 pub struct Question {
-    #[document(primary)]
     #[serde(default)]
     pub num: u32,
-    #[document(index)]
     pub id: String,
 
     pub description: String,
@@ -84,7 +76,6 @@ pub struct Question {
     pub source: String,
     #[serde(default)]
     pub rating: String,
-    #[document(nested)]
     #[serde(default)]
     pub batch_info: BatchInfo,
 }