Skip to content

Commit 9efcbff

Browse files
dantengskydantengsky
committed
Merge remote-tracking branch 'origin/main' into fix-thread-leakings
2 parents e2c8396 + 593463d commit 9efcbff

File tree

10 files changed

+261
-248
lines changed

10 files changed

+261
-248
lines changed

‎.github/actions/benchmark_cloud/action.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ runs:
5151
BENCHMARK_DATASET: ${{ inputs.dataset }}
5252
BENCHMARK_SIZE: ${{ inputs.size }}
5353
BENCHMARK_IMAGE_TAG: ${{ inputs.image_tag }}
54+
BENCHMARK_DATABASE: clickbench
5455
CLOUD_EMAIL: ${{ inputs.cloud_email }}
5556
CLOUD_PASSWORD: ${{ inputs.cloud_password }}
5657
CLOUD_ORG: ${{ inputs.cloud_org }}

‎.github/actions/setup_bendsql/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ inputs:
44
version:
55
description: "bendsql version"
66
required: false
7-
default: v0.3.7
7+
default: v0.3.8
88
runs:
99
using: "composite"
1010
steps:

‎benchmark/clickbench/benchmark_cloud.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ BENCHMARK_ID=${BENCHMARK_ID:-$(date +%s)}
66
BENCHMARK_DATASET=${BENCHMARK_DATASET:-hits}
77
BENCHMARK_SIZE=${BENCHMARK_SIZE:-Medium}
88
BENCHMARK_IMAGE_TAG=${BENCHMARK_IMAGE_TAG:-}
9+
BENCHMARK_DATABASE=${BENCHMARK_DATABASE:-default}
910

1011
if [[ -z "${BENCHMARK_IMAGE_TAG}" ]]; then
1112
echo "Please set BENCHMARK_IMAGE_TAG to run the benchmark."
@@ -36,7 +37,8 @@ bendsql cloud login \
3637
--endpoint "${CLOUD_ENDPOINT}" \
3738
--email "${CLOUD_EMAIL}" \
3839
--password "${CLOUD_PASSWORD}" \
39-
--org "${CLOUD_ORG}"
40+
--org "${CLOUD_ORG}" \
41+
--database "${BENCHMARK_DATABASE}"
4042

4143
bendsql cloud warehouse ls
4244
bendsql cloud warehouse create "${CLOUD_WAREHOUSE}" --size "${BENCHMARK_SIZE}" --tag "${BENCHMARK_IMAGE_TAG}"

‎docs/doc/14-sql-commands/40-show/show-settings.md‎

Lines changed: 38 additions & 31 deletions
Large diffs are not rendered by default.

‎docs/doc/14-sql-commands/80-setting-cmds/show-settings.md‎

Lines changed: 39 additions & 34 deletions
Large diffs are not rendered by default.

‎scripts/benchmark/query/load/hits.sh‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ DROP TABLE IF EXISTS hits ALL;
1111
SQL
1212

