Merge pull request #2581 from bakdata/master

Reintegrate Master
ingef · Jul 5, 2022 · c729d81 · c729d81
2 parents 7aeb590 + 289479c
commit c729d81
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 16 deletions.
diff --git a/backend/src/main/java/com/bakdata/conquery/io/storage/NamespaceStorage.java b/backend/src/main/java/com/bakdata/conquery/io/storage/NamespaceStorage.java
@@ -9,7 +9,6 @@
 import com.bakdata.conquery.ConqueryConstants;
 import com.bakdata.conquery.io.storage.xodus.stores.SingletonStore;
 import com.bakdata.conquery.models.config.StoreFactory;
-import com.bakdata.conquery.models.datasets.Dataset;
 import com.bakdata.conquery.models.datasets.concepts.StructureNode;
 import com.bakdata.conquery.models.dictionary.Dictionary;
 import com.bakdata.conquery.models.dictionary.EncodedDictionary;
@@ -83,13 +82,23 @@ public void openStores(ObjectMapper objectMapper) {
 
 	@Override
 	public void loadData() {
-		super.loadData();
+		dataset.loadData();
+		secondaryIds.loadData();
+		tables.loadData();
+		dictionaries.loadData();
+		imports.loadData();
 
 		internToExternMappers.loadData();
+		// Concepts depend on internToExternMappers
+		concepts.loadData();
+
 		idMapping.loadData();
 		structure.loadData();
 		workerToBuckets.loadData();
 		primaryDictionary.loadData();
+
+		log.info("Done reading {} / {}", dataset.get(), getClass().getName());
+
 	}
 
 	@Override

diff --git a/backend/src/main/java/com/bakdata/conquery/io/storage/NamespacedStorage.java b/backend/src/main/java/com/bakdata/conquery/io/storage/NamespacedStorage.java
@@ -24,7 +24,6 @@
 import com.bakdata.conquery.models.identifiable.ids.specific.ImportId;
 import com.bakdata.conquery.models.identifiable.ids.specific.SecondaryIdDescriptionId;
 import com.bakdata.conquery.models.identifiable.ids.specific.TableId;
-import com.bakdata.conquery.models.index.InternToExternMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Getter;
 import lombok.SneakyThrows;

diff --git a/...n/java/com/bakdata/conquery/models/datasets/concepts/select/connector/DistinctSelect.java b/...n/java/com/bakdata/conquery/models/datasets/concepts/select/connector/DistinctSelect.java
@@ -2,6 +2,7 @@
 
 import com.bakdata.conquery.io.cps.CPSType;
 import com.bakdata.conquery.io.jackson.serializer.NsIdRef;
+import com.bakdata.conquery.io.jackson.serializer.SerdesTarget;
 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.specific.MappableSingleColumnSelect;
@@ -16,7 +17,7 @@ public class DistinctSelect extends MappableSingleColumnSelect {
 
 	@JsonCreator
 	public DistinctSelect(@NsIdRef Column column,
-						  @NsIdRef InternToExternMapper mapping) {
+						  @NsIdRef(serdesTarget = SerdesTarget.MANAGER) InternToExternMapper mapping) {
 		super(column, mapping);
 	}
 

diff --git a/...java/com/bakdata/conquery/models/datasets/concepts/select/connector/FirstValueSelect.java b/...java/com/bakdata/conquery/models/datasets/concepts/select/connector/FirstValueSelect.java
@@ -2,11 +2,11 @@
 
 import com.bakdata.conquery.io.cps.CPSType;
 import com.bakdata.conquery.io.jackson.serializer.NsIdRef;
+import com.bakdata.conquery.io.jackson.serializer.SerdesTarget;
 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.specific.MappableSingleColumnSelect;
 import com.bakdata.conquery.models.index.InternToExternMapper;
-import com.bakdata.conquery.models.index.MapInternToExternMapper;
 import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator;
 import com.bakdata.conquery.models.query.queryplan.aggregators.specific.value.FirstValueAggregator;
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -16,7 +16,7 @@ public class FirstValueSelect extends MappableSingleColumnSelect {
 
 	@JsonCreator
 	public FirstValueSelect(@NsIdRef Column column,
-							@NsIdRef InternToExternMapper mapping) {
+							@NsIdRef(serdesTarget = SerdesTarget.MANAGER) InternToExternMapper mapping) {
 		super(column, mapping);
 	}
 

diff --git a/.../java/com/bakdata/conquery/models/datasets/concepts/select/connector/LastValueSelect.java b/.../java/com/bakdata/conquery/models/datasets/concepts/select/connector/LastValueSelect.java
@@ -1,11 +1,10 @@
 package com.bakdata.conquery.models.datasets.concepts.select.connector;
 
-import javax.annotation.Nullable;
-
 import com.bakdata.conquery.io.cps.CPSType;
 import com.bakdata.conquery.io.jackson.serializer.NsIdRef;
-import com.bakdata.conquery.models.datasets.concepts.select.Select;
+import com.bakdata.conquery.io.jackson.serializer.SerdesTarget;
 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.specific.MappableSingleColumnSelect;
 import com.bakdata.conquery.models.index.InternToExternMapper;
 import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator;
@@ -17,7 +16,7 @@ public class LastValueSelect extends MappableSingleColumnSelect {
 
 	@JsonCreator
 	public LastValueSelect(@NsIdRef Column column,
-						   @Nullable InternToExternMapper mapping) {
+						   @NsIdRef(serdesTarget = SerdesTarget.MANAGER) InternToExternMapper mapping) {
 		super(column, mapping);
 	}
 

diff --git a/...ava/com/bakdata/conquery/models/datasets/concepts/select/connector/RandomValueSelect.java b/...ava/com/bakdata/conquery/models/datasets/concepts/select/connector/RandomValueSelect.java
@@ -1,11 +1,10 @@
 package com.bakdata.conquery.models.datasets.concepts.select.connector;
 
-import javax.annotation.Nullable;
-
 import com.bakdata.conquery.io.cps.CPSType;
 import com.bakdata.conquery.io.jackson.serializer.NsIdRef;
-import com.bakdata.conquery.models.datasets.concepts.select.Select;
+import com.bakdata.conquery.io.jackson.serializer.SerdesTarget;
 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.specific.MappableSingleColumnSelect;
 import com.bakdata.conquery.models.index.InternToExternMapper;
 import com.bakdata.conquery.models.query.queryplan.aggregators.Aggregator;
@@ -16,7 +15,7 @@
 public class RandomValueSelect extends MappableSingleColumnSelect {
 	@JsonCreator
 	public RandomValueSelect(@NsIdRef Column column,
-							 @NsIdRef InternToExternMapper mapping) {
+							 @NsIdRef(serdesTarget = SerdesTarget.MANAGER) InternToExternMapper mapping) {
 		super(column, mapping);
 	}
 

diff --git a/...nquery/models/datasets/concepts/select/connector/specific/MappableSingleColumnSelect.java b/...nquery/models/datasets/concepts/select/connector/specific/MappableSingleColumnSelect.java
@@ -29,7 +29,7 @@ public abstract class MappableSingleColumnSelect extends SingleColumnSelect {
 	@JsonIgnore
 	protected final BiFunction<Object, PrintSettings, String> mapper;
 
-	public MappableSingleColumnSelect(@NsIdRef Column column,
+	public MappableSingleColumnSelect(Column column,
 									  @Nullable InternToExternMapper mapping){
 		super(column);
 		this.mapping = mapping;

diff --git a/backend/src/main/java/com/bakdata/conquery/models/query/resultinfo/SelectResultInfo.java b/backend/src/main/java/com/bakdata/conquery/models/query/resultinfo/SelectResultInfo.java
@@ -52,7 +52,8 @@ public ColumnDescriptor asColumnDescriptor(PrintSettings settings, UniqueNamer u
 							   .defaultLabel(defaultColumnName(settings))
 							   .userConceptLabel(userColumnName(settings))
 							   .type(getType().typeInfo())
-							   .selectId(select.getId())
+							   .semantics(getSemantics())
+							   .selectId(select.getId()) // TODO delete this?
 							   .build();
 	}