diff --git a/core/mvcc/cursor.rs b/core/mvcc/cursor.rs index ad0f0e9e7..19a0d170c 100644 --- a/core/mvcc/cursor.rs +++ b/core/mvcc/cursor.rs @@ -60,7 +60,6 @@ impl MvccLazyCursor { db: Arc>, tx_id: u64, root_page_or_table_id: i64, - pager: Arc, btree_cursor: Box, ) -> Result> { assert!( @@ -311,7 +310,7 @@ impl CursorTrait for MvccLazyCursor { // In End we can assume we have already called next and it returned false, so we can assume we have consumed the rowid. let btree_consumed = match self.get_current_pos() { CursorPosition::Loaded { - row_id, + row_id: _, in_btree: _, btree_consumed, } => btree_consumed, diff --git a/core/mvcc/database/tests.rs b/core/mvcc/database/tests.rs index 044da2b15..3eb13240e 100644 --- a/core/mvcc/database/tests.rs +++ b/core/mvcc/database/tests.rs @@ -829,7 +829,6 @@ fn test_lazy_scan_cursor_basic() { db.mvcc_store.clone(), tx_id, table_id, - db.conn.pager.load().clone(), Box::new(BTreeCursor::new(db.conn.pager.load().clone(), table_id, 1)), ) .unwrap(); @@ -872,7 +871,6 @@ fn test_lazy_scan_cursor_with_gaps() { db.mvcc_store.clone(), tx_id, table_id, - db.conn.pager.load().clone(), Box::new(BTreeCursor::new(db.conn.pager.load().clone(), table_id, 1)), ) .unwrap(); @@ -924,7 +922,6 @@ fn test_cursor_basic() { db.mvcc_store.clone(), tx_id, table_id, - db.conn.pager.load().clone(), Box::new(BTreeCursor::new(db.conn.pager.load().clone(), table_id, 1)), ) .unwrap(); @@ -979,7 +976,6 @@ fn test_cursor_with_empty_table() { db.mvcc_store.clone(), tx_id, table_id, - db.conn.pager.load().clone(), Box::new(BTreeCursor::new(db.conn.pager.load().clone(), table_id, 1)), ) .unwrap(); @@ -997,7 +993,6 @@ fn test_cursor_modification_during_scan() { db.mvcc_store.clone(), tx_id, table_id, - db.conn.pager.load().clone(), Box::new(BTreeCursor::new(db.conn.pager.load().clone(), table_id, 1)), ) .unwrap(); diff --git a/core/vdbe/execute.rs b/core/vdbe/execute.rs index 2c2abbc77..9be4a1c86 100644 --- a/core/vdbe/execute.rs +++ b/core/vdbe/execute.rs @@ -945,7 +945,6 @@ pub fn op_open_read( mv_store, tx_id, *root_page, - pager.clone(), btree_cursor, )?)) } else { @@ -7117,7 +7116,6 @@ pub fn op_open_write( mv_store, tx_id, root_page, - pager.clone(), btree_cursor, )?)) } else { @@ -8112,13 +8110,7 @@ pub fn op_open_dup( let cursor: Box = if let Some(tx_id) = program.connection.get_mv_tx_id() { let mv_store = mv_store.unwrap().clone(); - Box::new(MvCursor::new( - mv_store, - tx_id, - root_page, - pager.clone(), - cursor, - )?) + Box::new(MvCursor::new(mv_store, tx_id, root_page, cursor)?) } else { cursor };