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](backup) Read db name from BackupJobInfo #39855

Merged
merged 1 commit into from
Aug 24, 2024
Merged

[fix](backup) Read db name from BackupJobInfo #39855

merged 1 commit into from
Aug 24, 2024

Conversation

w41ter
Copy link
Contributor

@w41ter w41ter commented Aug 23, 2024

PR #37412 read the db name from BackupMeta, but it is not compatible, since BackupMeta is not serialized to json.

@w41ter
[fix](backup) Read db name from BackupJobInfo
4e396d9 
PR apache#37412 read the db name from BackupMeta, but it is not compatible,
since BackupMeta is not serialized to json.
@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.

@w41ter
Copy link
Contributor Author

w41ter commented Aug 23, 2024

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	18003	4521	4397	4397
q2	3006	188	174	174
q3	11098	1124	1144	1124
q4	10898	743	728	728
q5	8137	2872	2796	2796
q6	228	141	138	138
q7	984	629	595	595
q8	9313	2034	2070	2034
q9	7268	6505	6512	6505
q10	6989	2186	2211	2186
q11	459	242	239	239
q12	397	217	223	217
q13	17753	3041	3015	3015
q14	282	247	233	233
q15	525	489	498	489
q16	492	401	391	391
q17	980	679	760	679
q18	7356	6811	6785	6785
q19	1399	999	1052	999
q20	679	337	328	328
q21	3857	2883	2688	2688
q22	1125	1071	1034	1034
Total cold run time: 111228 ms
Total hot run time: 37774 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4356	4268	4254	4254
q2	384	280	280	280
q3	2885	2612	2630	2612
q4	1909	1657	1620	1620
q5	5399	5348	5425	5348
q6	221	129	134	129
q7	2092	1710	1696	1696
q8	3171	3365	3365	3365
q9	8401	8456	8354	8354
q10	3443	3246	3200	3200
q11	583	488	526	488
q12	779	607	605	605
q13	11130	3037	2995	2995
q14	306	281	271	271
q15	523	481	470	470
q16	509	428	424	424
q17	1783	1468	1463	1463
q18	7729	7491	7547	7491
q19	1662	1606	1543	1543
q20	2085	1842	1799	1799
q21	5353	5200	5309	5200
q22	1135	1073	1034	1034
Total cold run time: 65838 ms
Total hot run time: 54641 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 187084 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 4e396d96e76699c98311b8eb2399bab04d926d99, data reload: false

query1	898	376	375	375
query2	6465	1898	1888	1888
query3	6644	217	223	217
query4	32302	23248	23320	23248
query5	4176	509	500	500
query6	268	166	172	166
query7	4583	293	284	284
query8	254	215	207	207
query9	8677	2469	2448	2448
query10	432	256	253	253
query11	16786	15063	14956	14956
query12	139	96	99	96
query13	1623	383	374	374
query14	9757	7147	7278	7147
query15	271	173	171	171
query16	7719	494	459	459
query17	1590	571	566	566
query18	1433	297	288	288
query19	270	146	141	141
query20	119	114	110	110
query21	207	101	100	100
query22	4360	3991	4215	3991
query23	34212	33473	33601	33473
query24	11099	2817	2835	2817
query25	614	376	391	376
query26	1131	156	150	150
query27	2353	277	277	277
query28	7367	2067	2060	2060
query29	731	417	419	417
query30	302	153	146	146
query31	962	788	765	765
query32	101	54	55	54
query33	751	272	275	272
query34	995	472	477	472
query35	882	738	717	717
query36	1128	935	931	931
query37	149	81	84	81
query38	3983	3818	3908	3818
query39	1427	1379	1366	1366
query40	192	118	114	114
query41	48	46	45	45
query42	117	99	97	97
query43	507	474	457	457
query44	1185	737	763	737
query45	201	167	167	167
query46	1104	728	726	726
query47	1867	1808	1785	1785
query48	363	287	296	287
query49	1110	422	421	421
query50	820	404	411	404
query51	7098	7070	7080	7070
query52	97	88	90	88
query53	249	180	182	180
query54	984	449	437	437
query55	79	76	78	76
query56	283	245	254	245
query57	1176	1058	1088	1058
query58	239	245	236	236
query59	2933	2788	2702	2702
query60	319	277	265	265
query61	99	103	120	103
query62	876	660	646	646
query63	217	185	181	181
query64	5241	2269	1705	1705
query65	3255	3155	3176	3155
query66	1258	330	335	330
query67	15467	15117	15452	15117
query68	3557	592	575	575
query69	395	277	287	277
query70	1185	1032	1067	1032
query71	342	272	281	272
query72	6402	2453	2199	2199
query73	738	319	319	319
query74	9232	8893	8703	8703
query75	3396	2694	2699	2694
query76	1870	953	955	953
query77	447	325	334	325
query78	10886	9304	9282	9282
query79	1264	547	539	539
query80	952	515	522	515
query81	596	241	232	232
query82	731	136	141	136
query83	229	155	156	155
query84	238	78	82	78
query85	851	335	334	334
query86	387	299	304	299
query87	4378	4330	4299	4299
query88	3045	2305	2285	2285
query89	386	297	294	294
query90	1861	205	194	194
query91	133	107	114	107
query92	69	61	55	55
query93	1060	552	542	542
query94	898	300	313	300
query95	369	268	263	263
query96	593	271	271	271
query97	3210	3084	3080	3080
query98	359	208	256	208
query99	1472	1274	1256	1256
Total cold run time: 286075 ms
Total hot run time: 187084 ms

