Skip to content

Conversation

@xinyiZzz
Copy link
Contributor

@xinyiZzz xinyiZzz commented May 13, 2024

Proposed changes

  1. Fix DORIS_THIRDPARTY
  2. Fix BUILD_TYPE case conversion

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...

@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.

@xinyiZzz
Copy link
Contributor Author

run buildall

@github-actions
Copy link
Contributor

sh-checker report

To get the full details, please check in the job output.

shellcheck errors

'shellcheck ' returned error 1 finding the following syntactical issues:

----------

In build.sh line 362:
BUILD_TYPE_LOWWER=`echo "${BUILD_TYPE}" | tr '[:upper:]' '[:lower:]'`
                  ^-- SC2006 (style): Use $(...) notation instead of legacy backticks `...`.

Did you mean: 
BUILD_TYPE_LOWWER=$(echo "${BUILD_TYPE}" | tr '[:upper:]' '[:lower:]')

For more information:
  https://www.shellcheck.net/wiki/SC2006 -- Use $(...) notation instead of le...
----------

You can address the above issues in one of three ways:
1. Manually correct the issue in the offending shell script;
2. Disable specific issues by adding the comment:
  # shellcheck disable=NNNN
above the line that contains the issue, where NNNN is the error code;
3. Add '-e NNNN' to the SHELLCHECK_OPTS setting in your .yml action file.



shfmt errors

'shfmt ' returned error 1 finding the following formatting issues:

----------
--- build.sh.orig
+++ build.sh
@@ -359,7 +359,7 @@
         USE_MEM_TRACKER='OFF'
     fi
 fi
-BUILD_TYPE_LOWWER=`echo "${BUILD_TYPE}" | tr '[:upper:]' '[:lower:]'`
+BUILD_TYPE_LOWWER=$(echo "${BUILD_TYPE}" | tr '[:upper:]' '[:lower:]')
 if [[ "${BUILD_TYPE_LOWWER}" == "asan" ]]; then
     USE_JEMALLOC='OFF'
 elif [[ -z "${USE_JEMALLOC}" ]]; then
----------

You can reformat the above files to meet shfmt's requirements by typing:

  shfmt  -w filename


zy-kkk
zy-kkk previously approved these changes May 13, 2024
@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label May 13, 2024
@github-actions
Copy link
Contributor

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

@github-actions
Copy link
Contributor

PR approved by anyone and no changes requested.

@xinyiZzz
Copy link
Contributor Author

run buildall

@github-actions github-actions bot removed the approved Indicates a PR has been approved by one committer. label May 13, 2024
@xinyiZzz
Copy link
Contributor Author

run buildall

@github-actions
Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17594	4243	4193	4193
q2	2019	184	201	184
q3	10450	1224	1148	1148
q4	10209	787	843	787
q5	7460	2774	2739	2739
q6	223	134	135	134
q7	1023	615	585	585
q8	9242	2122	2081	2081
q9	9337	6727	6716	6716
q10	9232	3924	3859	3859
q11	461	240	244	240
q12	427	236	226	226
q13	18275	3211	3114	3114
q14	256	219	224	219
q15	507	472	477	472
q16	505	405	398	398
q17	1003	648	679	648
q18	8285	7772	7862	7772
q19	3518	1534	1550	1534
q20	635	334	330	330
q21	5182	4100	4075	4075
q22	340	291	288	288
Total cold run time: 116183 ms
Total hot run time: 41742 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4554	4409	4315	4315
q2	375	262	277	262
q3	3192	2982	2883	2883
q4	1888	1585	1597	1585
q5	5519	5453	5501	5453
q6	213	120	122	120
q7	2350	1959	1979	1959
q8	3252	3381	3431	3381
q9	8697	8601	8637	8601
q10	3929	3858	3900	3858
q11	608	496	510	496
q12	786	632	638	632
q13	15984	3171	3183	3171
q14	303	257	260	257
q15	521	468	473	468
q16	477	412	422	412
q17	1767	1483	1480	1480
q18	7562	7673	7408	7408
q19	1641	1560	1586	1560
q20	1944	1744	1769	1744
q21	7920	4969	4758	4758
q22	560	493	501	493
Total cold run time: 74042 ms
Total hot run time: 55296 ms

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

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

@doris-robot
Copy link

TPC-DS: Total hot run time: 187134 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 91839fd2456d977a8581700d57a76d4ad9df79b4, data reload: false

query1	910	373	357	357
query2	6438	2468	2294	2294
query3	6635	212	207	207
query4	23178	21164	21364	21164
query5	4100	439	418	418
query6	256	186	195	186
query7	4587	290	289	289
query8	242	196	200	196
query9	8560	2453	2452	2452
query10	440	259	249	249
query11	14679	14150	14180	14150
query12	141	93	90	90
query13	1641	390	371	371
query14	10570	8503	7737	7737
query15	261	172	183	172
query16	7871	265	267	265
query17	1767	571	567	567
query18	1642	290	280	280
query19	234	157	155	155
query20	95	88	88	88
query21	199	131	126	126
query22	5113	4815	4919	4815
query23	34202	33487	33580	33487
query24	6587	2868	2953	2868
query25	589	388	384	384
query26	691	158	155	155
query27	1937	319	334	319
query28	3784	2078	2060	2060
query29	905	616	594	594
query30	244	150	160	150
query31	980	730	739	730
query32	85	52	53	52
query33	491	251	249	249
query34	875	474	488	474
query35	769	679	676	676
query36	1057	923	920	920
query37	103	65	68	65
query38	2893	2812	2718	2718
query39	1603	1578	1555	1555
query40	192	125	127	125
query41	42	38	38	38
query42	101	94	97	94
query43	576	550	552	550
query44	1070	727	726	726
query45	266	263	248	248
query46	1064	743	720	720
query47	1929	1886	1872	1872
query48	378	296	304	296
query49	831	386	390	386
query50	765	398	389	389
query51	6765	6630	6734	6630
query52	110	89	92	89
query53	346	288	280	280
query54	543	439	439	439
query55	75	72	74	72
query56	245	225	231	225
query57	1228	1140	1131	1131
query58	214	196	202	196
query59	3339	3194	3225	3194
query60	256	244	239	239
query61	90	87	88	87
query62	599	498	472	472
query63	309	283	288	283
query64	8422	7389	7353	7353
query65	3130	3084	3107	3084
query66	774	341	339	339
query67	15496	14933	15079	14933
query68	4572	533	533	533
query69	495	311	301	301
query70	1133	1170	1109	1109
query71	360	281	275	275
query72	7338	2623	2338	2338
query73	705	332	338	332
query74	6478	6132	6127	6127
query75	3356	2682	2649	2649
query76	2541	919	938	919
query77	564	285	267	267
query78	10611	10070	10077	10070
query79	2186	508	540	508
query80	1059	427	440	427
query81	514	224	222	222
query82	661	96	96	96
query83	242	162	164	162
query84	238	85	86	85
query85	1536	274	257	257
query86	480	320	280	280
query87	3273	3113	3088	3088
query88	3990	2471	2447	2447
query89	483	381	385	381
query90	2047	190	186	186
query91	124	99	99	99
query92	63	48	50	48
query93	2689	510	506	506
query94	1171	184	184	184
query95	390	305	315	305
query96	589	281	266	266
query97	3130	2986	2991	2986
query98	244	218	216	216
query99	1232	891	893	891
Total cold run time: 271003 ms
Total hot run time: 187134 ms

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 35.66% (8986/25202)
Line Coverage: 27.32% (74273/271877)
Region Coverage: 26.55% (38386/144583)
Branch Coverage: 23.37% (19577/83774)
Coverage Report: http://coverage.selectdb-in.cc/coverage/91839fd2456d977a8581700d57a76d4ad9df79b4_91839fd2456d977a8581700d57a76d4ad9df79b4/report/index.html

@xinyiZzz xinyiZzz merged commit 667f5b5 into apache:master May 13, 2024
nextdreamblue pushed a commit to nextdreamblue/doris that referenced this pull request May 13, 2024
Fix DORIS_THIRDPARTY
Fix BUILD_TYPE case conversion
ByteYue pushed a commit to ByteYue/doris that referenced this pull request May 15, 2024
Fix DORIS_THIRDPARTY
Fix BUILD_TYPE case conversion
xinyiZzz added a commit to xinyiZzz/incubator-doris that referenced this pull request May 31, 2024
xinyiZzz added a commit to xinyiZzz/incubator-doris that referenced this pull request May 31, 2024
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/3.0.0-merged reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants