From 9f6a734797586262f4013f1b08dd9a461234b873 Mon Sep 17 00:00:00 2001 From: Ziyang Hu Date: Thu, 5 May 2022 20:17:18 +0800 Subject: [PATCH] cleanup --- cozorocks/bridge/cozorocks.h | 2 +- src/db/env.rs | 1 - src/db/eval.rs | 3 +-- src/db/plan.rs | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/cozorocks/bridge/cozorocks.h b/cozorocks/bridge/cozorocks.h index 9499c45d..7b41989d 100644 --- a/cozorocks/bridge/cozorocks.h +++ b/cozorocks/bridge/cozorocks.h @@ -391,7 +391,7 @@ struct TransactionBridge { options.change_level = true; options.target_level = 0; options.exclusive_manual_compaction = false; - write_status(raw_db->CompactRange(options, nullptr, nullptr), status); + write_status(raw_db->CompactRange(options, const_cast(&cf), nullptr, nullptr), status); } inline std::unique_ptr iterator_txn( diff --git a/src/db/env.rs b/src/db/env.rs index af2adafa..278b73b0 100644 --- a/src/db/env.rs +++ b/src/db/env.rs @@ -1,4 +1,3 @@ -use std::collections::BTreeMap; use cozorocks::SlicePtr; use crate::db::engine::Session; use crate::relation::value::Value; diff --git a/src/db/eval.rs b/src/db/eval.rs index 3d8b07bd..588175c3 100644 --- a/src/db/eval.rs +++ b/src/db/eval.rs @@ -3,11 +3,10 @@ use std::collections::{BTreeMap}; use cozorocks::SlicePtr; use crate::db::engine::{Session}; use crate::db::plan::AccessorMap; -use crate::db::table::{ColId, TableId}; use crate::relation::value::{Value}; use crate::error::{CozoError, Result}; use crate::error::CozoError::LogicError; -use crate::relation::tuple::{OwnTuple, Tuple}; +use crate::relation::tuple::{Tuple}; use crate::relation::value; diff --git a/src/db/plan.rs b/src/db/plan.rs index d1fd74e8..aa8327a1 100644 --- a/src/db/plan.rs +++ b/src/db/plan.rs @@ -99,7 +99,7 @@ impl<'a> Session<'a> { }; Ok(res) } - fn base_relation_to_accessor_map(&self, table: &str, binding: &str, info: &TableInfo) -> AccessorMap { + fn base_relation_to_accessor_map(&self, _table: &str, binding: &str, info: &TableInfo) -> AccessorMap { let mut ret = BTreeMap::new(); for (i, (k, _)) in info.key_typing.iter().enumerate() { ret.insert(k.into(), (info.table_id, (true, i).into())); @@ -179,7 +179,7 @@ mod tests { let s = r#"from p:Person select p {id, name}"#; let parsed = Parser::parse(Rule::relational_query, s).unwrap().next().unwrap(); - let plan = sess.query_to_plan(parsed).unwrap(); + let _plan = sess.query_to_plan(parsed).unwrap(); } drop(engine); let _ = fs::remove_dir_all(db_path);