Skip to content

Commit 25133c8

Browse files
committed
Merge branch 'main' into feature-precompile_regex_pattern
2 parents cc72e32 + e603185 commit 25133c8

File tree

178 files changed

+3890
-2894
lines changed

Some content is hidden

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

178 files changed

+3890
-2894
lines changed

.github/workflows/pr_comment.yml

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

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
# under the License.
1717

1818
[workspace]
19+
# datafusion-cli is excluded because of its Cargo.lock. See datafusion-cli/README.md.
1920
exclude = ["datafusion-cli", "dev/depcheck"]
2021
members = [
2122
"datafusion/common",
@@ -33,7 +34,6 @@ members = [
3334
"datafusion/optimizer",
3435
"datafusion/physical-expr",
3536
"datafusion/physical-expr-common",
36-
"datafusion/physical-expr-functions-aggregate",
3737
"datafusion/physical-optimizer",
3838
"datafusion/physical-plan",
3939
"datafusion/proto",
@@ -106,7 +106,6 @@ datafusion-functions-window = { path = "datafusion/functions-window", version =
106106
datafusion-optimizer = { path = "datafusion/optimizer", version = "41.0.0", default-features = false }
107107
datafusion-physical-expr = { path = "datafusion/physical-expr", version = "41.0.0", default-features = false }
108108
datafusion-physical-expr-common = { path = "datafusion/physical-expr-common", version = "41.0.0", default-features = false }
109-
datafusion-physical-expr-functions-aggregate = { path = "datafusion/physical-expr-functions-aggregate", version = "41.0.0" }
110109
datafusion-physical-optimizer = { path = "datafusion/physical-optimizer", version = "41.0.0" }
111110
datafusion-physical-plan = { path = "datafusion/physical-plan", version = "41.0.0" }
112111
datafusion-proto = { path = "datafusion/proto", version = "41.0.0" }

benchmarks/queries/clickbench/README.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,21 @@ LIMIT 10;
5858
```
5959

6060

61+
### Q3: What is the income distribution for users in specific regions
62+
63+
**Question**: "What regions and social networks have the highest variance of parameter price
64+
65+
**Important Query Properties**: STDDEV and VAR aggregation functions, GROUP BY multiple small ints
66+
67+
```sql
68+
SELECT "SocialSourceNetworkID", "RegionID", COUNT(*), AVG("Age"), AVG("ParamPrice"), STDDEV("ParamPrice") as s, VAR("ParamPrice")
69+
FROM 'hits.parquet'
70+
GROUP BY "SocialSourceNetworkID", "RegionID"
71+
HAVING s IS NOT NULL
72+
ORDER BY s DESC
73+
LIMIT 10;
74+
```
75+
6176
## Data Notes
6277

6378
Here are some interesting statistics about the data used in the queries
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
SELECT COUNT(DISTINCT "SearchPhrase"), COUNT(DISTINCT "MobilePhone"), COUNT(DISTINCT "MobilePhoneModel") FROM hits;
22
SELECT COUNT(DISTINCT "HitColor"), COUNT(DISTINCT "BrowserCountry"), COUNT(DISTINCT "BrowserLanguage") FROM hits;
3-
SELECT "BrowserCountry", COUNT(DISTINCT "SocialNetwork"), COUNT(DISTINCT "HitColor"), COUNT(DISTINCT "BrowserLanguage"), COUNT(DISTINCT "SocialAction") FROM hits GROUP BY 1 ORDER BY 2 DESC LIMIT 10;
3+
SELECT "BrowserCountry", COUNT(DISTINCT "SocialNetwork"), COUNT(DISTINCT "HitColor"), COUNT(DISTINCT "BrowserLanguage"), COUNT(DISTINCT "SocialAction") FROM hits GROUP BY 1 ORDER BY 2 DESC LIMIT 10;
4+
SELECT "SocialSourceNetworkID", "RegionID", COUNT(*), AVG("Age"), AVG("ParamPrice"), STDDEV("ParamPrice") as s, VAR("ParamPrice") FROM hits GROUP BY "SocialSourceNetworkID", "RegionID" HAVING s IS NOT NULL ORDER BY s DESC LIMIT 10;

0 commit comments

Comments
 (0)