-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Use correct schema when opening transformed partitioned tables (#…
…5305) - We were using the schema from the constituent table when trying to reference the key columns instead of the keys table - Was not a problem when the schemas matched, but if there was a transform on the table removing one of the key columns, it would throw an error - Fixes #5304 - Tested using the snippet in the ticket - Added unit tests
- Loading branch information
Showing
5 changed files
with
192 additions
and
6 deletions.
There are no files selected for viewing
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
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
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
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
173 changes: 173 additions & 0 deletions
173
web/client-api/src/test/java/io/deephaven/web/client/api/PartitionedTableTestGwt.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,173 @@ | ||
| // | ||
| // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending | ||
| // | ||
| package io.deephaven.web.client.api; | ||
|
|
||
| import elemental2.core.JsArray; | ||
| import elemental2.dom.CustomEvent; | ||
| import io.deephaven.web.client.api.subscription.ViewportData; | ||
| import io.deephaven.web.client.api.tree.JsTreeTable; | ||
|
|
||
| public class PartitionedTableTestGwt extends AbstractAsyncGwtTestCase { | ||
| @Override | ||
| public String getModuleName() { | ||
| return "io.deephaven.web.DeephavenIntegrationTest"; | ||
| } | ||
|
|
||
| private final TableSourceBuilder tables = new TableSourceBuilder() | ||
| .script("from deephaven import empty_table") | ||
| .script("source = empty_table(100).update(['MyKey=``+i%5', 'x=i'])") | ||
| .script("partitioned_source = source.partition_by(by=['MyKey'])") | ||
| .script("partitioned_result = partitioned_source.transform(func=lambda t: t.drop_columns('MyKey'))") | ||
| .script("constituent_result = partitioned_result.get_constituent(['0'])"); | ||
|
|
||
| private final TableSourceBuilder tickingTables = new TableSourceBuilder() | ||
| .script("from deephaven import time_table") | ||
| .script("source = time_table('PT0.1s').update(['MyKey=``+i%5', 'x=i'])") | ||
| .script("partitioned_source = source.partition_by(by=['MyKey'])") | ||
| .script("partitioned_result = partitioned_source.transform(func=lambda t: t.drop_columns('MyKey'))"); | ||
|
|
||
|
|
||
| public void testPartitionedTable() { | ||
| connect(tables) | ||
| .then(partitionedTable("partitioned_source")) | ||
| .then(partitionedTable -> { | ||
| delayTestFinish(1500); | ||
| Column[] keyColumns = partitionedTable.getKeyColumns(); | ||
| assertEquals(1, keyColumns.length); | ||
| assertEquals("MyKey", keyColumns[0].getName()); | ||
|
|
||
| Column[] columns = partitionedTable.getColumns(); | ||
| assertEquals(2, columns.length); | ||
| assertEquals("MyKey", columns[0].getName()); | ||
| assertEquals("x", columns[1].getName()); | ||
|
|
||
| return partitionedTable.getKeyTable().then(keyTable -> { | ||
| System.out.println("KeyTable size: " + keyTable.getSize()); | ||
| assertEquals(5d, keyTable.getSize()); | ||
|
|
||
| return partitionedTable.getTable("2"); | ||
| }).then(constituentTable -> { | ||
| assertEquals(20d, constituentTable.getSize()); | ||
| partitionedTable.close(); | ||
|
|
||
| return null; | ||
| }); | ||
| }) | ||
| .then(this::finish).catch_(this::report); | ||
| } | ||
|
|
||
| public void testTransformedPartitionedTable() { | ||
| connect(tables) | ||
| .then(partitionedTable("partitioned_result")) | ||
| .then(partitionedTable -> { | ||
| delayTestFinish(1500); | ||
| Column[] keyColumns = partitionedTable.getKeyColumns(); | ||
| assertEquals(1, keyColumns.length); | ||
| assertEquals("MyKey", keyColumns[0].getName()); | ||
|
|
||
| Column[] columns = partitionedTable.getColumns(); | ||
| assertEquals(1, columns.length); | ||
| assertEquals("x", columns[0].getName()); | ||
|
|
||
| return partitionedTable.getKeyTable().then(keyTable -> { | ||
| assertEquals(5d, keyTable.getSize()); | ||
|
|
||
| return partitionedTable.getTable("2"); | ||
| }).then(constituentTable -> { | ||
| assertEquals(20d, constituentTable.getSize()); | ||
| constituentTable.close(); | ||
| partitionedTable.close(); | ||
| return null; | ||
| }); | ||
| }) | ||
| .then(this::finish).catch_(this::report); | ||
| } | ||
|
|
||
| public void testConstituentResult() { | ||
| connect(tables) | ||
| .then(table("constituent_result")) | ||
| .then(table -> { | ||
| delayTestFinish(1500); | ||
|
|
||
| JsArray<Column> columns = table.getColumns(); | ||
| assertEquals(1, columns.length); | ||
| assertEquals("x", columns.getAt(0).getName()); | ||
|
|
||
| table.close(); | ||
| return null; | ||
| }) | ||
| .then(this::finish).catch_(this::report); | ||
| } | ||
|
|
||
| public void testTickingPartitionedTable() { | ||
| connect(tickingTables) | ||
| .then(partitionedTable("partitioned_source")) | ||
| .then(partitionedTable -> { | ||
| delayTestFinish(20_000); | ||
| Column[] keyColumns = partitionedTable.getKeyColumns(); | ||
| assertEquals(1, keyColumns.length); | ||
| assertEquals("MyKey", keyColumns[0].getName()); | ||
|
|
||
| Column[] columns = partitionedTable.getColumns(); | ||
| assertEquals(3, columns.length); | ||
| assertEquals("MyKey", columns[1].getName()); | ||
| assertEquals("x", columns[2].getName()); | ||
|
|
||
| return partitionedTable.getKeyTable().then(keyTable -> { | ||
| keyTable.setViewport(0, 99, keyTable.getColumns(), null); | ||
| return keyTable.getViewportData().then(data -> { | ||
| assertEquals(0d, keyTable.getSize()); | ||
|
|
||
| return waitForEventWhere(keyTable, JsTable.EVENT_UPDATED, | ||
| (CustomEvent<ViewportData> d) -> d.detail.getRows().length == 5, 20004); | ||
| }); | ||
| }).then(event -> partitionedTable.getTable("2")).then(constituentTable -> { | ||
| assertEquals(3, constituentTable.getColumns().length); | ||
| assertEquals(2d, constituentTable.getSize()); | ||
|
|
||
| constituentTable.close(); | ||
| partitionedTable.close(); | ||
|
|
||
| return null; | ||
| }); | ||
| }) | ||
| .then(this::finish).catch_(this::report); | ||
| } | ||
|
|
||
| public void testTickingTransformedPartitionedTable() { | ||
| connect(tickingTables) | ||
| .then(partitionedTable("partitioned_result")) | ||
| .then(partitionedTable -> { | ||
| delayTestFinish(20_000); | ||
| Column[] keyColumns = partitionedTable.getKeyColumns(); | ||
| assertEquals(1, keyColumns.length); | ||
| assertEquals("MyKey", keyColumns[0].getName()); | ||
|
|
||
| Column[] columns = partitionedTable.getColumns(); | ||
| assertEquals(2, columns.length); | ||
| assertEquals("Timestamp", columns[0].getName()); | ||
| assertEquals("x", columns[1].getName()); | ||
|
|
||
| return partitionedTable.getKeyTable().then(keyTable -> { | ||
| keyTable.setViewport(0, 99, keyTable.getColumns(), null); | ||
| return keyTable.getViewportData().then(data -> { | ||
| assertEquals(0d, keyTable.getSize()); | ||
|
|
||
| return waitForEventWhere(keyTable, JsTable.EVENT_UPDATED, | ||
| (CustomEvent<ViewportData> d) -> d.detail.getRows().length == 5, 20004); | ||
| }).then(event -> partitionedTable.getTable("2")).then(constituentTable -> { | ||
| assertEquals(2, constituentTable.getColumns().length); | ||
| assertEquals(2d, constituentTable.getSize()); | ||
|
|
||
| keyTable.close(); | ||
| constituentTable.close(); | ||
| partitionedTable.close(); | ||
|
|
||
| return null; | ||
| }); | ||
| }); | ||
| }) | ||
| .then(this::finish).catch_(this::report); | ||
| } | ||
| } |