@doris-robot
Copy link

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

query1	0.05	0.04	0.04
query2	0.07	0.04	0.04
query3	0.23	0.05	0.05
query4	1.67	0.07	0.08
query5	0.50	0.49	0.50
query6	1.13	0.73	0.72
query7	0.02	0.02	0.01
query8	0.06	0.04	0.04
query9	0.55	0.49	0.49
query10	0.55	0.54	0.54
query11	0.16	0.12	0.11
query12	0.15	0.12	0.11
query13	0.62	0.58	0.59
query14	0.76	0.78	0.77
query15	0.84	0.83	0.82
query16	0.37	0.37	0.37
query17	1.10	1.01	1.05
query18	0.21	0.20	0.20
query19	1.83	1.85	1.79
query20	0.01	0.00	0.01
query21	15.40	0.66	0.65
query22	4.14	6.39	3.25
query23	18.31	1.35	1.28
query24	2.06	0.23	0.23
query25	0.16	0.08	0.08
query26	0.26	0.18	0.18
query27	0.07	0.08	0.07
query28	13.24	1.01	0.99
query29	12.65	3.28	3.28
query30	0.24	0.06	0.05
query31	2.88	0.41	0.40
query32	3.25	0.47	0.48
query33	2.92	3.03	2.98
query34	16.99	4.39	4.52
query35	4.48	4.51	4.47
query36	0.66	0.47	0.49
query37	0.19	0.16	0.16
query38	0.17	0.16	0.16
query39	0.04	0.04	0.04
query40	0.15	0.13	0.13
query41	0.10	0.05	0.06
query42	0.06	0.05	0.05
query43	0.05	0.05	0.05
Total cold run time: 109.35 s
Total hot run time: 32.13 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 Aug 23, 2024
@github-actions GitHub Actions
Copy link
Contributor

PR approved by anyone and no changes requested.

dataroaring
dataroaring approved these changes Aug 23, 2024
View reviewed changes
Copy link
Contributor

@dataroaring dataroaring left a comment

Choose a reason for hiding this comment

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

LGTM

@dataroaring dataroaring merged commit 96a0f8d into apache:master Aug 24, 2024
29 of 31 checks passed
@w41ter w41ter mentioned this pull request Aug 26, 2024
Merged
w41ter added a commit to w41ter/incubator-doris that referenced this pull request Aug 26, 2024
@w41ter
[chore](backup) Fix the db name of the restored view
8ba8cc3 
Cherry-pick apache#37412, apache#39855

Previously, during restore, the database name in the CREATE VIEW
statement was not modified, causing the restored view to be unviewable
with the SHOW VIEW command. This PR retains the original cluster's
database name in the BackupMeta and manually replaces it with the new
cluster's database name in the CREATE VIEW statement during restore.
This was referenced Aug 26, 2024
Merged
Merged
w41ter added a commit to w41ter/incubator-doris that referenced this pull request Aug 26, 2024
@w41ter
[fix](backup) Read db name from BackupJobInfo (apache#39855)
99b4665 
PR apache#37412 read the db name from BackupMeta, but it is not compatible,
since BackupMeta is not serialized to json.
w41ter added a commit that referenced this pull request Aug 26, 2024
@w41ter
[chore](backup) Fix the db name of the restored view (#38072)
e21d2b8 
Cherry-pick #37412, #39855

Previously, during restore, the database name in the CREATE VIEW
statement was not modified, causing the restored view to be unviewable
with the SHOW VIEW command. This PR retains the original cluster's
database name in the BackupMeta and manually replaces it with the new
cluster's database name in the CREATE VIEW statement during restore.
w41ter added a commit that referenced this pull request Aug 26, 2024
@w41ter
[fix](backup) Read db name from BackupJobInfo #39855 (#39900)
f1e2b06 
cherry pick from #39855
w41ter added a commit that referenced this pull request Aug 26, 2024
@w41ter
[fix](restore) Reset the db name of the materialized index stmt #39710 (
9412ba5 
#39848)

cherry pick from #39710, #39855
@w41ter w41ter deleted the replace_backup_meta_db_name branch September 5, 2024 02:31
w41ter added a commit to w41ter/incubator-doris that referenced this pull request Sep 5, 2024
@w41ter
[fix](backup) Read db name from BackupJobInfo (apache#39855)
c17679b 
PR apache#37412 read the db name from BackupMeta, but it is not compatible,
since BackupMeta is not serialized to json.
@w41ter w41ter mentioned this pull request Sep 5, 2024
Merged
dataroaring pushed a commit that referenced this pull request Sep 5, 2024
@w41ter
[fix](backup) Read db name from BackupJobInfo #39855 (#40397)
2bc9f86 
cherry pick from #39855
mongo360 pushed a commit to mongo360/doris that referenced this pull request Dec 11, 2024
@w41ter
[fix](backup) Read db name from BackupJobInfo apache#39855 (apache#39900
265ca95 
)

cherry pick from apache#39855
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dataroaring dataroaring dataroaring approved these changes

@gavinchou gavinchou gavinchou approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@w41ter @doris-robot @gavinchou @dataroaring