diff options
author | Eric Giffon <eric.giffon@sonarsource.com> | 2025-02-28 14:25:57 +0100 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2025-02-28 20:03:04 +0000 |
commit | 84c3a6ac3f66ab4a0a4b80a8ce8803ccb408e60a (patch) | |
tree | 3c4b4b495a588323c54c8a20711a80da74cf9d76 | |
parent | 3c6f59b77e3c73768fbd4b6cd1a6fbd233605e49 (diff) | |
download | sonarqube-84c3a6ac3f66ab4a0a4b80a8ce8803ccb408e60a.tar.gz sonarqube-84c3a6ac3f66ab4a0a4b80a8ce8803ccb408e60a.zip |
SONAR-24434 Lower the size limit and exclude duplications_data
2 files changed, 8 insertions, 4 deletions
diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/adhoc/AbstractMigrateLiveMeasuresToMeasures.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/adhoc/AbstractMigrateLiveMeasuresToMeasures.java index 2e692c3bfb8..027e19152ca 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/adhoc/AbstractMigrateLiveMeasuresToMeasures.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/adhoc/AbstractMigrateLiveMeasuresToMeasures.java @@ -67,7 +67,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 """; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/adhoc/MigrateBranchesLiveMeasuresToMeasuresTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/adhoc/MigrateBranchesLiveMeasuresToMeasuresTest.java index 4890c498d69..8776d8ecd83 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/adhoc/MigrateBranchesLiveMeasuresToMeasuresTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/adhoc/MigrateBranchesLiveMeasuresToMeasuresTest.java @@ -162,14 +162,17 @@ public class MigrateBranchesLiveMeasuresToMeasuresTest { 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.migrate(List.of(branch1)); @@ -181,7 +184,8 @@ public class MigrateBranchesLiveMeasuresToMeasuresTest { .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 |