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.

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

Revert "[Improvementation](join) empty_block shall be set true when b… #33916

Merged
merged 1 commit into from
Apr 20, 2024

Conversation

BiteTheDDDDt
Copy link
Contributor

…uild block only one row (#33721)"

This reverts commit a93c865.

Proposed changes

Issue Number: close #xxx

Further comments

If this is a relatively large or complex change, kick off the discussion at [email protected] 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.

@BiteTheDDDDt
Copy link
Contributor Author

run buildall

Copy link
Member

@mrhhsg mrhhsg 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 Apr 19, 2024
Copy link
Contributor

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

Copy link
Contributor

PR approved by anyone and no changes requested.

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

clang-tidy made some suggestions

@@ -62,17 +62,15 @@ void ColumnWithTypeAndName::dump_structure(std::ostream& out) const {
out << name;
}

if (type) {
if (type)
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: statement should be inside braces [readability-braces-around-statements]

Suggested change
if (type)
if (type) {

be/src/vec/core/column_with_type_and_name.cpp:66:

-     else
+     } else

Comment on lines +67 to 68
else
out << " nullptr";
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: statement should be inside braces [readability-braces-around-statements]

Suggested change
else
out << " nullptr";
else {
out << " nullptr";
}

if (column) {
out << ' ' << column->dump_structure() << "(use_count=" << column->use_count() << ')';
} else {
if (column)
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: statement should be inside braces [readability-braces-around-statements]

Suggested change
if (column)
if (column) {

be/src/vec/core/column_with_type_and_name.cpp:71:

-     else
+     } else

Comment on lines +72 to 73
else
out << " nullptr";
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: statement should be inside braces [readability-braces-around-statements]

Suggested change
else
out << " nullptr";
else {
out << " nullptr";
}

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17607	4363	4272	4272
q2	2017	202	189	189
q3	10439	1175	1173	1173
q4	10203	788	857	788
q5	7541	2728	2654	2654
q6	216	134	133	133
q7	1018	612	598	598
q8	9241	2069	2053	2053
q9	7376	6588	6538	6538
q10	8601	3585	3489	3489
q11	467	241	235	235
q12	395	222	215	215
q13	17761	2968	2938	2938
q14	283	224	226	224
q15	518	489	490	489
q16	523	378	373	373
q17	972	693	706	693
q18	7553	6854	6734	6734
q19	5428	1550	1482	1482
q20	653	319	311	311
q21	3391	2783	2894	2783
q22	369	305	305	305
Total cold run time: 112572 ms
Total hot run time: 38669 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4286	4181	4193	4181
q2	365	272	276	272
q3	3027	2759	2693	2693
q4	1881	1563	1543	1543
q5	5290	5352	5304	5304
q6	206	124	122	122
q7	2236	1861	1885	1861
q8	3217	3354	3363	3354
q9	8547	8607	8568	8568
q10	4085	3949	3956	3949
q11	609	489	495	489
q12	811	608	642	608
q13	16123	3297	3177	3177
q14	334	284	281	281
q15	515	461	475	461
q16	492	453	423	423
q17	1820	1519	1529	1519
q18	8034	7961	7875	7875
q19	1699	1521	1522	1521
q20	2056	1849	1873	1849
q21	5262	4896	4882	4882
q22	536	472	474	472
Total cold run time: 71431 ms
Total hot run time: 55404 ms

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 35.40% (8921/25203)
Line Coverage: 27.10% (73279/270408)
Region Coverage: 26.24% (37857/144285)
Branch Coverage: 23.05% (19280/83642)
Coverage Report: http://coverage.selectdb-in.cc/coverage/f7e0949d43080cdb6d4f69f859e8171a4e1682f1_f7e0949d43080cdb6d4f69f859e8171a4e1682f1/report/index.html

@doris-robot
Copy link

TPC-DS: Total hot run time: 184617 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 f7e0949d43080cdb6d4f69f859e8171a4e1682f1, data reload: false

query1	913	372	353	353
query2	7386	2563	2579	2563
query3	6704	205	199	199
query4	23669	21233	21416	21233
query5	4148	402	413	402
query6	273	185	170	170
query7	4580	283	282	282
query8	236	181	176	176
query9	8517	2329	2300	2300
query10	415	244	246	244
query11	14823	14269	14179	14179
query12	133	88	84	84
query13	1647	378	368	368
query14	8766	7020	7932	7020
query15	268	188	181	181
query16	8245	259	263	259
query17	1985	571	566	566
query18	2120	285	267	267
query19	343	155	154	154
query20	90	86	85	85
query21	204	130	130	130
query22	5114	4881	4880	4880
query23	33987	33137	33372	33137
query24	10766	2945	3175	2945
query25	637	411	401	401
query26	700	167	153	153
query27	2341	361	366	361
query28	6065	2080	2068	2068
query29	873	655	650	650
query30	304	182	184	182
query31	1003	743	762	743
query32	99	55	53	53
query33	674	253	253	253
query34	891	498	478	478
query35	834	703	697	697
query36	1074	966	947	947
query37	114	74	80	74
query38	3439	3384	3305	3305
query39	1646	1612	1610	1610
query40	177	127	127	127
query41	47	43	47	43
query42	105	96	96	96
query43	575	562	554	554
query44	1119	747	745	745
query45	289	289	265	265
query46	1114	729	752	729
query47	2024	1940	1958	1940
query48	387	303	309	303
query49	836	411	414	411
query50	801	424	415	415
query51	6935	6768	6738	6738
query52	97	88	84	84
query53	339	268	272	268
query54	301	222	227	222
query55	73	69	69	69
query56	243	218	230	218
query57	1243	1114	1126	1114
query58	215	191	193	191
query59	3646	3308	3159	3159
query60	255	219	224	219
query61	87	84	84	84
query62	591	434	436	434
query63	299	276	282	276
query64	4611	3523	4031	3523
query65	3029	3011	3023	3011
query66	750	324	324	324
query67	15959	14984	15039	14984
query68	10099	545	552	545
query69	581	321	300	300
query70	1419	1153	1187	1153
query71	1456	1262	1258	1258
query72	6981	2583	2485	2485
query73	1612	321	318	318
query74	6957	6358	6471	6358
query75	4582	2587	2619	2587
query76	5286	1004	1021	1004
query77	595	257	267	257
query78	11076	10353	10107	10107
query79	11798	523	522	522
query80	2847	444	425	425
query81	521	240	236	236
query82	238	92	95	92
query83	213	162	158	158
query84	267	82	85	82
query85	978	307	262	262
query86	346	299	319	299
query87	3491	3293	3321	3293
query88	5391	2309	2324	2309
query89	512	364	362	362
query90	2469	174	176	174
query91	121	98	95	95
query92	59	47	47	47
query93	7213	504	489	489
query94	1570	174	173	173
query95	390	285	286	285
query96	605	264	259	259
query97	3138	2923	2912	2912
query98	249	219	218	218
query99	1093	861	855	855
Total cold run time: 306326 ms
Total hot run time: 184617 ms

@doris-robot
Copy link

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

query1	0.04	0.03	0.04
query2	0.09	0.04	0.03
query3	0.23	0.05	0.05
query4	1.68	0.10	0.09
query5	0.48	0.49	0.48
query6	1.47	0.72	0.73
query7	0.02	0.01	0.01
query8	0.06	0.04	0.04
query9	0.55	0.49	0.49
query10	0.55	0.56	0.55
query11	0.15	0.12	0.11
query12	0.15	0.12	0.11
query13	0.61	0.58	0.57
query14	0.77	0.76	0.77
query15	0.83	0.80	0.80
query16	0.37	0.37	0.37
query17	1.01	1.02	1.03
query18	0.22	0.23	0.25
query19	1.88	1.74	1.81
query20	0.02	0.01	0.01
query21	15.41	0.66	0.64
query22	4.12	6.61	2.82
query23	18.34	1.32	1.17
query24	1.69	0.30	0.22
query25	0.14	0.08	0.08
query26	0.25	0.17	0.16
query27	0.08	0.08	0.08
query28	13.26	0.99	0.97
query29	12.60	3.29	3.30
query30	0.26	0.07	0.06
query31	2.88	0.38	0.38
query32	3.27	0.47	0.45
query33	2.80	2.85	2.82
query34	17.20	4.39	4.42
query35	4.45	4.48	4.52
query36	0.65	0.46	0.47
query37	0.18	0.15	0.15
query38	0.16	0.14	0.15
query39	0.04	0.04	0.04
query40	0.18	0.13	0.14
query41	0.09	0.04	0.05
query42	0.05	0.04	0.04
query43	0.04	0.04	0.04
Total cold run time: 109.32 s
Total hot run time: 31.26 s

@doris-robot
Copy link

Load test result on machine: 'aliyun_ecs.c7a.8xlarge_32C64G'

Load test result on commit f7e0949d43080cdb6d4f69f859e8171a4e1682f1 with default session variables
Stream load json:         19 seconds loaded 2358488459 Bytes, about 118 MB/s
Stream load orc:          58 seconds loaded 1101869774 Bytes, about 18 MB/s
Stream load parquet:      32 seconds loaded 861443392 Bytes, about 25 MB/s
Insert into select:       13.4 seconds inserted 10000000 Rows, about 746K ops/s

@yiguolei yiguolei merged commit d8c4b0e into apache:master Apr 20, 2024
25 of 29 checks passed
BiteTheDDDDt added a commit to BiteTheDDDDt/incubator-doris that referenced this pull request Apr 28, 2024
BiteTheDDDDt added a commit that referenced this pull request Apr 28, 2024
…uild block only one row (#33721) (#34264)

* Revert "[Bug](join) do not short_circuit_for_probe for mark join (#34170)"

This reverts commit 57621c2.

* Revert "[Improvementation](join) empty_block shall be set true when build block only one row (#33721)" (#33916)

This reverts commit a93c865.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by one committer. reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants