Skip to content

Commit

Permalink
Use queue instead of streams in NodeQuery
Browse files Browse the repository at this point in the history 
Changes NodeQuery to use a single instance of a Queue for keeping
track of and aggregating query results to avoid extra allocations
within queries and when joining the results.
  • Loading branch information
@milesziemer
milesziemer committed Jan 23, 2024
1 parent 67b47d3 commit e957978
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 39 deletions.
1 change: 1 addition & 0 deletions ...hy-model/src/main/java/software/amazon/smithy/model/neighbor/IdRefShapeRelationships.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
*/
final class IdRefShapeRelationships {
private static final Selector WITH_ID_REF = Selector.parse("[trait|idRef]");

private final Model model;
private final Map<ShapeId, Set<Relationship>> relationships = new HashMap<>();

Expand Down
51 changes: 29 additions & 22 deletions smithy-model/src/main/java/software/amazon/smithy/model/neighbor/NodeQuery.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,40 @@

package software.amazon.smithy.model.neighbor;

import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.Queue;
import software.amazon.smithy.model.node.Node;
import software.amazon.smithy.utils.ListUtils;

/**
* Searches {@link Node}s to find matching children. Each search
* condition is executed on the result of the previous search,
* and the results are aggregated.
*/
final class NodeQuery {
private static final Query SELF = Stream::of;
private static final Query SELF = (node, result) -> result.add(node);

private static final Query ANY_MEMBER = (node) -> {
private static final Query ANY_MEMBER = (node, result) -> {
if (node == null || !node.isObjectNode()) {
return Stream.empty();
return;
}
return node.expectObjectNode().getMembers().values().stream();
result.addAll(node.expectObjectNode().getMembers().values());
};

private static final Query ANY_ELEMENT = (node) -> {
private static final Query ANY_ELEMENT = (node, result) -> {
if (node == null || !node.isArrayNode()) {
return Stream.empty();
return;
}
return node.expectArrayNode().getElements().stream();
result.addAll(node.expectArrayNode().getElements());
};

private static final Query ANY_MEMBER_NAME = (node) -> {
private static final Query ANY_MEMBER_NAME = (node, result) -> {
if (node == null || !node.isObjectNode()) {
return Stream.empty();
return;
}
return node.expectObjectNode().getMembers().keySet().stream();
result.addAll(node.expectObjectNode().getMembers().keySet());
};

private final List<Query> queries = new ArrayList<>();
Expand All @@ -52,11 +52,11 @@ NodeQuery self() {
}

NodeQuery member(String name) {
queries.add(node -> {
queries.add((node, result) -> {
if (node == null || !node.isObjectNode()) {
return Stream.empty();
return;
}
return node.expectObjectNode().getMember(name).map(Stream::of).orElse(Stream.empty());
node.expectObjectNode().getMember(name).ifPresent(result::add);
});
return this;
}
Expand All @@ -76,20 +76,27 @@ NodeQuery anyMemberName() {
return this;
}

List<Node> execute(Node node) {
Collection<Node> execute(Node node) {
Queue<Node> previousResult = new ArrayDeque<>();

if (queries.isEmpty()) {
return ListUtils.of();
return previousResult;
}

Stream<Node> previousResult = Stream.of(node);
previousResult.add(node);
for (Query query : queries) {
previousResult = previousResult.flatMap(query::run);
// Each time a query runs, it adds to the queue, but we only want it to
// run on the nodes added by the previous query.
for (int i = previousResult.size(); i > 0; i--) {
query.run(previousResult.poll(), previousResult);
}
}
return previousResult.collect(Collectors.toList());

return previousResult;
}

@FunctionalInterface
interface Query {
Stream<? extends Node> run(Node node);
void run(Node node, Queue<Node> result);
}
}
34 changes: 17 additions & 17 deletions smithy-model/src/test/java/software/amazon/smithy/model/neighbor/NodeQueryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.hasSize;

import java.util.List;
import java.util.Collection;
import org.junit.jupiter.api.Test;
import software.amazon.smithy.model.node.Node;
import software.amazon.smithy.model.node.StringNode;
Expand All @@ -14,7 +14,7 @@ public class NodeQueryTest {
public void noQueriesGivesNoResults() {
Node node = Node.from("{}");

List<Node> result = new NodeQuery().execute(node);
Collection<Node> result = new NodeQuery().execute(node);

assertThat(result, hasSize(0));
}
Expand All @@ -23,7 +23,7 @@ public void noQueriesGivesNoResults() {
public void self() {
Node node = Node.from("{}");

List<Node> result = new NodeQuery().self().execute(node);
Collection<Node> result = new NodeQuery().self().execute(node);

assertThat(result, containsInAnyOrder(node));
}
Expand All @@ -32,7 +32,7 @@ public void self() {
public void selfCanBeAppliedMultipleTimes() {
Node node = Node.from("{}");

List<Node> result = new NodeQuery().self().self().self().execute(node);
Collection<Node> result = new NodeQuery().self().self().self().execute(node);

assertThat(result, containsInAnyOrder(node));
}
Expand All @@ -42,7 +42,7 @@ public void member() {
Node member = StringNode.from("bar");
Node node = Node.objectNode().withMember("foo", member);

List<Node> result = new NodeQuery().member("foo").execute(node);
Collection<Node> result = new NodeQuery().member("foo").execute(node);

assertThat(result, containsInAnyOrder(member));
}
Expand All @@ -53,7 +53,7 @@ public void anyMember() {
Node member2 = StringNode.from("member-two");
Node node = Node.objectNode().withMember("one", member1).withMember("two", member2);

List<Node> result = new NodeQuery().anyMember().execute(node);
Collection<Node> result = new NodeQuery().anyMember().execute(node);

assertThat(result, containsInAnyOrder(member1, member2));
}
Expand All @@ -64,7 +64,7 @@ public void anyElement() {
Node element2 = StringNode.from("element-two");
Node node = Node.arrayNode(element1, element2);

List<Node> result = new NodeQuery().anyElement().execute(node);
Collection<Node> result = new NodeQuery().anyElement().execute(node);

assertThat(result, containsInAnyOrder(element1, element2));
}
Expand All @@ -77,7 +77,7 @@ public void anyMemberName() {
Node member2 = StringNode.from("member-two");
Node node = Node.objectNode().withMember(key1, member1).withMember(key2, member2);

List<Node> result = new NodeQuery().anyMemberName().execute(node);
Collection<Node> result = new NodeQuery().anyMemberName().execute(node);

assertThat(result, containsInAnyOrder(key1, key2));
}
Expand All @@ -86,7 +86,7 @@ public void anyMemberName() {
public void memberGivesNoResultsOnNonObjectNode() {
Node node = Node.from("[{\"foo\": 0}]");

List<Node> result = new NodeQuery().member("foo").execute(node);
Collection<Node> result = new NodeQuery().member("foo").execute(node);

assertThat(result, hasSize(0));
}
Expand All @@ -95,7 +95,7 @@ public void memberGivesNoResultsOnNonObjectNode() {
public void memberGivesNoResultsIfMemberNameNotFound() {
Node node = Node.from("{\"a\": 0, \"b\": 0}");

List<Node> result = new NodeQuery().member("foo").execute(node);
Collection<Node> result = new NodeQuery().member("foo").execute(node);

assertThat(result, hasSize(0));
}
Expand All @@ -104,7 +104,7 @@ public void memberGivesNoResultsIfMemberNameNotFound() {
public void anyMemberGivesNoResultsOnNonObjectNode() {
Node node = Node.from("[{\"foo\": 0}]");

List<Node> result = new NodeQuery().anyMember().execute(node);
Collection<Node> result = new NodeQuery().anyMember().execute(node);

assertThat(result, hasSize(0));
}
Expand All @@ -113,7 +113,7 @@ public void anyMemberGivesNoResultsOnNonObjectNode() {
public void anyMemberGivesNoResultsOnEmptyObjectNode() {
Node node = Node.from("{}");

List<Node> result = new NodeQuery().anyMember().execute(node);
Collection<Node> result = new NodeQuery().anyMember().execute(node);

assertThat(result, hasSize(0));
}
Expand All @@ -122,7 +122,7 @@ public void anyMemberGivesNoResultsOnEmptyObjectNode() {
public void anyElementGivesNoResultsOnNonArrayNode() {
Node node = Node.from("{\"foo\": [0]}");

List<Node> result = new NodeQuery().anyElement().execute(node);
Collection<Node> result = new NodeQuery().anyElement().execute(node);

assertThat(result, hasSize(0));
}
Expand All @@ -131,7 +131,7 @@ public void anyElementGivesNoResultsOnNonArrayNode() {
public void anyElementGivesNoResultsOnEmptyArrayNode() {
Node node = Node.from("[]");

List<Node> result = new NodeQuery().anyElement().execute(node);
Collection<Node> result = new NodeQuery().anyElement().execute(node);

assertThat(result, hasSize(0));
}
Expand All @@ -140,7 +140,7 @@ public void anyElementGivesNoResultsOnEmptyArrayNode() {
public void anyMemberNameGivesNoResultsOnNonObjectNode() {
Node node = Node.from("1");

List<Node> result = new NodeQuery().anyMemberName().execute(node);
Collection<Node> result = new NodeQuery().anyMemberName().execute(node);

assertThat(result, hasSize(0));
}
Expand All @@ -149,7 +149,7 @@ public void anyMemberNameGivesNoResultsOnNonObjectNode() {
public void anyMemberNameGivesNoResultsOnEmptyObject() {
Node node = Node.from("{}");

List<Node> result = new NodeQuery().anyMemberName().execute(node);
Collection<Node> result = new NodeQuery().anyMemberName().execute(node);

assertThat(result, hasSize(0));
}
Expand All @@ -165,7 +165,7 @@ public void eachQueryExecuteOnResultOfPreviousQuery() {
.withMember("arr3", Node.arrayNode(element3)));
Node node = Node.arrayNode(obj, obj);

List<Node> result = new NodeQuery()
Collection<Node> result = new NodeQuery()
.anyElement()
.member("foo")
.anyMember()
Expand Down

0 comments on commit e957978

Please sign in to comment.