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

[opt](jdbc catalog) Compatible with higher ClickHouse JDBC Driver versions #46026

Merged
merged 1 commit into from
Jan 22, 2025

Conversation

zy-kkk
Copy link
Member

@zy-kkk zy-kkk commented Dec 26, 2024

What problem does this PR solve?

Issue Number: close #xxx

Related PR: #xxx

Problem Summary:

  1. Since clickhouse changes the database level in jdbc metadata from schema to catalog in JDBC Driver 0.5.0 and later, we need to be compatible with this change
  2. Since clickhouse JDBC Driver supports getting metadata from prepared statements only in Driver version 0.6.2 and later, if you use query tvf to query clickhouse catalog, you need to use a driver later than this version
  3. Delete some tests and add them again later

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

@Thearas
Copy link
Contributor

Thearas commented Dec 26, 2024

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?

@zy-kkk
Copy link
Member Author

zy-kkk commented Dec 26, 2024

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17582	6131	6032	6032
q2	2055	305	171	171
q3	10416	1256	693	693
q4	10210	880	436	436
q5	7510	2173	1949	1949
q6	205	185	151	151
q7	898	760	626	626
q8	9231	1351	1141	1141
q9	5085	4815	4952	4815
q10	6723	2307	1847	1847
q11	455	278	268	268
q12	340	372	222	222
q13	17765	3614	2945	2945
q14	233	227	224	224
q15	556	500	497	497
q16	649	603	602	602
q17	535	846	334	334
q18	7099	6425	6467	6425
q19	1233	962	563	563
q20	302	350	191	191
q21	2814	2180	1980	1980
q22	363	338	310	310
Total cold run time: 102259 ms
Total hot run time: 32422 ms

----- Round 2, with runtime_filter_mode=off -----
q1	6231	6198	6246	6198
q2	238	326	229	229
q3	2250	2653	2318	2318
q4	1384	1842	1328	1328
q5	4332	4751	4671	4671
q6	187	179	149	149
q7	2102	1909	1812	1812
q8	2604	2766	2642	2642
q9	7319	7187	7162	7162
q10	3063	3350	2794	2794
q11	595	513	497	497
q12	645	735	606	606
q13	3347	3767	3073	3073
q14	311	295	292	292
q15	571	523	505	505
q16	655	695	655	655
q17	1187	1699	1246	1246
q18	7519	7450	7141	7141
q19	775	1104	1024	1024
q20	1881	1910	1856	1856
q21	5445	5137	5016	5016
q22	618	642	546	546
Total cold run time: 53259 ms
Total hot run time: 51760 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 190176 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 6b27a477d9ab02133d9e9f9b7dd61e74ddad5572, data reload: false

query1	965	375	380	375
query2	6518	2388	2330	2330
query3	6708	219	207	207
query4	34088	23625	23977	23625
query5	4384	631	487	487
query6	300	202	184	184
query7	4638	506	308	308
query8	298	254	237	237
query9	9450	2761	2772	2761
query10	481	311	256	256
query11	18107	15377	15334	15334
query12	152	108	108	108
query13	1676	539	422	422
query14	10403	7210	7122	7122
query15	218	196	184	184
query16	7863	633	468	468
query17	1598	741	585	585
query18	1520	376	306	306
query19	239	185	186	185
query20	116	110	112	110
query21	211	116	104	104
query22	4270	4335	4301	4301
query23	34357	33684	33517	33517
query24	6328	2288	2267	2267
query25	474	432	380	380
query26	1203	269	148	148
query27	1988	455	338	338
query28	5211	2471	2433	2433
query29	688	533	415	415
query30	229	179	149	149
query31	971	905	822	822
query32	84	63	59	59
query33	489	354	301	301
query34	770	819	513	513
query35	771	811	740	740
query36	1019	1054	943	943
query37	111	104	72	72
query38	4070	4097	4049	4049
query39	1470	1435	1410	1410
query40	204	116	99	99
query41	46	46	46	46
query42	123	108	102	102
query43	515	526	487	487
query44	1267	822	807	807
query45	177	167	163	163
query46	850	1042	648	648
query47	1874	1913	1846	1846
query48	394	403	318	318
query49	777	482	387	387
query50	619	652	378	378
query51	7084	7180	7086	7086
query52	102	106	95	95
query53	221	253	184	184
query54	482	489	415	415
query55	83	74	82	74
query56	259	261	246	246
query57	1182	1170	1114	1114
query58	235	216	255	216
query59	3155	3117	2928	2928
query60	260	286	251	251
query61	112	106	135	106
query62	869	794	738	738
query63	224	195	203	195
query64	4368	987	645	645
query65	3269	3199	3225	3199
query66	1056	406	308	308
query67	15864	15706	15509	15509
query68	8422	785	525	525
query69	466	320	281	281
query70	1241	1104	1135	1104
query71	413	283	254	254
query72	5734	2785	2538	2538
query73	596	653	363	363
query74	10191	9099	8849	8849
query75	4364	3167	2662	2662
query76	4910	1201	792	792
query77	851	358	280	280
query78	10162	10135	10105	10105
query79	2860	921	609	609
query80	676	519	443	443
query81	478	269	233	233
query82	570	150	128	128
query83	163	167	155	155
query84	242	97	74	74
query85	785	367	316	316
query86	352	318	290	290
query87	4646	4605	4429	4429
query88	4696	2255	2213	2213
query89	403	336	309	309
query90	1903	192	189	189
query91	137	138	107	107
query92	66	59	55	55
query93	1034	901	554	554
query94	661	390	288	288
query95	347	267	253	253
query96	498	613	280	280
query97	2706	2848	2703	2703
query98	230	207	207	207
query99	1642	1564	1443	1443
Total cold run time: 292552 ms
Total hot run time: 190176 ms

