UnionSourceManager: Do Not Generate Shifts on Empty Constituents #3610
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
nbauernfeind
added
bug
rcaudy
requested changes
Mar 28, 2023
engine/table/src/main/java/io/deephaven/engine/table/impl/BaseTable.java
Show resolved
Hide resolved
engine/table/src/main/java/io/deephaven/engine/table/impl/BaseTable.java
Show resolved
Hide resolved
engine/table/src/main/java/io/deephaven/engine/table/impl/sources/UnionSourceManager.java
Outdated
Show resolved
Hide resolved
| if (slotAllocationChanged) { | ||
| currFirstRowKeys[nextCurrentSlot + 1] = checkOverflow(nextSlotPrevFirstRowKey + shiftDelta); | ||
| resultRows.insertWithShift(currFirstRowKey, constituent.getRowSet()); | ||
| if (shiftDelta != 0) { | ||
| // don't bother shifting if the constituent is empty | ||
| if (shiftDelta != 0 && constituent.size() > 0) { |
There was a problem hiding this comment.
We should move the line above (insertWithShift) into this if block.
There was a problem hiding this comment.
Is shiftDelta guaranteed to be non-zero here? We clear resultRows past the first shifted row when we set slotAllocationChanged to true. If it is valid for shiftDelta to be zero, then we must add the constituent to the result set unconditionally.
I'll drop the shiftDelta of zero check. I believe with your partition table related changes that constituents can be removed causing negative shifts; and thus a shift of zero is possible. However, shiftRange does ignore shifts of zero.
engine/table/src/main/java/io/deephaven/engine/table/impl/sources/UnionSourceManager.java
Outdated
Show resolved
Hide resolved
engine/table/src/main/java/io/deephaven/engine/table/impl/sources/UnionSourceManager.java
Outdated
Show resolved
Hide resolved
rcaudy
reviewed
Mar 28, 2023
engine/table/src/main/java/io/deephaven/engine/table/impl/sources/UnionSourceManager.java
Outdated
Show resolved
Hide resolved
…ces/UnionSourceManager.java Co-authored-by: Ryan Caudy <rcaudy@gmail.com>
…Table.java Co-authored-by: Ryan Caudy <rcaudy@gmail.com>
…ces/UnionSourceManager.java Co-authored-by: Ryan Caudy <rcaudy@gmail.com>
rcaudy
reviewed
Mar 28, 2023
engine/table/src/main/java/io/deephaven/engine/table/impl/sources/UnionSourceManager.java
Outdated
Show resolved
Hide resolved
rcaudy
approved these changes
Mar 28, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #3594.
Nightlies are running at: https://github.com/nbauernfeind/deephaven-core/actions/runs/4545546046