1313
cat <<SQL | bendsql query
14-
CREATE TABLE hits (
14+
CREATE TRANSIENT TABLE hits (
1515
WatchID BIGINT NOT NULL,
1616
JavaEnable SMALLINT NOT NULL,
17-
Title VARCHAR NOT NULL,
17+
Title TEXT NOT NULL,
1818
GoodEvent SMALLINT NOT NULL,
1919
EventTime TIMESTAMP NOT NULL,
2020
EventDate Date NOT NULL,
@@ -25,8 +25,8 @@ cat <<SQL | bendsql query
2525
CounterClass SMALLINT NOT NULL,
2626
OS SMALLINT NOT NULL,
2727
UserAgent SMALLINT NOT NULL,
28-
URL VARCHAR NOT NULL,
29-
Referer VARCHAR NOT NULL,
28+
URL TEXT NOT NULL,
29+
Referer TEXT NOT NULL,
3030
IsRefresh SMALLINT NOT NULL,
3131
RefererCategoryID SMALLINT NOT NULL,
3232
RefererRegionID INTEGER NOT NULL,
@@ -37,7 +37,7 @@ cat <<SQL | bendsql query
3737
ResolutionDepth SMALLINT NOT NULL,
3838
FlashMajor SMALLINT NOT NULL,
3939
FlashMinor SMALLINT NOT NULL,
40-
FlashMinor2 VARCHAR NOT NULL,
40+
FlashMinor2 TEXT NOT NULL,
4141
NetMajor SMALLINT NOT NULL,
4242
NetMinor SMALLINT NOT NULL,
4343
UserAgentMajor SMALLINT NOT NULL,
@@ -46,12 +46,12 @@ cat <<SQL | bendsql query
4646
JavascriptEnable SMALLINT NOT NULL,
4747
IsMobile SMALLINT NOT NULL,
4848
MobilePhone SMALLINT NOT NULL,
49-
MobilePhoneModel VARCHAR NOT NULL,
50-
Params VARCHAR NOT NULL,
49+
MobilePhoneModel TEXT NOT NULL,
50+
Params TEXT NOT NULL,
5151
IPNetworkID INTEGER NOT NULL,
5252
TraficSourceID SMALLINT NOT NULL,
5353
SearchEngineID SMALLINT NOT NULL,
54-
SearchPhrase VARCHAR NOT NULL,
54+
SearchPhrase TEXT NOT NULL,
5555
AdvEngineID SMALLINT NOT NULL,
5656
IsArtifical SMALLINT NOT NULL,
5757
WindowClientWidth SMALLINT NOT NULL,
@@ -62,20 +62,20 @@ cat <<SQL | bendsql query
6262
SilverlightVersion2 SMALLINT NOT NULL,
6363
SilverlightVersion3 INTEGER NOT NULL,
6464
SilverlightVersion4 SMALLINT NOT NULL,
65-
PageCharset VARCHAR NOT NULL,
65+
PageCharset TEXT NOT NULL,
6666
CodeVersion INTEGER NOT NULL,
6767
IsLink SMALLINT NOT NULL,
6868
IsDownload SMALLINT NOT NULL,
6969
IsNotBounce SMALLINT NOT NULL,
7070
FUniqID BIGINT NOT NULL,
71-
OriginalURL VARCHAR NOT NULL,
71+
OriginalURL TEXT NOT NULL,
7272
HID INTEGER NOT NULL,
7373
IsOldCounter SMALLINT NOT NULL,
7474
IsEvent SMALLINT NOT NULL,
7575
IsParameter SMALLINT NOT NULL,
7676
DontCountHits SMALLINT NOT NULL,
7777
WithHash SMALLINT NOT NULL,
78-
HitColor VARCHAR NOT NULL,
78+
HitColor CHAR NOT NULL,
7979
LocalEventTime TIMESTAMP NOT NULL,
8080
Age SMALLINT NOT NULL,
8181
Sex SMALLINT NOT NULL,
@@ -86,10 +86,10 @@ cat <<SQL | bendsql query
8686
WindowName INTEGER NOT NULL,
8787
OpenerName INTEGER NOT NULL,
8888
HistoryLength SMALLINT NOT NULL,
89-
BrowserLanguage VARCHAR NOT NULL,
90-
BrowserCountry VARCHAR NOT NULL,
91-
SocialNetwork VARCHAR NOT NULL,
92-
SocialAction VARCHAR NOT NULL,
89+
BrowserLanguage TEXT NOT NULL,
90+
BrowserCountry TEXT NOT NULL,
91+
SocialNetwork TEXT NOT NULL,
92+
SocialAction TEXT NOT NULL,
9393
HTTPError SMALLINT NOT NULL,
9494
SendTiming INTEGER NOT NULL,
9595
DNSTiming INTEGER NOT NULL,
@@ -98,32 +98,36 @@ cat <<SQL | bendsql query
9898
ResponseEndTiming INTEGER NOT NULL,
9999
FetchTiming INTEGER NOT NULL,
100100
SocialSourceNetworkID SMALLINT NOT NULL,
101-
SocialSourcePage VARCHAR NOT NULL,
101+
SocialSourcePage TEXT NOT NULL,
102102
ParamPrice BIGINT NOT NULL,
103-
ParamOrderID VARCHAR NOT NULL,
104-
ParamCurrency VARCHAR NOT NULL,
103+
ParamOrderID TEXT NOT NULL,
104+
ParamCurrency TEXT NOT NULL,
105105
ParamCurrencyID SMALLINT NOT NULL,
106-
OpenstatServiceName VARCHAR NOT NULL,
107-
OpenstatCampaignID VARCHAR NOT NULL,
108-
OpenstatAdID VARCHAR NOT NULL,
109-
OpenstatSourceID VARCHAR NOT NULL,
110-
UTMSource VARCHAR NOT NULL,
111-
UTMMedium VARCHAR NOT NULL,
112-
UTMCampaign VARCHAR NOT NULL,
113-
UTMContent VARCHAR NOT NULL,
114-
UTMTerm VARCHAR NOT NULL,
115-
FromTag VARCHAR NOT NULL,
106+
OpenstatServiceName TEXT NOT NULL,
107+
OpenstatCampaignID TEXT NOT NULL,
108+
OpenstatAdID TEXT NOT NULL,
109+
OpenstatSourceID TEXT NOT NULL,
110+
UTMSource TEXT NOT NULL,
111+
UTMMedium TEXT NOT NULL,
112+
UTMCampaign TEXT NOT NULL,
113+
UTMContent TEXT NOT NULL,
114+
UTMTerm TEXT NOT NULL,
115+
FromTag TEXT NOT NULL,
116116
HasGCLID SMALLINT NOT NULL,
117117
RefererHash BIGINT NOT NULL,
118118
URLHash BIGINT NOT NULL,
119119
CLID INTEGER NOT NULL
120-
);
120+
) CLUSTER BY (CounterID, EventDate, UserID, EventTime, WatchID);
121121
SQL
122122

