Cleanup and restructure sql conversion dir (#3298)

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/CountFilter.java

@@ -22,8 +22,8 @@
 import com.bakdata.conquery.models.query.queryplan.filter.FilterNode;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.ConnectorCteStep;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.FilterContext;
+import com.bakdata.conquery.sql.conversion.model.aggregator.CountSqlAggregator;
 import com.bakdata.conquery.sql.conversion.model.filter.SqlFilters;
-import com.bakdata.conquery.sql.conversion.model.select.CountSqlAggregator;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/CountQuartersFilter.java

@@ -17,8 +17,8 @@
 import com.bakdata.conquery.models.query.queryplan.filter.FilterNode;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.ConnectorCteStep;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.FilterContext;
+import com.bakdata.conquery.sql.conversion.model.aggregator.CountQuartersSqlAggregator;
 import com.bakdata.conquery.sql.conversion.model.filter.SqlFilters;
-import com.bakdata.conquery.sql.conversion.model.select.CountQuartersSqlAggregator;
 import lombok.Getter;
 import lombok.Setter;
 

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/DateDistanceFilter.java

@@ -19,8 +19,8 @@
 import com.bakdata.conquery.models.query.queryplan.filter.FilterNode;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.ConnectorCteStep;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.FilterContext;
+import com.bakdata.conquery.sql.conversion.model.aggregator.DateDistanceSqlAggregator;
 import com.bakdata.conquery.sql.conversion.model.filter.SqlFilters;
-import com.bakdata.conquery.sql.conversion.model.select.DateDistanceSqlAggregator;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/FlagFilter.java

@@ -21,8 +21,8 @@
 import com.bakdata.conquery.models.query.queryplan.filter.FilterNode;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.ConnectorCteStep;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.FilterContext;
+import com.bakdata.conquery.sql.conversion.model.aggregator.FlagSqlAggregator;
 import com.bakdata.conquery.sql.conversion.model.filter.SqlFilters;
-import com.bakdata.conquery.sql.conversion.model.select.FlagSqlAggregator;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.dropwizard.validation.ValidationMethod;

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/NumberFilter.java

@@ -19,8 +19,8 @@
 import com.bakdata.conquery.models.query.queryplan.filter.FilterNode;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.ConnectorCteStep;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.FilterContext;
+import com.bakdata.conquery.sql.conversion.model.aggregator.NumberSqlAggregator;
 import com.bakdata.conquery.sql.conversion.model.filter.SqlFilters;
-import com.bakdata.conquery.sql.conversion.model.select.NumberSqlAggregator;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/PrefixTextFilter.java

@@ -34,5 +34,4 @@ public EnumSet<MajorTypeId> getAcceptedColumnTypes() {
 	public FilterNode createFilterNode(String value) {
 		return new PrefixTextFilterNode(getColumn(), value);
 	}
-
 }

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/filters/specific/SumFilter.java

@@ -34,9 +34,9 @@
 import com.bakdata.conquery.models.query.queryplan.filter.FilterNode;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.ConnectorCteStep;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.FilterContext;
+import com.bakdata.conquery.sql.conversion.model.aggregator.SumDistinctSqlAggregator;
+import com.bakdata.conquery.sql.conversion.model.aggregator.SumSqlAggregator;
 import com.bakdata.conquery.sql.conversion.model.filter.SqlFilters;
-import com.bakdata.conquery.sql.conversion.model.select.SumDistinctSqlAggregator;
-import com.bakdata.conquery.sql.conversion.model.select.SumSqlAggregator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.NoArgsConstructor;

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/concept/specific/ExistsSelect.java

@@ -10,7 +10,7 @@
 import com.bakdata.conquery.models.datasets.concepts.select.concept.UniversalSelect;
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.ExistsAggregator;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.SelectContext;
-import com.bakdata.conquery.sql.conversion.model.select.ExistsSqlAggregator;
+import com.bakdata.conquery.sql.conversion.model.aggregator.ExistsSqlAggregator;
 import com.bakdata.conquery.sql.conversion.model.select.SqlSelects;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/FirstValueSelect.java

@@ -9,7 +9,7 @@
 import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator;
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.value.FirstValueAggregator;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.SelectContext;
-import com.bakdata.conquery.sql.conversion.model.select.FirstValueSqlAggregator;
+import com.bakdata.conquery.sql.conversion.model.aggregator.FirstValueSqlAggregator;
 import com.bakdata.conquery.sql.conversion.model.select.SqlSelects;
 import com.fasterxml.jackson.annotation.JsonCreator;
 

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/LastValueSelect.java

@@ -9,7 +9,7 @@
 import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator;
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.value.LastValueAggregator;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.SelectContext;
-import com.bakdata.conquery.sql.conversion.model.select.LastValueSqlAggregator;
+import com.bakdata.conquery.sql.conversion.model.aggregator.LastValueSqlAggregator;
 import com.bakdata.conquery.sql.conversion.model.select.SqlSelects;
 import com.fasterxml.jackson.annotation.JsonCreator;
 

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/RandomValueSelect.java

@@ -9,7 +9,7 @@
 import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator;
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.value.RandomValueAggregator;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.SelectContext;
-import com.bakdata.conquery.sql.conversion.model.select.RandomValueSqlAggregator;
+import com.bakdata.conquery.sql.conversion.model.aggregator.RandomValueSqlAggregator;
 import com.bakdata.conquery.sql.conversion.model.select.SqlSelects;
 import com.fasterxml.jackson.annotation.JsonCreator;
 

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/CountQuartersSelect.java

@@ -12,7 +12,7 @@
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.CountQuartersOfDateRangeAggregator;
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.CountQuartersOfDatesAggregator;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.SelectContext;
-import com.bakdata.conquery.sql.conversion.model.select.CountQuartersSqlAggregator;
+import com.bakdata.conquery.sql.conversion.model.aggregator.CountQuartersSqlAggregator;
 import com.bakdata.conquery.sql.conversion.model.select.SqlSelects;
 import com.fasterxml.jackson.annotation.JsonCreator;
 

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/CountSelect.java

@@ -15,7 +15,7 @@
 import com.bakdata.conquery.models.query.queryplan.aggregators.DistinctValuesWrapperAggregator;
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.CountAggregator;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.SelectContext;
-import com.bakdata.conquery.sql.conversion.model.select.CountSqlAggregator;
+import com.bakdata.conquery.sql.conversion.model.aggregator.CountSqlAggregator;
 import com.bakdata.conquery.sql.conversion.model.select.SqlSelects;
 import lombok.Data;
 import lombok.NoArgsConstructor;

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/DateDistanceSelect.java

@@ -14,7 +14,7 @@
 import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator;
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.DateDistanceAggregator;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.SelectContext;
-import com.bakdata.conquery.sql.conversion.model.select.DateDistanceSqlAggregator;
+import com.bakdata.conquery.sql.conversion.model.aggregator.DateDistanceSqlAggregator;
 import com.bakdata.conquery.sql.conversion.model.select.SqlSelects;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import lombok.Getter;

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/FlagSelect.java

@@ -13,7 +13,7 @@
 import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator;
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.FlagsAggregator;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.SelectContext;
-import com.bakdata.conquery.sql.conversion.model.select.FlagSqlAggregator;
+import com.bakdata.conquery.sql.conversion.model.aggregator.FlagSqlAggregator;
 import com.bakdata.conquery.sql.conversion.model.select.SqlSelects;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/PrefixSelect.java

@@ -4,9 +4,9 @@
 
 import com.bakdata.conquery.io.cps.CPSType;
 import com.bakdata.conquery.io.jackson.serializer.NsIdRef;
+import com.bakdata.conquery.models.datasets.Column;
 import com.bakdata.conquery.models.datasets.concepts.select.Select;
 import com.bakdata.conquery.models.datasets.concepts.select.connector.SingleColumnSelect;
-import com.bakdata.conquery.models.datasets.Column;
 import com.bakdata.conquery.models.events.MajorTypeId;
 import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator;
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.PrefixTextAggregator;

backend/src/main/java/com/bakdata/conquery/models/datasets/concepts/select/connector/specific/SumSelect.java

@@ -27,9 +27,9 @@
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.sum.RealSumAggregator;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.ConnectorCteStep;
 import com.bakdata.conquery.sql.conversion.cqelement.concept.SelectContext;
+import com.bakdata.conquery.sql.conversion.model.aggregator.SumDistinctSqlAggregator;
+import com.bakdata.conquery.sql.conversion.model.aggregator.SumSqlAggregator;
 import com.bakdata.conquery.sql.conversion.model.select.SqlSelects;
-import com.bakdata.conquery.sql.conversion.model.select.SumDistinctSqlAggregator;
-import com.bakdata.conquery.sql.conversion.model.select.SumSqlAggregator;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.dropwizard.validation.ValidationMethod;

backend/src/main/java/com/bakdata/conquery/sql/conversion/cqelement/aggregation/DateAggregationCteStep.java

@@ -4,9 +4,4 @@
 
 interface DateAggregationCteStep extends CteStep {
 
-	@Override
-	default String cteName(String nodeLabel) {
-		return "%s%s".formatted(nodeLabel, getSuffix());
-	}
-
 }

backend/src/main/java/com/bakdata/conquery/sql/conversion/cqelement/aggregation/DateAggregationDates.java

@@ -24,7 +24,6 @@ public class DateAggregationDates {
 
 	private static final String RANGE_START = "RANGE_START";
 	private static final String RANGE_END = "RANGE_END";
-	private static final AtomicInteger validityDateCounter = new AtomicInteger();
 	private final List<ColumnDateRange> validityDates;
 
 	public static DateAggregationDates forSingleStep(QueryStep queryStep) {
@@ -36,9 +35,10 @@ public static DateAggregationDates forSingleStep(QueryStep queryStep) {
 	}
 
 	public static DateAggregationDates forSteps(List<QueryStep> querySteps) {
+		AtomicInteger validityDateCounter = new AtomicInteger(0);
 		List<ColumnDateRange> validityDates = querySteps.stream()
 														.filter(queryStep -> queryStep.getSelects().getValidityDate().isPresent())
-														.map(DateAggregationDates::numerateValidityDate)
+														.map(queryStep -> numerateValidityDate(queryStep, validityDateCounter))
 														.toList();
 		return new DateAggregationDates(validityDates);
 	}
@@ -70,7 +70,7 @@ public DateAggregationDates qualify(String qualifier) {
 		return new DateAggregationDates(qualified);
 	}
 
-	private static ColumnDateRange numerateValidityDate(QueryStep queryStep) {
+	private static ColumnDateRange numerateValidityDate(QueryStep queryStep, AtomicInteger validityDateCounter) {
 		ColumnDateRange validityDate = queryStep.getQualifiedSelects().getValidityDate().get();
 
 		if (validityDate.isSingleColumnRange()) {

backend/src/main/java/com/bakdata/conquery/sql/conversion/cqelement/aggregation/IntersectCteStep.java

@@ -13,9 +13,9 @@
 @RequiredArgsConstructor
 enum IntersectCteStep implements DateAggregationCteStep {
 
-	OVERLAP("_overlap", OverlapCte::new, null),
-	INTERMEDIATE_TABLE("_no_overlap", IntermediateTableCte::new, null),
-	MERGE("_merge", MergeCte::new, OVERLAP);
+	OVERLAP("overlap", OverlapCte::new, null),
+	INTERMEDIATE_TABLE("no_overlap", IntermediateTableCte::new, null),
+	MERGE("merge", MergeCte::new, OVERLAP);
 
 	private static final Set<IntersectCteStep> REQUIRED_STEPS = Set.of(values());
 	private final String suffix;

backend/src/main/java/com/bakdata/conquery/sql/conversion/cqelement/aggregation/InvertCteStep.java

@@ -13,8 +13,8 @@
 @RequiredArgsConstructor
 enum InvertCteStep implements DateAggregationCteStep {
 
-	ROW_NUMBER("_row_numbers", RowNumberCte::new, null),
-	INVERT("_inverted_dates", InvertCte::new, InvertCteStep.ROW_NUMBER);
+	ROW_NUMBER("row_numbers", RowNumberCte::new, null),
+	INVERT("inverted_dates", InvertCte::new, InvertCteStep.ROW_NUMBER);
 
 	private static final Set<InvertCteStep> REQUIRED_STEPS = Set.of(values());
 	private final String suffix;

backend/src/main/java/com/bakdata/conquery/sql/conversion/cqelement/aggregation/MergeCteStep.java

@@ -13,10 +13,10 @@
 @RequiredArgsConstructor
 enum MergeCteStep implements DateAggregationCteStep {
 
-	OVERLAP("_overlap", OverlapCte::new, null),
-	INTERMEDIATE_TABLE("_no_overlap", IntermediateTableCte::new, null),
-	NODE_NO_OVERLAP("_node_no_overlap", NodeNoOverlapCte::new, INTERMEDIATE_TABLE),
-	MERGE("_merge", MergeCte::new, OVERLAP);
+	OVERLAP("overlap", OverlapCte::new, null),
+	INTERMEDIATE_TABLE("no_overlap", IntermediateTableCte::new, null),
+	NODE_NO_OVERLAP("node_no_overlap", NodeNoOverlapCte::new, INTERMEDIATE_TABLE),
+	MERGE("merge", MergeCte::new, OVERLAP);
 
 	private static final Set<MergeCteStep> REQUIRED_STEPS = Set.of(values());
 	private final String suffix;

backend/src/main/java/com/bakdata/conquery/sql/conversion/cqelement/aggregation/PostgreSqlDateAggregator.java

@@ -14,23 +14,20 @@
 import com.bakdata.conquery.sql.conversion.model.Selects;
 import com.bakdata.conquery.sql.conversion.model.select.SqlSelect;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import org.jooq.Field;
 import org.jooq.impl.DSL;
 
 public class PostgreSqlDateAggregator implements SqlDateAggregator {
 
 	@Getter
+	@RequiredArgsConstructor
 	private enum PostgresDateAggregationCteStep implements DateAggregationCteStep {
 
 		DATE_AGGREGATED("dates_aggregated"),
 		DATES_INVERTED("dates_inverted");
 
 		private final String suffix;
-
-		PostgresDateAggregationCteStep(String suffix) {
-			this.suffix = suffix;
-		}
-
 	}
 
 	private final SqlFunctionProvider functionProvider;

backend/src/main/java/com/bakdata/conquery/sql/conversion/cqelement/concept/AggregationFilterCte.java

@@ -2,20 +2,23 @@
 
 import java.util.List;
 
+import com.bakdata.conquery.sql.conversion.model.QualifyingUtil;
 import com.bakdata.conquery.sql.conversion.model.QueryStep;
 import com.bakdata.conquery.sql.conversion.model.Selects;
 import com.bakdata.conquery.sql.conversion.model.filter.WhereCondition;
 import com.bakdata.conquery.sql.conversion.model.select.SqlSelect;
 import org.jooq.Condition;
+import org.jooq.Field;
 
 class AggregationFilterCte extends ConnectorCte {
 
 	@Override
 	public QueryStep.QueryStepBuilder convertStep(CQTableContext tableContext) {
 
 		String predecessorTableName = tableContext.getConnectorTables().getPredecessor(cteStep());
+		Field<Object> primaryColumn = QualifyingUtil.qualify(tableContext.getPrimaryColumn(), predecessorTableName);
 		Selects aggregationFilterSelects = Selects.builder()
-												  .primaryColumn(tableContext.getPrimaryColumn())
+												  .primaryColumn(primaryColumn)
 												  .sqlSelects(getForAggregationFilterSelects(tableContext))
 												  .build()
 												  .qualify(predecessorTableName);

backend/src/main/java/com/bakdata/conquery/sql/conversion/cqelement/concept/AggregationSelectCte.java

@@ -2,28 +2,33 @@
 
 import java.util.List;
 
+import com.bakdata.conquery.sql.conversion.model.QualifyingUtil;
 import com.bakdata.conquery.sql.conversion.model.QueryStep;
 import com.bakdata.conquery.sql.conversion.model.Selects;
 import com.bakdata.conquery.sql.conversion.model.select.SqlSelect;
+import org.jooq.Field;
 
 class AggregationSelectCte extends ConnectorCte {
 
 	@Override
 	public QueryStep.QueryStepBuilder convertStep(CQTableContext tableContext) {
 
+		String predecessor = tableContext.getConnectorTables().getPredecessor(ConnectorCteStep.AGGREGATION_SELECT);
+		Field<Object> primaryColumn = QualifyingUtil.qualify(tableContext.getPrimaryColumn(), predecessor);
+
 		List<SqlSelect> requiredInAggregationFilterStep = tableContext.allSqlSelects().stream()
 																	  .flatMap(sqlSelects -> sqlSelects.getAggregationSelects().stream())
 																	  .distinct()
 																	  .toList();
 
 		Selects aggregationSelectSelects = Selects.builder()
-												  .primaryColumn(tableContext.getPrimaryColumn())
+												  .primaryColumn(primaryColumn)
 												  .sqlSelects(requiredInAggregationFilterStep)
 												  .build();
 
 		return QueryStep.builder()
 						.selects(aggregationSelectSelects)
-						.groupBy(List.of(tableContext.getPrimaryColumn()));
+						.groupBy(List.of(primaryColumn));
 	}
 
 	@Override

backend/src/main/java/com/bakdata/conquery/sql/conversion/cqelement/concept/ConnectorCteStep.java

@@ -28,14 +28,8 @@ public enum ConnectorCteStep implements CteStep {
 	private final ConnectorCteStep predecessor;
 
 	public static Set<ConnectorCteStep> withOptionalSteps(ConnectorCteStep... connectorCteStep) {
-		HashSet<ConnectorCteStep> steps = new HashSet<>(MANDATORY_STEPS);
+		Set<ConnectorCteStep> steps = new HashSet<>(MANDATORY_STEPS);
 		steps.addAll(Set.of(connectorCteStep));
 		return steps;
 	}
-
-	@Override
-	public String cteName(String conceptLabel) {
-		return "%s-%s".formatted(conceptLabel, this.suffix);
-	}
-
 }