Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style: decoupling kipdb::TransactionIter #198

Merged
merged 2 commits into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[package]
name = "fnck_sql"
version = "0.0.1-alpha.14"
version = "0.0.1-alpha.15"
edition = "2021"
authors = ["Kould <[email protected]>", "Xwg <[email protected]>"]
description = "SQL as a Function for Rust"
Expand Down
2 changes: 1 addition & 1 deletion src/bin/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use async_trait::async_trait;
use clap::Parser;
use fnck_sql::db::{DBTransaction, DataBaseBuilder, Database};
use fnck_sql::errors::DatabaseError;
use fnck_sql::storage::kip::KipStorage;
use fnck_sql::storage::kipdb::KipStorage;
use fnck_sql::types::tuple::{Schema, Tuple};
use fnck_sql::types::LogicalType;
use futures::stream;
Expand Down
2 changes: 1 addition & 1 deletion src/binder/create_table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ mod tests {
use super::*;
use crate::binder::BinderContext;
use crate::catalog::ColumnDesc;
use crate::storage::kip::KipStorage;
use crate::storage::kipdb::KipStorage;
use crate::storage::Storage;
use crate::types::LogicalType;
use sqlparser::ast::CharLengthUnits;
Expand Down
2 changes: 1 addition & 1 deletion src/binder/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ pub mod test {
use crate::catalog::{ColumnCatalog, ColumnDesc};
use crate::errors::DatabaseError;
use crate::planner::LogicalPlan;
use crate::storage::kip::KipStorage;
use crate::storage::kipdb::KipStorage;
use crate::storage::{Storage, Transaction};
use crate::types::LogicalType::Integer;
use std::path::PathBuf;
Expand Down
2 changes: 1 addition & 1 deletion src/db.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use crate::optimizer::rule::implementation::ImplementationRuleImpl;
use crate::optimizer::rule::normalization::NormalizationRuleImpl;
use crate::parser::parse_sql;
use crate::planner::LogicalPlan;
use crate::storage::kip::KipStorage;
use crate::storage::kipdb::KipStorage;
use crate::storage::{Storage, Transaction};
use crate::types::tuple::{SchemaRef, Tuple};
use crate::udf::current_date::CurrentDate;
Expand Down
2 changes: 1 addition & 1 deletion src/execution/volcano/dql/aggregate/hash_agg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ mod test {
use crate::planner::operator::values::ValuesOperator;
use crate::planner::operator::Operator;
use crate::planner::LogicalPlan;
use crate::storage::kip::KipStorage;
use crate::storage::kipdb::KipStorage;
use crate::storage::Storage;
use crate::types::tuple::create_table;
use crate::types::value::DataValue;
Expand Down
2 changes: 1 addition & 1 deletion src/execution/volcano/dql/join/hash_join.rs
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ mod test {
use crate::planner::operator::values::ValuesOperator;
use crate::planner::operator::Operator;
use crate::planner::LogicalPlan;
use crate::storage::kip::KipStorage;
use crate::storage::kipdb::KipStorage;
use crate::storage::Storage;
use crate::types::value::DataValue;
use crate::types::LogicalType;
Expand Down
2 changes: 1 addition & 1 deletion src/execution/volcano/dql/join/nested_loop_join.rs
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ mod test {
use crate::expression::ScalarExpression;
use crate::planner::operator::values::ValuesOperator;
use crate::planner::operator::Operator;
use crate::storage::kip::KipStorage;
use crate::storage::kipdb::KipStorage;
use crate::storage::Storage;
use crate::types::value::DataValue;
use crate::types::LogicalType;
Expand Down
2 changes: 1 addition & 1 deletion src/expression/range_detacher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ mod test {
use crate::planner::operator::filter::FilterOperator;
use crate::planner::operator::Operator;
use crate::planner::LogicalPlan;
use crate::storage::kip::KipTransaction;
use crate::storage::kipdb::KipTransaction;
use crate::types::value::DataValue;
use std::ops::Bound;
use std::sync::Arc;
Expand Down
2 changes: 1 addition & 1 deletion src/optimizer/core/memo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ mod tests {
use crate::optimizer::rule::implementation::ImplementationRuleImpl;
use crate::optimizer::rule::normalization::NormalizationRuleImpl;
use crate::planner::operator::PhysicalOption;
use crate::storage::kip::KipTransaction;
use crate::storage::kipdb::KipTransaction;
use crate::storage::{Storage, Transaction};
use crate::types::index::{IndexInfo, IndexMeta, IndexType};
use crate::types::value::DataValue;
Expand Down
3 changes: 1 addition & 2 deletions src/optimizer/core/statistics_meta.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ use crate::errors::DatabaseError;
use crate::expression::range_detacher::Range;
use crate::optimizer::core::cm_sketch::CountMinSketch;
use crate::optimizer::core::histogram::Histogram;
use crate::storage::kip::StatisticsMetaCache;
use crate::storage::Transaction;
use crate::storage::{StatisticsMetaCache, Transaction};
use crate::types::index::IndexId;
use crate::types::value::DataValue;
use serde::{Deserialize, Serialize};
Expand Down
2 changes: 1 addition & 1 deletion src/optimizer/rule/normalization/column_pruning.rs
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ mod tests {
use crate::optimizer::rule::normalization::NormalizationRuleImpl;
use crate::planner::operator::join::JoinCondition;
use crate::planner::operator::Operator;
use crate::storage::kip::KipTransaction;
use crate::storage::kipdb::KipTransaction;

#[tokio::test]
async fn test_column_pruning() -> Result<(), DatabaseError> {
Expand Down
2 changes: 1 addition & 1 deletion src/optimizer/rule/normalization/combine_operators.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ mod tests {
use crate::optimizer::heuristic::optimizer::HepOptimizer;
use crate::optimizer::rule::normalization::NormalizationRuleImpl;
use crate::planner::operator::Operator;
use crate::storage::kip::KipTransaction;
use crate::storage::kipdb::KipTransaction;
use crate::types::value::DataValue;
use crate::types::LogicalType;
use std::sync::Arc;
Expand Down
2 changes: 1 addition & 1 deletion src/optimizer/rule/normalization/pushdown_limit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ mod tests {
use crate::optimizer::rule::normalization::NormalizationRuleImpl;
use crate::planner::operator::limit::LimitOperator;
use crate::planner::operator::Operator;
use crate::storage::kip::KipTransaction;
use crate::storage::kipdb::KipTransaction;

#[tokio::test]
async fn test_limit_project_transpose() -> Result<(), DatabaseError> {
Expand Down
2 changes: 1 addition & 1 deletion src/optimizer/rule/normalization/pushdown_predicates.rs
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ mod tests {
use crate::optimizer::heuristic::optimizer::HepOptimizer;
use crate::optimizer::rule::normalization::NormalizationRuleImpl;
use crate::planner::operator::Operator;
use crate::storage::kip::KipTransaction;
use crate::storage::kipdb::KipTransaction;
use crate::types::value::DataValue;
use crate::types::LogicalType;
use std::collections::Bound;
Expand Down
2 changes: 1 addition & 1 deletion src/optimizer/rule/normalization/simplification.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ mod test {
use crate::optimizer::rule::normalization::NormalizationRuleImpl;
use crate::planner::operator::Operator;
use crate::planner::LogicalPlan;
use crate::storage::kip::KipTransaction;
use crate::storage::kipdb::KipTransaction;
use crate::types::value::DataValue;
use crate::types::{ColumnId, LogicalType};
use std::collections::Bound;
Expand Down
Loading
Loading