Make ArrayOverBuffer behave like an Array/Array.sort no longer mutates the Array #4022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hubertp
requested review from
jdunkerley,
radeusgd,
4e6 and
JaroslavTulach
as code owners
radeusgd
reviewed
Jan 4, 2023
engine/runtime/src/main/java/org/enso/interpreter/runtime/data/ArrayOverBuffer.java
Outdated
Show resolved
Hide resolved
radeusgd
reviewed
Jan 4, 2023
engine/runtime/src/main/java/org/enso/interpreter/runtime/data/ArrayOverBuffer.java
Show resolved
Hide resolved
JaroslavTulach
approved these changes
Jan 5, 2023
engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/mutable/SortNode.java
Outdated
Show resolved
Hide resolved
engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/mutable/SortNode.java
Outdated
Show resolved
Hide resolved
hubertp
changed the title
hubertp
commented
Jan 5, 2023
engine/runtime/src/main/java/org/enso/interpreter/runtime/data/DisplayArrayUtils.java
Show resolved
Hide resolved
jdunkerley
approved these changes
Jan 6, 2023
engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/mutable/SortNode.java
Outdated
Show resolved
Hide resolved
JaroslavTulach
approved these changes
Jan 7, 2023
hubertp
force-pushed
the
wip/hubert/arrayoverbuffer-fixes-183058716
branch
3 times, most recently
from
7a547df to
0de2ac7
Compare
radeusgd
reviewed
Jan 9, 2023
engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/mutable/SortNode.java
Outdated
Show resolved
Hide resolved
radeusgd
reviewed
Jan 9, 2023
Comment on lines
+95
to
+96
| arr = vec.map .x . to_array | ||
| sorted = arr.sort |
There was a problem hiding this comment.
This is not a Python array anymore, right? After a Vector.map operation, this will be an Enso allocated Java array, no?
Still, a good test but this part is not really testing what it says - only the part below is actually invoking our sort on a Python array instance.
radeusgd
approved these changes
Jan 9, 2023
Most of the problems with accessing `ArrayOverBuffer` have been resolved by using `CoerceArrayNode` (#3817). In `Array.sort` we still however specialized on Array which wasn't compatible with `ArrayOverBuffer`. Added a specialization to `Array.sort` to deal with that case. Because one cannot use a custom comparator with primitive (Java) arrays there is a conversion needed. It's a necessary penalty if we want to keep `ArrayOverBuffer` around. Also fixed an example in `Array.enso` by providing a default argument.
Sorting in place would be impractical to support for Arrays coming from JS or Python. That is why `Array.sort` now returns a copy of the original Array(-like) structure, sorted. This eliminates the need for createing a copy of Array for `Vector.sort`. Applied DRY to displaying Array-like structures.
Skip ArrayOverBuffer specialization as it is now handled by a generic `hasArrayElements` one.
hubertp
force-pushed
the
wip/hubert/arrayoverbuffer-fixes-183058716
branch
from
0de2ac7 to
99134ff
Compare
…ion/builtin/mutable/SortNode.java Co-authored-by: Radosław Waśko <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Description
Most of the problems with accessing
ArrayOverBufferhave been resolved by usingCoerceArrayNode(#3817). InArray.sortwe still however specialized on Array which wasn't compatible withArrayOverBuffer. Similarly sorting JS or Python arrays wouldn't work.Added a specialization to
Array.sortto deal with that case. A generic specialization (withhasArrayElements) not only handlesArrayOverBufferbut also polyglot arrays coming from JS or Python. We could have an additional specialization forArrayOverBufferonly (removed in the last commit) that returnsArrayOverBufferrather thanArrayalthough that adds additional complexity which so far is unnecessary.Also fixed an example in
Array.ensoby providing a default argument.Checklist
Please include the following checklist in your PR:
Scala,
Java,
and
Rust
style guides.