From 34a0176f52b1ef24e690036152dd1fdf14ae08da Mon Sep 17 00:00:00 2001 From: Weimin Yu Date: Thu, 5 Jan 2023 11:04:38 -0500 Subject: [PATCH] Disable id preassignment when writing to sql (#1893) * Disable id preassignment when writing to sql See b/264416932 for details. --- .../google/registry/beam/spec11/Spec11Pipeline.java | 3 +-- .../registry/model/reporting/Spec11ThreatMatch.java | 10 ---------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java b/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java index 6db902618..00723f903 100644 --- a/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java +++ b/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java @@ -26,7 +26,6 @@ import google.registry.beam.common.RegistryJpaIO; import google.registry.beam.common.RegistryJpaIO.Read; import google.registry.beam.spec11.SafeBrowsingTransforms.EvaluateSafeBrowsingFn; import google.registry.config.RegistryConfig.ConfigModule; -import google.registry.model.IdService; import google.registry.model.domain.Domain; import google.registry.model.reporting.Spec11ThreatMatch; import google.registry.model.reporting.Spec11ThreatMatch.ThreatType; @@ -175,7 +174,7 @@ public class Spec11Pipeline implements Serializable { .setDomainName(input.getKey().domainName()) .setDomainRepoId(input.getKey().domainRepoId()) .setRegistrarId(input.getKey().registrarId()) - .setId(IdService.allocateId()) + // TODO(b/264416932) Assign id to prevent duplicate inserts. .build(); output.output(spec11ThreatMatch); } diff --git a/core/src/main/java/google/registry/model/reporting/Spec11ThreatMatch.java b/core/src/main/java/google/registry/model/reporting/Spec11ThreatMatch.java index c02bddfe2..ec92b1e99 100644 --- a/core/src/main/java/google/registry/model/reporting/Spec11ThreatMatch.java +++ b/core/src/main/java/google/registry/model/reporting/Spec11ThreatMatch.java @@ -133,16 +133,6 @@ public class Spec11ThreatMatch extends ImmutableObject implements Buildable, Ser return super.build(); } - /** - * Manually set the ID for testing or other special circumstances. - * - *

In general the ID is generated by SQL and there should be no need to set it manually. - */ - public Builder setId(Long id) { - getInstance().id = id; - return this; - } - public Builder setDomainName(String domainName) { getInstance().domainName = domainName; getInstance().tld = DomainNameUtils.getTldFromDomainName(domainName);