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](hudi) Fix some errors caused by resolving code conflicts #45355

Merged
merged 1 commit into from
Dec 15, 2024
Merged

[Fix](hudi) Fix some errors caused by resolving code conflicts #45355

merged 1 commit into from
Dec 15, 2024

Conversation

suxiaogang223
Copy link
Contributor

What problem does this PR solve?

Problem Summary:
Fix some errors caused by resolving code conflicts

Release note

None

Check List (For Author)

  • Test

    • Regression test
    • Unit Test
    • Manual test (add detailed scripts or steps below)
    • No need to test or manual test. Explain why:
      • This is a refactor/code format and no logic has been changed.
      • Previous test can cover this change.
      • No code files have been changed.
      • Other reason

  • Behavior changed:

    • No.
    • Yes.

  • Does this need documentation?

    • No.
    • Yes.

Check List (For Reviewer who merge this PR)

  • Confirm the release note
  • Confirm test cases
  • Confirm document
  • Add branch pick label

@hello-stephen
Copy link
Contributor

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

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

@suxiaogang223
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17607	7488	7270	7270
q2	2045	170	166	166
q3	10559	1131	1144	1131
q4	10227	771	743	743
q5	7626	2682	2646	2646
q6	238	149	150	149
q7	1009	628	612	612
q8	9246	1886	1949	1886
q9	6630	6450	6496	6450
q10	6949	2290	2325	2290
q11	471	251	256	251
q12	413	235	246	235
q13	17768	2986	3016	2986
q14	236	208	204	204
q15	569	515	510	510
q16	640	596	581	581
q17	971	611	554	554
q18	7423	6579	6727	6579
q19	1338	1011	944	944
q20	469	180	180	180
q21	4033	3109	3226	3109
q22	371	315	322	315
Total cold run time: 106838 ms
Total hot run time: 39791 ms

----- Round 2, with runtime_filter_mode=off -----
q1	7306	7302	7274	7274
q2	320	225	236	225
q3	2899	2737	3021	2737
q4	2156	1917	1913	1913
q5	5627	5721	5611	5611
q6	225	140	140	140
q7	2212	1768	1824	1768
q8	3410	3564	3506	3506
q9	9020	8913	9046	8913
q10	3588	3565	3546	3546
q11	600	512	497	497
q12	831	613	627	613
q13	11331	3182	3189	3182
q14	300	279	267	267
q15	572	524	524	524
q16	679	638	652	638
q17	1801	1595	1546	1546
q18	7776	7462	7502	7462
q19	1701	1481	1531	1481
q20	2128	1817	1802	1802
q21	5431	5186	5204	5186
q22	659	541	591	541
Total cold run time: 70572 ms
Total hot run time: 59372 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 189961 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 154857c7b05a39147e4903396e52ddcfb8bf7af2, data reload: false

query1	992	378	371	371
query2	6513	2208	2088	2088
query3	6707	224	215	215
query4	34335	23436	23522	23436
query5	4282	461	461	461
query6	271	199	179	179
query7	4621	306	307	306
query8	329	246	231	231
query9	9547	2703	2694	2694
query10	479	257	257	257
query11	18157	15182	15369	15182
query12	155	119	103	103
query13	1685	447	416	416
query14	8953	6792	7243	6792
query15	327	178	182	178
query16	7691	448	413	413
query17	1747	585	557	557
query18	2019	300	324	300
query19	369	148	143	143
query20	117	104	122	104
query21	202	98	105	98
query22	4487	4115	4090	4090
query23	34446	33628	33678	33628
query24	11427	2590	2489	2489
query25	664	367	370	367
query26	1850	153	150	150
query27	2931	277	285	277
query28	8294	2474	2455	2455
query29	964	395	403	395
query30	306	148	150	148
query31	1041	815	820	815
query32	95	56	60	56
query33	770	285	278	278
query34	1013	515	513	513
query35	919	738	752	738
query36	1076	951	930	930
query37	245	71	75	71
query38	4301	4167	4122	4122
query39	1493	1556	1426	1426
query40	278	102	125	102
query41	45	43	45	43
query42	116	97	94	94
query43	546	506	484	484
query44	1263	823	819	819
query45	191	170	165	165
query46	1160	720	693	693
query47	1926	1800	1841	1800
query48	424	332	321	321
query49	1304	383	382	382
query50	795	381	388	381
query51	7225	7052	7001	7001
query52	102	90	87	87
query53	249	175	185	175
query54	1165	390	407	390
query55	82	76	79	76
query56	251	233	237	233
query57	1243	1109	1124	1109
query58	223	206	222	206
query59	3210	2994	3120	2994
query60	264	251	232	232
query61	106	104	106	104
query62	877	682	649	649
query63	212	179	192	179
query64	5093	694	630	630
query65	3286	3207	3233	3207
query66	1466	312	313	312
query67	16219	15720	15773	15720
query68	5171	568	564	564
query69	410	255	256	255
query70	1217	1146	1194	1146
query71	355	259	247	247
query72	6352	4045	4030	4030
query73	760	360	359	359
query74	10363	8992	8881	8881
query75	3426	2611	2663	2611
query76	3009	1111	1066	1066
query77	550	293	362	293
query78	10307	9476	9428	9428
query79	1854	599	580	580
query80	1206	433	410	410
query81	537	240	237	237
query82	951	118	118	118
query83	236	147	145	145
query84	241	68	71	68
query85	1417	303	301	301
query86	415	288	298	288
query87	4800	4604	4533	4533
query88	3454	2226	2195	2195
query89	413	297	305	297
query90	2037	188	180	180
query91	138	102	111	102
query92	61	49	50	49
query93	1273	552	550	550
query94	1128	286	296	286
query95	363	249	254	249
query96	606	282	291	282
query97	2849	2646	2687	2646
query98	221	194	193	193
query99	1581	1330	1312	1312
Total cold run time: 302842 ms
Total hot run time: 189961 ms

