Skip to content

fix: JsPartitionedTable keyColumn and keyColumnTypes ordering #4931

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

Merged
georgecwan merged 3 commits into from
Dec 19, 2023
Merged

fix: JsPartitionedTable keyColumn and keyColumnTypes ordering #4931

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfc4254
Fix keyColumn and keyColumnTypes order
georgecwan Dec 11, 2023
12f0eec
Merge branch 'main' of github.com:deephaven/deephaven-core into fix-p…
georgecwan Dec 18, 2023
b2470b8
Remove unnecessary loop
georgecwan Dec 18, 2023
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
21 changes: 12 additions & 9 deletions web/client-api/src/main/java/io/deephaven/web/client/api/JsPartitionedTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@
import jsinterop.annotations.JsType;
import jsinterop.base.Js;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
* Represents a set of Tables each corresponding to some key. The keys are available locally, but a call must be made to
Expand Down Expand Up @@ -95,19 +92,25 @@ public Promise<JsPartitionedTable> refetch() {
WebBarrageUtils.readSchemaMessage(descriptor.getConstituentDefinitionSchema_asU8()));
ColumnDefinition[] columnDefinitions = tableDefinition.getColumns();
Column[] columns = new Column[0];
Column[] keyColumns = new Column[0];
for (int i = 0; i < columnDefinitions.length; i++) {
ColumnDefinition columnDefinition = columnDefinitions[i];
Column column = columnDefinition.makeJsColumn(columns.length, tableDefinition.getColumnsByName());
columns[columns.length] = column;
if (descriptor.getKeyColumnNamesList().indexOf(columnDefinition.getName()) != -1) {
keyColumnTypes.add(columnDefinition.getType());
keyColumns[keyColumns.length] = column;
}
Column[] keyColumns = new Column[0];
JsArray<String> keyColumnNames = descriptor.getKeyColumnNamesList();
for (int i = 0; i < keyColumnNames.length; i++) {
String name = keyColumnNames.getAt(i);
ColumnDefinition columnDefinition = tableDefinition.getColumnsByName().get(false).get(name);
int index = 0;
while (!columns[index].getName().equals(name)) {
index++;
}
keyColumnTypes.add(columnDefinition.getType());
keyColumns[keyColumns.length] = columns[index];
Copy link
Copy Markdown
Member

@niloc132 niloc132 Dec 18, 2023

Choose a reason for hiding this comment

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

No need to loop twice, i think this would do the job too?

Suggested change
ColumnDefinition columnDefinition = tableDefinition.getColumnsByName().get(false).get(name);
int index = 0;
while (!columns[index].getName().equals(name)) {
index++;
}
keyColumnTypes.add(columnDefinition.getType());
keyColumns[keyColumns.length] = columns[index];
ColumnDefinition columnDefinition = tableDefinition.getColumnsByName().get(false).get(name);
keyColumnTypes.add(columnDefinition.getType());
keyColumns[keyColumns.length] = columns[columnDefinition.getIndex()];

}
this.columns = JsObject.freeze(columns);
this.keyColumns = JsObject.freeze(keyColumns);

return w.getExportedObjects()[0].fetch();
}).then(result -> {
keys = (JsTable) result;
Expand Down
⚡