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.

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

Support sorting on complex columns in MSQ #16322

Merged
merged 29 commits into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
1c46cb4
init
LakshSingla Apr 23, 2024
486d29a
working, almost
LakshSingla Apr 26, 2024
260206b
stuff working
LakshSingla May 3, 2024
b93b53e
Merge branch 'master' into msq-complex-sorting
LakshSingla May 3, 2024
ac8ba6b
tests, checkstyle
LakshSingla May 6, 2024
abbf49b
tests
LakshSingla May 6, 2024
b7ea7b8
more changes
LakshSingla May 6, 2024
f3caaf6
test comments
LakshSingla May 8, 2024
c852c35
changes
LakshSingla May 8, 2024
d2dd402
tests
LakshSingla May 8, 2024
a0d29d4
tests
LakshSingla May 8, 2024
ae87dab
tests
LakshSingla May 8, 2024
4b86b31
better comment
LakshSingla May 8, 2024
1ec5796
tests fix
LakshSingla May 8, 2024
b68948e
tests fix
LakshSingla May 8, 2024
08633f0
tests fix, test framework fix, comments
LakshSingla May 9, 2024
8d49678
Trigger Build
LakshSingla May 9, 2024
76fd60e
Merge branch 'master' into msq-complex-sorting
LakshSingla May 9, 2024
cd29bec
merge fix
LakshSingla May 9, 2024
690c5cf
convert list to array
LakshSingla May 9, 2024
d1d28e1
add back old tests
LakshSingla May 9, 2024
7f27724
preserve old tests, add new tests for complexcol + byte comparable col
LakshSingla May 9, 2024
ae77984
tests
LakshSingla May 10, 2024
2af2977
add benchmarks for nested data
LakshSingla May 10, 2024
b1c61cb
final set, have separate methods
LakshSingla May 10, 2024
eaa0593
some more final changes
LakshSingla May 10, 2024
2e23831
Merge branch 'master' into msq-complex-sorting
LakshSingla May 10, 2024
7356aa2
review comments
LakshSingla May 13, 2024
806b1ec
Update FrameWriterUtils.java
LakshSingla May 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
more changes
  • Loading branch information
LakshSingla committed May 6, 2024
commit b7ea7b8164051d15c8420c756ba9c69b992f4dae
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,6 @@ static ClusterBy computeIntermediateClusterBy(final GroupByQuery query)
static ClusterBy computeClusterByForResults(final GroupByQuery query)
{
if (query.getLimitSpec() instanceof DefaultLimitSpec) {
final RowSignature resultSignature = computeResultSignature(query);
final DefaultLimitSpec defaultLimitSpec = (DefaultLimitSpec) query.getLimitSpec();

if (!defaultLimitSpec.getColumns().isEmpty()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.function.Supplier;

public class RowKeyComparisonRunLengths
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ private Sequence<List<Object>> sortIfNeeded(
final List<String> sortColumnNames
)
{
final List<KeyColumn> keyColumns = computeSortColumns(sortColumnNames, signature);
final List<KeyColumn> keyColumns = computeSortColumns(sortColumnNames);

if (keyColumns.isEmpty()) {
return rows;
Expand Down Expand Up @@ -500,15 +500,15 @@ private Pair<Frame, Integer> writeFrame(
capabilitiesAdjustFn,
rows,
signature,
computeSortColumns(sortColumns, signature)
computeSortColumns(sortColumns)
);
}

/**
* Converts the provided column names into {@link KeyColumn} according to the current {@link #sortedness}
* parameter.
*/
private List<KeyColumn> computeSortColumns(final List<String> sortColumnNames, final RowSignature rowSignature)
private List<KeyColumn> computeSortColumns(final List<String> sortColumnNames)
{
if (sortedness == KeyOrder.NONE) {
return Collections.emptyList();
Expand Down
Loading