Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleanup money #3535

Merged
merged 60 commits into from
Oct 2, 2024
Merged

cleanup money #3535

merged 60 commits into from
Oct 2, 2024

Conversation

awildturtok
Copy link
Collaborator

… storage primitive. Is now BigDecimal

- ResultType is now very simple mix of primitive enum and LIST. (We hope to remove even more logic from it)
- Result printing was always weird with Mappings embedded in StringT. We've moved that responsibility into ResultInfo via SelectResultInfo for mapped Selects.
- This PR opens the possibility to embed anonymization into the ResultInfo.
- PrintSettings now caches the C10n calls as they were before that sometimes invoked per cell, which should make rendering faster.
@awildturtok awildturtok requested a review from thoniTUB August 22, 2024 13:07
@awildturtok awildturtok marked this pull request as ready for review August 28, 2024 15:12
@awildturtok
Copy link
Collaborator Author

@thoniTUB ich hab hier vergessen einen neuen Branch zu starten, da das Money ding auch in die gleiche Schiene ist, ist das glaube nicht besonders schlimm. Aber einfach nervig. Ich kann wenn es dich stört nochmal versuchen es auseinander zu dröseln.

We inject the result specific Printers using the printerFactory. This untangles the burden of formatting.

Now a Select claiming to produce a specific type only needs to guarantee they are in a format capable of being handled by the printers it elects to use.

This allows us later to make a printer that alters the result before printing it, without having to inject into all renderers.
@awildturtok awildturtok force-pushed the feature/cleanup-MONEY branch from 2208753 to 2122da5 Compare August 29, 2024 08:51
@awildturtok awildturtok changed the base branch from feature/decouple-printing-from-ResultTyoe to develop August 29, 2024 08:56
@awildturtok awildturtok force-pushed the feature/cleanup-MONEY branch from 8fd7f53 to 9ee0f68 Compare September 3, 2024 12:04
@awildturtok awildturtok force-pushed the feature/cleanup-MONEY branch from 764e2f6 to 23a6b14 Compare September 3, 2024 12:52
@@ -80,14 +82,15 @@ private static List<ColumnConsumer> generateColumnConsumers(List<ResultInfo> idH
return consumers;
}

private static List<Printer> generateColumnPrinters(List<ResultInfo> idHeaders, List<ResultInfo> resultInfos, PrintSettings printSettings) {
private static List<Printer> generateColumnPrinters(List<ResultInfo> idHeaders, List<ResultInfo> resultInfos, PrintSettings printSettings,
PrinterFactory printerFactory) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kann geinlined werden

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

verstehe den hinweuis nicht aber habe die methode aufgeräumt

@awildturtok awildturtok force-pushed the feature/cleanup-MONEY branch from 1e101b6 to efa20ba Compare September 5, 2024 11:42
@@ -31,6 +30,7 @@ public ObjectMapper createWorkerPersistenceMapper(Workers workers) {
final ObjectMapper objectMapper = createInternalObjectMapper(View.Persistence.Shard.class);

workers.injectInto(objectMapper);
config.injectInto(objectMapper);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fehlte das beim injecten irgendwo?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Muss schauen ob es das war, aber brauche ich um den MoneyIntStore die decimal stelle zu fixen

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, wollte den Kommentar eigentlich wieder löschen. Hatte danach die Injection gesehen

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keine Sorge, ich glaube die config ist schon woanders injiziert. Muss das auf jeden Fall testen

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ist der irrelevant geworden?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ja, der hat money mit einer REAL_RANGE gefiltert.

# Conflicts:
#	backend/src/main/java/com/bakdata/conquery/models/query/SingleTableResult.java
#	backend/src/main/java/com/bakdata/conquery/models/query/preview/EntityPreviewExecution.java
#	backend/src/main/java/com/bakdata/conquery/models/query/resultinfo/ResultInfo.java
#	backend/src/main/java/com/bakdata/conquery/models/query/resultinfo/printers/ResultPrinters.java
#	backend/src/test/java/com/bakdata/conquery/integration/common/IntegrationUtils.java
#	backend/src/test/java/com/bakdata/conquery/integration/json/FormTest.java
#	backend/src/test/java/com/bakdata/conquery/io/result/ResultTestUtil.java
#	backend/src/test/java/com/bakdata/conquery/io/result/excel/ExcelResultRenderTest.java
#	backend/src/test/java/com/bakdata/conquery/models/events/stores/types/ColumnStoreSerializationTests.java
#	backend/src/test/java/com/bakdata/conquery/models/types/ResultTypeTest.java
@awildturtok awildturtok force-pushed the feature/cleanup-MONEY branch from 945f4e7 to 256b651 Compare October 2, 2024 09:16
@awildturtok awildturtok merged commit 23b76fd into develop Oct 2, 2024
7 checks passed
@thoniTUB thoniTUB deleted the feature/cleanup-MONEY branch October 2, 2024 10:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants