fix greatest/least usage

ingef · Nov 11, 2024 · 1446b9a · 1446b9a
1 parent 98f5902
commit 1446b9a
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/backend/src/main/java/com/bakdata/conquery/mode/local/UpdateMatchingStatsSqlJob.java b/backend/src/main/java/com/bakdata/conquery/mode/local/UpdateMatchingStatsSqlJob.java
@@ -163,7 +163,7 @@ public void calculateMatchingStats(final TreeConcept treeConcept) {
 
 		// if there is no validity date at all, we select no field
 
-		final Field<?> validityDateExpression = toValidityDateExpression(validityDateMap, !relevantColumns.isEmpty());
+		final Field<?> validityDateExpression = toValidityDateExpression(validityDateMap);
 
 		final SelectJoinStep<Record> query = dslContext.select(relevantColumnsAliased)
 													   .select(
@@ -291,23 +291,23 @@ private Condition toJooqCondition(final Connector connector, CTCondition childCo
 	/**
 	 * Select the minimum of the least start date and the maximum of the greatest end date of all validity dates of all connectors.
 	 */
-	private Field<String> toValidityDateExpression(final Map<Connector, List<ColumnDateRange>> validityDateMap, boolean grouped) {
+	private Field<String> toValidityDateExpression(final Map<Connector, List<ColumnDateRange>> validityDateMap) {
 		if (validityDateMap.isEmpty()){
 			return noField(String.class);
 		}
 
-		final List<ColumnDateRange> validityDates = validityDateMap.values().stream().flatMap(List::stream).map(functionProvider::toDualColumn).toList();
+		final List<ColumnDateRange> validityDates = validityDateMap.values().stream()
+																   .flatMap(List::stream)
+																   .map(functionProvider::toDualColumn)
+																   .toList();
+
 		final List<Field<Date>> allStarts = validityDates.stream().map(ColumnDateRange::getStart).toList();
 		final List<Field<Date>> allEnds = validityDates.stream().map(ColumnDateRange::getEnd).toList();
 
-		final ColumnDateRange minAndMax;
+		final Field<Date> startField = allStarts.size() > 1 ? functionProvider.least(allStarts) : allStarts.get(0);
+		final Field<Date> endField = allEnds.size() > 1 ? functionProvider.greatest(allEnds) : allEnds.get(0);
 
-		if (grouped){
-			minAndMax = ColumnDateRange.of(min(functionProvider.least(allStarts)), max(functionProvider.greatest((allEnds))));
-		}
-		else {
-			minAndMax = ColumnDateRange.of(functionProvider.least(allStarts), functionProvider.greatest(allEnds));
-		}
+		final ColumnDateRange minAndMax = ColumnDateRange.of(min(startField), max(endField));
 
 		return functionProvider.daterangeStringExpression(minAndMax);
 	}