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

[fix](colocate) fix colocate join while multi tables #37729

Merged
merged 1 commit into from
Jul 15, 2024
Merged

[fix](colocate) fix colocate join while multi tables #37729

merged 1 commit into from
Jul 15, 2024

Conversation

cambyzju
Copy link
Contributor

after #37361, in multi-tables cases, we should no depend on SlotReference.getTable()

@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.

@cambyzju
Copy link
Contributor Author

run buildall

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Jul 12, 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.

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	19120	4468	4378	4378
q2	2883	213	191	191
q3	11011	1346	1166	1166
q4	10406	730	811	730
q5	8198	2701	2687	2687
q6	221	141	141	141
q7	1001	599	605	599
q8	9213	2082	2072	2072
q9	8793	6555	6558	6555
q10	8787	3793	3751	3751
q11	464	240	243	240
q12	409	231	236	231
q13	18826	2981	2993	2981
q14	278	238	232	232
q15	521	481	474	474
q16	485	374	378	374
q17	963	679	726	679
q18	8000	7640	7382	7382
q19	6416	1532	1416	1416
q20	700	321	327	321
q21	4876	3285	3334	3285
q22	348	282	288	282
Total cold run time: 121919 ms
Total hot run time: 40167 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4419	4271	4267	4267
q2	384	268	261	261
q3	3017	2828	2735	2735
q4	1855	1607	1581	1581
q5	5304	5287	5333	5287
q6	229	134	137	134
q7	2137	1708	1699	1699
q8	3201	3305	3304	3304
q9	8398	8414	8408	8408
q10	3947	3700	3694	3694
q11	569	505	499	499
q12	787	615	613	613
q13	17460	2992	3016	2992
q14	330	274	289	274
q15	508	488	477	477
q16	481	403	443	403
q17	1793	1482	1469	1469
q18	7649	7448	7447	7447
q19	1684	1629	1483	1483
q20	2028	1791	1781	1781
q21	4838	4649	4656	4649
q22	586	489	505	489
Total cold run time: 71604 ms
Total hot run time: 53946 ms

@doris-robot
Copy link

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

query1	931	369	368	368
query2	6457	1859	1796	1796
query3	6660	209	225	209
query4	28344	17317	17226	17226
query5	4223	527	505	505
query6	272	186	165	165
query7	4600	307	300	300
query8	247	200	189	189
query9	8805	2418	2410	2410
query10	429	279	275	275
query11	12339	10069	10089	10069
query12	141	86	91	86
query13	1644	402	391	391
query14	10369	7797	7743	7743
query15	267	171	170	170
query16	7614	349	326	326
query17	1752	574	555	555
query18	1789	296	285	285
query19	207	157	161	157
query20	98	82	85	82
query21	211	130	128	128
query22	4450	4117	3893	3893
query23	33725	33080	33034	33034
query24	11987	2918	2841	2841
query25	677	395	397	395
query26	1761	155	156	155
query27	2806	280	280	280
query28	7507	2040	2037	2037
query29	1022	657	649	649
query30	296	153	153	153
query31	991	738	761	738
query32	100	58	62	58
query33	800	317	331	317
query34	890	503	506	503
query35	723	601	579	579
query36	1154	962	916	916
query37	254	86	84	84
query38	2898	2765	2732	2732
query39	864	788	830	788
query40	281	135	131	131
query41	53	48	47	47
query42	126	102	106	102
query43	510	482	472	472
query44	1177	769	744	744
query45	196	167	167	167
query46	1099	763	734	734
query47	1872	1754	1773	1754
query48	370	317	308	308
query49	1212	441	436	436
query50	791	407	405	405
query51	6952	6832	6804	6804
query52	118	95	97	95
query53	367	307	311	307
query54	1043	480	475	475
query55	77	76	80	76
query56	325	309	310	309
query57	1180	1053	1074	1053
query58	280	252	273	252
query59	2810	2600	2617	2600
query60	314	293	294	293
query61	96	94	98	94
query62	843	655	659	655
query63	330	305	296	296
query64	10585	2256	6381	2256
query65	3117	3101	3099	3099
query66	1338	343	345	343
query67	15721	14908	14822	14822
query68	7281	568	568	568
query69	727	461	410	410
query70	1237	1183	1137	1137
query71	519	282	290	282
query72	8954	5452	5296	5296
query73	793	334	330	330
query74	6034	5476	5468	5468
query75	4789	2710	2739	2710
query76	5009	994	976	976
query77	755	313	317	313
query78	10382	9069	10550	9069
query79	9647	546	536	536
query80	863	546	496	496
query81	580	223	224	223
query82	704	138	137	137
query83	343	171	172	171
query84	276	91	88	88
query85	1395	347	311	311
query86	407	316	303	303
query87	3320	3160	3071	3071
query88	4359	2469	2481	2469
query89	550	391	396	391
query90	2081	199	202	199
query91	137	103	103	103
query92	61	51	55	51
query93	5422	527	524	524
query94	1270	224	222	222
query95	413	319	323	319
query96	618	280	281	280
query97	3179	3055	3044	3044
query98	228	202	199	199
query99	1506	1285	1285	1285
Total cold run time: 307326 ms
Total hot run time: 173697 ms

