Add db_get_progress and db_init functions.

nyash_server/src/database.rs

@@ -1,10 +1,10 @@
-use crate::num_utils;
+
-use rand::{self, Rng, distr::weighted::Weight};
+use rand::{self, Rng};
 use redb::{
-    Database, Key, MultimapTableDefinition, ReadableDatabase, ReadableMultimapTable, ReadableTable, ReadableTableMetadata, TableDefinition
+    Database, ReadableDatabase, ReadableTable, ReadableTableMetadata, TableDefinition
 };
 // use std::collections::HashMap;
-use std::{ops::Not, u64, u128};
+use std::{ops::Not,path::Path, u64, u128};
 
 //tables defenition
 const DB_FILE: &str = "./data";
@@ -344,7 +344,7 @@ impl<'a> RangesTable<'a> {
 
 }
 
-fn db_create_job(db: Database, pref_job_size: u64) -> Result<Option<JobRecord>, redb::Error> {
+fn db_create_job(db: &Database, pref_job_size: u64) -> Result<Option<JobRecord>, redb::Error> {
     let transct = db.begin_write()?;
 
     // 1. look for abandonent jobs
@@ -410,7 +410,7 @@ fn db_create_job(db: Database, pref_job_size: u64) -> Result<Option<JobRecord>,
 
 
 // returns false if no such job found in DB
-fn db_commit_job(db: Database, job_id: u64) -> Result<bool, redb::Error> {
+fn db_commit_job(db: &Database, job_id: u64) -> Result<bool, redb::Error> {
     let transct: redb::WriteTransaction = db.begin_write()?;
 
     let job_found = {
@@ -444,7 +444,7 @@ fn db_commit_job(db: Database, job_id: u64) -> Result<bool, redb::Error> {
 }
 
 
-fn db_get_progress(db: Database) -> Result<f64, redb::Error> {
+fn db_get_progress(db: &Database) -> Result<f64, redb::Error> {
     let trx: redb::ReadTransaction = db.begin_read()?;
     let progress = {
         let ranges_t = trx.open_table(RANGES)?;
@@ -461,3 +461,36 @@ fn db_get_progress(db: Database) -> Result<f64, redb::Error> {
     return Ok(progress);
 }
 
+
+fn db_init(db: &Database) -> Result<(), redb::Error> {
+    let transct: redb::WriteTransaction = db.begin_write()?;
+    {
+        let ranges = transct.open_table(RANGES)?;
+        let ranges_to_use = transct.open_table(RANGES_TO_USE)?;
+
+        // create new ranges
+        for r_id in 0..=u16::MAX {
+            let r = RangeRecord::new(id);
+            ranges.insert(r_id, r.value())?;
+            ranges_to_use.insert(r_id, ())?;
+        }
+    }
+    transct.commit()?;
+    Ok(())
+}
+
+fn db_open(db_file_path: &Path) -> Result<Database, redb::Error> {
+    let db = Database::create(db_file_path)?;
+    let trx = db.begin_read()?;
+    let ranges_len = {
+        let ranges_table = trx.open_table(RANGES)?;
+        ranges_table.len()?
+    };
+    trx.close()?;
+    if ranges_len == 0 {
+        db_init(&db)?;
+    }
+
+    Ok(db)
+}
+

nyash_server/src/main.rs

@@ -3,10 +3,9 @@ mod num_utils;
 mod database;
 
 
+fn read_config() -> (){
     
-
+}
-
-
 
 fn main() {
     println!("Hello, world!");
@@ -23,6 +22,9 @@ fn main() {
     let e = a1.min(u32::MAX);
     println!("e = {}",e);
 
+    for i in 0..=u16::MAX {
+        println!("{}", i);
+    }
 
 }