Skip to content

Conversation

@LuGuangming
Copy link
Contributor

@LuGuangming LuGuangming commented Dec 25, 2023

Proposed changes

Issue Number: close #29014

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

@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 587:
if [[ -f ${USER_SETTINGS_MVN_REPO} ]]; then
         ^-----------------------^ SC2154 (warning): USER_SETTINGS_MVN_REPO is referenced but not assigned.


In build.sh line 599:
        "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}} -Dskip.doc=true -DskipTests -Dcheckstyle.skip=true ${MVN_OPT:+${MVN_OPT}} ${MVN_PRIVITE_PENDING}
                                                                                                                                        ^--------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
        "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}} -Dskip.doc=true -DskipTests -Dcheckstyle.skip=true ${MVN_OPT:+${MVN_OPT}} "${MVN_PRIVITE_PENDING}"


In build.sh line 601:
        "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}} -Dskip.doc=true -DskipTests ${MVN_OPT:+${MVN_OPT}} ${MVN_PRIVITE_PENDING}
                                                                                                                 ^--------------------^ SC2086 (info): Double quote to prevent globbing and word splitting.

Did you mean: 
        "${MVN_CMD}" package -pl ${FE_MODULES:+${FE_MODULES}} -Dskip.doc=true -DskipTests ${MVN_OPT:+${MVN_OPT}} "${MVN_PRIVITE_PENDING}"

For more information:
  https://www.shellcheck.net/wiki/SC2154 -- USER_SETTINGS_MVN_REPO is referen...
  https://www.shellcheck.net/wiki/SC2086 -- Double quote to prevent globbing ...
----------

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 ' found no issues.

@LuGuangming
Copy link
Contributor Author

run buildall

Copy link
Contributor

@yiguolei yiguolei left a comment

Choose a reason for hiding this comment

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

LGTM

@yiguolei
Copy link
Contributor

run buildall

@yiguolei yiguolei added usercase Important user case type label dev/2.0.4 labels Dec 30, 2023
@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Dec 30, 2023
@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.

@doris-robot
Copy link

TPC-H test result on machine: 'aliyun_ecs.c7a.8xlarge_32C64G'

Tpch sf100 test result on commit 5b3b94c9198c94041ec05c4166cc90d02e0bde0f, data reload: false

run tpch-sf100 query with default conf and session variables
q1	5381	5145	5165	5145
q2	398	158	160	158
q3	1448	1170	1223	1170
q4	1086	811	855	811
q5	3122	3028	3084	3028
q6	226	133	127	127
q7	961	525	548	525
q8	2149	2294	2195	2195
q9	6675	6648	6635	6635
q10	3159	3128	3183	3128
q11	346	210	232	210
q12	380	227	228	227
q13	4382	3666	3616	3616
q14	255	232	213	213
q15	610	555	550	550
q16	454	413	421	413
q17	1036	496	520	496
q18	7033	6733	6820	6733
q19	1642	1526	1488	1488
q20	858	352	358	352
q21	2852	2485	2479	2479
q22	385	318	323	318
Total cold run time: 44838 ms
Total hot run time: 40017 ms

run tpch-sf100 query with default conf and set session variable runtime_filter_mode=off
q1	5159	5099	5041	5041
q2	339	249	264	249
q3	3354	3239	3255	3239
q4	2152	2058	2052	2052
q5	5936	5912	5877	5877
q6	230	125	126	125
q7	2375	1938	1913	1913
q8	3542	3648	3682	3648
q9	9063	8923	8979	8923
q10	3845	3909	3894	3894
q11	584	485	474	474
q12	789	636	637	636
q13	3894	3191	3180	3180
q14	302	258	259	258
q15	601	544	541	541
q16	558	508	520	508
q17	2017	1787	1817	1787
q18	8810	8340	8349	8340
q19	1737	1645	1668	1645
q20	2267	1995	1987	1987
q21	5765	5269	5218	5218
q22	582	502	509	502
Total cold run time: 63901 ms
Total hot run time: 60037 ms

@doris-robot
Copy link

(From new machine)TeamCity pipeline, clickbench performance test result:
the sum of best hot time: 46.37 seconds
stream load tsv: 564 seconds loaded 74807831229 Bytes, about 126 MB/s
stream load json: 19 seconds loaded 2358488459 Bytes, about 118 MB/s
stream load orc: 66 seconds loaded 1101869774 Bytes, about 15 MB/s
stream load parquet: 33 seconds loaded 861443392 Bytes, about 24 MB/s
insert into select: 28.3 seconds inserted 10000000 Rows, about 353K ops/s
storage size: 17183690485 Bytes

@morningman morningman changed the title [Enhancement] support user custom defined privite settings,xml for bu… [Enhancement] support user custom defined privite settings,xml for build fe Dec 31, 2023
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

@morningman morningman merged commit 74202fe into apache:master Dec 31, 2023
@wm1581066 wm1581066 removed the usercase Important user case type label label Jan 10, 2024
HappenLee pushed a commit to HappenLee/incubator-doris that referenced this pull request Jan 12, 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/2.0.4 reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Enhancement] support user custom defined privite settings,xml for build fe

5 participants