@doris-robot
Copy link

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

query1	0.04	0.04	0.03
query2	0.08	0.04	0.04
query3	0.23	0.06	0.05
query4	1.67	0.08	0.09
query5	0.50	0.48	0.48
query6	1.14	0.72	0.74
query7	0.02	0.01	0.02
query8	0.05	0.04	0.05
query9	0.55	0.50	0.49
query10	0.56	0.55	0.56
query11	0.16	0.12	0.12
query12	0.14	0.12	0.13
query13	0.61	0.58	0.58
query14	0.76	0.78	0.78
query15	0.86	0.81	0.81
query16	0.36	0.38	0.37
query17	0.97	1.00	0.94
query18	0.23	0.23	0.22
query19	1.93	1.74	1.80
query20	0.02	0.01	0.01
query21	15.40	0.75	0.65
query22	4.51	7.20	1.40
query23	18.23	1.33	1.19
query24	2.05	0.22	0.21
query25	0.17	0.09	0.08
query26	0.29	0.20	0.20
query27	0.45	0.23	0.23
query28	13.33	1.02	1.00
query29	12.61	3.38	3.38
query30	0.25	0.06	0.06
query31	2.87	0.40	0.39
query32	3.25	0.49	0.46
query33	2.88	2.89	2.87
query34	17.07	4.36	4.37
query35	4.39	4.39	4.38
query36	0.66	0.48	0.48
query37	0.18	0.15	0.16
query38	0.16	0.14	0.14
query39	0.05	0.03	0.04
query40	0.16	0.12	0.13
query41	0.10	0.05	0.06
query42	0.06	0.05	0.04
query43	0.04	0.05	0.04
Total cold run time: 110.04 s
Total hot run time: 30.09 s

@cambyzju
Copy link
Contributor Author

run p0

@cambyzju
Copy link
Contributor Author

run p1

lide-reed
lide-reed approved these changes Jul 15, 2024
View reviewed changes
Copy link
Contributor

@lide-reed lide-reed left a comment

Choose a reason for hiding this comment

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

LGTM

xy720
xy720 approved these changes Jul 15, 2024
View reviewed changes
Copy link
Member

@xy720 xy720 left a comment

Choose a reason for hiding this comment

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

LGTM

@cambyzju cambyzju merged commit 09ba4ac into apache:master Jul 15, 2024
29 of 32 checks passed
@morrySnow morrySnow added the p0_b label Jul 15, 2024
wsjz pushed a commit to wsjz/incubator-doris that referenced this pull request Jul 15, 2024
@cambyzju @wsjz
[fix](colocate) fix colocate join while multi tables (apache#37729)
86e8a48
cambyzju added a commit to cambyzju/incubator-doris that referenced this pull request Jul 16, 2024
@cambyzju
[fix](colocate) fix colocate join while multi tables (apache#37729)
1ff4470
@cambyzju cambyzju mentioned this pull request Jul 16, 2024
Merged
yiguolei pushed a commit to cambyzju/incubator-doris that referenced this pull request Jul 16, 2024
@cambyzju @yiguolei
[fix](colocate) fix colocate join while multi tables (apache#37729)
7cd326e
yiguolei pushed a commit that referenced this pull request Jul 16, 2024
@cambyzju
[fix](colocate) fix colocate join while multi tables (#37729) (#37859)
faa425b 
cherry-pick #37729 to branch-2.1
cambyzju added a commit to cambyzju/incubator-doris that referenced this pull request Jul 16, 2024
@cambyzju
[fix](colocate) fix colocate join while multi tables (apache#37729)
8be495d
@cambyzju cambyzju mentioned this pull request Jul 16, 2024
Merged
morrySnow pushed a commit that referenced this pull request Jul 17, 2024
@cambyzju
[fix)(colocate join) fix wrong use of colocate join (#37361)(#37729) (#…
3bb5291 
…37937)

cherry-pick from master #37361 #37729
seawinde pushed a commit to seawinde/doris that referenced this pull request Jul 17, 2024
@cambyzju @seawinde
[fix](colocate) fix colocate join while multi tables (apache#37729)
2a9ec0f
dataroaring pushed a commit that referenced this pull request Jul 17, 2024
@cambyzju @dataroaring
[fix](colocate) fix colocate join while multi tables (#37729)
a8ca96c
mongo360 pushed a commit to mongo360/doris that referenced this pull request Aug 16, 2024
@cambyzju
[fix)(colocate join) fix wrong use of colocate join (apache#37361)(ap…
c443f97 
…ache#37729) (apache#37937)

cherry-pick from master apache#37361 apache#37729
@gavinchou gavinchou mentioned this pull request Aug 19, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lide-reed lide-reed lide-reed approved these changes

@xy720 xy720 xy720 approved these changes

@morrySnow morrySnow morrySnow approved these changes

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by one committer. dev/2.0.14-merged dev/2.1.5-merged dev/3.0.1-merged p0_b reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@cambyzju @doris-robot @lide-reed @xy720 @morrySnow @yiguolei @dataroaring