Skip to content
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

Jump to bottom

Revert "[Fix](timezone) Introduce a config to use Doris tzdata direct… #35316

Merged
merged 1 commit into from
May 27, 2024
Merged

Revert "[Fix](timezone) Introduce a config to use Doris tzdata direct… #35316

merged 1 commit into from
May 27, 2024

Conversation

zclllyybb
Copy link
Contributor

@zclllyybb zclllyybb commented May 23, 2024 •
edited
Loading

…ly (#31561)"

This reverts commit 65d998f.

Proposed changes

Issue Number: close #xxx

should also cherry-pick to 2.0, 2.1 and enterprise

doc pr: apache/doris-website#684

Further comments

If this is a relatively large or complex change, kick off the discussion at dev@doris.apache.org by explaining why you chose the solution you did and what alternatives you considered, etc...

@doris-robot
Copy link

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR

Since 2024-03-18, the Document has been moved to doris-website.
See Doris Document.

@zclllyybb
Copy link
Contributor Author

run buildall

@github-actions GitHub Actions
Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

@doris-robot
Copy link

TPC-H: Total hot run time: 40249 ms 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpch-tools
Tpch sf100 test result on commit 36de36926679d43388a54f56f98ee1a96e0e49c9, data reload: false

------ Round 1 ----------------------------------
q1	17639	4406	4354	4354
q2	2018	194	197	194
q3	10466	1243	1184	1184
q4	10154	821	694	694
q5	7468	2736	2821	2736
q6	226	139	137	137
q7	979	616	599	599
q8	9243	2136	2166	2136
q9	9076	6516	6508	6508
q10	9011	3743	3761	3743
q11	443	242	240	240
q12	496	232	221	221
q13	17866	2947	2979	2947
q14	269	217	234	217
q15	528	464	476	464
q16	506	385	405	385
q17	979	722	775	722
q18	8225	7597	7436	7436
q19	5015	1563	1516	1516
q20	664	315	319	315
q21	4948	3221	3949	3221
q22	351	280	292	280
Total cold run time: 116570 ms
Total hot run time: 40249 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4389	4272	4240	4240
q2	378	262	267	262
q3	3026	2754	2785	2754
q4	1938	1657	1637	1637
q5	5271	5281	5300	5281
q6	211	126	130	126
q7	2176	1734	1741	1734
q8	3202	3355	3347	3347
q9	8431	8410	8364	8364
q10	3924	3681	3645	3645
q11	583	504	490	490
q12	785	613	629	613
q13	17307	2990	3010	2990
q14	303	267	254	254
q15	519	473	466	466
q16	490	420	430	420
q17	1772	1508	1464	1464
q18	7788	7719	7448	7448
q19	1686	1577	1612	1577
q20	2020	1818	1781	1781
q21	4837	4907	4896	4896
q22	584	507	487	487
Total cold run time: 71620 ms
Total hot run time: 54276 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 170092 ms 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpcds-tools
TPC-DS sf100 test result on commit 36de36926679d43388a54f56f98ee1a96e0e49c9, data reload: false

query1	919	382	363	363
query2	6441	2448	2295	2295
query3	6653	203	208	203
query4	19345	17350	17290	17290
query5	4147	421	421	421
query6	255	150	150	150
query7	4586	298	307	298
query8	236	191	176	176
query9	8828	2469	2443	2443
query10	437	291	257	257
query11	10615	10141	10094	10094
query12	129	87	85	85
query13	1640	348	360	348
query14	9337	7523	7622	7523
query15	256	162	174	162
query16	8148	269	278	269
query17	1806	525	537	525
query18	2122	283	265	265
query19	195	154	161	154
query20	92	85	82	82
query21	192	132	134	132
query22	4240	4073	3837	3837
query23	33606	33017	32993	32993
query24	12107	2948	2869	2869
query25	639	351	361	351
query26	1716	157	157	157
query27	2972	319	314	314
query28	7707	2063	2065	2063
query29	1028	613	605	605
query30	306	173	181	173
query31	994	731	746	731
query32	99	55	55	55
query33	791	261	258	258
query34	1018	469	501	469
query35	720	605	593	593
query36	1099	918	932	918
query37	271	68	70	68
query38	2924	2824	2757	2757
query39	842	793	805	793
query40	273	127	120	120
query41	47	43	45	43
query42	103	96	95	95
query43	594	567	540	540
query44	1241	719	755	719
query45	173	161	159	159
query46	1079	709	722	709
query47	1884	1775	1777	1775
query48	379	293	294	293
query49	1202	380	394	380
query50	779	399	422	399
query51	6886	6837	6839	6837
query52	103	94	97	94
query53	344	289	293	289
query54	952	430	418	418
query55	70	74	67	67
query56	248	240	240	240
query57	1175	1046	1013	1013
query58	233	201	205	201
query59	3573	3190	3015	3015
query60	271	248	255	248
query61	88	84	89	84
query62	653	453	467	453
query63	308	289	281	281
query64	9793	2238	1678	1678
query65	3191	3132	3118	3118
query66	1380	330	324	324
query67	15478	15018	14916	14916
query68	4616	540	542	540
query69	438	260	279	260
query70	1191	1134	1084	1084
query71	407	323	265	265
query72	7273	2723	2641	2641
query73	711	323	323	323
query74	6094	5637	5586	5586
query75	3377	2605	2653	2605
query76	2570	1004	949	949
query77	433	273	260	260
query78	10233	9886	9922	9886
query79	2571	515	515	515
query80	1112	431	430	430
query81	531	245	239	239
query82	1135	97	97	97
query83	251	176	167	167
query84	236	91	86	86
query85	1339	285	285	285
query86	469	288	302	288
query87	3270	3093	3087	3087
query88	4073	2475	2406	2406
query89	478	395	386	386
query90	1944	191	190	190
query91	123	98	97	97
query92	61	48	48	48
query93	1779	512	506	506
query94	1249	181	187	181
query95	402	306	311	306
query96	600	265	266	265
query97	3192	3009	3069	3009
query98	241	223	226	223
query99	1100	845	835	835
Total cold run time: 275457 ms
Total hot run time: 170092 ms

@doris-robot
Copy link

ClickBench: Total hot run time: 30.96 s 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/clickbench-tools
ClickBench test result on commit 36de36926679d43388a54f56f98ee1a96e0e49c9, data reload: false

query1	0.04	0.03	0.03
query2	0.08	0.04	0.04
query3	0.23	0.05	0.05
query4	1.69	0.07	0.07
query5	0.50	0.50	0.48
query6	1.12	0.72	0.72
query7	0.02	0.02	0.01
query8	0.05	0.04	0.04
query9	0.55	0.50	0.50
query10	0.56	0.55	0.53
query11	0.16	0.11	0.11
query12	0.15	0.12	0.12
query13	0.58	0.59	0.60
query14	0.78	0.77	0.77
query15	0.81	0.82	0.82
query16	0.37	0.37	0.35
query17	0.95	0.94	1.00
query18	0.22	0.24	0.25
query19	1.85	1.72	1.75
query20	0.01	0.02	0.01
query21	15.73	0.65	0.64
query22	4.54	6.07	2.43
query23	18.30	1.27	1.17
query24	2.05	0.21	0.22
query25	0.14	0.08	0.09
query26	0.26	0.17	0.18
query27	0.08	0.08	0.07
query28	13.25	1.01	1.03
query29	12.98	3.23	3.30
query30	0.24	0.06	0.06
query31	2.86	0.39	0.39
query32	3.29	0.47	0.48
query33	2.92	2.92	2.92
query34	17.17	4.42	4.42
query35	4.59	4.51	4.52
query36	0.65	0.45	0.49
query37	0.17	0.15	0.16
query38	0.15	0.14	0.15
query39	0.04	0.04	0.03
query40	0.16	0.14	0.14
query41	0.10	0.05	0.05
query42	0.06	0.05	0.05
query43	0.04	0.03	0.04
Total cold run time: 110.49 s
Total hot run time: 30.96 s

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 35.65% (9018/25294)
Line Coverage: 27.31% (74563/273041)
Region Coverage: 26.53% (38586/145417)
Branch Coverage: 23.40% (19683/84126)
Coverage Report: http://coverage.selectdb-in.cc/coverage/36de36926679d43388a54f56f98ee1a96e0e49c9_36de36926679d43388a54f56f98ee1a96e0e49c9/report/index.html

@zclllyybb zclllyybb mentioned this pull request May 24, 2024
Merged
HappenLee
HappenLee approved these changes May 24, 2024
View reviewed changes
Copy link
Contributor

@HappenLee HappenLee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label May 24, 2024
@github-actions GitHub Actions
Copy link
Contributor

PR approved by at least one committer and no changes requested.

@github-actions GitHub Actions
Copy link
Contributor

PR approved by anyone and no changes requested.

@BiteTheDDDDt BiteTheDDDDt merged commit 7b11920 into apache:master May 27, 2024
28 of 30 checks passed
dataroaring pushed a commit that referenced this pull request May 28, 2024
@zclllyybb @dataroaring
Revert "[Fix](timezone) Introduce a config to use Doris tzdata direct…
dd49386 
…ly (#31561)" (#35316)

This reverts commit 65d998f.
luzhijing pushed a commit to apache/doris-website that referenced this pull request Jun 6, 2024
@zclllyybb
[Revert](timezone) Remove a function of timezone and its documents (#684
5b7792c 
)

master pr: apache/doris#35316
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BiteTheDDDDt BiteTheDDDDt BiteTheDDDDt approved these changes

@HappenLee HappenLee HappenLee approved these changes

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by one committer. reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@zclllyybb @doris-robot @BiteTheDDDDt @HappenLee