Skip to content

Commit 32f0eda

Browse files
authored
Merge pull request #10483 from andylokandy/desc
refactor(expr): combine TypeDeserializer and ColumnBuilder
2 parents 97f4303 + 29bf7b0 commit 32f0eda

Some content is hidden

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

72 files changed

+1077
-2544
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/query/catalog/src/plan/pushdown.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ impl PushDownInfo {
9393
if let RemoteExpr::<String>::ColumnRef { id, .. } = &order.0 {
9494
// TODO: support sub column of nested type.
9595
let field = schema.field_with_name(id).unwrap();
96-
let data_type: DataType = field.data_type().into();
97-
if !support(&data_type) {
96+
if !support(&field.data_type().into()) {
9897
return None;
9998
}
10099

src/query/expression/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ comfy-table = "6"
2727
dashmap = "5.4"
2828
educe = "0.4"
2929
enum-as-inner = "0.5"
30-
enum_dispatch = "0.3.8"
3130
ethnum = { version = "1.3", features = ["serde", "macros"] }
3231
futures = "0.3.24"
3332
hex = "0.4.3"

src/query/expression/src/block.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,9 +452,8 @@ impl DataBlock {
452452
let column = if !block_column_ids.contains(&column_id) {
453453
let default_val = &default_vals[i];
454454
let table_data_type = field.data_type();
455-
let data_type: DataType = table_data_type.into();
456455
BlockEntry {
457-
data_type,
456+
data_type: table_data_type.into(),
458457
value: Value::Scalar(default_val.to_owned()),
459458
}
460459
} else {

src/query/expression/src/deserializations/array.rs

Lines changed: 0 additions & 145 deletions
This file was deleted.

src/query/expression/src/deserializations/boolean.rs

Lines changed: 0 additions & 91 deletions
This file was deleted.

0 commit comments

Comments
 (0)