123123
cat <<SQL | bendsql query
124124
COPY INTO hits FROM 's3://repo.databend.rs/hits_p/' credentials=(aws_key_id='$REPO_ACCESS_KEY_ID' aws_secret_key='$REPO_SECRET_ACCESS_KEY') pattern ='.*[.]tsv' file_format=(type='TSV' field_delimiter='\\t' record_delimiter='\\n' skip_header=1);
125125
SQL
126126

127+
cat <<SQL | bendsql query
128+
ANALYZE TABLE hits;
129+
SQL
130+
127131
cat <<SQL | bendsql query
128132
SELECT count(*) FROM hits;
129133
SQL

‎scripts/benchmark/query/load/tpch.sh‎

100644100755
Lines changed: 73 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -7,118 +7,118 @@ select version();
77
SQL
88

99
for t in customer lineitem nation orders partsupp part region supplier; do
10-
echo "DROP TABLE IF EXISTS $t;" | bendsql query
10+
echo "DROP TABLE IF EXISTS $t;" | bendsql query
1111
done
1212

1313
cat <<SQL | bendsql query
1414
CREATE TABLE IF NOT EXISTS customer (
15-
c_custkey BIGINT not null,
16-
c_name STRING not null,
17-
c_address STRING not null,
18-
c_nationkey INTEGER not null,
19-
c_phone STRING not null,
20-
c_acctbal DECIMAL(15, 2) not null,
21-
c_mktsegment STRING not null,
22-
c_comment STRING not null
23-
);
15+
c_custkey BIGINT not null,
16+
c_name STRING not null,
17+
c_address STRING not null,
18+
c_nationkey INTEGER not null,
19+
c_phone STRING not null,
20+
c_acctbal DECIMAL(15, 2) not null,
21+
c_mktsegment STRING not null,
22+
c_comment STRING not null
23+
) CLUSTER BY (c_custkey);
2424
SQL
2525

2626
cat <<SQL | bendsql query
2727
CREATE TABLE IF NOT EXISTS lineitem (
28-
l_orderkey BIGINT not null,
29-
l_partkey BIGINT not null,
30-
l_suppkey BIGINT not null,
31-
l_linenumber BIGINT not null,
32-
l_quantity DECIMAL(15, 2) not null,
33-
l_extendedprice DECIMAL(15, 2) not null,
34-
l_discount DECIMAL(15, 2) not null,
35-
l_tax DECIMAL(15, 2) not null,
36-
l_returnflag STRING not null,
37-
l_linestatus STRING not null,
38-
l_shipdate DATE not null,
39-
l_commitdate DATE not null,
28+
l_orderkey BIGINT not null,
29+
l_partkey BIGINT not null,
30+
l_suppkey BIGINT not null,
31+
l_linenumber BIGINT not null,
32+
l_quantity DECIMAL(15, 2) not null,
33+
l_extendedprice DECIMAL(15, 2) not null,
34+
l_discount DECIMAL(15, 2) not null,
35+
l_tax DECIMAL(15, 2) not null,
36+
l_returnflag STRING not null,
37+
l_linestatus STRING not null,
38+
l_shipdate DATE not null,
39+
l_commitdate DATE not null,
4040
l_receiptdate DATE not null,
4141
l_shipinstruct STRING not null,
42-
l_shipmode STRING not null,
43-
l_comment STRING not null
44-
);
42+
l_shipmode STRING not null,
43+
l_comment STRING not null
44+
) CLUSTER BY(l_shipdate, l_orderkey);
4545
SQL
4646

4747
# create tpch tables
4848
cat <<SQL | bendsql query
4949
CREATE TABLE IF NOT EXISTS nation (
50-
n_nationkey INTEGER not null,
51-
n_name STRING not null,
52-
n_regionkey INTEGER not null,
53-
n_comment STRING
54-
);
50+
n_nationkey INTEGER not null,
51+
n_name STRING not null,
52+
n_regionkey INTEGER not null,
53+
n_comment STRING
54+
) CLUSTER BY (n_nationkey);
5555
SQL
5656

