start and done reporters centrally, removes to many reports

backend/src/main/java/com/bakdata/conquery/models/jobs/CalculateCBlocksJob.java

@@ -62,8 +62,6 @@ public void execute() throws Exception {
 				.collect(Collectors.toList());
 
 		Futures.allAsList(futures).get();
-
-		getProgressReporter().done();
 	}
 
 	private CalculationInformationProcessor createInformationProcessor(CalculationInformation info) {

backend/src/main/java/com/bakdata/conquery/models/jobs/ImportJob.java

@@ -269,7 +269,7 @@ public void execute() throws JSONException, InterruptedException, IOException {
 
 		log.info("Remapping Dictionaries {}", sharedDictionaryMappings.values());
 
-		applyDictionaryMappings(sharedDictionaryMappings, container.getStores());
+		remapToSharedDictionary(sharedDictionaryMappings, container.getStores());
 
 
 		Import imp = createImport(header, container.getStores(), table.getColumns(), container.size());
@@ -295,14 +295,12 @@ public void execute() throws JSONException, InterruptedException, IOException {
 
 		workerAssignments.forEach(namespace::addBucketsToWorker);
 
-		getProgressReporter().done();
 	}
 
 	/**
 	 * select, then send buckets.
 	 */
-	private Map<WorkerId, Set<BucketId>> sendBuckets(Map<Integer, Integer> starts, Map<Integer, Integer> lengths, DictionaryMapping primaryMapping, Import imp, Map<Integer, List<Integer>> buckets2LocalEntities, ColumnStore[] storesSorted)
-			throws JsonProcessingException {
+	private Map<WorkerId, Set<BucketId>> sendBuckets(Map<Integer, Integer> starts, Map<Integer, Integer> lengths, DictionaryMapping primaryMapping, Import imp, Map<Integer, List<Integer>> buckets2LocalEntities, ColumnStore[] storesSorted) {
 
 		Map<WorkerId, Set<BucketId>> newWorkerAssignments = new HashMap<>();
 
@@ -328,8 +326,6 @@ private Map<WorkerId, Set<BucketId>> sendBuckets(Map<Integer, Integer> starts, M
 			subJob.report(1);
 		}
 
-		subJob.done();
-
 		return newWorkerAssignments;
 	}
 
@@ -454,7 +450,13 @@ private void distributeWorkerResponsibilities(DictionaryMapping primaryMapping)
 	/**
 	 * Apply new positions into incoming shared dictionaries.
 	 */
-	private void applyDictionaryMappings(Map<String, DictionaryMapping> mappings, Map<String, ColumnStore> values) {
+	private void remapToSharedDictionary(Map<String, DictionaryMapping> mappings, Map<String, ColumnStore> values) {
+
+		if (mappings.isEmpty()) {
+			log.trace("No columns with shared dictionary appear to be in the import.");
+			return;
+		}
+
 		final ProgressReporter subJob = getProgressReporter().subJob(mappings.size());
 
 		for (Map.Entry<String, DictionaryMapping> entry : mappings.entrySet()) {

backend/src/main/java/com/bakdata/conquery/models/jobs/JobExecutor.java

@@ -130,6 +130,8 @@ public void run() {
 					} finally {
 						ConqueryMDC.setLocation(this.getName());
 
+						job.getProgressReporter().done();
+
 						log.trace("Finished job {} within {}", job, timer.stop());
 						time.stop();
 					}

backend/src/main/java/com/bakdata/conquery/models/messages/namespaces/specific/UpdateMatchingStatsMessage.java

@@ -52,13 +52,14 @@ public String getLabel() {
 
 		@Override
 		public void execute() throws Exception {
-			final ProgressReporter progressReporter = getProgressReporter().subJob(worker.getStorage().getAllConcepts().size());
 			if (worker.getStorage().getAllCBlocks().isEmpty()) {
 				log.debug("Worker {} is empty, skipping.", worker);
-				progressReporter.done();
 				return;
 			}
 
+			final ProgressReporter progressReporter = getProgressReporter();
+			progressReporter.setMax(worker.getStorage().getAllConcepts().size());
+
 			log.info("BEGIN update Matching stats for {} Concepts", worker.getStorage().getAllConcepts().size());
 
 			// SubJobs collect into this Map.
@@ -118,7 +119,6 @@ public void execute() throws Exception {
 				worker.send(new UpdateElementMatchingStats(worker.getInfo().getId(), messages));
 			}
 
-			progressReporter.done();
 		}
 
 
@@ -172,8 +172,6 @@ private void calculateConceptMatches(Concept<?> concept, Map<ConceptElement<?>,
 				}
 			}
 
-			getProgressReporter().report(1);
-
 			log.trace("DONE calculating for `{}`", concept.getId());
 		}
 

backend/src/main/java/com/bakdata/conquery/util/progressreporter/ProgressReporterImpl.java

@@ -15,7 +15,7 @@ public class ProgressReporterImpl implements ProgressReporter {
 	private long max = 1;
 	private long innerProgress = 0;
 	private long reservedForChildren = 0;
-	private final List<ProgressReporterImpl> children = new ArrayList<ProgressReporterImpl>();
+	private final List<ProgressReporterImpl> children = new ArrayList<>();
 
 	@Getter
 	private final long creationTimeMillis;
@@ -94,6 +94,10 @@ public String getEstimate() {
 
 	@Override
 	public void report(int steps) {
+		if (!isStarted()) {
+			log.warn("Progress reporter was not started");
+			return;
+		}
 		if (innerProgress + steps > max) {
 			log.warn("Progress({}) + ChildProgressReserve({}) + Steps({}) is bigger than the maximum Progress({}). There might be to many reports in the code.", innerProgress, reservedForChildren, steps, max);
 			return;
@@ -104,30 +108,30 @@ public void report(int steps) {
 
 	@Override
 	public void setMax(long max) {
-		if (this.max > max) {
-			log.warn("Max cannot be decreased.");
+
+		if (max <= 0) {
+			log.warn("Max can not be 0 or less");
 			return;
 		}
 
-		if (max <= 0) {
-			throw new IllegalArgumentException("Max can not be 0 or less");
+		if (this.max > max) {
+			log.warn("Max cannot be decreased.");
+			return;
 		}
 
 		this.max = max;
 	}
 
 	@Override
 	public void done() {
-		if(endTimeMillis > -1) {
+		if (isDone()) {
 			log.warn("Done was called again for {}", this);
 			return;
 		}
 		endTimeMillis = System.currentTimeMillis();
 
 		for (ProgressReporter child : children) {
-			if (!child.isDone()) {
-				log.warn("One or more Children are not done yet");
-			}
+			child.done();
 		}
 
 		if (getAbsoluteProgress() < getAbsoluteMax()) {