Skip to content

[improvement](jdbc catalog)Rename config from disable_jdbc_sqlserver_encrypt to force_sqlserver_jdbc_encrypt_false #37015

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
Merged
zy-kkk merged 1 commit into from
Jul 1, 2024
Merged

[improvement](jdbc catalog)Rename config from disable_jdbc_sqlserver_encrypt to force_sqlserver_jdbc_encrypt_false #37015

zy-kkk merged 1 commit into from
Jul 1, 2024

Conversation

@zy-kkk
Copy link
Member

@zy-kkk zy-kkk commented Jun 28, 2024 •
edited
Loading

Front #36659
Renamed the configuration parameter disable_jdbc_sqlserver_encrypt to force_sqlserver_jdbc_encrypt_false to make its purpose clearer and more explicit. This new name better indicates that the parameter forces the JDBC URL to set encrypt=false when enabled.

@doris-robot
Copy link

doris-robot commented Jun 28, 2024

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.

@zy-kkk
Copy link
Member Author

zy-kkk commented Jun 28, 2024

run buildall

@github-actions
Copy link
Contributor

github-actions bot commented Jun 28, 2024

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 Jun 28, 2024
@github-actions
Copy link
Contributor

github-actions bot commented Jun 28, 2024

PR approved by anyone and no changes requested.

@doris-robot
Copy link

doris-robot commented Jun 28, 2024

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

------ Round 1 ----------------------------------
q1	17601	4310	4268	4268
q2	2024	218	211	211
q3	10423	1178	1032	1032
q4	10185	742	787	742
q5	7489	2624	2655	2624
q6	214	137	139	137
q7	944	612	613	612
q8	9218	2057	2057	2057
q9	8991	6530	6458	6458
q10	8987	3755	3724	3724
q11	459	242	246	242
q12	497	233	233	233
q13	18801	2951	2987	2951
q14	267	225	211	211
q15	525	481	470	470
q16	523	380	376	376
q17	954	719	739	719
q18	7929	7382	7324	7324
q19	6272	1439	1440	1439
q20	649	319	327	319
q21	4894	3839	3842	3839
q22	392	340	339	339
Total cold run time: 118238 ms
Total hot run time: 40327 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4404	4217	4190	4190
q2	374	264	273	264
q3	3051	2880	2937	2880
q4	1968	1714	1717	1714
q5	5547	5548	5440	5440
q6	219	128	128	128
q7	2259	1871	1886	1871
q8	3258	3417	3435	3417
q9	8709	8830	8760	8760
q10	4159	3734	3860	3734
q11	593	489	517	489
q12	831	682	650	650
q13	16033	3217	3174	3174
q14	303	276	285	276
q15	554	479	471	471
q16	505	446	434	434
q17	1802	1533	1523	1523
q18	8134	7994	7810	7810
q19	1879	1663	1591	1591
q20	3252	1894	1830	1830
q21	8305	4963	4747	4747
q22	652	572	553	553
Total cold run time: 76791 ms
Total hot run time: 55946 ms

@doris-robot
Copy link

doris-robot commented Jun 28, 2024

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

query1	908	382	375	375
query2	6457	2428	2456	2428
query3	6639	206	207	206
query4	19474	17539	17267	17267
query5	3661	497	483	483
query6	259	167	158	158
query7	4577	311	289	289
query8	314	277	274	274
query9	8519	2469	2452	2452
query10	563	310	282	282
query11	10761	10091	9996	9996
query12	117	90	85	85
query13	1636	375	367	367
query14	10300	6756	7006	6756
query15	233	188	181	181
query16	7696	272	274	272
query17	1664	575	536	536
query18	1757	285	281	281
query19	200	154	160	154
query20	95	81	86	81
query21	210	143	137	137
query22	4364	4006	4079	4006
query23	33870	33645	33806	33645
query24	11188	2945	2920	2920
query25	649	406	394	394
query26	1138	160	161	160
query27	2301	320	332	320
query28	7081	2197	2180	2180
query29	937	658	653	653
query30	336	153	152	152
query31	991	777	748	748
query32	96	52	55	52
query33	753	281	299	281
query34	1009	479	480	479
query35	769	609	644	609
query36	1148	992	973	973
query37	147	73	71	71
query38	2951	2899	2816	2816
query39	892	845	798	798
query40	218	128	125	125
query41	51	50	56	50
query42	114	101	94	94
query43	566	544	555	544
query44	1230	757	734	734
query45	187	160	158	158
query46	1081	720	700	700
query47	1843	1793	1749	1749
query48	373	312	292	292
query49	873	402	411	402
query50	756	382	384	382
query51	6894	6889	6792	6792
query52	107	90	88	88
query53	362	303	301	301
query54	874	445	439	439
query55	73	74	74	74
query56	282	277	258	258
query57	1135	1093	1070	1070
query58	256	233	246	233
query59	3436	3278	3136	3136
query60	310	268	269	268
query61	93	88	92	88
query62	618	441	441	441
query63	316	299	291	291
query64	8747	2249	1713	1713
query65	3166	3102	3149	3102
query66	742	322	325	322
query67	15652	14927	15199	14927
query68	4629	534	546	534
query69	617	390	392	390
query70	1206	1147	1141	1141
query71	454	266	272	266
query72	7906	5406	5597	5406
query73	747	325	319	319
query74	5819	5493	5564	5493
query75	3980	2679	2668	2668
query76	3025	964	915	915
query77	702	296	296	296
query78	10604	9873	9745	9745
query79	2279	525	520	520
query80	2557	460	466	460
query81	566	225	213	213
query82	973	107	104	104
query83	305	172	170	170
query84	258	87	96	87
query85	1508	339	265	265
query86	469	314	288	288
query87	3291	3094	3110	3094
query88	3844	2373	2351	2351
query89	477	396	386	386
query90	1985	192	186	186
query91	127	96	98	96
query92	62	52	49	49
query93	2374	520	525	520
query94	1342	187	182	182
query95	404	306	308	306
query96	600	273	274	273
query97	3234	3031	3012	3012
query98	219	207	192	192
query99	1133	842	823	823
Total cold run time: 274711 ms
Total hot run time: 173840 ms

@doris-robot
Copy link

doris-robot commented Jun 28, 2024

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

query1	0.04	0.03	0.03
query2	0.08	0.04	0.04
query3	0.22	0.05	0.05
query4	1.66	0.08	0.08
query5	0.53	0.50	0.49
query6	1.13	0.72	0.73
query7	0.02	0.01	0.02
query8	0.05	0.04	0.04
query9	0.56	0.50	0.50
query10	0.56	0.55	0.54
query11	0.16	0.11	0.11
query12	0.15	0.12	0.12
query13	0.59	0.59	0.60
query14	0.79	0.77	0.77
query15	0.85	0.81	0.81
query16	0.35	0.38	0.38
query17	1.04	0.98	0.99
query18	0.24	0.24	0.24
query19	1.84	1.75	1.71
query20	0.02	0.01	0.01
query21	15.43	0.75	0.66
query22	4.71	7.50	1.61
query23	18.23	1.35	1.27
query24	2.19	0.22	0.22
query25	0.15	0.08	0.09
query26	0.27	0.17	0.18
query27	0.08	0.08	0.08
query28	13.20	1.02	1.01
query29	12.62	3.31	3.29
query30	0.27	0.06	0.06
query31	2.87	0.39	0.39
query32	3.25	0.47	0.48
query33	2.88	2.84	2.92
query34	17.14	4.39	4.43
query35	4.44	4.50	4.50
query36	0.65	0.47	0.45
query37	0.19	0.14	0.15
query38	0.14	0.14	0.15
query39	0.04	0.04	0.04
query40	0.18	0.17	0.14
query41	0.10	0.05	0.04
query42	0.06	0.05	0.05
query43	0.04	0.04	0.04
Total cold run time: 110.01 s
Total hot run time: 30.3 s

This was referenced Jun 28, 2024
Merged
Merged
@zy-kkk zy-kkk merged commit d6892a1 into apache:master Jul 1, 2024
@zy-kkk zy-kkk deleted the force_sqlserver_jdbc_encrypt_false branch July 1, 2024 07:01
morningman pushed a commit that referenced this pull request Jul 1, 2024
@zy-kkk
[branch-2.0][improvement](sqlserver catalog) Can configure whether to…
4c4f0be 
… use encryption when connecting to SQL Server using the catalog (#36940)

pick #36659
pick #37015
zy-kkk added a commit that referenced this pull request Jul 2, 2024
@zy-kkk
[branch-2.1][improvement](sqlserver catalog) Configurable whether to …
3f382b7 
…use encrypt when connecting to SQL Server using the catalog (#36971)

pick (#36659)
pick #37015
In previous versions, we used druid as the default JDBC connection pool,
which can use custom decryption to parse the certificate when SQL Server
encryption is turned on. However, in the new version, after changing
HikariCP as the default connection pool, the SQLServer certificate
cannot be parsed, so encryption needs to be turned off for normal use.
Therefore, a parameter is added to decide whether to disable SQLServer
encryption. It is not disabled by default.
dataroaring pushed a commit that referenced this pull request Jul 2, 2024
@zy-kkk @dataroaring
[improvement](jdbc catalog)Rename config from `disable_jdbc_sqlserver…
cefa74d 
…_encrypt` to `force_sqlserver_jdbc_encrypt_false` (#37015)

Front #36659
Renamed the configuration parameter `disable_jdbc_sqlserver_encrypt` to
`force_sqlserver_jdbc_encrypt_false` to make its purpose clearer and
more explicit. This new name better indicates that the parameter forces
the JDBC URL to set `encrypt=false` when enabled.
@xiaokang xiaokang mentioned this pull request Jul 14, 2024
Closed
mongo360 pushed a commit to mongo360/doris that referenced this pull request Aug 16, 2024
@zy-kkk
[branch-2.0][improvement](sqlserver catalog) Can configure whether to…
e83c6ac 
… use encryption when connecting to SQL Server using the catalog (apache#36940)

pick apache#36659
pick apache#37015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@morningman morningman morningman approved these changes

+1 more reviewer

@BePPPower BePPPower BePPPower approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by one committer. dev/2.0.13-merged dev/2.1.5-merged dev/3.0.0-merged reviewed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@zy-kkk @doris-robot @morningman @BePPPower @wm1581066 @dataroaring