Skip to content

chore: ndv upper cutoff #19133

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.

Sign up for GitHub

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

Merged
zhang2014 merged 8 commits into from
Dec 25, 2025
Merged

chore: ndv upper cutoff #19133

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2fa7afe
ndv max
forsaken628 Dec 19, 2025
83e85da
x
forsaken628 Dec 19, 2025
f795243
update test
forsaken628 Dec 21, 2025
bbfabf9
update test
forsaken628 Dec 21, 2025
30825a7
fix
forsaken628 Dec 22, 2025
46078ba
fix
forsaken628 Dec 22, 2025
c335098
Merge branch 'main' into ndv
zhang2014 Dec 24, 2025
4340e0e
Merge branch 'main' into ndv
zhang2014 Dec 25, 2025
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
72 changes: 0 additions & 72 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,80 +11,8 @@ members = [
"src/bendpy",
"src/bendsave",
"src/binaries",
"src/common/auth",
"src/common/base",
"src/common/building",
"src/common/cache",
"src/common/cloud_control",
"src/common/column",
"src/common/compress",
"src/common/exception",
"src/common/frozen_api",
"src/common/grpc",
"src/common/hashtable",
"src/common/http",
"src/common/io",
"src/common/license",
"src/common/metrics",
"src/common/native",
"src/common/storage",
"src/common/telemetry",
"src/common/timezone",
"src/common/tracing",
"src/common/vector",
"src/common/version",
"src/meta/*",
"src/query/ast",
"src/query/catalog",
"src/query/codegen",
"src/query/config",
"src/query/datavalues",
"src/query/ee_features/attach_table",
"src/query/ee_features/data_mask",
"src/query/ee_features/resources_management",
"src/query/ee_features/storage_encryption",
"src/query/ee_features/stream_handler",
"src/query/ee_features/vacuum_handler",
"src/query/ee_features/virtual_column",
"src/query/ee",
"src/query/expression",
"src/query/formats",
"src/query/functions",
"src/query/functions",
"src/query/functions/src/scalars/arithmetic",
"src/query/functions/src/scalars/geographic",
"src/query/functions/src/scalars/integer_arithmetic",
"src/query/functions/src/scalars/mathematics",
"src/query/functions/src/scalars/numeric_basic_arithmetic",
"src/query/functions/src/scalars/timestamp",
"src/query/management",
"src/query/pipeline",
"src/query/pipeline/transforms",
"src/query/script",
"src/query/service",
"src/query/settings",
"src/query/sql",
"src/query/storages/basic",
"src/query/storages/common/blocks",
"src/query/storages/common/cache",
"src/query/storages/common/index",
"src/query/storages/common/io",
"src/query/storages/common/pruner",
"src/query/storages/common/session",
"src/query/storages/common/stage",
"src/query/storages/common/table_meta",
"src/query/storages/delta",
"src/query/storages/factory",
"src/query/storages/fuse",
"src/query/storages/hive/hive",
"src/query/storages/iceberg",
"src/query/storages/information_schema",
"src/query/storages/orc",
"src/query/storages/parquet",
"src/query/storages/stage",
"src/query/storages/stream",
"src/query/storages/system",
"src/query/users",
"src/tests/sqlsmith",
"tests/sqllogictests",
]
Expand Down
1 change: 1 addition & 0 deletions src/query/ast/src/parser/script.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ pub fn script_stmts(i: Input) -> IResult<Vec<ScriptStatement>> {
semicolon_terminated_list1(script_stmt).parse(i)
}

#[recursive::recursive]
pub fn script_stmt(i: Input) -> IResult<ScriptStatement> {
if let Some(token) = i.tokens.first() {
let kind = token.kind;
Expand Down
22 changes: 11 additions & 11 deletions ...tests/it/sql/planner/optimizer/data/results/basic/01_cross_join_aggregation_optimized.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ Aggregate(Final)
├── build keys: []
├── probe keys: []
├── other filters: []
├── Scan
│ ├── table: default.integers (#0)
│ ├── filters: []
│ ├── order by: []
│ └── limit: NONE
└── Exchange(Broadcast)
└── Scan
├── table: default.integers (#1)
├── filters: []
├── order by: []
└── limit: NONE
├── Exchange(Broadcast)
│ └── Scan
│ ├── table: default.integers (#1)
│ ├── filters: []
│ ├── order by: []
│ └── limit: NONE
└── Scan
├── table: default.integers (#0)
├── filters: []
├── order by: []
└── limit: NONE

4 changes: 2 additions & 2 deletions ...rvice/tests/it/sql/planner/optimizer/data/results/basic/01_cross_join_aggregation_raw.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ EvalScalar
├── probe keys: []
├── other filters: []
├── Scan
│ ├── table: default.integers (#0)
│ ├── table: default.integers (#1)
│ ├── filters: []
│ ├── order by: []
│ └── limit: NONE
└── Scan
├── table: default.integers (#1)
├── table: default.integers (#0)
├── filters: []
├── order by: []
└── limit: NONE
Expand Down
66 changes: 33 additions & 33 deletions ...planner/optimizer/data/results/obfuscated/01_multi_join_avg_case_expression_optimized.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,37 +17,37 @@ Exchange(Merge)
├── build keys: [a1z.a0k (#48), a1z.a0n (#50)]
├── probe keys: [a0c.a0k (#7), a0c.a0n (#10)]
├── other filters: [lte(a1z.a2c (#52), a0c.a0d (#0)), gt(a1z.a2k (#61), a0c.a0d (#0))]
├── Join(Inner)
│ ├── build keys: [a0m (#149)]
│ ├── probe keys: [a0c.a0m (#9)]
│ ├── other filters: []
│ ├── Join(Inner)
│ │ ├── build keys: [a5r.a5t (#151)]
│ │ ├── probe keys: [a0c.a0l (#8)]
│ │ ├── other filters: []
│ │ ├── Scan
│ │ │ ├── table: default.a0c (#0)
│ │ │ ├── filters: [gte(a0c.a0d (#0), '20240526'), lte(a0c.a0d (#0), '20250525')]
│ │ │ ├── order by: []
│ │ │ └── limit: NONE
│ │ └── Exchange(Broadcast)
│ │ └── Scan
│ │ ├── table: default.a5r (#3)
│ │ ├── filters: [eq(substring(a5r.a5w (#156), 1, 1), '1')]
│ │ ├── order by: []
│ │ └── limit: NONE
│ └── Exchange(Broadcast)
│ └── EvalScalar
│ ├── scalars: [CAST(a2x.a0m (#74) AS String NULL) AS (#149)]
│ └── Scan
│ ├── table: default.a2x (#2)
│ ├── filters: [eq(substring(a2x.a4m (#118), 20, 1), '1')]
│ ├── order by: []
│ └── limit: NONE
└── Exchange(Broadcast)
└── Scan
├── table: default.a1z (#1)
├── filters: [eq(a1z.a2t (#70), '624100')]
├── order by: []
└── limit: NONE
├── Exchange(Broadcast)
│ └── Scan
│ ├── table: default.a1z (#1)
│ ├── filters: [eq(a1z.a2t (#70), '624100')]
│ ├── order by: []
│ └── limit: NONE
└── Join(Inner)
├── build keys: [a0m (#149)]
├── probe keys: [a0c.a0m (#9)]
├── other filters: []
├── Exchange(Broadcast)
│ └── EvalScalar
│ ├── scalars: [CAST(a2x.a0m (#74) AS String NULL) AS (#149)]
│ └── Scan
│ ├── table: default.a2x (#2)
│ ├── filters: [eq(substring(a2x.a4m (#118), 20, 1), '1')]
│ ├── order by: []
│ └── limit: NONE
└── Join(Inner)
├── build keys: [a5r.a5t (#151)]
├── probe keys: [a0c.a0l (#8)]
├── other filters: []
├── Exchange(Broadcast)
│ └── Scan
│ ├── table: default.a5r (#3)
│ ├── filters: [eq(substring(a5r.a5w (#156), 1, 1), '1')]
│ ├── order by: []
│ └── limit: NONE
└── Scan
├── table: default.a0c (#0)
├── filters: [gte(a0c.a0d (#0), '20240526'), lte(a0c.a0d (#0), '20250525')]
├── order by: []
└── limit: NONE

60 changes: 30 additions & 30 deletions ...t/sql/planner/optimizer/data/results/obfuscated/01_multi_join_avg_case_expression_raw.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,34 +13,34 @@ EvalScalar
├── build keys: [a5r.a5t (#151)]
├── probe keys: [a0c.a0l (#8)]
├── other filters: []
├── Join(Left)
│ ├── build keys: [a0m (#149)]
│ ├── probe keys: [a0c.a0m (#9)]
│ ├── other filters: []
│ ├── Join(Left)
│ │ ├── build keys: [a1z.a0k (#48), a1z.a0n (#50)]
│ │ ├── probe keys: [a0c.a0k (#7), a0c.a0n (#10)]
│ │ ├── other filters: [lte(a1z.a2c (#52), a0c.a0d (#0)), gt(a1z.a2k (#61), a0c.a0d (#0))]
│ │ ├── Scan
│ │ │ ├── table: default.a0c (#0)
│ │ │ ├── filters: []
│ │ │ ├── order by: []
│ │ │ └── limit: NONE
│ │ └── Scan
│ │ ├── table: default.a1z (#1)
│ │ ├── filters: []
│ │ ├── order by: []
│ │ └── limit: NONE
│ └── EvalScalar
│ ├── scalars: [CAST(a2x.a0m (#74) AS String NULL) AS (#149)]
│ └── Scan
│ ├── table: default.a2x (#2)
│ ├── filters: []
│ ├── order by: []
│ └── limit: NONE
└── Scan
├── table: default.a5r (#3)
├── filters: []
├── order by: []
└── limit: NONE
├── Scan
│ ├── table: default.a5r (#3)
│ ├── filters: []
│ ├── order by: []
│ └── limit: NONE
└── Join(Left)
├── build keys: [a0m (#149)]
├── probe keys: [a0c.a0m (#9)]
├── other filters: []
├── EvalScalar
│ ├── scalars: [CAST(a2x.a0m (#74) AS String NULL) AS (#149)]
│ └── Scan
│ ├── table: default.a2x (#2)
│ ├── filters: []
│ ├── order by: []
│ └── limit: NONE
└── Join(Left)
├── build keys: [a1z.a0k (#48), a1z.a0n (#50)]
├── probe keys: [a0c.a0k (#7), a0c.a0n (#10)]
├── other filters: [lte(a1z.a2c (#52), a0c.a0d (#0)), gt(a1z.a2k (#61), a0c.a0d (#0))]
├── Scan
│ ├── table: default.a1z (#1)
│ ├── filters: []
│ ├── order by: []
│ └── limit: NONE
└── Scan
├── table: default.a0c (#0)
├── filters: []
├── order by: []
└── limit: NONE

66 changes: 33 additions & 33 deletions ...planner/optimizer/data/results/obfuscated/01_multi_join_sum_case_expression_optimized.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,37 @@ Exchange(Merge)
├── build keys: [a1z.a0k (#48), a1z.a0n (#50)]
├── probe keys: [a0c.a0k (#7), a0c.a0n (#10)]
├── other filters: [lte(a1z.a2c (#52), a0c.a0d (#0)), gt(a1z.a2k (#61), a0c.a0d (#0))]
├── Join(Inner)
│ ├── build keys: [a0m (#149)]
│ ├── probe keys: [a0c.a0m (#9)]
│ ├── other filters: []
│ ├── Join(Inner)
│ │ ├── build keys: [a5r.a5t (#151)]
│ │ ├── probe keys: [a0c.a0l (#8)]
│ │ ├── other filters: []
│ │ ├── Scan
│ │ │ ├── table: default.a0c (#0)
│ │ │ ├── filters: [gte(a0c.a0d (#0), '20240526'), lte(a0c.a0d (#0), '20250525')]
│ │ │ ├── order by: []
│ │ │ └── limit: NONE
│ │ └── Exchange(Broadcast)
│ │ └── Scan
│ │ ├── table: default.a5r (#3)
│ │ ├── filters: [eq(substring(a5r.a5w (#156), 1, 1), '1')]
│ │ ├── order by: []
│ │ └── limit: NONE
│ └── Exchange(Broadcast)
│ └── EvalScalar
│ ├── scalars: [CAST(a2x.a0m (#74) AS String NULL) AS (#149)]
│ └── Scan
│ ├── table: default.a2x (#2)
│ ├── filters: [eq(substring(a2x.a4m (#118), 20, 1), '1')]
│ ├── order by: []
│ └── limit: NONE
└── Exchange(Broadcast)
└── Scan
├── table: default.a1z (#1)
├── filters: [eq(a1z.a2t (#70), '624100')]
├── order by: []
└── limit: NONE
├── Exchange(Broadcast)
│ └── Scan
│ ├── table: default.a1z (#1)
│ ├── filters: [eq(a1z.a2t (#70), '624100')]
│ ├── order by: []
│ └── limit: NONE
└── Join(Inner)
├── build keys: [a0m (#149)]
├── probe keys: [a0c.a0m (#9)]
├── other filters: []
├── Exchange(Broadcast)
│ └── EvalScalar
│ ├── scalars: [CAST(a2x.a0m (#74) AS String NULL) AS (#149)]
│ └── Scan
│ ├── table: default.a2x (#2)
│ ├── filters: [eq(substring(a2x.a4m (#118), 20, 1), '1')]
│ ├── order by: []
│ └── limit: NONE
└── Join(Inner)
├── build keys: [a5r.a5t (#151)]
├── probe keys: [a0c.a0l (#8)]
├── other filters: []
├── Exchange(Broadcast)
│ └── Scan
│ ├── table: default.a5r (#3)
│ ├── filters: [eq(substring(a5r.a5w (#156), 1, 1), '1')]
│ ├── order by: []
│ └── limit: NONE
└── Scan
├── table: default.a0c (#0)
├── filters: [gte(a0c.a0d (#0), '20240526'), lte(a0c.a0d (#0), '20250525')]
├── order by: []
└── limit: NONE

Loading
Loading