Skip to content

Commit b66b381

Browse files
committed
chore: publish fnck_sql_serde_marco
1 parent 7498b21 commit b66b381

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+57
-55
lines changed

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ regex = { version = "1" }
5959
rocksdb = { version = "0.22.0" }
6060
rust_decimal = { version = "1" }
6161
serde = { version = "1", features = ["derive", "rc"] }
62-
serde_macros = { path = "serde_macros" }
62+
fnck_sql_serde_macros = { version = "0.1.0", path = "fnck_sql_serde_macros" }
6363
siphasher = { version = "1", features = ["serde"] }
6464
sqlparser = { version = "0.34", features = ["serde"] }
6565
strum_macros = { version = "0.26.2" }
@@ -85,7 +85,7 @@ pprof = { version = "0.13", features = ["flamegraph", "criterion"] }
8585
members = [
8686
"tests/sqllogictest",
8787
"tests/macros-test"
88-
, "serde_macros"]
88+
, "fnck_sql_serde_macros"]
8989

9090
[profile.release]
9191
lto = true

fnck_sql_serde_macros/Cargo.toml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[package]
2+
name = "fnck_sql_serde_macros"
3+
version = "0.1.0"
4+
edition = "2021"
5+
description = "SerdeMacros for FnckSQL"
6+
license = "Apache-2.0"
7+
8+
[dependencies]
9+
darling = "0.20"
10+
proc-macro2 = "1"
11+
quote = "1"
12+
syn = "2"
13+
14+
[lib]
15+
path = "src/lib.rs"
16+
proc-macro = true
File renamed without changes.

serde_macros/Cargo.toml

-14
This file was deleted.

src/binder/copy.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::planner::operator::copy_from_file::CopyFromFileOperator;
88
use crate::planner::operator::copy_to_file::CopyToFileOperator;
99
use crate::planner::operator::Operator;
1010
use serde::{Deserialize, Serialize};
11-
use serde_macros::ReferenceSerialization;
11+
use fnck_sql_serde_macros::ReferenceSerialization;
1212
use sqlparser::ast::{CopyOption, CopySource, CopyTarget};
1313

1414
#[derive(Debug, PartialEq, PartialOrd, Ord, Hash, Eq, Clone, ReferenceSerialization)]

src/catalog/column.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::expression::ScalarExpression;
44
use crate::types::tuple::EMPTY_TUPLE;
55
use crate::types::value::ValueRef;
66
use crate::types::{ColumnId, LogicalType};
7-
use serde_macros::ReferenceSerialization;
7+
use fnck_sql_serde_macros::ReferenceSerialization;
88
use sqlparser::ast::CharLengthUnits;
99
use std::hash::Hash;
1010
use std::ops::Deref;

src/catalog/table.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::types::index::{IndexMeta, IndexMetaRef, IndexType};
44
use crate::types::tuple::SchemaRef;
55
use crate::types::{ColumnId, LogicalType};
66
use itertools::Itertools;
7-
use serde_macros::ReferenceSerialization;
7+
use fnck_sql_serde_macros::ReferenceSerialization;
88
use std::collections::BTreeMap;
99
use std::sync::Arc;
1010
use std::{slice, vec};

src/catalog/view.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::catalog::TableName;
22
use crate::planner::LogicalPlan;
3-
use serde_macros::ReferenceSerialization;
3+
use fnck_sql_serde_macros::ReferenceSerialization;
44
use std::fmt;
55
use std::fmt::Formatter;
66

src/expression/agg.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use serde_macros::ReferenceSerialization;
1+
use fnck_sql_serde_macros::ReferenceSerialization;
22