5757
cat <<SQL | bendsql query
5858
CREATE TABLE IF NOT EXISTS orders (
59-
o_orderkey BIGINT not null,
60-
o_custkey BIGINT not null,
61-
o_orderstatus STRING not null,
62-
o_totalprice DECIMAL(15, 2) not null,
63-
o_orderdate DATE not null,
64-
o_orderpriority STRING not null,
65-
o_clerk STRING not null,
66-
o_shippriority INTEGER not null,
67-
o_comment STRING not null
68-
);
59+
o_orderkey BIGINT not null,
60+
o_custkey BIGINT not null,
61+
o_orderstatus STRING not null,
62+
o_totalprice DECIMAL(15, 2) not null,
63+
o_orderdate DATE not null,
64+
o_orderpriority STRING not null,
65+
o_clerk STRING not null,
66+
o_shippriority INTEGER not null,
67+
o_comment STRING not null
68+
) CLUSTER BY (o_orderkey, o_orderdate);
6969
SQL
7070

7171
cat <<SQL | bendsql query
7272
CREATE TABLE IF NOT EXISTS partsupp (
73-
ps_partkey BIGINT not null,
74-
ps_suppkey BIGINT not null,
75-
ps_availqty BIGINT not null,
76-
ps_supplycost DECIMAL(15, 2) not null,
77-
ps_comment STRING not null
78-
);
73+
ps_partkey BIGINT not null,
74+
ps_suppkey BIGINT not null,
75+
ps_availqty BIGINT not null,
76+
ps_supplycost DECIMAL(15, 2) not null,
77+
ps_comment STRING not null
78+
) CLUSTER BY (ps_partkey);
7979
SQL
8080

8181
cat <<SQL | bendsql query
8282
CREATE TABLE IF NOT EXISTS part (
83-
p_partkey BIGINT not null,
84-
p_name STRING not null,
85-
p_mfgr STRING not null,
86-
p_brand STRING not null,
87-
p_type STRING not null,
88-
p_size INTEGER not null,
89-
p_container STRING not null,
83+
p_partkey BIGINT not null,
84+
p_name STRING not null,
85+
p_mfgr STRING not null,
86+
p_brand STRING not null,
87+
p_type STRING not null,
88+
p_size INTEGER not null,
89+
p_container STRING not null,
9090
p_retailprice DECIMAL(15, 2) not null,
91-
p_comment STRING not null
92-
);
91+
p_comment STRING not null
92+
) CLUSTER BY (p_partkey);
9393
SQL
9494

9595
cat <<SQL | bendsql query
9696
CREATE TABLE IF NOT EXISTS region (
97-
r_regionkey INTEGER not null,
98-
r_name STRING not null,
99-
r_comment STRING
100-
);
97+
r_regionkey INTEGER not null,
98+
r_name STRING not null,
99+
r_comment STRING
100+
) CLUSTER BY (r_regionkey);
101101
SQL
102102

103103
cat <<SQL | bendsql query
104104
CREATE TABLE IF NOT EXISTS supplier (
105-
s_suppkey BIGINT not null,
106-
s_name STRING not null,
107-
s_address STRING not null,
108-
s_nationkey INTEGER not null,
109-
s_phone STRING not null,
110-
s_acctbal DECIMAL(15, 2) not null,
111-
s_comment STRING not null
112-
);
105+
s_suppkey BIGINT not null,
106+
s_name STRING not null,
107+
s_address STRING not null,
108+
s_nationkey INTEGER not null,
109+
s_phone STRING not null,
110+
s_acctbal DECIMAL(15, 2) not null,
111+
s_comment STRING not null
112+
) CLUSTER BY (s_suppkey);
113113
SQL
114114

115115
for t in customer lineitem nation orders partsupp part region supplier; do
116-
echo "loading into $t ..."
117-
cat <<SQL | bendsql query
118-
COPY INTO $t FROM 's3://repo.databend.rs/tpch10/${t}/'
119-
credentials=(aws_key_id='$AWS_KEY_ID' aws_secret_key='$AWS_SECRET_KEY') pattern ='${t}.*'
116+
echo "loading into $t ..."
117+
cat <<SQL | bendsql query
118+
COPY INTO $t FROM 's3://repo.databend.rs/datasets/tpch10/${t}/'
119+
credentials=(aws_key_id='$REPO_ACCESS_KEY_ID' aws_secret_key='$REPO_SECRET_ACCESS_KEY') pattern ='${t}.*'
120120
file_format=(type='CSV' field_delimiter='|' record_delimiter='\\n' skip_header=0);
121-
ANALYZE TABLE '${t}';
122-
SELECT count(*) as count_${t} FROM '${t}';
121+
ANALYZE TABLE "${t}";
122+
SELECT count(*) as count_${t} FROM "${t}";
123123
SQL
124124
done

0 commit comments

Comments
 (0)