Get sum fully working

Author: JakeRoggenbuck

python/lstore/query.py

@@ -45,9 +45,7 @@ def insert(self, *columns):
     # Assume that select will never be called on a key that doesn't exist
     """
 
-    def select(
-        self, search_key: Any, search_key_index: int, projected_columns_index: List[int]
-    ):
+    def select(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)
 
     """
@@ -88,8 +86,8 @@ def update(self, primary_key: int, *columns):
     # Returns False if no record exists in the given range
     """
 
-    def sum(self, start_range, end_range, aggregate_column_index) -> int:
-        return self.table.sum(start_range, end_range, aggregate_column_index)
+    def sum(self, start_range: int, end_range: int, aggregate_column_index: int) -> int:
+        return self.rquery.sum(start_range, end_range, aggregate_column_index)
 
     """
     :param start_range: int         # Start of the key range to aggregate
@@ -101,9 +99,7 @@ def sum(self, start_range, end_range, aggregate_column_index) -> int:
     # Returns False if no record exists in the given range
     """
 
-    def sum_version(
-        self, start_range, end_range, aggregate_column_index, relative_version
-    ):
+    def sum_version(self, start_range, end_range, aggregate_column_index, relative_version):
         pass
 
     """

src/database.rs

@@ -110,7 +110,7 @@ impl RTable {
         self.page_directory.remove(&rid);
     }
 
-    pub fn sum(&self, start: u64, end: u64, col_index: u64) -> i64 {
+    pub fn sum(&mut self, start: u64, end: u64, col_index: u64) -> i64 {
         let mut agg = 0i64;
         for rid in start..end {
             if let Some(v) = self.read(rid) {

src/query.rs

@@ -34,7 +34,7 @@ impl RQuery {
 
     fn update(&mut self) {}
 
-    fn sum(&self, start: u64, end: u64, col_index: u64) -> i64 {
+    fn sum(&mut self, start: u64, end: u64, col_index: u64) -> i64 {
         self.table.sum(start, end, col_index)
     }