From 75992a84d8093e4f8df9953a57266c7708c8e1b7 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Fri, 27 Dec 2024 10:30:15 +0200 Subject: [PATCH 1/5] cli: Fix unused result warnings --- cli/app.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/app.rs b/cli/app.rs index 0593066c5..7e6155543 100644 --- a/cli/app.rs +++ b/cli/app.rs @@ -526,7 +526,7 @@ impl Limbo { break; } Ok(StepResult::Busy) => { - self.writeln("database is busy"); + let _ = self.writeln("database is busy"); break; } Err(err) => { @@ -565,7 +565,7 @@ impl Limbo { Ok(StepResult::Interrupt) => break, Ok(StepResult::Done) => break, Ok(StepResult::Busy) => { - self.writeln("database is busy"); + let _ = self.writeln("database is busy"); break; } Err(err) => { @@ -619,7 +619,7 @@ impl Limbo { StepResult::Interrupt => break, StepResult::Done => break, StepResult::Busy => { - self.writeln("database is busy"); + let _ = self.writeln("database is busy"); break; } } @@ -676,7 +676,7 @@ impl Limbo { StepResult::Interrupt => break, StepResult::Done => break, StepResult::Busy => { - self.writeln("database is busy"); + let _ = self.writeln("database is busy"); break; } } From 244326ee572183d383b7bf4c4607b74afbd3bed1 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Fri, 27 Dec 2024 10:33:47 +0200 Subject: [PATCH 2/5] core: Remove unused imports --- core/storage/wal.rs | 3 +-- core/translate/planner.rs | 7 ++----- core/vdbe/explain.rs | 1 - 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/core/storage/wal.rs b/core/storage/wal.rs index 3cdad9263..8648efe1c 100644 --- a/core/storage/wal.rs +++ b/core/storage/wal.rs @@ -1,4 +1,4 @@ -use std::collections::{HashMap, HashSet}; +use std::collections::HashMap; use std::sync::atomic::{AtomicU32, Ordering}; use std::sync::RwLock; use std::{cell::RefCell, rc::Rc, sync::Arc}; @@ -16,7 +16,6 @@ use crate::{Completion, Page}; use self::sqlite3_ondisk::{checksum_wal, PageContent, WAL_MAGIC_BE, WAL_MAGIC_LE}; use super::buffer_pool::BufferPool; -use super::page_cache::PageCacheKey; use super::pager::{PageRef, Pager}; use super::sqlite3_ondisk::{self, begin_write_btree_page, WalHeader}; diff --git a/core/translate/planner.rs b/core/translate/planner.rs index 0bdc447f3..75e37d1a5 100644 --- a/core/translate/planner.rs +++ b/core/translate/planner.rs @@ -1,8 +1,5 @@ -use super::{ - optimizer::Optimizable, - plan::{ - Aggregate, BTreeTableReference, Direction, GroupBy, Plan, ResultSetColumn, SourceOperator, - }, +use super::plan::{ + Aggregate, BTreeTableReference, Direction, GroupBy, Plan, ResultSetColumn, SourceOperator, }; use crate::{ function::Func, diff --git a/core/vdbe/explain.rs b/core/vdbe/explain.rs index ce03a53fd..cdcbe70bb 100644 --- a/core/vdbe/explain.rs +++ b/core/vdbe/explain.rs @@ -1,5 +1,4 @@ use super::{Insn, InsnReference, OwnedValue, Program}; -use crate::types::LimboText; use std::rc::Rc; pub fn insn_to_str( From 464508bb298640198c130e607291934ceb55e186 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Fri, 27 Dec 2024 10:35:25 +0200 Subject: [PATCH 3/5] core/vdbe: Kill unused next_free_register() --- core/vdbe/builder.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/vdbe/builder.rs b/core/vdbe/builder.rs index 8dd1cd4de..3a687b441 100644 --- a/core/vdbe/builder.rs +++ b/core/vdbe/builder.rs @@ -59,10 +59,6 @@ impl ProgramBuilder { reg } - pub fn next_free_register(&self) -> usize { - self.next_free_register - } - pub fn alloc_cursor_id( &mut self, table_identifier: Option, From 9680471876c027fc8b220505faa39f0e5fc1d256 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Fri, 27 Dec 2024 10:36:20 +0200 Subject: [PATCH 4/5] core: Remove unreachable pragma patterns --- core/translate/mod.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/translate/mod.rs b/core/translate/mod.rs index db69f1578..0a459e3fb 100644 --- a/core/translate/mod.rs +++ b/core/translate/mod.rs @@ -369,7 +369,6 @@ fn update_pragma( query_pragma("journal_mode", header, program)?; Ok(()) } - _ => todo!("pragma `{name}`"), } } @@ -396,9 +395,6 @@ fn query_pragma( dest: register, }); } - _ => { - todo!("pragma `{name}`"); - } } program.emit_insn(Insn::ResultRow { From b2f96ddfbd66fdbc9861477813a9d0c490e8863e Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Fri, 27 Dec 2024 10:39:24 +0200 Subject: [PATCH 5/5] core/translate: Remove unnecessary mut --- core/translate/planner.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/translate/planner.rs b/core/translate/planner.rs index 75e37d1a5..7eb269b9a 100644 --- a/core/translate/planner.rs +++ b/core/translate/planner.rs @@ -264,7 +264,7 @@ pub fn prepare_select_plan<'a>(schema: &Schema, select: ast::Select) -> Result

{ let col_count = columns.len();