@doris-robot
Copy link

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

query1	0.03	0.03	0.03
query2	0.08	0.03	0.04
query3	0.23	0.08	0.06
query4	1.61	0.10	0.11
query5	0.43	0.39	0.40
query6	1.15	0.65	0.66
query7	0.03	0.02	0.01
query8	0.04	0.03	0.03
query9	0.57	0.50	0.50
query10	0.54	0.56	0.55
query11	0.14	0.10	0.10
query12	0.15	0.11	0.11
query13	0.61	0.61	0.59
query14	2.72	2.86	2.80
query15	0.90	0.83	0.83
query16	0.39	0.37	0.38
query17	1.01	1.08	1.04
query18	0.23	0.22	0.21
query19	1.92	1.98	1.90
query20	0.01	0.01	0.01
query21	15.39	0.95	0.61
query22	0.75	0.74	0.74
query23	15.30	1.45	0.62
query24	3.73	0.78	1.85
query25	0.15	0.13	0.20
query26	0.33	0.14	0.14
query27	0.05	0.05	0.09
query28	13.92	1.46	1.04
query29	12.58	3.94	3.31
query30	0.25	0.08	0.06
query31	2.84	0.60	0.37
query32	3.25	0.55	0.47
query33	3.22	3.08	3.30
query34	16.78	5.10	4.51
query35	4.50	4.45	4.41
query36	0.65	0.48	0.48
query37	0.10	0.06	0.06
query38	0.05	0.04	0.04
query39	0.04	0.02	0.02
query40	0.16	0.13	0.12
query41	0.08	0.03	0.02
query42	0.04	0.03	0.02
query43	0.03	0.03	0.03
Total cold run time: 106.98 s
Total hot run time: 31.42 s

@morningman
Copy link
Contributor

This pull request introduces significant enhancements to the JdbcClickHouseClient class, including new methods for handling database terms and driver versions, and updates to regression tests to support these changes. The most important changes are summarized below:

Enhancements to JdbcClickHouseClient:

  • Added methods to determine if the database term is a catalog or schema, including isDatabaseTermCatalog, determineDatabaseTerm, isNewClickHouseDriver, and getDatabaseTermFromUrl. These methods ensure compatibility with different driver versions and configurations.
  • Implemented the getDatabaseNameList, processTable, getRemoteColumns, and getCatalogName methods to handle database terms appropriately based on the driver version and URL configuration.

Updates to JdbcClient:

  • Added a getJdbcDriverVersion method to retrieve the JDBC driver version, which is used in the JdbcClickHouseClient for determining database term handling.

Regression Tests:

  • Updated the test_clickhouse_jdbc_catalog regression test suite to include tests for different configurations of the ClickHouse JDBC driver, covering both catalog and schema database terms. This ensures the new functionality is thoroughly tested. [1] [2]

private boolean determineDatabaseTerm() {
try (Connection conn = getConnection()) {
String jdbcUrl = conn.getMetaData().getURL();
// 获取驱动版本是否大于等于 0.5.0
Copy link
Contributor

Choose a reason for hiding this comment

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

English

* true will be returned.
* 2. If it is an old version driver (<0.5.0), always returns false.
*/
private boolean isDatabaseTermCatalog() {
Copy link
Contributor

Choose a reason for hiding this comment

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

I suggest to check and fill the databaseTermIsCatalog when creating the catalog.
(for old version, user can call refresh to fill this field, added to the document).

So that we don't need to use this synchronized things, which make the code hard to maintain.

@zy-kkk
Copy link
Member Author

zy-kkk commented Jan 7, 2025

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17601	6183	6248	6183
q2	2060	311	161	161
q3	10514	1280	725	725
q4	10217	867	431	431
q5	7542	2222	1996	1996
q6	207	184	150	150
q7	926	766	620	620
q8	9204	1360	1193	1193
q9	5200	4831	4845	4831
q10	6760	2290	1866	1866
q11	486	280	263	263
q12	346	351	222	222
q13	17765	3689	3046	3046
q14	228	235	225	225
q15	563	497	506	497
q16	629	634	599	599
q17	590	864	345	345
q18	7140	6573	6496	6496
q19	1279	972	547	547
q20	312	322	185	185
q21	2875	2122	1961	1961
q22	365	316	306	306
Total cold run time: 102809 ms
Total hot run time: 32848 ms

----- Round 2, with runtime_filter_mode=off -----
q1	6222	6256	6222	6222
q2	238	330	233	233
q3	2213	2680	2363	2363
q4	1436	1859	1405	1405
q5	4393	4751	4737	4737
q6	187	175	144	144
q7	2129	2042	1838	1838
q8	2624	2832	2757	2757
q9	7274	7115	7269	7115
q10	3059	3315	2817	2817
q11	596	518	503	503
q12	676	763	596	596
q13	3471	3974	3207	3207
q14	292	314	265	265
q15	566	519	512	512
q16	662	696	641	641
q17	1225	1753	1251	1251
q18	7591	7426	7214	7214
q19	839	1143	1055	1055
q20	1905	1941	1839	1839
q21	5529	5024	4807	4807
q22	626	642	596	596
Total cold run time: 53753 ms
Total hot run time: 52117 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 189085 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 613bc38d55318695f049a785e7a40bc055d11199, data reload: false

query1	980	368	367	367
query2	6521	2468	2341	2341
query3	6700	217	216	216
query4	33919	23561	23504	23504
query5	4276	638	454	454
query6	277	201	196	196
query7	4631	492	301	301
query8	311	252	236	236
query9	9764	2786	2767	2767
query10	471	301	253	253
query11	18473	15375	15137	15137
query12	165	105	107	105
query13	1659	534	404	404
query14	10406	6695	7628	6695
query15	232	196	186	186
query16	7975	596	422	422
query17	1567	749	550	550
query18	2122	389	286	286
query19	206	176	142	142
query20	119	110	106	106
query21	203	118	101	101
query22	4422	4344	4190	4190
query23	34640	33102	34455	33102
query24	6383	2256	2250	2250
query25	443	438	372	372
query26	1058	255	149	149
query27	2108	463	338	338
query28	5410	2483	2462	2462
query29	507	521	434	434
query30	222	179	152	152
query31	1017	900	808	808
query32	74	58	60	58
query33	497	334	291	291
query34	749	852	517	517
query35	796	802	737	737
query36	1027	1058	994	994
query37	115	108	77	77
query38	4126	4110	4044	4044
query39	1491	1440	1415	1415
query40	202	113	97	97
query41	47	45	47	45
query42	125	102	102	102
query43	525	529	504	504
query44	1298	815	823	815
query45	174	171	171	171
query46	858	1038	652	652
query47	1896	1902	1861	1861
query48	380	412	318	318
query49	766	472	388	388
query50	618	667	375	375
query51	7120	7136	7035	7035
query52	101	102	87	87
query53	223	261	194	194
query54	475	467	417	417
query55	81	76	80	76
query56	253	261	237	237
query57	1178	1208	1103	1103
query58	234	233	227	227
query59	3066	3246	2966	2966
query60	270	257	247	247
query61	110	103	106	103
query62	862	796	746	746
query63	236	188	185	185
query64	4278	1046	631	631
query65	3302	3213	3224	3213
query66	1036	429	306	306
query67	15915	15777	15527	15527
query68	7518	697	512	512
query69	465	290	253	253
query70	1191	1143	1064	1064
query71	467	287	253	253
query72	6046	3785	3769	3769
query73	660	753	361	361
query74	9686	9286	8762	8762
query75	3936	3161	2637	2637
query76	3554	1178	767	767
query77	765	396	279	279
query78	11025	10088	9385	9385
query79	2879	761	595	595
query80	568	534	451	451
query81	481	268	233	233
query82	571	153	128	128
query83	163	172	145	145
query84	231	95	68	68
query85	755	429	297	297
query86	364	324	302	302
query87	4427	4641	4362	4362
query88	4521	2242	2202	2202
query89	398	317	310	310
query90	1960	184	184	184
query91	130	132	101	101
query92	65	57	51	51
query93	996	755	533	533
query94	663	385	280	280
query95	334	262	245	245
query96	492	614	284	284
query97	2896	3011	2859	2859
query98	223	204	197	197
query99	1481	1535	1429	1429
Total cold run time: 291602 ms
Total hot run time: 189085 ms

@doris-robot
Copy link

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

query1	0.04	0.03	0.03
query2	0.07	0.04	0.03
query3	0.24	0.07	0.07
query4	1.61	0.10	0.11
query5	0.43	0.41	0.40
query6	1.14	0.65	0.65
query7	0.02	0.02	0.02
query8	0.04	0.04	0.03
query9	0.57	0.52	0.49
query10	0.56	0.57	0.54
query11	0.13	0.11	0.11
query12	0.14	0.11	0.10
query13	0.60	0.61	0.59
query14	2.71	2.76	2.71
query15	0.89	0.84	0.82
query16	0.37	0.38	0.38
query17	1.03	1.01	1.00
query18	0.22	0.20	0.20
query19	1.98	1.79	1.92
query20	0.02	0.02	0.01
query21	15.40	0.93	0.58
query22	0.75	0.81	0.74
query23	15.19	1.35	0.53
query24	2.82	0.78	2.33
query25	0.26	0.19	0.16
query26	0.27	0.14	0.13
query27	0.05	0.07	0.06
query28	13.86	1.49	1.04
query29	12.59	4.01	3.25
query30	0.25	0.09	0.06
query31	2.82	0.59	0.39
query32	3.22	0.54	0.48
query33	3.15	3.14	3.06
query34	16.70	5.06	4.60
query35	4.46	4.43	4.42
query36	0.63	0.50	0.47
query37	0.10	0.06	0.06
query38	0.04	0.03	0.03
query39	0.03	0.02	0.02
query40	0.17	0.14	0.12
query41	0.08	0.02	0.02
query42	0.03	0.02	0.02
query43	0.03	0.03	0.03
Total cold run time: 105.71 s
Total hot run time: 31.12 s

@@ -379,10 +378,11 @@ private void testJdbcConnection() throws DdlException {

private void testFeToJdbcConnection() throws DdlException {
try {
initLocalObjectsImpl();
Copy link
Contributor

Choose a reason for hiding this comment

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

Why move this method to here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Initializing the client in the method that tests FE's external connection is more convenient for process control, rather than outside this method

String[] versionParts = driverVersion.split("\\.");
int majorVersion = Integer.parseInt(versionParts[0]);
int minorVersion = Integer.parseInt(versionParts[1]);
// 判断是否大于等于 0.5.x
Copy link
Contributor

Choose a reason for hiding this comment

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

English.
And we should add UT for this method

@zy-kkk zy-kkk force-pushed the ck_driver_1226 branch 2 times, most recently from 613e095 to 9ab4125 Compare January 15, 2025 16:43
@zy-kkk
Copy link
Member Author

zy-kkk commented Jan 20, 2025

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17585	5530	5390	5390
q2	2052	301	168	168
q3	10546	1193	748	748
q4	10252	971	518	518
q5	8195	2369	2146	2146
q6	192	162	133	133
q7	885	755	591	591
q8	9226	1323	1121	1121
q9	5207	4868	4866	4866
q10	6821	2333	1892	1892
q11	470	269	253	253
q12	334	355	214	214
q13	17773	3679	3343	3343
q14	230	226	219	219
q15	523	462	462	462
q16	646	622	593	593
q17	566	864	334	334
q18	7064	6433	6416	6416
q19	2053	953	545	545
q20	309	317	191	191
q21	2918	2124	1977	1977
q22	359	328	318	318
Total cold run time: 104206 ms
Total hot run time: 32438 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5586	5457	5506	5457
q2	240	344	235	235
q3	2258	2674	2333	2333
q4	1434	1807	1375	1375
q5	4321	4716	4604	4604
q6	165	159	130	130
q7	2054	1945	1821	1821
q8	2615	2825	2664	2664
q9	7397	7209	7313	7209
q10	3031	3313	2773	2773
q11	555	507	485	485
q12	648	722	559	559
q13	3573	3928	3245	3245
q14	298	291	272	272
q15	544	484	475	475
q16	636	696	630	630
q17	1220	1722	1267	1267
q18	7598	7471	7426	7426
q19	774	1159	1048	1048
q20	1993	2065	1849	1849
q21	5741	5289	4965	4965
q22	607	601	552	552
Total cold run time: 53288 ms
Total hot run time: 51374 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 194020 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 2e8831c74058149a4baa6e5e62d32c09901bc6de, data reload: false

query1	1320	941	925	925
query2	6217	2009	2033	2009
query3	11093	4632	4707	4632
query4	32609	23342	23086	23086
query5	3716	625	480	480
query6	293	243	173	173
query7	3977	488	304	304
query8	289	241	215	215
query9	9370	2564	2551	2551
query10	458	305	255	255
query11	17718	15068	14913	14913
query12	155	105	103	103
query13	1551	503	381	381
query14	9754	6764	6610	6610
query15	237	214	212	212
query16	8065	690	493	493
query17	1597	795	591	591
query18	2138	432	322	322
query19	214	200	169	169
query20	118	118	118	118
query21	204	123	103	103
query22	4821	4689	4608	4608
query23	34830	33515	33343	33343
query24	6525	2351	2305	2305
query25	457	477	392	392
query26	722	239	160	160
query27	1990	472	328	328
query28	5540	2465	2420	2420
query29	560	541	441	441
query30	210	190	156	156
query31	956	879	860	860
query32	87	64	59	59
query33	512	356	307	307
query34	756	880	510	510
query35	819	842	797	797
query36	1024	1083	959	959
query37	124	112	82	82
query38	4282	4296	4217	4217
query39	1475	1454	1428	1428
query40	200	122	101	101
query41	51	50	50	50
query42	120	107	102	102
query43	503	515	470	470
query44	1380	849	816	816
query45	192	172	170	170
query46	867	1062	646	646
query47	1967	1927	1915	1915
query48	380	411	317	317
query49	710	492	393	393
query50	669	663	399	399
query51	7070	6927	6975	6927
query52	99	99	101	99
query53	227	260	192	192
query54	502	512	409	409
query55	95	82	84	82
query56	264	257	259	257
query57	1243	1218	1145	1145
query58	245	255	229	229
query59	3130	3150	3002	3002
query60	279	279	252	252
query61	117	122	122	122
query62	782	726	670	670
query63	235	185	189	185
query64	3606	1058	690	690
query65	3257	3181	3158	3158
query66	993	414	299	299
query67	16091	15799	15613	15613
query68	8047	826	523	523
query69	513	294	249	249
query70	1168	1154	1158	1154
query71	395	282	248	248
query72	5911	3960	3846	3846
query73	642	736	358	358
query74	10084	9274	8820	8820
query75	3186	3125	2681	2681
query76	3121	1174	775	775
query77	476	358	271	271
query78	10051	10149	9367	9367
query79	3316	810	597	597
query80	627	525	447	447
query81	496	285	240	240
query82	645	150	120	120
query83	175	171	161	161
query84	239	93	84	84
query85	762	371	307	307
query86	345	310	316	310
query87	4447	4503	4376	4376
query88	4600	2163	2138	2138
query89	408	328	290	290
query90	1789	190	188	188
query91	135	131	105	105
query92	69	56	51	51
query93	1724	865	528	528
query94	702	409	302	302
query95	337	260	251	251
query96	489	601	280	280
query97	2826	2899	2785	2785
query98	226	203	199	199
query99	1490	1352	1242	1242
Total cold run time: 291498 ms
Total hot run time: 194020 ms

@doris-robot
Copy link

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

query1	0.03	0.04	0.03
query2	0.06	0.03	0.03
query3	0.24	0.08	0.07
query4	1.62	0.10	0.10
query5	0.41	0.41	0.41
query6	1.16	0.65	0.67
query7	0.02	0.01	0.02
query8	0.04	0.03	0.03
query9	0.59	0.50	0.50
query10	0.55	0.57	0.56
query11	0.14	0.10	0.10
query12	0.14	0.11	0.11
query13	0.60	0.59	0.60
query14	2.73	2.88	2.72
query15	0.88	0.84	0.83
query16	0.38	0.39	0.39
query17	1.06	1.02	1.02
query18	0.23	0.21	0.22
query19	1.92	1.87	1.98
query20	0.01	0.01	0.01
query21	15.35	0.93	0.60
query22	0.75	0.78	0.69
query23	15.30	1.41	0.52
query24	2.71	1.68	1.45
query25	0.13	0.16	0.08
query26	0.36	0.15	0.14
query27	0.08	0.04	0.04
query28	14.35	0.98	0.42
query29	12.54	3.94	3.30
query30	0.26	0.09	0.07
query31	2.81	0.60	0.40
query32	3.23	0.55	0.46
query33	2.99	3.04	3.04
query34	16.64	5.19	4.55
query35	4.61	4.59	4.56
query36	0.62	0.51	0.47
query37	0.09	0.05	0.06
query38	0.04	0.04	0.03
query39	0.04	0.03	0.02
query40	0.16	0.14	0.12
query41	0.08	0.03	0.03
query42	0.04	0.03	0.03
query43	0.03	0.03	0.03
Total cold run time: 106.02 s
Total hot run time: 31.34 s

Copy link
Contributor

@morningman morningman left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

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

@github-actions github-actions bot added approved Indicates a PR has been approved by one committer. reviewed labels Jan 22, 2025
Copy link
Contributor

PR approved by anyone and no changes requested.

@morningman morningman merged commit 13e6b97 into apache:master Jan 22, 2025
26 of 27 checks passed
@zy-kkk zy-kkk deleted the ck_driver_1226 branch February 12, 2025 09:02
zy-kkk added a commit to zy-kkk/doris that referenced this pull request Feb 12, 2025
…sions (apache#46026)

### What problem does this PR solve?

Issue Number: close #xxx

Related PR: #xxx

Problem Summary:
1. Since clickhouse changes the database level in jdbc metadata from
schema to catalog in JDBC Driver 0.5.0 and later, we need to be
compatible with this change
2. Since clickhouse JDBC Driver supports getting metadata from prepared
statements only in Driver version 0.6.2 and later, if you use query tvf
to query clickhouse catalog, you need to use a driver later than this
version
3. Delete some tests and add them again later
zy-kkk added a commit to zy-kkk/doris that referenced this pull request Feb 12, 2025
…sions (apache#46026)

### What problem does this PR solve?

Issue Number: close #xxx

Related PR: #xxx

Problem Summary:
1. Since clickhouse changes the database level in jdbc metadata from
schema to catalog in JDBC Driver 0.5.0 and later, we need to be
compatible with this change
2. Since clickhouse JDBC Driver supports getting metadata from prepared
statements only in Driver version 0.6.2 and later, if you use query tvf
to query clickhouse catalog, you need to use a driver later than this
version
3. Delete some tests and add them again later
yiguolei pushed a commit that referenced this pull request Feb 13, 2025
@yiguolei yiguolei added usercase Important user case type label dev/2.1.9-merged labels Feb 13, 2025
github-actions bot pushed a commit that referenced this pull request Feb 21, 2025
…sions (#46026)

### What problem does this PR solve?

Issue Number: close #xxx

Related PR: #xxx

Problem Summary:
1. Since clickhouse changes the database level in jdbc metadata from
schema to catalog in JDBC Driver 0.5.0 and later, we need to be
compatible with this change
2. Since clickhouse JDBC Driver supports getting metadata from prepared
statements only in Driver version 0.6.2 and later, if you use query tvf
to query clickhouse catalog, you need to use a driver later than this
version
3. Delete some tests and add them again later
lzyy2024 pushed a commit to lzyy2024/doris that referenced this pull request Feb 21, 2025
…sions (apache#46026)

### What problem does this PR solve?

Issue Number: close #xxx

Related PR: #xxx

Problem Summary:
1. Since clickhouse changes the database level in jdbc metadata from
schema to catalog in JDBC Driver 0.5.0 and later, we need to be
compatible with this change
2. Since clickhouse JDBC Driver supports getting metadata from prepared
statements only in Driver version 0.6.2 and later, if you use query tvf
to query clickhouse catalog, you need to use a driver later than this
version
3. Delete some tests and add them again later
dataroaring pushed a commit that referenced this pull request Feb 22, 2025
…C Driver versions #46026 (#48182)

Cherry-picked from #46026

Co-authored-by: zy-kkk <zhongyk10@gmail.com>
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. dev/2.1.9-merged dev/3.0.5-merged reviewed usercase Important user case type label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants