Merge pull request #50 from JakeRoggenbuck/fix-out-of-bounds

Fix out of bounds

Author: JakeRoggenbuck

python/lstore/query.py

@@ -1,6 +1,6 @@
 from lstore.table import Table, Record
 from lstore.index import Index
-from typing import Any
+from typing import Any, List
 from .lstore import hello_from_rust, RDatabase, RQuery
 
 
@@ -46,7 +46,7 @@ def insert(self, *columns):
     """
 
     def select(
-        self, search_key: Any, search_key_index: int, projected_columns_index: int
+        self, search_key: Any, search_key_index: int, projected_columns_index: List[int]
     ):
         return self.rquery.select(search_key, search_key_index, projected_columns_index)
 

simple_tester.py

@@ -12,5 +12,5 @@
     recs.append(rec)
 
 for rec in recs:
-    vals = query.select(rec.rid, 0, 0)
+    vals = query.select(rec.rid, 0, [0])
     print(vals)

src/container.rs

@@ -340,6 +340,20 @@ impl TailContainer {
             addresses: addresses.clone(),
         }
     }
+
+    pub fn read_record(&self, record: Record) -> Vec<u64> {
+        let mut values = Vec::<u64>::new();
+
+        let addrs = record.addresses.lock().unwrap();
+        let addrs_clone = addrs.clone();
+        for addr in addrs_clone {
+            let a = addr.page.lock().unwrap();
+            let b = a.read(addr.offset as usize);
+            values.push(b.expect("Value should be there"));
+        }
+
+        values
+    }
 }
 
 #[cfg(test)]
@@ -373,6 +387,17 @@ mod tests {
         assert_eq!(addresses.len(), 5); // 3 reserved + 2 data columns
     }
 
+    #[test]
+    fn test_base_container_insert_513() {
+        let mut container = BaseContainer::new(2);
+        container.initialize();
+
+        for x in 0..513 {
+            let values = vec![42, 43];
+            let _record = container.insert_record(1, values);
+        }
+    }
+
     #[test]
     #[should_panic(expected = "Number of values does not match number of columns")]
     fn test_base_container_insert_wrong_columns() {

src/page.rs

@@ -30,8 +30,10 @@ impl PhysicalPage {
     }
 
     pub fn write(&mut self, value: u64) {
-        self.data[self.num_records as usize] = value;
-        self.num_records += 1;
+        if self.has_capacity() {
+            self.data[self.num_records as usize] = value;
+            self.num_records += 1;
+        }
     }
 
     pub fn read(&self, index: usize) -> Option<u64> {

src/query.rs

@@ -26,8 +26,7 @@ impl RQuery {
         &mut self,
         search_key: i64,
         _search_key_index: i64,
-        // TODO: I think this should be a vec, but I'm not sure
-        projected_columns_index: i64,
+        _projected_columns_index: Vec<i64>,
     ) -> Vec<u64> {
         self.table.read(search_key as u64).unwrap()
     }