Skip to content

Fixing partition removal bug #72

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
merged 1 commit into from
Feb 2, 2019
Merged

Fixing partition removal bug #72

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
7 changes: 6 additions & 1 deletion src/main/java/com/yahoo/bullet/querying/QueryManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,12 @@ public Querier removeAndGetQuery(String id) {
Query query = querier.getQuery();
Set<String> keys = partitioner.getKeys(query);
for (String key : keys) {
partitioning.get(key).remove(id);
Set<String> partition = partitioning.get(key);
partition.remove(id);
if (partition.isEmpty()) {
log.debug("Partition: {} is empty. Removing...", key);
partitioning.remove(key);
}
log.debug("Removed query: {} from partition: {}", id, key);
}
}
Expand Down
36 changes: 36 additions & 0 deletions src/test/java/com/yahoo/bullet/querying/QueryManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,4 +372,40 @@ public void testQuerySeeingStatistics() {
Assert.assertEquals(stats.get(QueryManager.PartitionStat.ACTUAL_QUERIES_SEEN), 6L);
Assert.assertEquals(stats.get(QueryManager.PartitionStat.EXPECTED_QUERIES_SEEN), 9L);
}

@Test
public void testPartitionRemoval() {
QueryManager manager = new QueryManager(getEqualityPartitionerConfig("A", "B"));
Query queryA = getQuery(ImmutablePair.of("A", "foo"));
Query queryB = getQuery(ImmutablePair.of("A", "foo"), ImmutablePair.of("B", "bar"));
Query queryC = getQuery();
manager.addQuery("idA", getQuerier(queryA));
manager.addQuery("idB", getQuerier(queryB));
manager.addQuery("idC", getQuerier(queryC));
manager.addQuery("idD", getQuerier(queryC));

Map<QueryManager.PartitionStat, Object> stats = manager.getStats();
Assert.assertEquals(stats.get(QueryManager.PartitionStat.QUERY_COUNT), 4);
Assert.assertEquals(stats.get(QueryManager.PartitionStat.PARTITION_COUNT), 3);

manager.removeAndGetQuery("idA");
stats = manager.getStats();
Assert.assertEquals(stats.get(QueryManager.PartitionStat.QUERY_COUNT), 3);
Assert.assertEquals(stats.get(QueryManager.PartitionStat.PARTITION_COUNT), 2);

manager.removeAndGetQuery("idB");
stats = manager.getStats();
Assert.assertEquals(stats.get(QueryManager.PartitionStat.QUERY_COUNT), 2);
Assert.assertEquals(stats.get(QueryManager.PartitionStat.PARTITION_COUNT), 1);

manager.removeAndGetQuery("idD");
stats = manager.getStats();
Assert.assertEquals(stats.get(QueryManager.PartitionStat.QUERY_COUNT), 1);
Assert.assertEquals(stats.get(QueryManager.PartitionStat.PARTITION_COUNT), 1);

manager.removeAndGetQuery("idC");
stats = manager.getStats();
Assert.assertEquals(stats.get(QueryManager.PartitionStat.QUERY_COUNT), 0);
Assert.assertEquals(stats.get(QueryManager.PartitionStat.PARTITION_COUNT), 0);
}
}