From 25dbe8034c09862a1e35adddf6e21c821624765b Mon Sep 17 00:00:00 2001 From: awildturtok <1553491+awildturtok@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:38:26 +0100 Subject: [PATCH] cleanup logging around UpdateMatchingStatsSqlJob.java --- .../com/bakdata/conquery/apiv1/LabelMap.java | 23 +++++-------------- .../mode/local/UpdateMatchingStatsSqlJob.java | 3 +-- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/LabelMap.java b/backend/src/main/java/com/bakdata/conquery/apiv1/LabelMap.java index 51663d3dfd..4b72c4b716 100644 --- a/backend/src/main/java/com/bakdata/conquery/apiv1/LabelMap.java +++ b/backend/src/main/java/com/bakdata/conquery/apiv1/LabelMap.java @@ -10,20 +10,19 @@ import com.bakdata.conquery.models.query.FilterSearch; import com.bakdata.conquery.util.search.TrieSearch; import com.google.common.collect.BiMap; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.RequiredArgsConstructor; +import lombok.Data; +import lombok.ToString; import lombok.experimental.Delegate; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.time.StopWatch; -@Getter -@RequiredArgsConstructor @Slf4j -@EqualsAndHashCode +@Data +@ToString(onlyExplicitlyIncluded = true) public class LabelMap implements Searchable { + @ToString.Include private final FilterId id; + @Delegate private final BiMap delegate; private final int minSuffixLength; @@ -42,20 +41,10 @@ public TrieSearch createTrieSearch(IndexConfig config) { log.trace("Labels for {}: `{}`", getId(), collected.stream().map(FrontendValue::toString).collect(Collectors.toList())); } - StopWatch timer = StopWatch.createStarted(); - log.trace("START-SELECT ADDING_ITEMS for {}", getId()); - collected.forEach(feValue -> search.addItem(feValue, FilterSearch.extractKeywords(feValue))); - log.trace("DONE-SELECT ADDING_ITEMS for {} in {}", getId(), timer); - - timer.reset(); - log.trace("START-SELECT SHRINKING for {}", getId()); - search.shrinkToFit(); - log.trace("DONE-SELECT SHRINKING for {} in {}", getId(), timer); - return search; } 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 index 993a9313ed..9428e93c45 100644 --- a/backend/src/main/java/com/bakdata/conquery/mode/local/UpdateMatchingStatsSqlJob.java +++ b/backend/src/main/java/com/bakdata/conquery/mode/local/UpdateMatchingStatsSqlJob.java @@ -184,12 +184,11 @@ public void calculateMatchingStats(final TreeConcept treeConcept) { executionService.fetchStream(finalQuery) .forEach(record -> mapRecordToConceptElements(treeConcept, record, treeCache)); + log.debug("DONE fetching results for {}", treeConcept.getId()); } catch (RuntimeException exception) { log.error("FAILED collecting results for {}", treeConcept.getId(), exception); } - - log.debug("DONE fetching results for {}", treeConcept.getId()); } /**