cleanup money #3535

awildturtok · 2024-08-22T13:07:47Z

… 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.

… FeatureGroup

…or QueryStatisticsTest

…call.

…ers to records

awildturtok · 2024-08-28T15:49:09Z

@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.

… storage primitive. Is now BigDecimal

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.

…inter

backend/src/main/java/com/bakdata/conquery/io/result/parquet/EntityResultWriteSupport.java

backend/src/main/java/com/bakdata/conquery/models/events/stores/specific/MoneyIntStore.java

backend/src/main/java/com/bakdata/conquery/apiv1/query/TableExportQuery.java

backend/src/main/java/com/bakdata/conquery/apiv1/query/ArrayConceptQuery.java

thoniTUB · 2024-09-04T05:56:27Z

backend/src/main/java/com/bakdata/conquery/io/result/parquet/EntityResultWriteSupport.java

@@ -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) {


Kann geinlined werden

verstehe den hinweuis nicht aber habe die methode aufgeräumt

backend/src/main/java/com/bakdata/conquery/io/result/arrow/ResultArrowProcessor.java

...kdata/conquery/models/datasets/concepts/select/connector/specific/CountOccurencesSelect.java

backend/src/test/resources/tests/sql/filter/number_money/real_range/number_money.spec.json

This reverts commit 6358f64.

…d other dependencies

…rialization

thoniTUB · 2024-09-17T09:59:34Z

backend/src/main/java/com/bakdata/conquery/mode/cluster/InternalMapperFactory.java

@@ -31,6 +30,7 @@ public ObjectMapper createWorkerPersistenceMapper(Workers workers) {
 		final ObjectMapper objectMapper = createInternalObjectMapper(View.Persistence.Shard.class);

 		workers.injectInto(objectMapper);
+		config.injectInto(objectMapper);


fehlte das beim injecten irgendwo?

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

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

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

thoniTUB · 2024-09-17T10:19:33Z

backend/src/test/resources/tests/sql/filter/number_money/real_range/number_money.spec.json

Ist der irrelevant geworden?

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 added 19 commits July 31, 2024 17:28

fixes null resultType in Test

84ad761

fix Printer signature

18a0bd8

minor cleanup of naming

061c9ac

fixes ResultTypeTest, brings back localized mapping of Resolution and…

92ba8d0

… FeatureGroup

adds missing ResultType to satisfy default constructor

bab8bab

unwrap ListPrinters in Arrow and Excel renderer

a3a0a42

fixes type of MappableSingleColumnSelect, and fixing type selection f…

56950fd

…or QueryStatisticsTest

Merge branch 'develop' into feature/decouple-printing-from-ResultTyoe

7645cf1

fix TypedSelectDummy holder

f152160

adds ListPrinter for ConceptColumnSelect

d2a9986

fixes DateRange header and SecondaryIdResultInfo

31de3f2

Early binds PrintSettings to avoid passing it into Printers at every …

8b2ee30

…call.

fixes not using Printer object for ConceptIds. Also migrate all print…

0eecef6

…ers to records

fixes StoredQueriesProcessorTest

cb0c47e

cleanup superfluous c'tor

3bd7407

cleanup superfluous PrintSettings c'tor

d4692bf

Cleanup Localized Printers

e95bb29

Code Style Issues and cleanup

6d03233

awildturtok requested a review from thoniTUB August 22, 2024 13:07

Merge branch 'develop' into feature/decouple-printing-from-ResultTyoe

d8cceb5

awildturtok marked this pull request as ready for review August 28, 2024 15:12

awildturtok added 4 commits August 29, 2024 10:18

reworks Money to no longer be "cent" based and instead just use it as…

15237c9

… storage primitive. Is now BigDecimal

wip, trying to fix money filler

f6ff223

use printers in ExcelRenderer

39608be

awildturtok force-pushed the feature/cleanup-MONEY branch from 2208753 to 2122da5 Compare August 29, 2024 08:51

awildturtok changed the base branch from feature/decouple-printing-from-ResultTyoe to develop August 29, 2024 08:56

Merge remote-tracking branch 'origin/develop' into feature/cleanup-MONEY

3a3f81c

awildturtok added 2 commits September 3, 2024 13:31

deletes problematic Aggregator

d5ae999

introduce types for Printers

9ee0f68

awildturtok force-pushed the feature/cleanup-MONEY branch from 8fd7f53 to 9ee0f68 Compare September 3, 2024 12:04

awildturtok added 2 commits September 3, 2024 14:25

pull PrinterFactory out of PrintSettings, pass manually into createPr…

b90891a

…inter

removes deleted Select

23a6b14

awildturtok force-pushed the feature/cleanup-MONEY branch from 764e2f6 to 23a6b14 Compare September 3, 2024 12:52

Code Style issues

38e7833

awildturtok commented Sep 3, 2024

View reviewed changes

thoniTUB reviewed Sep 4, 2024

View reviewed changes

backend/src/main/java/com/bakdata/conquery/io/result/arrow/ResultArrowProcessor.java Show resolved Hide resolved

thoniTUB reviewed Sep 4, 2024

View reviewed changes

...kdata/conquery/models/datasets/concepts/select/connector/specific/CountOccurencesSelect.java Outdated Show resolved Hide resolved

backend/src/test/resources/tests/sql/filter/number_money/real_range/number_money.spec.json Outdated Show resolved Hide resolved

awildturtok added 9 commits September 4, 2024 13:45

pull default for decimalShift from CurrencyConfig

03434fb

fixes injection and deserialization test

672cb42

semantics are immutable

f8ffea9

fixes missing null-Check

8bdfdd1

try fixing Money handling for preview

6358f64

Revert "try fixing Money handling for preview"

65e701c

This reverts commit 6358f64.

revert using Decimal for Arrow/Parquet: causes issues with jsArrow an…

e9203fa

…d other dependencies

fixes MoneyPrinter being fixed to BigDecimal causing issues with dese…

88224e5

…rialization

skip rescaling of money values

efa20ba

awildturtok force-pushed the feature/cleanup-MONEY branch from 1e101b6 to efa20ba Compare September 5, 2024 11:42

awildturtok added 2 commits September 16, 2024 17:00

fixes rescaling for Money

c65d0fe

simplify printer usage

484acf2

awildturtok requested a review from thoniTUB September 17, 2024 08:43

thoniTUB approved these changes Sep 17, 2024

View reviewed changes

awildturtok added 2 commits September 17, 2024 15:52

Merge branch 'develop' into feature/cleanup-MONEY

32d30d1

awildturtok force-pushed the feature/cleanup-MONEY branch from 945f4e7 to 256b651 Compare October 2, 2024 09:16

awildturtok merged commit 23b76fd into develop Oct 2, 2024
7 checks passed

thoniTUB deleted the feature/cleanup-MONEY branch October 2, 2024 10:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cleanup money #3535

cleanup money #3535

awildturtok commented Aug 22, 2024

awildturtok commented Aug 28, 2024

thoniTUB Sep 4, 2024

awildturtok Sep 17, 2024

thoniTUB Sep 17, 2024

awildturtok Sep 17, 2024

thoniTUB Sep 17, 2024

awildturtok Sep 17, 2024

thoniTUB Sep 17, 2024

awildturtok Sep 17, 2024

cleanup money #3535

cleanup money #3535

Conversation

awildturtok commented Aug 22, 2024

awildturtok commented Aug 28, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment