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.

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

[FIX](complextype)fix array/map/struct impl hashcode and equals #27717

Merged
merged 6 commits into from
Nov 30, 2023
Merged

[FIX](complextype)fix array/map/struct impl hashcode and equals #27717

merged 6 commits into from
Nov 30, 2023

Conversation

amorynan
Copy link
Contributor

Proposed changes

Issue Number: close #xxx

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

xiaokang
xiaokang reviewed Nov 28, 2023
View reviewed changes
fe/fe-core/src/main/java/org/apache/doris/analysis/ArrayLiteral.java Outdated Show resolved Hide resolved
fe/fe-core/src/main/java/org/apache/doris/analysis/MapLiteral.java Outdated Show resolved Hide resolved
fe/fe-core/src/main/java/org/apache/doris/analysis/StructLiteral.java Outdated
}

StructLiteral that = (StructLiteral) o;
for (int i = 0; i < children.size(); i++) {
Copy link
Contributor

Choose a reason for hiding this comment

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

check children.size() equal first to avoid index out of bound

fe/fe-core/src/main/java/org/apache/doris/analysis/MapLiteral.java Show resolved Hide resolved
fe/fe-core/src/main/java/org/apache/doris/analysis/StructLiteral.java Show resolved Hide resolved
@apache apache deleted a comment from xiaokang Nov 29, 2023
@wm1581066 wm1581066 added the p0_b label Nov 29, 2023
@amorynan
Copy link
Contributor Author

run buildall

@amorynan
Copy link
Contributor Author

run clickbench

@amorynan
Copy link
Contributor Author

run compile

@amorynan
Copy link
Contributor Author

run buildall

@amorynan
Copy link
Contributor Author

run buildall

@amorynan amorynan mentioned this pull request Nov 29, 2023
Merged
xiaokang
xiaokang previously approved these changes Nov 29, 2023
View reviewed changes
Copy link
Contributor

@xiaokang xiaokang 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 Nov 29, 2023
@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions GitHub Actions
Copy link
Contributor

PR approved by anyone and no changes requested.

@doris-robot
Copy link

(From new machine)TeamCity pipeline, clickbench performance test result:
the sum of best hot time: 43.42 seconds
stream load tsv: 568 seconds loaded 74807831229 Bytes, about 125 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.0 seconds inserted 10000000 Rows, about 344K ops/s
storage size: 17099273449 Bytes

morrySnow
morrySnow reviewed Nov 29, 2023
View reviewed changes
fe/fe-core/src/main/java/org/apache/doris/analysis/ArrayLiteral.java Outdated Show resolved Hide resolved
fe/fe-core/src/main/java/org/apache/doris/analysis/MapLiteral.java Outdated
Comment on lines 241 to 243
if (that.children.size() != children.size()) {
return false;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto

@amorynan
Copy link
Contributor Author

run buildall

@github-actions github-actions bot removed the approved Indicates a PR has been approved by one committer. label Nov 29, 2023
@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Nov 29, 2023
@github-actions GitHub Actions
Copy link
Contributor

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

@doris-robot
Copy link

(From new machine)TeamCity pipeline, clickbench performance test result:
the sum of best hot time: 44.42 seconds
stream load tsv: 570 seconds loaded 74807831229 Bytes, about 125 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: 28.9 seconds inserted 10000000 Rows, about 346K ops/s
storage size: 17101172485 Bytes

xiaokang
xiaokang approved these changes Nov 30, 2023
View reviewed changes
Copy link
Contributor

@xiaokang xiaokang left a comment

Choose a reason for hiding this comment

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

LGTM

@amorynan
Copy link
Contributor Author

run beut

@amorynan
Copy link
Contributor Author

run feut

@amorynan
Copy link
Contributor Author

run clickbench

@doris-robot
Copy link

(From new machine)TeamCity pipeline, clickbench performance test result:
the sum of best hot time: 44.41 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: 34 seconds loaded 861443392 Bytes, about 24 MB/s
insert into select: 29.2 seconds inserted 10000000 Rows, about 342K ops/s
storage size: 17163907690 Bytes

@doris-robot
Copy link

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

run tpch-sf100 query with default conf and session variables
q1	4902	4649	4660	4649
q2	359	154	157	154
q3	1500	1316	1318	1316
q4	1151	1017	968	968
q5	3266	3251	3223	3223
q6	253	133	133	133
q7	1005	524	563	524
q8	2213	2228	2230	2228
q9	6979	6989	6936	6936
q10	3280	3389	3375	3375
q11	343	225	244	225
q12	381	253	249	249
q13	4830	3860	3836	3836
q14	245	224	215	215
q15	576	534	522	522
q16	443	395	374	374
q17	1028	691	627	627
q18	8159	7818	7540	7540
q19	1549	1546	1543	1543
q20	602	304	315	304
q21	3416	2997	3003	2997
q22	376	303	305	303
Total cold run time: 46856 ms
Total hot run time: 42241 ms

run tpch-sf100 query with default conf and set session variable runtime_filter_mode=off
q1	4630	4574	4572	4572
q2	316	200	233	200
q3	3747	3734	3745	3734
q4	2527	2507	2503	2503
q5	6231	6187	6178	6178
q6	247	123	128	123
q7	2632	2003	1972	1972
q8	3766	3746	3681	3681
q9	9508	9414	9393	9393
q10	4069	4150	4158	4150
q11	651	512	484	484
q12	802	656	624	624
q13	4387	3653	3643	3643
q14	286	247	247	247
q15	586	523	537	523
q16	500	454	502	454
q17	2108	2076	2110	2076
q18	9510	9036	9940	9036
q19	1839	1780	1774	1774
q20	2309	1987	1952	1952
q21	7470	7073	6867	6867
q22	667	558	555	555
Total cold run time: 68788 ms
Total hot run time: 64741 ms

@yiguolei yiguolei merged commit 6c4ec3c into apache:master Nov 30, 2023
26 of 27 checks passed
XuJianxu pushed a commit to XuJianxu/doris that referenced this pull request Dec 14, 2023
@amorynan
[FIX](complextype)fix array/map/struct impl hashcode and equals (apac…
f583bed 
…he#27717)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xiaokang xiaokang xiaokang approved these changes

@morrySnow morrySnow morrySnow approved these changes

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by one committer. dev/2.0.3-merged p0_b reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@amorynan @doris-robot @xiaokang @morrySnow @yiguolei @wm1581066