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

[deps](odbc) undefined the BOOL in include/sqltypes.h #28014

Merged
merged 1 commit into from
Dec 5, 2023

Conversation

morningman
Copy link
Contributor

Proposed changes

When ENABLE_PCH = false, this define will be conflict with BOOL in include/arrow/type_fwd.h.
The ODBC table will be deprecated in 2.1, so I just simply undefined the BOOL in include/sqltypes.h
to make compile OK

Further comments

If this is a relatively large or complex change, kick off the discussion at dev@doris.apache.org by explaining why you chose the solution you did and what alternatives you considered, etc...

@morningman
Copy link
Contributor Author

run buildall

Copy link
Contributor

@HappenLee HappenLee left a comment

Choose a reason for hiding this comment

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

LGTM

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Dec 5, 2023
Copy link
Contributor

github-actions bot commented Dec 5, 2023

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

Copy link
Contributor

github-actions bot commented Dec 5, 2023

PR approved by anyone and no changes requested.

@doris-robot
Copy link

TPC-H test result on machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
Tpch sf100 test result on commit 4ddcb1b4809d3fdba8b95181014cb480681346e0, data reload: false

run tpch-sf100 query with default conf and session variables
q1	4716	4432	4418	4418
q2	361	153	159	153
q3	1454	1220	1203	1203
q4	1106	925	914	914
q5	3183	3193	3174	3174
q6	249	128	129	128
q7	996	497	490	490
q8	2224	2225	2213	2213
q9	6693	6759	6698	6698
q10	3223	3245	3265	3245
q11	325	206	208	206
q12	347	214	217	214
q13	4575	3820	3799	3799
q14	239	216	222	216
q15	580	526	523	523
q16	443	391	386	386
q17	1005	623	577	577
q18	7578	7426	7501	7426
q19	1525	1413	1430	1413
q20	1058	320	355	320
q21	3105	2670	2669	2669
q22	356	289	291	289
Total cold run time: 45341 ms
Total hot run time: 40674 ms

run tpch-sf100 query with default conf and set session variable runtime_filter_mode=off
q1	4368	4377	4362	4362
q2	267	167	175	167
q3	3535	3521	3511	3511
q4	2383	2370	2361	2361
q5	5752	5728	5737	5728
q6	239	121	124	121
q7	2381	1871	1839	1839
q8	3510	3527	3524	3524
q9	9085	9025	9104	9025
q10	3904	3981	3982	3981
q11	506	396	386	386
q12	766	586	599	586
q13	4321	3568	3533	3533
q14	277	263	239	239
q15	572	525	523	523
q16	500	444	458	444
q17	1868	1847	1859	1847
q18	8573	8242	8257	8242
q19	1731	1737	1743	1737
q20	2255	1942	1930	1930
q21	6514	6176	6148	6148
q22	514	429	429	429
Total cold run time: 63821 ms
Total hot run time: 60663 ms

@doris-robot
Copy link

(From new machine)TeamCity pipeline, clickbench performance test result:
the sum of best hot time: 45.92 seconds
stream load tsv: 564 seconds loaded 74807831229 Bytes, about 126 MB/s
stream load json: 18 seconds loaded 2358488459 Bytes, about 124 MB/s
stream load orc: 65 seconds loaded 1101869774 Bytes, about 16 MB/s
stream load parquet: 32 seconds loaded 861443392 Bytes, about 25 MB/s
insert into select: 29.4 seconds inserted 10000000 Rows, about 340K ops/s
storage size: 17166990779 Bytes

@morningman morningman merged commit aaa44fa into apache:master Dec 5, 2023
XuJianxu pushed a commit to XuJianxu/doris that referenced this pull request Dec 14, 2023
When `ENABLE_PCH = false`, this define will be conflict with BOOL in `include/arrow/type_fwd.h`.
The ODBC table will be deprecated in 2.1, so I just simply undefined the BOOL in include/sqltypes.h
to make compile OK
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. reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants