feat: DH-18778: Add rebase method to TreeTable and RollupTable in support of ACLs. #6666
+445
−97
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
…f ACL application.
cpwright
added
NoDocumentationNeeded
NoReleaseNotesNeeded
cpwright
changed the title
cpwright
commented
Feb 27, 2025
engine/test-utils/src/main/java/io/deephaven/engine/testutil/HierarchicalTableTestTools.java
Show resolved
Hide resolved
rcaudy
reviewed
Feb 28, 2025
engine/api/src/main/java/io/deephaven/engine/table/hierarchical/RollupTable.java
Outdated
Show resolved
Hide resolved
engine/api/src/main/java/io/deephaven/engine/table/hierarchical/TreeTable.java
Outdated
Show resolved
Hide resolved
engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/RollupTableImpl.java
Outdated
Show resolved
Hide resolved
engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/RollupTableImpl.java
Outdated
Show resolved
Hide resolved
engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/RollupTableImpl.java
Outdated
Show resolved
Hide resolved
| @@ -222,6 +222,28 @@ protected TreeTableImpl copy() { | |||
| parentIdentifierColumn, nodeFilterColumns, nodeOperations, availableColumnDefinitions); | |||
| } | |||
|
|
|||
| @Override | |||
| public TreeTable rebase(@NotNull final Table newSource) { | |||
| if (!newSource.getDefinition().equals(source.getDefinition())) { | |||
There was a problem hiding this comment.
We could make a case that we just need to have the parent and id columns present on newSource. I guess we don't need to do that for the ACL case.
engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/TreeTableImpl.java
Outdated
Show resolved
Hide resolved
engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/TreeTableImpl.java
Outdated
Show resolved
Hide resolved
engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/TreeTableImpl.java
Outdated
Show resolved
Hide resolved
engine/test-utils/src/main/java/io/deephaven/engine/testutil/HierarchicalTableTestTools.java
Show resolved
Hide resolved
…l/RollupTable.java Co-authored-by: Ryan Caudy <rcaudy@gmail.com>
…core into nightly/cpw/DH-18778
…archical/TreeTableImpl.java Co-authored-by: Ryan Caudy <rcaudy@gmail.com>
…archical/TreeTableImpl.java Co-authored-by: Ryan Caudy <rcaudy@gmail.com>
…core into nightly/cpw/DH-18778
rcaudy
reviewed
Mar 3, 2025
| } | ||
|
|
||
| @Override | ||
| public RollupTableImpl rebase(final Table newSource) { | ||
| public RollupTableImpl rebase(final @NotNull Table newSource) { |
There was a problem hiding this comment.
Suggested change
| public RollupTableImpl rebase(final @NotNull Table newSource) { | |
| public RollupTableImpl rebase(@NotNull final Table newSource) { |
Comment on lines
+521
to
+522
| private static @NotNull RollupTableImpl makeRollupInternal(@NotNull final QueryTable source, | ||
| @NotNull final Collection<? extends Aggregation> aggregations, |
There was a problem hiding this comment.
Suggested change
| private static @NotNull RollupTableImpl makeRollupInternal(@NotNull final QueryTable source, | |
| @NotNull final Collection<? extends Aggregation> aggregations, | |
| private static @NotNull RollupTableImpl makeRollupInternal( | |
| @NotNull final QueryTable source, | |
| @NotNull final Collection<? extends Aggregation> aggregations, |
| aggregatedNodeDefinition, aggregatedNodeOperations, | ||
| constituentNodeDefinition, constituentNodeOperations, | ||
| null, | ||
| return makeRollupInternal(newSourceQueryTable, aggregations, includesConstituents, groupByColumns, |
There was a problem hiding this comment.
I believe you have lost some attributes you should be keeping with this change (specifically sortable columns and column descriptions, which aren't labeled as copyable for rollups, presumably because they get re-written by makeRollup). I think you need to pass the new attribute map in. I see you did it the other way in TreeTableImpl.
Comment on lines
+253
to
+254
| private static @NotNull TreeTableImpl makeTreeInternal(@NotNull final QueryTable source, | ||
| @NotNull final ColumnName identifierColumn, |
There was a problem hiding this comment.
Suggested change
| private static @NotNull TreeTableImpl makeTreeInternal(@NotNull final QueryTable source, | |
| @NotNull final ColumnName identifierColumn, | |
| private static @NotNull TreeTableImpl makeTreeInternal( | |
| @NotNull final QueryTable source, | |
| @NotNull final ColumnName identifierColumn, |
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.
No description provided.