diff options
author | Eric Giffon <eric.giffon@sonarsource.com> | 2025-02-27 14:35:34 +0100 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2025-02-28 20:03:15 +0000 |
commit | 9dcc2956bbd5f1c1b102d3b19bdee1d078ffd77a (patch) | |
tree | 2e7d8920f8e2a7e8e0f74b02da086f43705da959 /server | |
parent | 3c99e9353b0c68ead38fbe08ff4599d4e2b6efdc (diff) | |
download | sonarqube-9dcc2956bbd5f1c1b102d3b19bdee1d078ffd77a.tar.gz sonarqube-9dcc2956bbd5f1c1b102d3b19bdee1d078ffd77a.zip |
SONAR-24210 Lower the size limit and exclude duplications_data
Diffstat (limited to 'server')
2 files changed, 8 insertions, 4 deletions
diff --git a/server/sonar-db-migration/src/it/java/org/sonar/server/platform/db/migration/version/v108/MigrateBranchesLiveMeasuresToMeasuresIT.java b/server/sonar-db-migration/src/it/java/org/sonar/server/platform/db/migration/version/v108/MigrateBranchesLiveMeasuresToMeasuresIT.java index 308aa8495e2..d1b4a196925 100644 --- a/server/sonar-db-migration/src/it/java/org/sonar/server/platform/db/migration/version/v108/MigrateBranchesLiveMeasuresToMeasuresIT.java +++ b/server/sonar-db-migration/src/it/java/org/sonar/server/platform/db/migration/version/v108/MigrateBranchesLiveMeasuresToMeasuresIT.java @@ -311,14 +311,17 @@ class MigrateBranchesLiveMeasuresToMeasuresIT { String nclocMetricUuid = insertMetric("ncloc", "INT"); String metricWithDataUuid = insertMetric("metric_with_data", "DATA"); String metricWithLargeDataUuid = insertMetric("metric_with_large_data", "DATA"); + String duplicationsDataMetricUuid = insertMetric(CoreMetrics.DUPLICATIONS_DATA_KEY, "DATA"); String branch1 = "branch_1"; insertNotMigratedBranch(branch1); String component1 = uuidFactory.create(); insertMeasure(branch1, component1, nclocMetricUuid, Map.of("value", 120)); - byte[] largeValue = createLargeValue(999_999); + byte[] largeValue = createLargeValue(99_999); + byte[] veryLargeValue = createLargeValue(100_000); insertMeasure(branch1, component1, metricWithDataUuid, Map.of("measure_data", largeValue)); - insertMeasure(branch1, component1, metricWithLargeDataUuid, Map.of("measure_data", createLargeValue(1_000_000))); + insertMeasure(branch1, component1, metricWithLargeDataUuid, Map.of("measure_data", veryLargeValue)); + insertMeasure(branch1, component1, duplicationsDataMetricUuid, Map.of("measure_data", veryLargeValue)); underTest.execute(); @@ -330,7 +333,8 @@ class MigrateBranchesLiveMeasuresToMeasuresIT { .extracting(t -> t.get("component_uuid"), t -> t.get("branch_uuid"), t -> t.get("json_value"), t -> t.get("json_value_hash")) .containsOnly(tuple(component1, branch1, "{\"ncloc\":120.0,\"metric_with_data\":\"" + - new String(largeValue, StandardCharsets.UTF_8) + "\"}", -8442559321192521885L)); + new String(largeValue, StandardCharsets.UTF_8) + "\",\"duplications_data\":\"" + + new String(veryLargeValue, StandardCharsets.UTF_8) + "\"}", 3796772412311633189L)); } @Test diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v108/AbstractMigrateLiveMeasuresToMeasures.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v108/AbstractMigrateLiveMeasuresToMeasures.java index 71d0e173080..2ba2df82c0b 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v108/AbstractMigrateLiveMeasuresToMeasures.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v108/AbstractMigrateLiveMeasuresToMeasures.java @@ -69,7 +69,7 @@ public abstract class AbstractMigrateLiveMeasuresToMeasures extends DataChange { FROM live_measures lm INNER JOIN metrics m ON m.uuid = lm.metric_uuid WHERE lm.project_uuid = ? - AND (lm.measure_data is null OR %s(lm.measure_data) < 1000000) + AND (lm.measure_data is null OR %s(lm.measure_data) < 100000 OR m.name = 'duplications_data') AND m.name NOT IN ('executable_lines_data', 'ncloc_data') ORDER BY lm.component_uuid """; |