create query in createQueryPlan

ingef · Sep 20, 2021 · badd453 · badd453
1 parent fae01dc
commit badd453
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/SecondaryIdQuery.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/SecondaryIdQuery.java
@@ -67,7 +67,7 @@ public class SecondaryIdQuery extends Query {
 	@Override
 	public SecondaryIdQueryPlan createQueryPlan(QueryPlanContext context) {
 
-		return new SecondaryIdQueryPlan(query, context, secondaryId, withSecondaryId, withoutSecondaryId);
+		return new SecondaryIdQueryPlan(query, context, secondaryId, withSecondaryId, withoutSecondaryId, query.createQueryPlan(context.withSelectedSecondaryId(secondaryId)));
 	}
 
 	@Override

diff --git a/backend/src/main/java/com/bakdata/conquery/models/query/queryplan/SecondaryIdQueryPlan.java b/backend/src/main/java/com/bakdata/conquery/models/query/queryplan/SecondaryIdQueryPlan.java
@@ -51,9 +51,11 @@ public class SecondaryIdQueryPlan implements QueryPlan<MultilineEntityResult> {
 	private final Set<Column> tablesWithSecondaryId;
 	private final Set<Table> tablesWithoutSecondaryId;
 
+	private final ConceptQueryPlan queryPlan;
+
+
 	private final Map<String, ConceptQueryPlan> childPerKey = new HashMap<>();
 
-	private ConceptQueryPlan queryPlan;
 
 
 	/**
@@ -113,7 +115,6 @@ private Optional<MultilineEntityResult> createResult(Entity entity) {
 
 	@Override
 	public void init(QueryExecutionContext ctx, Entity entity) {
-		queryPlan = query.createQueryPlan(queryPlanContext.withSelectedSecondaryId(secondaryId));
 		queryPlan.init(ctx, entity);