33
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, ReferenceSerialization)]
44
pub enum AggKind {

src/expression/function/scala.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::types::tuple::Tuple;
66
use crate::types::value::DataValue;
77
use crate::types::LogicalType;
88
use serde::{Deserialize, Serialize};
9-
use serde_macros::ReferenceSerialization;
9+
use fnck_sql_serde_macros::ReferenceSerialization;
1010
use std::fmt::Debug;
1111
use std::hash::{Hash, Hasher};
1212
use std::ops::Deref;

src/expression/function/table.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::expression::function::FunctionSummary;
44
use crate::expression::ScalarExpression;
55
use crate::types::tuple::{SchemaRef, Tuple};
66
use serde::{Deserialize, Serialize};
7-
use serde_macros::ReferenceSerialization;
7+
use fnck_sql_serde_macros::ReferenceSerialization;
88
use std::fmt::Debug;
99
use std::hash::{Hash, Hasher};
1010
use std::ops::Deref;

src/expression/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::types::evaluator::{BinaryEvaluatorBox, EvaluatorFactory, UnaryEvaluat
77
use crate::types::value::ValueRef;
88
use crate::types::LogicalType;
99
use itertools::Itertools;
10-
use serde_macros::ReferenceSerialization;
10+
use fnck_sql_serde_macros::ReferenceSerialization;
1111
use sqlparser::ast::TrimWhereField;
1212
use sqlparser::ast::{
1313
BinaryOperator as SqlBinaryOperator, CharLengthUnits, UnaryOperator as SqlUnaryOperator,

src/expression/range_detacher.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::expression::{BinaryOperator, ScalarExpression};
33
use crate::types::value::{DataValue, ValueRef, NULL_VALUE};
44
use crate::types::ColumnId;
55
use itertools::Itertools;
6-
use serde_macros::ReferenceSerialization;
6+
use fnck_sql_serde_macros::ReferenceSerialization;
77
use std::cmp::Ordering;
88
use std::collections::Bound;
99
use std::fmt::Formatter;

src/optimizer/core/histogram.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::types::index::{IndexId, IndexMeta};
88
use crate::types::value::{DataValue, ValueRef};
99
use crate::types::LogicalType;
1010
use ordered_float::OrderedFloat;
11-
use serde_macros::ReferenceSerialization;
11+
use fnck_sql_serde_macros::ReferenceSerialization;
1212
use std::collections::Bound;
1313
use std::sync::Arc;
1414
use std::{cmp, mem};

src/optimizer/core/statistics_meta.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::serdes::{ReferenceSerialization, ReferenceTables};
77
use crate::storage::{StatisticsMetaCache, Transaction};
88
use crate::types::index::IndexId;
99
use crate::types::value::DataValue;
10-
use serde_macros::ReferenceSerialization;
10+
use fnck_sql_serde_macros::ReferenceSerialization;
1111
use std::fs::OpenOptions;
1212
use std::io::Write;
1313
use std::path::Path;

src/planner/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::planner::operator::values::ValuesOperator;
77
use crate::planner::operator::{Operator, PhysicalOption};
88
use crate::types::tuple::{Schema, SchemaRef};
99
use itertools::Itertools;
10-
use serde_macros::ReferenceSerialization;
10+
use fnck_sql_serde_macros::ReferenceSerialization;
1111
use std::sync::Arc;
1212

1313
#[derive(Debug, Clone)]

src/planner/operator/aggregate.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::planner::LogicalPlan;
22
use crate::{expression::ScalarExpression, planner::operator::Operator};
33
use itertools::Itertools;
4-
use serde_macros::ReferenceSerialization;
4+
use fnck_sql_serde_macros::ReferenceSerialization;
55
use std::fmt;
66
use std::fmt::Formatter;
77

src/planner/operator/alter_table/add_column.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::catalog::{ColumnCatalog, TableName};
2-
use serde_macros::ReferenceSerialization;
2+
use fnck_sql_serde_macros::ReferenceSerialization;
33
use std::fmt;
44
use std::fmt::Formatter;
55

src/planner/operator/alter_table/drop_column.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::catalog::TableName;
2-
use serde_macros::ReferenceSerialization;
2+
use fnck_sql_serde_macros::ReferenceSerialization;
33
use std::fmt;
44
use std::fmt::Formatter;
55

src/planner/operator/analyze.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::catalog::TableName;
22
use crate::types::index::IndexMetaRef;
3-
use serde_macros::ReferenceSerialization;
3+
use fnck_sql_serde_macros::ReferenceSerialization;
44

55
#[derive(Debug, PartialEq, Eq, Clone, Hash, ReferenceSerialization)]
66
pub struct AnalyzeOperator {

src/planner/operator/copy_from_file.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::binder::copy::ExtSource;
22
use crate::types::tuple::SchemaRef;
33
use itertools::Itertools;
4-
use serde_macros::ReferenceSerialization;
4+
use fnck_sql_serde_macros::ReferenceSerialization;
55
use std::fmt;
66
use std::fmt::Formatter;
77

src/planner/operator/copy_to_file.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::binder::copy::ExtSource;
2-
use serde_macros::ReferenceSerialization;
2+
use fnck_sql_serde_macros::ReferenceSerialization;
33

44
#[derive(Debug, PartialEq, Eq, Clone, Hash, ReferenceSerialization)]
55
pub struct CopyToFileOperator {

src/planner/operator/create_index.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::catalog::{ColumnRef, TableName};
22
use crate::types::index::IndexType;
33
use itertools::Itertools;
4-
use serde_macros::ReferenceSerialization;
4+
use fnck_sql_serde_macros::ReferenceSerialization;
55
use std::fmt;
66
use std::fmt::Formatter;
77

src/planner/operator/create_table.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::catalog::{ColumnCatalog, TableName};
22
use itertools::Itertools;
3-
use serde_macros::ReferenceSerialization;
3+
use fnck_sql_serde_macros::ReferenceSerialization;
44
use std::fmt;
55
use std::fmt::Formatter;
66

src/planner/operator/create_view.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::catalog::view::View;
2-
use serde_macros::ReferenceSerialization;
2+
use fnck_sql_serde_macros::ReferenceSerialization;
33
use std::fmt;
44
use std::fmt::Formatter;
55

src/planner/operator/delete.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::catalog::{ColumnRef, TableName};
2-
use serde_macros::ReferenceSerialization;
2+
use fnck_sql_serde_macros::ReferenceSerialization;
33
use std::fmt;
44
use std::fmt::Formatter;
55

src/planner/operator/describe.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::catalog::TableName;
2-
use serde_macros::ReferenceSerialization;
2+
use fnck_sql_serde_macros::ReferenceSerialization;
33
use std::fmt;
44
use std::fmt::Formatter;
55

src/planner/operator/drop_table.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::catalog::TableName;
2-
use serde_macros::ReferenceSerialization;
2+
use fnck_sql_serde_macros::ReferenceSerialization;
33
use std::fmt;
44
use std::fmt::Formatter;
55

src/planner/operator/filter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::expression::ScalarExpression;
22
use crate::planner::LogicalPlan;
3-
use serde_macros::ReferenceSerialization;
3+
use fnck_sql_serde_macros::ReferenceSerialization;
44
use std::fmt::Formatter;
55
use std::{fmt, vec};
66

src/planner/operator/function_scan.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::expression::function::table::TableFunction;
22
use crate::planner::operator::Operator;
33
use crate::planner::LogicalPlan;
4-
use serde_macros::ReferenceSerialization;
4+
use fnck_sql_serde_macros::ReferenceSerialization;
55
use std::fmt;
66
use std::fmt::Formatter;
77

src/planner/operator/insert.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::catalog::TableName;
2-
use serde_macros::ReferenceSerialization;
2+
use fnck_sql_serde_macros::ReferenceSerialization;
33
use std::fmt;
44
use std::fmt::Formatter;
55

src/planner/operator/join.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use super::Operator;
22
use crate::expression::ScalarExpression;
33
use crate::planner::LogicalPlan;
44
use itertools::Itertools;
5-
use serde_macros::ReferenceSerialization;
5+
use fnck_sql_serde_macros::ReferenceSerialization;
66
use std::fmt;
77
use std::fmt::Formatter;
88
use strum_macros::Display;

src/planner/operator/limit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::Operator;
22
use crate::planner::LogicalPlan;
3-
use serde_macros::ReferenceSerialization;
3+
use fnck_sql_serde_macros::ReferenceSerialization;
44
use std::fmt;
55
use std::fmt::Formatter;
66

src/planner/operator/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ use crate::planner::operator::update::UpdateOperator;
4848
use crate::planner::operator::values::ValuesOperator;
4949
use crate::types::index::IndexInfo;
5050
use itertools::Itertools;
51-
use serde_macros::ReferenceSerialization;
51+
use fnck_sql_serde_macros::ReferenceSerialization;
5252
use std::fmt;
5353
use std::fmt::Formatter;
5454

src/planner/operator/project.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::expression::ScalarExpression;
22
use itertools::Itertools;
3-
use serde_macros::ReferenceSerialization;
3+
use fnck_sql_serde_macros::ReferenceSerialization;
44
use std::fmt;
55
use std::fmt::Formatter;
66

src/planner/operator/sort.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::expression::ScalarExpression;
22
use itertools::Itertools;
3-
use serde_macros::ReferenceSerialization;
3+
use fnck_sql_serde_macros::ReferenceSerialization;
44
use std::fmt;
55
use std::fmt::Formatter;
66

src/planner/operator/table_scan.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::storage::Bounds;
55
use crate::types::index::IndexInfo;
66
use crate::types::ColumnId;
77
use itertools::Itertools;
8-
use serde_macros::ReferenceSerialization;
8+
use fnck_sql_serde_macros::ReferenceSerialization;
99
use std::fmt;
1010
use std::fmt::Formatter;
1111

src/planner/operator/truncate.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::catalog::TableName;
2-
use serde_macros::ReferenceSerialization;
2+
use fnck_sql_serde_macros::ReferenceSerialization;
33
use std::fmt;
44
use std::fmt::Formatter;
55

src/planner/operator/union.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::planner::operator::Operator;
22
use crate::planner::LogicalPlan;
33
use crate::types::tuple::SchemaRef;
44
use itertools::Itertools;
5-
use serde_macros::ReferenceSerialization;
5+
use fnck_sql_serde_macros::ReferenceSerialization;
66
use std::fmt;
77
use std::fmt::Formatter;
88

src/planner/operator/update.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::catalog::TableName;
2-
use serde_macros::ReferenceSerialization;
2+
use fnck_sql_serde_macros::ReferenceSerialization;
33
use std::fmt;
44
use std::fmt::Formatter;
55

src/planner/operator/values.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::types::tuple::SchemaRef;
22
use crate::types::value::ValueRef;
33
use itertools::Itertools;
4-
use serde_macros::ReferenceSerialization;
4+
use fnck_sql_serde_macros::ReferenceSerialization;
55
use std::fmt;
66
use std::fmt::Formatter;
77

src/types/index.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::expression::range_detacher::Range;
44
use crate::expression::ScalarExpression;
55
use crate::types::value::ValueRef;
66
use crate::types::{ColumnId, LogicalType};
7-
use serde_macros::ReferenceSerialization;
7+
use fnck_sql_serde_macros::ReferenceSerialization;
88
use std::fmt;
99
use std::fmt::Formatter;
1010
use std::sync::Arc;

src/types/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use std::any::TypeId;
1111
use std::cmp;
1212

1313
use crate::errors::DatabaseError;
14-
use serde_macros::ReferenceSerialization;
14+
use fnck_sql_serde_macros::ReferenceSerialization;
1515
use sqlparser::ast::{CharLengthUnits, ExactNumberInfo, TimezoneInfo};
1616
use strum_macros::AsRefStr;
1717
use ulid::Ulid;

0 commit comments

Comments
 (0)