Skip to content

Fix InMemoryDataTableStore.getRows returning only first matching bucket #7276

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

Closed
jkschneider wants to merge 1 commit into from
+22 −11
Closed

Fix InMemoryDataTableStore.getRows returning only first matching bucket #7276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 5 additions & 11 deletions rewrite-core/src/main/java/org/openrewrite/InMemoryDataTableStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,22 +60,16 @@ public <Row> void insertRow(DataTable<Row> dataTable, ExecutionContext ctx, Row

@Override
public Stream<?> getRows(String dataTableName, @Nullable String group) {
// Scan for matching bucket
List<Object> allRows = new ArrayList<>();
for (Bucket bucket : buckets.values()) {
if (bucket.dataTable.getName().equals(dataTableName) &&
java.util.Objects.equals(bucket.dataTable.getGroup(), group)) {
return snapshotRows(bucket);
synchronized (bucket.rows) {
allRows.addAll(bucket.rows);
}
}
}
return Stream.empty();
}

private static Stream<Object> snapshotRows(Bucket bucket) {
List<Object> snapshot;
synchronized (bucket.rows) {
snapshot = new ArrayList<>(bucket.rows);
}
return snapshot.stream();
return allRows.stream();
}

@Override
Expand Down
17 changes: 17 additions & 0 deletions rewrite-core/src/test/java/org/openrewrite/DataTableStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,23 @@ void ungroupedTablesGetSeparateBuckets() {
assertThat(store.getDataTables()).hasSize(2);
}

@Test
void getRowsAggregatesAcrossUngroupedBuckets() {
InMemoryDataTableStore store = new InMemoryDataTableStore();
ExecutionContext ctx = ctx();

// Two ungrouped tables with different instance names end up in separate buckets
TestTable table1 = new TestTable(Recipe.noop()).withInstanceName(() -> "instance-a");
TestTable table2 = new TestTable(Recipe.noop()).withInstanceName(() -> "instance-b");

store.insertRow(table1, ctx, new TestTable.Row("from-a"));
store.insertRow(table2, ctx, new TestTable.Row("from-b"));

// getRows should return rows from ALL matching buckets, not just the first
List<?> rows = store.getRows(TestTable.class.getName(), null).collect(Collectors.toList());
assertThat(rows).hasSize(2);
}

// =========================================================================
// DataTable identity
// =========================================================================
Expand Down