set result count only for finished executions in execution info

Author: thoniTUB

backend/src/main/java/com/bakdata/conquery/models/config/ExcelResultProvider.java

@@ -6,6 +6,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.OptionalLong;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import jakarta.ws.rs.core.MediaType;
@@ -62,9 +63,15 @@ public Collection<ResultAsset> generateResultURLs(ManagedExecution exec, UriBuil
 		}
 
 		// Check if resulting dimensions are possible for the xlsx format
-		final long rowCount = singleExecution.resultRowCount();
+		final OptionalLong rowCount = singleExecution.resultRowCount();
+
+		if (rowCount.isEmpty()) {
+			log.warn("Cannot check maximum row requirement, because the result has no rows");
+			return Collections.emptyList();
+		}
+
 		final int maxRowCount = SpreadsheetVersion.EXCEL2007.getMaxRows();
-		if (rowCount + 1 /* header row*/ > maxRowCount) {
+		if (rowCount.getAsLong() + 1 /* header row*/ > maxRowCount) {
 
 			log.trace("Row count is too high for XLSX format (is: {}, max: {}). Not producing a result URL", rowCount, maxRowCount);
 

backend/src/main/java/com/bakdata/conquery/models/forms/managed/ManagedInternalForm.java

@@ -167,7 +167,7 @@ public Stream<EntityResult> streamResults(OptionalLong limit) {
 	}
 
 	@Override
-	public long resultRowCount() {
+	public OptionalLong resultRowCount() {
 		if (subQueries.size() != 1) {
 			// Get the query, only if there is only one query set in the whole execution
 			throw new UnsupportedOperationException("Cannot return the result query of a multi query form");

backend/src/main/java/com/bakdata/conquery/models/query/ManagedQuery.java

@@ -1,6 +1,7 @@
 package com.bakdata.conquery.models.query;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.OptionalLong;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
@@ -82,18 +83,25 @@ public Stream<EntityResult> streamResults(OptionalLong maybeLimit) {
 	}
 
 	@Override
-	public synchronized long resultRowCount() {
+	public synchronized OptionalLong resultRowCount() {
 		ExecutionManager executionManager = getExecutionManager();
-		return executionManager.tryGetExecutionInfo(getId())
-							   .map(info -> ((ExecutionManager.InternalExecutionInfo) info).getResultCount())
-							   .orElse(0L);
+		Optional<ExecutionManager.ExecutionInfo> executionInfo = executionManager.tryGetExecutionInfo(getId());
+
+		return executionInfo.map(ExecutionManager.InternalExecutionInfo.class::cast)
+					 .map(ExecutionManager.InternalExecutionInfo::getResultCount)
+					 .map(OptionalLong::of)
+					 .orElse(OptionalLong.empty());
 	}
 
 	@Override
 	public void setStatusBase(@NonNull Subject subject, @NonNull ExecutionStatus status) {
 
 		super.setStatusBase(subject, status);
-		status.setNumberOfResults(resultRowCount());
+		OptionalLong resultRowCount = resultRowCount();
+		if (status.getStatus().equals(ExecutionState.DONE) && resultRowCount.isPresent()) {
+			// We only want to present the result number if the execution finished
+			status.setNumberOfResults(resultRowCount.getAsLong());
+		}
 
 		Query query = getQuery();
 		status.setQueryType(query.getClass().getAnnotation(CPSType.class).id());

backend/src/main/java/com/bakdata/conquery/models/query/SingleTableResult.java

@@ -64,7 +64,7 @@ default List<ColumnDescriptor> generateColumnDescriptions(boolean isInitialized,
 	Stream<EntityResult> streamResults(OptionalLong limit);
 
 	@JsonIgnore
-	long resultRowCount();
+	OptionalLong resultRowCount();
 
 
 }

backend/src/main/java/com/bakdata/conquery/models/query/preview/EntityPreviewExecution.java

@@ -397,7 +397,7 @@ public Stream<EntityResult> streamResults(OptionalLong limit) {
 	}
 
 	@Override
-	public long resultRowCount() {
+	public OptionalLong resultRowCount() {
 		return getValuesQuery().resultRowCount();
 	}
 }

backend/src/main/java/com/bakdata/conquery/models/query/statistics/ResultStatistics.java

@@ -66,7 +66,7 @@ public static ResultStatistics collectResultStatistics(
 		}
 
 		// Count result lines and entities (may differ in case of form or SecondaryIdQuery)
-		final ListenableFuture<Integer> futureLines = executorService.submit(() -> (int) managedQuery.resultRowCount());
+		final ListenableFuture<Integer> futureLines = executorService.submit(() -> (int) managedQuery.resultRowCount().orElse(0));
 
 		final ListenableFuture<Integer> futureEntities = executorService.submit(() -> (int) managedQuery.streamResults(OptionalLong.empty()).count());
 

backend/src/test/java/com/bakdata/conquery/api/StoredQueriesProcessorTest.java

@@ -9,6 +9,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.OptionalLong;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import jakarta.validation.Validator;
@@ -249,8 +250,8 @@ public List<ResultInfo> collectResultInfos() {
 			}
 
 			@Override
-			public synchronized long resultRowCount() {
-				return resultCount;
+			public synchronized OptionalLong resultRowCount() {
+				return OptionalLong.of(resultCount);
 			}
 		};
 		setState(execState, managedQuery.getId());
@@ -277,7 +278,7 @@ public void getQueriesFiltered() {
 
 		assertThat(infos)
 				.containsExactly(
-						makeState(QUERY_ID_0, USERS[0], USERS[0], NEW, "CONCEPT_QUERY", null, 100L),
+						makeState(QUERY_ID_0, USERS[0], USERS[0], NEW, "CONCEPT_QUERY", null, null),
 						makeState(QUERY_ID_4, USERS[1], USERS[0], DONE, "CONCEPT_QUERY", null, 100L),
 						makeState(QUERY_ID_7, USERS[1], USERS[0], DONE, "SECONDARY_ID_QUERY", new SecondaryIdDescriptionId(DATASET_0.getId(), "sid"), 100L),
 						makeState(QUERY_ID_9, USERS[1], USERS[0], DONE, "CONCEPT_QUERY", null, 100L),
@@ -309,8 +310,8 @@ public List<ResultInfo> collectResultInfos() {
 			}
 
 			@Override
-			public synchronized long resultRowCount() {
-				return resultCount;
+			public synchronized OptionalLong resultRowCount() {
+				return resultCount == null ? OptionalLong.empty(): OptionalLong.of(resultCount);
 			}
 		};
 

backend/src/test/java/com/bakdata/conquery/integration/json/AbstractQueryEngineTest.java

@@ -84,7 +84,7 @@ public void executeTest(StandaloneSupport standaloneSupport) throws IOException
 		if (executionResult.streamResults(OptionalLong.empty()).noneMatch(MultilineEntityResult.class::isInstance)) {
 			long lastResultCount;
 			if (executionResult instanceof ManagedQuery editorQuery) {
-				lastResultCount = editorQuery.resultRowCount();
+				lastResultCount = editorQuery.resultRowCount().orElseThrow();
 			}
 			else {
 				throw new UnexpectedTypeException("Did expect an EditorQuery, but got element of type %s.".formatted(execution.getClass()));