@doris-robot
Copy link

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

query1	0.03	0.03	0.02
query2	0.07	0.04	0.03
query3	0.23	0.08	0.07
query4	1.60	0.10	0.11
query5	0.43	0.40	0.41
query6	1.15	0.67	0.64
query7	0.02	0.02	0.01
query8	0.03	0.04	0.03
query9	0.57	0.50	0.49
query10	0.55	0.57	0.56
query11	0.14	0.10	0.10
query12	0.13	0.11	0.11
query13	0.60	0.61	0.59
query14	2.84	2.85	2.74
query15	0.90	0.82	0.83
query16	0.39	0.38	0.37
query17	0.97	1.07	1.07
query18	0.23	0.19	0.21
query19	1.89	1.84	1.94
query20	0.02	0.01	0.02
query21	15.35	0.59	0.59
query22	2.72	2.40	2.61
query23	16.94	0.93	0.82
query24	2.98	1.04	2.45
query25	0.10	0.15	0.12
query26	0.70	0.13	0.14
query27	0.04	0.04	0.04
query28	9.82	1.09	1.08
query29	12.55	3.19	3.20
query30	0.25	0.07	0.06
query31	2.86	0.39	0.38
query32	3.30	0.46	0.45
query33	2.99	3.05	3.09
query34	16.74	4.48	4.52
query35	4.47	4.48	4.50
query36	0.65	0.48	0.48
query37	0.09	0.06	0.06
query38	0.05	0.03	0.04
query39	0.04	0.02	0.03
query40	0.15	0.14	0.12
query41	0.08	0.02	0.03
query42	0.03	0.02	0.02
query43	0.04	0.03	0.03
Total cold run time: 105.73 s
Total hot run time: 33.28 s

@github-actions GitHub Actions
Copy link
Contributor

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

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

PR approved by anyone and no changes requested.

@morningman morningman merged commit 39f4731 into apache:master Dec 15, 2024
32 of 33 checks passed
@suxiaogang223 suxiaogang223 deleted the fix_hudi_ branch December 16, 2024 08:16
@morningman morningman mentioned this pull request Dec 22, 2024
Merged
16 tasks
morningman added a commit that referenced this pull request Dec 23, 2024
@morningman
[fix](hudi) remove session variable field in HudiScanNode (#45762)
49d397b 
### What problem does this PR solve?

Related PR: #45355

Problem Summary:
The `sessionVariable` field is already in parent class
`FileQueryScanNode`,
remove it from `HudiScanNode`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jibing-Li Jibing-Li Jibing-Li approved these changes

@wuwenchi wuwenchi wuwenchi approved these changes

@CalvinKirs CalvinKirs CalvinKirs approved these changes

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

Successfully merging this pull request may close these issues.
7 participants
@suxiaogang223 @hello-stephen @doris-robot @CalvinKirs @wuwenchi @Jibing-Li @morningman