Remove ReservedList from Datastore schema (#1285 )

* Remove ReservedList from Datastore schema * Remove some Datastore references * Add a different non-replicated entity to ReplayCommitLogsToSqlActionTest
Use direct ofyTm reference when clearing cache in tool (#1287 )
2026-08-14 11:16:14 +00:00 · 2021-08-17 16:56:00 -04:00 · 2021-08-17 13:20:17 -06:00 · 2021-08-16 13:21:00 -04:00 · 2021-08-16 12:03:45 -04:00 · 2021-08-14 12:34:23 -06:00
155 changed files with 3275 additions and 3333 deletions
@@ -36,6 +36,11 @@ import google.registry.gcs.GcsUtils;
 import google.registry.model.common.DatabaseMigrationStateSchedule;
 import google.registry.model.common.DatabaseMigrationStateSchedule.MigrationState;
 import google.registry.model.common.DatabaseMigrationStateSchedule.ReplayDirection;
+import google.registry.model.replay.DatastoreEntity;
+import google.registry.model.replay.DatastoreOnlyEntity;
+import google.registry.model.replay.NonReplicatedEntity;
+import google.registry.model.replay.ReplaySpecializer;
+import google.registry.model.replay.SqlReplayCheckpoint;
 import google.registry.model.server.Lock;
 import google.registry.model.translators.VKeyTranslatorFactory;
 import google.registry.persistence.VKey;
@@ -44,11 +49,6 @@ import google.registry.request.Action.Method;
 import google.registry.request.Parameter;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
-import google.registry.schema.replay.DatastoreEntity;
-import google.registry.schema.replay.DatastoreOnlyEntity;
-import google.registry.schema.replay.NonReplicatedEntity;
-import google.registry.schema.replay.ReplaySpecializer;
-import google.registry.schema.replay.SqlReplayCheckpoint;
 import google.registry.util.Clock;
 import google.registry.util.RequestStatusChecker;
 import java.io.IOException;
@@ -58,6 +58,7 @@ import javax.inject.Inject;
 import javax.servlet.http.HttpServletResponse;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
+import org.joda.time.Seconds;

 /** Action that replays commit logs to Cloud SQL to keep it up to date. */
@Action(
@@ -97,7 +98,8 @@ public class ReplayCommitLogsToSqlAction implements Runnable {

  @Override
  public void run() {
-    MigrationState state = DatabaseMigrationStateSchedule.getValueAtTime(clock.nowUtc());
+    DateTime startTime = clock.nowUtc();
+    MigrationState state = DatabaseMigrationStateSchedule.getValueAtTime(startTime);
    if (!state.getReplayDirection().equals(ReplayDirection.DATASTORE_TO_SQL)) {
      String message =
          String.format(
@@ -126,7 +128,7 @@ public class ReplayCommitLogsToSqlAction implements Runnable {
      if (dryRun) {
        resultMessage = executeDryRun();
      } else {
-        resultMessage = replayFiles();
+        resultMessage = replayFiles(startTime);
      }
      response.setStatus(SC_OK);
      response.setPayload(resultMessage);
@@ -160,10 +162,11 @@ public class ReplayCommitLogsToSqlAction implements Runnable {
        fileBatch.stream().limit(10).collect(toImmutableList()));
  }

-  private String replayFiles() {
-    DateTime replayTimeoutTime = clock.nowUtc().plus(REPLAY_TIMEOUT_DURATION);
+  private String replayFiles(DateTime startTime) {
+    DateTime replayTimeoutTime = startTime.plus(REPLAY_TIMEOUT_DURATION);
    DateTime searchStartTime = jpaTm().transact(() -> SqlReplayCheckpoint.get().plusMillis(1));
    int filesProcessed = 0;
+    int transactionsProcessed = 0;
    // Starting from one millisecond after the last file we processed, search for and import files
    // one hour at a time until we catch up to the current time or we hit the replay timeout (in
    // which case the next run will pick up from where we leave off).
@@ -171,12 +174,12 @@ public class ReplayCommitLogsToSqlAction implements Runnable {
    // We use hour-long batches because GCS supports filename prefix-based searches.
    while (true) {
      if (isAtOrAfter(clock.nowUtc(), replayTimeoutTime)) {
-        return String.format(
-            "Reached max execution time after replaying %d file(s).", filesProcessed);
+        return createResponseString(
+            "Reached max execution time", startTime, filesProcessed, transactionsProcessed);
      }
      if (isBeforeOrAt(clock.nowUtc(), searchStartTime)) {
-        return String.format(
-            "Caught up to current time after replaying %d file(s).", filesProcessed);
+        return createResponseString(
+            "Caught up to current time", startTime, filesProcessed, transactionsProcessed);
      }
      // Search through the end of the hour
      DateTime searchEndTime =
@@ -189,18 +192,32 @@ public class ReplayCommitLogsToSqlAction implements Runnable {
            searchStartTime.toString("yyyy-MM-dd HH"));
      }
      for (BlobInfo file : fileBatch) {
-        processFile(file);
+        transactionsProcessed += processFile(file);
        filesProcessed++;
        if (clock.nowUtc().isAfter(replayTimeoutTime)) {
-          return String.format(
-              "Reached max execution time after replaying %d file(s).", filesProcessed);
+          return createResponseString(
+              "Reached max execution time", startTime, filesProcessed, transactionsProcessed);
        }
      }
      searchStartTime = searchEndTime.plusMillis(1);
    }
  }

-  private void processFile(BlobInfo metadata) {
+  private String createResponseString(
+      String msg, DateTime startTime, int filesProcessed, int transactionsProcessed) {
+    double tps =
+        (double) transactionsProcessed
+            / (double) Seconds.secondsBetween(startTime, clock.nowUtc()).getSeconds();
+    return String.format(
+        "%s after replaying %d file(s) containing %d total transaction(s) (%.2f tx/s).",
+        msg, filesProcessed, transactionsProcessed, tps);
+  }
+
+  /**
+   * Replays the commit logs in the given commit log file and returns the number of transactions
+   * committed.
+   */
+  private int processFile(BlobInfo metadata) {
    try (InputStream input = gcsUtils.openInputStream(metadata.getBlobId())) {
      // Load and process the Datastore transactions one at a time
      ImmutableList<ImmutableList<VersionedEntity>> allTransactions =
@@ -213,6 +230,7 @@ public class ReplayCommitLogsToSqlAction implements Runnable {
      logger.atInfo().log(
          "Replayed %d transactions from commit log file %s with size %d B.",
          allTransactions.size(), metadata.getName(), metadata.getSize());
+      return allTransactions.size();
    } catch (IOException e) {
      throw new RuntimeException(
          "Errored out while replaying commit log file " + metadata.getName(), e);
@@ -28,10 +28,10 @@ import com.googlecode.objectify.Key;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
+import google.registry.model.domain.RegistryLock;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.host.HostResource;
 import google.registry.persistence.VKey;
-import google.registry.schema.domain.RegistryLock;
 import google.registry.util.AppEngineServiceUtils;
 import google.registry.util.Retrier;
 import javax.inject.Inject;
@@ -28,6 +28,7 @@ import com.google.common.flogger.FluentLogger;
 import com.google.common.net.MediaType;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.model.domain.DomainBase;
+import google.registry.model.domain.RegistryLock;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.registrar.Registrar;
 import google.registry.model.registrar.RegistrarContact;
@@ -37,7 +38,6 @@ import google.registry.request.Action;
 import google.registry.request.Parameter;
 import google.registry.request.Response;
 import google.registry.request.auth.Auth;
-import google.registry.schema.domain.RegistryLock;
 import google.registry.tools.DomainLockUtils;
 import google.registry.util.DateTimeUtils;
 import google.registry.util.EmailMessage;
@@ -23,6 +23,7 @@ import com.google.common.collect.Streams;
 import google.registry.backup.AppEngineEnvironment;
 import google.registry.beam.common.RegistryQuery.CriteriaQuerySupplier;
 import google.registry.model.ofy.ObjectifyService;
+import google.registry.model.replay.SqlEntity;
 import google.registry.persistence.transaction.JpaTransactionManager;
 import google.registry.persistence.transaction.TransactionManagerFactory;
 import java.io.Serializable;
@@ -358,17 +359,17 @@ public final class RegistryJpaIO {
    @ProcessElement
    public void processElement(@Element KV<ShardedKey<Integer>, Iterable<T>> kv) {
      try (AppEngineEnvironment env = new AppEngineEnvironment()) {
-        ImmutableList<Object> ofyEntities =
+        ImmutableList<Object> entities =
            Streams.stream(kv.getValue())
                .map(this.jpaConverter::apply)
                // TODO(b/177340730): post migration delete the line below.
                .filter(Objects::nonNull)
                .collect(ImmutableList.toImmutableList());
        try {
-          jpaTm().transact(() -> jpaTm().putAll(ofyEntities));
-          counter.inc(ofyEntities.size());
+          jpaTm().transact(() -> jpaTm().putAll(entities));
+          counter.inc(entities.size());
        } catch (RuntimeException e) {
-          processSingly(ofyEntities);
+          processSingly(entities);
        }
      }
    }
@@ -377,19 +378,22 @@ public final class RegistryJpaIO {
     * Writes entities in a failed batch one by one to identify the first bad entity and throws a
     * {@link RuntimeException} on it.
     */
-    private void processSingly(ImmutableList<Object> ofyEntities) {
-      for (Object ofyEntity : ofyEntities) {
+    private void processSingly(ImmutableList<Object> entities) {
+      for (Object entity : entities) {
        try {
-          jpaTm().transact(() -> jpaTm().put(ofyEntity));
+          jpaTm().transact(() -> jpaTm().put(entity));
          counter.inc();
        } catch (RuntimeException e) {
-          throw new RuntimeException(toOfyKey(ofyEntity).toString(), e);
+          throw new RuntimeException(toEntityKeyString(entity), e);
        }
      }
    }

-    private com.googlecode.objectify.Key<?> toOfyKey(Object ofyEntity) {
-      return com.googlecode.objectify.Key.create(ofyEntity);
+    private String toEntityKeyString(Object entity) {
+      if (entity instanceof SqlEntity) {
+        return ((SqlEntity) entity).getPrimaryKeyString();
+      }
+      return "Non-SqlEntity: " + String.valueOf(entity);
    }
  }
 }
@@ -39,9 +39,9 @@ import google.registry.backup.VersionedEntity;
 import google.registry.model.billing.BillingEvent.Flag;
 import google.registry.model.billing.BillingEvent.Reason;
 import google.registry.model.domain.DomainBase;
+import google.registry.model.replay.DatastoreAndSqlEntity;
+import google.registry.model.replay.SqlEntity;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.schema.replay.DatastoreAndSqlEntity;
-import google.registry.schema.replay.SqlEntity;
 import google.registry.tools.LevelDbLogReader;
 import java.io.Serializable;
 import java.util.Collection;
@@ -102,6 +102,7 @@
    <target>backend</target>
  </cron>

+  <!-- Disabled for sql-only tests.
  <cron>
    <url><![CDATA[/_dr/cron/commitLogCheckpoint]]></url>
    <description>
@@ -110,6 +111,7 @@
    <schedule>every 3 minutes synchronized</schedule>
    <target>backend</target>
  </cron>
+  -->

  <cron>
    <url><![CDATA[/_dr/task/deleteContactsAndHosts]]></url>
@@ -133,6 +135,7 @@
    <target>backend</target>
  </cron>

+  <!-- Disabled for sql-only tests
  <cron>
    <url><![CDATA[/_dr/cron/fanout?queue=export-snapshot&endpoint=/_dr/task/backupDatastore&runInEmpty]]></url>
    <description>
@@ -142,14 +145,12 @@
    </description>
    <!--
      Keep google.registry.export.CheckBackupAction.MAXIMUM_BACKUP_RUNNING_TIME less than
-      this interval. -->
+      this interval. - ->
    <schedule>every day 06:00</schedule>
    <target>backend</target>
  </cron>
+  -->

-  <!--
-    Removed for the duration of load testing
-    TODO(b/71607184): Restore after loadtesting is done
  <cron>
    <url><![CDATA[/_dr/cron/fanout?queue=retryable-cron-tasks&endpoint=/_dr/task/deleteProberData&runInEmpty]]></url>
    <description>
@@ -159,7 +160,6 @@
    <timezone>UTC</timezone>
    <target>backend</target>
  </cron>
-  -->

  <!-- TODO: Add borgmon job to check that these files are created and updated successfully. -->
  <cron>
@@ -200,6 +200,7 @@
    <target>backend</target>
  </cron>

+  <!-- Disabled for sql-only tests.
  <cron>
    <url><![CDATA[/_dr/cron/fanout?queue=replay-commit-logs-to-sql&endpoint=/_dr/task/replayCommitLogsToSql&runInEmpty]]></url>
    <description>
@@ -208,4 +209,26 @@
    <schedule>every 3 minutes</schedule>
    <target>backend</target>
  </cron>
+  -->
+
+  <!--
+    The next two wipeout jobs are required when crash has production data.
+   -->
+  <cron>
+    <url><![CDATA[/_dr/task/wipeOutCloudSql]]></url>
+    <description>
+      This job runs an action that deletes all data in Cloud SQL.
+    </description>
+    <schedule>every saturday 03:07</schedule>
+    <target>backend</target>
+  </cron>
+
+  <cron>
+    <url><![CDATA[/_dr/task/wipeOutDatastore]]></url>
+    <description>
+      This job runs an action that deletes all data in Cloud Datastore.
+    </description>
+    <schedule>every saturday 03:07</schedule>
+    <target>backend</target>
+  </cron>
 </cronentries>
@@ -230,7 +230,7 @@
  </cron>

  <cron>
-    <url><![CDATA[/_dr/cron/fanout?queue=replay-commit-logs-to-sql&endpoint=/_dr/task/replayCommitLogsToSql&runInEmpty&dryRun=true]]></url>
+    <url><![CDATA[/_dr/cron/fanout?queue=replay-commit-logs-to-sql&endpoint=/_dr/task/replayCommitLogsToSql&runInEmpty]]></url>
    <description>
      Replays recent commit logs from Datastore to the SQL secondary backend.
    </description>
@@ -17,7 +17,6 @@ package google.registry.model;
 import com.google.common.collect.ImmutableSet;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.common.Cursor;
-import google.registry.model.common.DatabaseMigrationStateSchedule;
 import google.registry.model.common.EntityGroupRoot;
 import google.registry.model.common.GaeUserIdConverter;
 import google.registry.model.contact.ContactHistory;
@@ -39,16 +38,15 @@ import google.registry.model.poll.PollMessage;
 import google.registry.model.rde.RdeRevision;
 import google.registry.model.registrar.Registrar;
 import google.registry.model.registrar.RegistrarContact;
+import google.registry.model.replay.LastSqlTransaction;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.server.Lock;
 import google.registry.model.server.ServerSecret;
 import google.registry.model.tld.Registry;
-import google.registry.model.tld.label.ReservedList;
 import google.registry.model.tmch.ClaimsList;
 import google.registry.model.tmch.ClaimsList.ClaimsListRevision;
 import google.registry.model.tmch.ClaimsList.ClaimsListSingleton;
 import google.registry.model.tmch.TmchCrl;
-import google.registry.schema.replay.LastSqlTransaction;

 /** Sets of classes of the Objectify-registered entities in use throughout the model. */
 public final class EntityClasses {
@@ -72,7 +70,6 @@ public final class EntityClasses {
          ContactHistory.class,
          ContactResource.class,
          Cursor.class,
-          DatabaseMigrationStateSchedule.class,
          DomainBase.class,
          DomainHistory.class,
          EntityGroupRoot.class,
@@ -94,7 +91,6 @@ public final class EntityClasses {
          Registrar.class,
          RegistrarContact.class,
          Registry.class,
-          ReservedList.class,
          ServerSecret.class,
          TmchCrl.class);

@@ -46,13 +46,13 @@ import google.registry.model.domain.DomainHistory;
 import google.registry.model.domain.GracePeriod;
 import google.registry.model.domain.rgp.GracePeriodStatus;
 import google.registry.model.domain.token.AllocationToken;
+import google.registry.model.replay.DatastoreAndSqlEntity;
+import google.registry.model.replay.DatastoreOnlyEntity;
 import google.registry.model.transfer.TransferData.TransferServerApproveEntity;
 import google.registry.persistence.BillingVKey.BillingEventVKey;
 import google.registry.persistence.BillingVKey.BillingRecurrenceVKey;
 import google.registry.persistence.VKey;
 import google.registry.persistence.WithLongVKey;
-import google.registry.schema.replay.DatastoreAndSqlEntity;
-import google.registry.schema.replay.DatastoreOnlyEntity;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -30,9 +30,9 @@ import google.registry.model.ImmutableObject;
 import google.registry.model.UpdateAutoTimestamp;
 import google.registry.model.annotations.InCrossTld;
 import google.registry.model.common.Cursor.CursorId;
+import google.registry.model.replay.DatastoreAndSqlEntity;
 import google.registry.model.tld.Registry;
 import google.registry.persistence.VKey;
-import google.registry.schema.replay.DatastoreAndSqlEntity;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Optional;
@@ -15,9 +15,7 @@
 package google.registry.model.common;

 import static com.google.common.base.Preconditions.checkArgument;
-import static google.registry.model.common.EntityGroupRoot.getCrossTldKey;
-import static google.registry.model.ofy.ObjectifyService.auditedOfy;
-import static google.registry.persistence.transaction.TransactionManagerFactory.ofyTm;
+import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
 import static google.registry.util.DateTimeUtils.START_OF_TIME;

 import com.google.common.annotations.VisibleForTesting;
@@ -26,16 +24,13 @@ import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSortedMap;
-import com.googlecode.objectify.Key;
-import com.googlecode.objectify.annotation.Embed;
-import com.googlecode.objectify.annotation.Entity;
-import com.googlecode.objectify.annotation.Mapify;
-import google.registry.model.annotations.InCrossTld;
-import google.registry.model.common.TimedTransitionProperty.TimeMapper;
+import com.google.common.flogger.FluentLogger;
+import google.registry.config.RegistryEnvironment;
 import google.registry.model.common.TimedTransitionProperty.TimedTransition;
-import google.registry.schema.replay.DatastoreOnlyEntity;
+import google.registry.model.replay.SqlOnlyEntity;
 import java.time.Duration;
-import java.util.Optional;
+import javax.persistence.Entity;
+import javax.persistence.PersistenceException;
 import org.joda.time.DateTime;

 /**
@@ -45,9 +40,9 @@ import org.joda.time.DateTime;
 * of access.
 */
@Entity
-@InCrossTld
-public class DatabaseMigrationStateSchedule extends CrossTldSingleton
-    implements DatastoreOnlyEntity {
+public class DatabaseMigrationStateSchedule extends CrossTldSingleton implements SqlOnlyEntity {
+
+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();

  public enum PrimaryDatabase {
    CLOUD_SQL,
@@ -96,12 +91,11 @@ public class DatabaseMigrationStateSchedule extends CrossTldSingleton
    }
  }

-  @Embed
  public static class MigrationStateTransition extends TimedTransition<MigrationState> {
    private MigrationState migrationState;

    @Override
-    protected MigrationState getValue() {
+    public MigrationState getValue() {
      return migrationState;
    }

@@ -185,7 +179,6 @@ public class DatabaseMigrationStateSchedule extends CrossTldSingleton
              MigrationStateTransition.class);

  @VisibleForTesting
-  @Mapify(TimeMapper.class)
  public TimedTransitionProperty<MigrationState, MigrationStateTransition> migrationTransitions =
      TimedTransitionProperty.forMapify(
          MigrationState.DATASTORE_ONLY, MigrationStateTransition.class);
@@ -201,7 +194,7 @@ public class DatabaseMigrationStateSchedule extends CrossTldSingleton

  /** Sets and persists to Datastore the provided migration transition schedule. */
  public static void set(ImmutableSortedMap<DateTime, MigrationState> migrationTransitionMap) {
-    ofyTm().assertInTransaction();
+    jpaTm().assertInTransaction();
    TimedTransitionProperty<MigrationState, MigrationStateTransition> transitions =
        TimedTransitionProperty.make(
            migrationTransitionMap,
@@ -211,7 +204,7 @@ public class DatabaseMigrationStateSchedule extends CrossTldSingleton
            MigrationState.DATASTORE_ONLY,
            "migrationTransitionMap must start with DATASTORE_ONLY");
    validateTransitionAtCurrentTime(transitions);
-    ofyTm().put(new DatabaseMigrationStateSchedule(transitions));
+    jpaTm().put(new DatabaseMigrationStateSchedule(transitions));
    CACHE.invalidateAll();
  }

@@ -228,20 +221,23 @@ public class DatabaseMigrationStateSchedule extends CrossTldSingleton
  /** Loads the currently-set migration schedule from Datastore, or the default if none exists. */
  @VisibleForTesting
  static TimedTransitionProperty<MigrationState, MigrationStateTransition> getUncached() {
-    return Optional.ofNullable(
-            auditedOfy()
-                .doTransactionless(
-                    () ->
-                        auditedOfy()
-                            .load()
-                            .key(
-                                Key.create(
-                                    getCrossTldKey(),
-                                    DatabaseMigrationStateSchedule.class,
-                                    CrossTldSingleton.SINGLETON_ID))
-                            .now()))
-        .map(s -> s.migrationTransitions)
-        .orElse(DEFAULT_TRANSITION_MAP);
+    return jpaTm()
+        .transactWithoutBackup(
+            () -> {
+              try {
+                return jpaTm()
+                    .loadSingleton(DatabaseMigrationStateSchedule.class)
+                    .map(s -> s.migrationTransitions)
+                    .orElse(DEFAULT_TRANSITION_MAP);
+              } catch (PersistenceException e) {
+                if (!RegistryEnvironment.get().equals(RegistryEnvironment.UNITTEST)) {
+                  throw e;
+                }
+                logger.atWarning().withCause(e).log(
+                    "Error when retrieving migration schedule; this should only happen in tests.");
+                return DEFAULT_TRANSITION_MAP;
+              }
+            });
  }

  /**
@@ -252,8 +248,8 @@ public class DatabaseMigrationStateSchedule extends CrossTldSingleton
   */
  private static void validateTransitionAtCurrentTime(
      TimedTransitionProperty<MigrationState, MigrationStateTransition> newTransitions) {
-    MigrationState currentValue = getUncached().getValueAtTime(ofyTm().getTransactionTime());
-    MigrationState nextCurrentValue = newTransitions.getValueAtTime(ofyTm().getTransactionTime());
+    MigrationState currentValue = getUncached().getValueAtTime(jpaTm().getTransactionTime());
+    MigrationState nextCurrentValue = newTransitions.getValueAtTime(jpaTm().getTransactionTime());
    checkArgument(
        VALID_STATE_TRANSITIONS.get(currentValue).contains(nextCurrentValue),
        "Cannot transition from current state-as-of-now %s to new state-as-of-now %s",
@@ -19,7 +19,7 @@ import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
 import google.registry.model.BackupGroupRoot;
-import google.registry.schema.replay.DatastoreOnlyEntity;
+import google.registry.model.replay.DatastoreOnlyEntity;
 import javax.annotation.Nullable;

 /**
@@ -21,10 +21,10 @@ import com.googlecode.objectify.annotation.EntitySubclass;
 import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
 import google.registry.model.contact.ContactHistory.ContactHistoryId;
+import google.registry.model.replay.DatastoreEntity;
+import google.registry.model.replay.SqlEntity;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.persistence.VKey;
-import google.registry.schema.replay.DatastoreEntity;
-import google.registry.schema.replay.SqlEntity;
 import java.io.Serializable;
 import java.util.Optional;
 import javax.annotation.Nullable;
@@ -19,9 +19,9 @@ import com.googlecode.objectify.annotation.Entity;
 import google.registry.model.EppResource.ForeignKeyedEppResource;
 import google.registry.model.annotations.ExternalMessagingName;
 import google.registry.model.annotations.ReportedOn;
+import google.registry.model.replay.DatastoreAndSqlEntity;
 import google.registry.persistence.VKey;
 import google.registry.persistence.WithStringVKey;
-import google.registry.schema.replay.DatastoreAndSqlEntity;
 import javax.persistence.Access;
 import javax.persistence.AccessType;
 import org.joda.time.DateTime;
@@ -21,9 +21,9 @@ import google.registry.model.annotations.ExternalMessagingName;
 import google.registry.model.annotations.ReportedOn;
 import google.registry.model.domain.secdns.DelegationSignerData;
 import google.registry.model.host.HostResource;
+import google.registry.model.replay.DatastoreAndSqlEntity;
 import google.registry.persistence.VKey;
 import google.registry.persistence.WithStringVKey;
-import google.registry.schema.replay.DatastoreAndSqlEntity;
 import java.util.Set;
 import javax.persistence.Access;
 import javax.persistence.AccessType;
@@ -62,6 +62,7 @@ import google.registry.model.domain.secdns.DelegationSignerData;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.host.HostResource;
 import google.registry.model.poll.PollMessage;
+import google.registry.model.replay.ReplaySpecializer;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.tld.Registry;
 import google.registry.model.transfer.DomainTransferData;
@@ -374,7 +375,7 @@ public class DomainContent extends EppResource
  /**
   * Callback to delete grace periods and DelegationSignerData records prior to domain delete.
   *
-   * <p>See {@link google.registry.schema.replay.ReplaySpecializer}.
+   * <p>See {@link ReplaySpecializer}.
   */
  public static void beforeSqlDelete(VKey<DomainBase> key) {
    // Delete all grace periods associated with the domain.
@@ -28,11 +28,11 @@ import google.registry.model.domain.GracePeriod.GracePeriodHistory;
 import google.registry.model.domain.secdns.DelegationSignerData;
 import google.registry.model.domain.secdns.DomainDsDataHistory;
 import google.registry.model.host.HostResource;
+import google.registry.model.replay.DatastoreEntity;
+import google.registry.model.replay.SqlEntity;
 import google.registry.model.reporting.DomainTransactionRecord;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.persistence.VKey;
-import google.registry.schema.replay.DatastoreEntity;
-import google.registry.schema.replay.SqlEntity;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Optional;
@@ -23,10 +23,10 @@ import com.googlecode.objectify.annotation.Embed;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.billing.BillingEvent.Recurring;
 import google.registry.model.domain.rgp.GracePeriodStatus;
+import google.registry.model.replay.DatastoreAndSqlEntity;
 import google.registry.persistence.BillingVKey.BillingEventVKey;
 import google.registry.persistence.BillingVKey.BillingRecurrenceVKey;
 import google.registry.persistence.VKey;
-import google.registry.schema.replay.DatastoreAndSqlEntity;
 import javax.annotation.Nullable;
 import javax.persistence.Access;
 import javax.persistence.AccessType;
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package google.registry.schema.domain;
+package google.registry.model.domain;

 import static com.google.common.base.Preconditions.checkArgument;
 import static google.registry.util.DateTimeUtils.isBeforeOrAt;
@@ -23,7 +23,7 @@ import google.registry.model.Buildable;
 import google.registry.model.CreateAutoTimestamp;
 import google.registry.model.ImmutableObject;
 import google.registry.model.UpdateAutoTimestamp;
-import google.registry.schema.replay.SqlOnlyEntity;
+import google.registry.model.replay.SqlOnlyEntity;
 import google.registry.util.DateTimeUtils;
 import java.time.ZonedDateTime;
 import java.util.Optional;
@@ -232,7 +232,7 @@ public final class RegistryLock extends ImmutableObject implements Buildable, Sq
    return new Builder(clone(this));
  }

-  /** Builder for {@link google.registry.schema.domain.RegistryLock}. */
+  /** Builder for {@link RegistryLock}. */
  public static class Builder extends Buildable.Builder<RegistryLock> {
    public Builder() {}

@@ -17,7 +17,7 @@ package google.registry.model.domain.secdns;
 import static google.registry.model.IdService.allocateId;

 import google.registry.model.domain.DomainHistory;
-import google.registry.schema.replay.SqlOnlyEntity;
+import google.registry.model.replay.SqlOnlyEntity;
 import javax.persistence.Access;
 import javax.persistence.AccessType;
 import javax.persistence.Column;
@@ -46,11 +46,11 @@ import google.registry.model.annotations.ReportedOn;
 import google.registry.model.common.TimedTransitionProperty;
 import google.registry.model.common.TimedTransitionProperty.TimeMapper;
 import google.registry.model.common.TimedTransitionProperty.TimedTransition;
+import google.registry.model.replay.DatastoreAndSqlEntity;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.persistence.DomainHistoryVKey;
 import google.registry.persistence.VKey;
 import google.registry.persistence.WithStringVKey;
-import google.registry.schema.replay.DatastoreAndSqlEntity;
 import java.util.Optional;
 import java.util.Set;
 import javax.annotation.Nullable;
@@ -21,10 +21,10 @@ import com.googlecode.objectify.annotation.EntitySubclass;
 import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
 import google.registry.model.host.HostHistory.HostHistoryId;
+import google.registry.model.replay.DatastoreEntity;
+import google.registry.model.replay.SqlEntity;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.persistence.VKey;
-import google.registry.schema.replay.DatastoreEntity;
-import google.registry.schema.replay.SqlEntity;
 import java.io.Serializable;
 import java.util.Optional;
 import javax.annotation.Nullable;
@@ -19,9 +19,9 @@ import com.googlecode.objectify.annotation.Entity;
 import google.registry.model.EppResource.ForeignKeyedEppResource;
 import google.registry.model.annotations.ExternalMessagingName;
 import google.registry.model.annotations.ReportedOn;
+import google.registry.model.replay.DatastoreAndSqlEntity;
 import google.registry.persistence.VKey;
 import google.registry.persistence.WithStringVKey;
-import google.registry.schema.replay.DatastoreAndSqlEntity;
 import javax.persistence.Access;
 import javax.persistence.AccessType;

@@ -25,7 +25,7 @@ import com.googlecode.objectify.annotation.Parent;
 import google.registry.model.BackupGroupRoot;
 import google.registry.model.EppResource;
 import google.registry.model.annotations.ReportedOn;
-import google.registry.schema.replay.DatastoreOnlyEntity;
+import google.registry.model.replay.DatastoreOnlyEntity;

 /** An index that allows for quick enumeration of all EppResource entities (e.g. via map reduce). */
@ReportedOn
@@ -24,7 +24,7 @@ import com.googlecode.objectify.annotation.Id;
 import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
 import google.registry.model.annotations.VirtualEntity;
-import google.registry.schema.replay.DatastoreOnlyEntity;
+import google.registry.model.replay.DatastoreOnlyEntity;

 /** A virtual entity to represent buckets to which EppResourceIndex objects are randomly added. */
@Entity
@@ -47,9 +47,9 @@ import google.registry.model.annotations.ReportedOn;
 import google.registry.model.contact.ContactResource;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.host.HostResource;
+import google.registry.model.replay.DatastoreOnlyEntity;
 import google.registry.persistence.VKey;
 import google.registry.persistence.transaction.CriteriaQueryBuilder;
-import google.registry.schema.replay.DatastoreOnlyEntity;
 import google.registry.util.NonFinalForTesting;
 import java.util.Collection;
 import java.util.Comparator;
@@ -33,7 +33,7 @@ import google.registry.model.Buildable;
 import google.registry.model.ImmutableObject;
 import google.registry.model.annotations.NotBackedUp;
 import google.registry.model.annotations.NotBackedUp.Reason;
-import google.registry.schema.replay.DatastoreOnlyEntity;
+import google.registry.model.replay.DatastoreOnlyEntity;
 import google.registry.util.NonFinalForTesting;
 import java.util.Random;
 import java.util.function.Supplier;
@@ -27,7 +27,7 @@ import com.googlecode.objectify.annotation.Parent;
 import google.registry.model.ImmutableObject;
 import google.registry.model.annotations.NotBackedUp;
 import google.registry.model.annotations.NotBackedUp.Reason;
-import google.registry.schema.replay.DatastoreOnlyEntity;
+import google.registry.model.replay.DatastoreOnlyEntity;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -23,7 +23,7 @@ import com.googlecode.objectify.annotation.Id;
 import google.registry.model.ImmutableObject;
 import google.registry.model.annotations.NotBackedUp;
 import google.registry.model.annotations.NotBackedUp.Reason;
-import google.registry.schema.replay.DatastoreOnlyEntity;
+import google.registry.model.replay.DatastoreOnlyEntity;
 import org.joda.time.DateTime;

 /** Singleton parent entity for all commit log checkpoints. */
@@ -25,7 +25,7 @@ import com.googlecode.objectify.annotation.Parent;
 import google.registry.model.ImmutableObject;
 import google.registry.model.annotations.NotBackedUp;
 import google.registry.model.annotations.NotBackedUp.Reason;
-import google.registry.schema.replay.DatastoreOnlyEntity;
+import google.registry.model.replay.DatastoreOnlyEntity;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import org.joda.time.DateTime;
@@ -29,7 +29,7 @@ import com.googlecode.objectify.annotation.Parent;
 import google.registry.model.ImmutableObject;
 import google.registry.model.annotations.NotBackedUp;
 import google.registry.model.annotations.NotBackedUp.Reason;
-import google.registry.schema.replay.DatastoreOnlyEntity;
+import google.registry.model.replay.DatastoreOnlyEntity;

 /** Representation of a saved entity in a {@link CommitLogManifest} (not deletes). */
@Entity
@@ -36,12 +36,12 @@ import google.registry.model.annotations.InCrossTld;
 import google.registry.model.contact.ContactHistory;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.host.HostHistory;
+import google.registry.model.replay.DatastoreEntity;
+import google.registry.model.replay.SqlEntity;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.persistence.VKey;
 import google.registry.persistence.transaction.QueryComposer;
 import google.registry.persistence.transaction.TransactionManager;
-import google.registry.schema.replay.DatastoreEntity;
-import google.registry.schema.replay.SqlEntity;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Optional;
@@ -22,9 +22,9 @@ import com.google.common.collect.ImmutableMap;
 import com.googlecode.objectify.Key;
 import google.registry.config.RegistryEnvironment;
 import google.registry.model.UpdateAutoTimestamp;
+import google.registry.model.replay.DatastoreEntity;
+import google.registry.model.replay.ReplaySpecializer;
 import google.registry.persistence.VKey;
-import google.registry.schema.replay.DatastoreEntity;
-import google.registry.schema.replay.ReplaySpecializer;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -43,6 +43,7 @@ import google.registry.model.host.HostResource;
 import google.registry.model.poll.PendingActionNotificationResponse.ContactPendingActionNotificationResponse;
 import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse;
 import google.registry.model.poll.PendingActionNotificationResponse.HostPendingActionNotificationResponse;
+import google.registry.model.replay.DatastoreAndSqlEntity;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.transfer.TransferData.TransferServerApproveEntity;
 import google.registry.model.transfer.TransferResponse;
@@ -50,7 +51,6 @@ import google.registry.model.transfer.TransferResponse.ContactTransferResponse;
 import google.registry.model.transfer.TransferResponse.DomainTransferResponse;
 import google.registry.persistence.VKey;
 import google.registry.persistence.WithLongVKey;
-import google.registry.schema.replay.DatastoreAndSqlEntity;
 import java.util.List;
 import java.util.Optional;
 import javax.annotation.Nullable;
@@ -39,7 +39,7 @@ public final class RdeNamingUtils {
  }

  /** Returns same thing as {@link #makeRydeFilename} except without the series and revision. */
-  static String makePartialName(String tld, DateTime date, RdeMode mode) {
+  public static String makePartialName(String tld, DateTime date, RdeMode mode) {
    return String.format("%s_%s_%s",
        checkNotNull(tld), formatDate(date), mode.getFilenameComponent());
  }
@@ -27,9 +27,9 @@ import com.googlecode.objectify.annotation.Ignore;
 import google.registry.model.BackupGroupRoot;
 import google.registry.model.ImmutableObject;
 import google.registry.model.rde.RdeRevision.RdeRevisionId;
+import google.registry.model.replay.NonReplicatedEntity;
 import google.registry.persistence.VKey;
 import google.registry.persistence.converter.LocalDateConverter;
-import google.registry.schema.replay.NonReplicatedEntity;
 import java.io.Serializable;
 import java.util.Optional;
 import javax.persistence.Column;
@@ -77,9 +77,9 @@ import google.registry.model.annotations.InCrossTld;
 import google.registry.model.annotations.ReportedOn;
 import google.registry.model.common.EntityGroupRoot;
 import google.registry.model.registrar.Registrar.BillingAccountEntry.CurrencyMapper;
+import google.registry.model.replay.DatastoreAndSqlEntity;
 import google.registry.model.tld.Registry;
 import google.registry.persistence.VKey;
-import google.registry.schema.replay.DatastoreAndSqlEntity;
 import google.registry.util.CidrAddressBlock;
 import java.security.cert.CertificateParsingException;
 import java.util.Comparator;
@@ -30,6 +30,7 @@ import static google.registry.util.PasswordUtils.SALT_SUPPLIER;
 import static google.registry.util.PasswordUtils.hashPassword;
 import static java.util.stream.Collectors.joining;

+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Enums;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
@@ -48,8 +49,8 @@ import google.registry.model.Jsonifiable;
 import google.registry.model.annotations.InCrossTld;
 import google.registry.model.annotations.ReportedOn;
 import google.registry.model.registrar.RegistrarContact.RegistrarPocId;
+import google.registry.model.replay.DatastoreAndSqlEntity;
 import google.registry.persistence.VKey;
-import google.registry.schema.replay.DatastoreAndSqlEntity;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Map;
@@ -396,7 +397,8 @@ public class RegistrarContact extends ImmutableObject
  }

  /** Class to represent the composite primary key for {@link RegistrarContact} entity. */
-  static class RegistrarPocId extends ImmutableObject implements Serializable {
+  @VisibleForTesting
+  public static class RegistrarPocId extends ImmutableObject implements Serializable {

    String emailAddress;

@@ -405,7 +407,8 @@ public class RegistrarContact extends ImmutableObject
    // Hibernate requires this default constructor.
    private RegistrarPocId() {}

-    RegistrarPocId(String emailAddress, String registrarId) {
+    @VisibleForTesting
+    public RegistrarPocId(String emailAddress, String registrarId) {
      this.emailAddress = emailAddress;
      this.registrarId = registrarId;
    }
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package google.registry.schema.replay;
+package google.registry.model.replay;

 import java.util.Optional;

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package google.registry.schema.replay;
+package google.registry.model.replay;

 import java.util.Optional;

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package google.registry.schema.replay;
+package google.registry.model.replay;

 import java.util.Optional;

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package google.registry.schema.replay;
+package google.registry.model.replay;

 import static com.google.common.base.Preconditions.checkArgument;
 import static google.registry.model.ofy.ObjectifyService.auditedOfy;
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package google.registry.schema.replay;
+package google.registry.model.replay;

 import java.util.Optional;

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package google.registry.schema.replay;
+package google.registry.model.replay;

 import google.registry.persistence.VKey;
 import java.lang.reflect.InvocationTargetException;
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package google.registry.schema.replay;
+package google.registry.model.replay;

 import static google.registry.model.ofy.ObjectifyService.auditedOfy;
 import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
@@ -12,7 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package google.registry.schema.replay;
+package google.registry.model.replay;
+
+import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;

 import java.util.Optional;

@@ -29,4 +31,19 @@ public interface SqlEntity {

  /** A method that will ber called before the object is saved to SQL in asynchronous replay. */
  default void beforeSqlSaveOnReplay() {}
+
+  /* Returns this entity's primary key field(s) in a string. */
+  default String getPrimaryKeyString() {
+    return jpaTm()
+        .transact(
+            () ->
+                String.format(
+                    "%s_%s",
+                    this.getClass().getSimpleName(),
+                    jpaTm()
+                        .getEntityManager()
+                        .getEntityManagerFactory()
+                        .getPersistenceUnitUtil()
+                        .getIdentifier(this)));
+  }
 }
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package google.registry.schema.replay;
+package google.registry.model.replay;

 import java.util.Optional;

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package google.registry.schema.replay;
+package google.registry.model.replay;

 import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
 import static google.registry.util.DateTimeUtils.START_OF_TIME;
@@ -22,7 +22,7 @@ import com.googlecode.objectify.annotation.Embed;
 import com.googlecode.objectify.annotation.Ignore;
 import google.registry.model.Buildable;
 import google.registry.model.ImmutableObject;
-import google.registry.schema.replay.DatastoreAndSqlEntity;
+import google.registry.model.replay.DatastoreAndSqlEntity;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
@@ -46,9 +46,9 @@ import google.registry.model.host.HostBase;
 import google.registry.model.host.HostHistory;
 import google.registry.model.host.HostHistory.HostHistoryId;
 import google.registry.model.host.HostResource;
+import google.registry.model.replay.DatastoreEntity;
+import google.registry.model.replay.SqlEntity;
 import google.registry.persistence.VKey;
-import google.registry.schema.replay.DatastoreEntity;
-import google.registry.schema.replay.SqlEntity;
 import java.util.Optional;
 import java.util.Set;
 import javax.annotation.Nullable;
@@ -21,7 +21,7 @@ import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
 import com.google.common.collect.ImmutableSet;
 import google.registry.model.Buildable;
 import google.registry.model.ImmutableObject;
-import google.registry.schema.replay.SqlOnlyEntity;
+import google.registry.model.replay.SqlOnlyEntity;
 import google.registry.util.DomainNameUtils;
 import java.util.Set;
 import javax.persistence.Column;
@@ -29,8 +29,8 @@ import com.googlecode.objectify.annotation.Id;
 import google.registry.model.ImmutableObject;
 import google.registry.model.annotations.NotBackedUp;
 import google.registry.model.annotations.NotBackedUp.Reason;
+import google.registry.model.replay.DatastoreAndSqlEntity;
 import google.registry.persistence.VKey;
-import google.registry.schema.replay.DatastoreAndSqlEntity;
 import google.registry.util.RequestStatusChecker;
 import google.registry.util.RequestStatusCheckerImpl;
 import java.io.Serializable;
@@ -28,7 +28,7 @@ import com.googlecode.objectify.annotation.Unindex;
 import google.registry.model.annotations.NotBackedUp;
 import google.registry.model.annotations.NotBackedUp.Reason;
 import google.registry.model.common.CrossTldSingleton;
-import google.registry.schema.replay.NonReplicatedEntity;
+import google.registry.model.replay.NonReplicatedEntity;
 import java.nio.ByteBuffer;
 import java.util.Optional;
 import java.util.UUID;
@@ -21,7 +21,7 @@ import static google.registry.util.DateTimeUtils.isBeforeOrAt;
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableMap;
 import google.registry.model.ImmutableObject;
-import google.registry.schema.replay.SqlOnlyEntity;
+import google.registry.model.replay.SqlOnlyEntity;
 import java.util.Map;
 import javax.persistence.CollectionTable;
 import javax.persistence.Column;
@@ -59,10 +59,10 @@ import google.registry.model.common.TimedTransitionProperty;
 import google.registry.model.common.TimedTransitionProperty.TimedTransition;
 import google.registry.model.domain.fee.BaseFee.FeeType;
 import google.registry.model.domain.fee.Fee;
+import google.registry.model.replay.DatastoreAndSqlEntity;
 import google.registry.model.tld.label.PremiumList;
 import google.registry.model.tld.label.ReservedList;
 import google.registry.persistence.VKey;
-import google.registry.schema.replay.DatastoreAndSqlEntity;
 import google.registry.util.Idn;
 import java.util.Map;
 import java.util.Optional;
@@ -18,10 +18,10 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;

 import com.google.common.collect.ImmutableList;
-import google.registry.schema.domain.RegistryLock;
+import google.registry.model.domain.RegistryLock;
 import java.util.Optional;

-/** Data access object for {@link google.registry.schema.domain.RegistryLock}. */
+/** Data access object for {@link RegistryLock}. */
 public final class RegistryLockDao {

  /** Returns the {@link RegistryLock} referred to by this revision ID, or empty if none exists. */
@@ -26,9 +26,9 @@ import com.google.common.hash.BloomFilter;
 import google.registry.model.Buildable;
 import google.registry.model.ImmutableObject;
 import google.registry.model.annotations.ReportedOn;
+import google.registry.model.replay.SqlOnlyEntity;
 import google.registry.model.tld.Registry;
 import google.registry.model.tld.label.PremiumList.PremiumEntry;
-import google.registry.schema.replay.SqlOnlyEntity;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -33,15 +33,10 @@ import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.UncheckedExecutionException;
-import com.googlecode.objectify.annotation.Embed;
-import com.googlecode.objectify.annotation.Entity;
-import com.googlecode.objectify.annotation.Mapify;
-import com.googlecode.objectify.mapper.Mapper;
 import google.registry.model.Buildable;
-import google.registry.model.annotations.ReportedOn;
+import google.registry.model.replay.SqlOnlyEntity;
 import google.registry.model.tld.Registry;
 import google.registry.model.tld.label.DomainLabelMetrics.MetricsReservedListMatch;
-import google.registry.schema.replay.NonReplicatedEntity;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -65,13 +60,11 @@ import org.joda.time.DateTime;
 * succeeds, we will end up with having two exact same reserved lists that differ only by
 * revisionId. This is fine though, because we only use the list with the highest revisionId.
 */
-@Entity
-@ReportedOn
@javax.persistence.Entity
@Table(indexes = {@Index(columnList = "name", name = "reservedlist_name_idx")})
 public final class ReservedList
    extends BaseDomainLabelList<ReservationType, ReservedList.ReservedListEntry>
-    implements NonReplicatedEntity {
+    implements SqlOnlyEntity {

  /**
   * Mapping from domain name to its reserved list info.
@@ -80,7 +73,6 @@ public final class ReservedList
   * from the immutability contract so we can modify it after construction and we have to handle the
   * database processing on our own so we can detach it after load.
   */
-  @Mapify(ReservedListEntry.LabelMapper.class)
  @Insignificant
  @Transient
  Map<String, ReservedListEntry> reservedListMap;
@@ -121,10 +113,9 @@ public final class ReservedList
   * A reserved list entry entity, persisted to Datastore, that represents a single label and its
   * reservation type.
   */
-  @Embed
  @javax.persistence.Entity(name = "ReservedEntry")
  public static class ReservedListEntry extends DomainLabelEntry<ReservationType, ReservedListEntry>
-      implements Buildable, NonReplicatedEntity, Serializable {
+      implements Buildable, SqlOnlyEntity, Serializable {

    @Insignificant @Id Long revisionId;

@@ -133,15 +124,6 @@ public final class ReservedList

    String comment;

-    /** Mapper for use with @Mapify */
-    static class LabelMapper implements Mapper<String, ReservedListEntry> {
-
-      @Override
-      public String getKey(ReservedListEntry entry) {
-        return entry.getDomainLabel();
-      }
-    }
-
    public String getComment(String comment) {
      return comment;
    }
@@ -239,7 +221,7 @@ public final class ReservedList
   * @return An Optional&lt;ReservedList&gt; that has a value if a reserved list exists by the given
   *     name, or absent if not.
   * @throws UncheckedExecutionException if some other error occurs while trying to load the
-   *     ReservedList from the cache or Datastore.
+   *     ReservedList from the cache or database.
   */
  public static Optional<ReservedList> get(String listName) {
    return getFromCache(listName, cache);
@@ -15,7 +15,7 @@
 package google.registry.model.tmch;

 import google.registry.model.ImmutableObject;
-import google.registry.schema.replay.NonReplicatedEntity;
+import google.registry.model.replay.NonReplicatedEntity;
 import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -36,9 +36,9 @@ import google.registry.model.annotations.NotBackedUp;
 import google.registry.model.annotations.NotBackedUp.Reason;
 import google.registry.model.annotations.VirtualEntity;
 import google.registry.model.common.CrossTldSingleton;
+import google.registry.model.replay.DatastoreOnlyEntity;
+import google.registry.model.replay.NonReplicatedEntity;
 import google.registry.model.tld.label.ReservedList.ReservedListEntry;
-import google.registry.schema.replay.DatastoreOnlyEntity;
-import google.registry.schema.replay.NonReplicatedEntity;
 import java.util.Map;
 import java.util.Optional;
 import javax.annotation.Nullable;
@@ -23,7 +23,7 @@ import com.googlecode.objectify.annotation.Entity;
 import google.registry.model.annotations.NotBackedUp;
 import google.registry.model.annotations.NotBackedUp.Reason;
 import google.registry.model.common.CrossTldSingleton;
-import google.registry.schema.replay.NonReplicatedEntity;
+import google.registry.model.replay.NonReplicatedEntity;
 import java.util.Optional;
 import javax.annotation.concurrent.Immutable;
 import javax.persistence.Column;
@@ -31,7 +31,6 @@ import google.registry.request.RequestModule;
 import google.registry.request.RequestScope;
 import google.registry.tools.server.CreateGroupsAction;
 import google.registry.tools.server.CreatePremiumListAction;
-import google.registry.tools.server.DeleteEntityAction;
 import google.registry.tools.server.GenerateZoneFilesAction;
 import google.registry.tools.server.KillAllCommitLogsAction;
 import google.registry.tools.server.KillAllEppResourcesAction;
@@ -63,7 +62,6 @@ import google.registry.tools.server.VerifyOteAction;
 interface ToolsRequestComponent {
  CreateGroupsAction createGroupsAction();
  CreatePremiumListAction createPremiumListAction();
-  DeleteEntityAction deleteEntityAction();
  EppToolAction eppToolAction();
  FlowComponent.Builder flowComponentBuilder();
  GenerateZoneFilesAction generateZoneFilesAction();
@@ -0,0 +1,46 @@
+// Copyright 2021 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package google.registry.persistence.converter;
+
+import com.google.common.collect.Maps;
+import google.registry.model.common.DatabaseMigrationStateSchedule;
+import google.registry.model.common.DatabaseMigrationStateSchedule.MigrationState;
+import google.registry.model.common.DatabaseMigrationStateSchedule.MigrationStateTransition;
+import java.util.Map;
+import javax.persistence.Converter;
+import org.joda.time.DateTime;
+
+/** JPA converter for {@link DatabaseMigrationStateSchedule} transitions. */
+@Converter(autoApply = true)
+public class DatabaseMigrationScheduleTransitionConverter
+    extends TimedTransitionPropertyConverterBase<MigrationState, MigrationStateTransition> {
+
+  @Override
+  Map.Entry<String, String> convertToDatabaseMapEntry(
+      Map.Entry<DateTime, MigrationStateTransition> entry) {
+    return Maps.immutableEntry(entry.getKey().toString(), entry.getValue().getValue().name());
+  }
+
+  @Override
+  Map.Entry<DateTime, MigrationState> convertToEntityMapEntry(Map.Entry<String, String> entry) {
+    return Maps.immutableEntry(
+        DateTime.parse(entry.getKey()), MigrationState.valueOf(entry.getValue()));
+  }
+
+  @Override
+  Class<MigrationStateTransition> getTimedTransitionSubclass() {
+    return MigrationStateTransition.class;
+  }
+}
@@ -1,36 +0,0 @@
-// Copyright 2020 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.persistence.converter;
-
-import static google.registry.model.common.EntityGroupRoot.getCrossTldKey;
-
-import com.googlecode.objectify.Key;
-import google.registry.model.tld.label.ReservedList;
-import javax.persistence.Converter;
-
-/** JPA converter for a set of {@link Key} containing a {@link ReservedList} */
-@Converter(autoApply = true)
-public class ReservedListKeySetConverter extends StringSetConverterBase<Key<ReservedList>> {
-
-  @Override
-  String toString(Key<ReservedList> key) {
-    return key.getName();
-  }
-
-  @Override
-  Key<ReservedList> fromString(String value) {
-    return Key.create(getCrossTldKey(), ReservedList.class, value);
-  }
-}
@@ -38,11 +38,11 @@ import google.registry.model.index.ForeignKeyIndex.ForeignKeyContactIndex;
 import google.registry.model.index.ForeignKeyIndex.ForeignKeyDomainIndex;
 import google.registry.model.index.ForeignKeyIndex.ForeignKeyHostIndex;
 import google.registry.model.ofy.DatastoreTransactionManager;
+import google.registry.model.replay.NonReplicatedEntity;
+import google.registry.model.replay.SqlOnlyEntity;
 import google.registry.model.tmch.ClaimsList.ClaimsListSingleton;
 import google.registry.persistence.JpaRetries;
 import google.registry.persistence.VKey;
-import google.registry.schema.replay.NonReplicatedEntity;
-import google.registry.schema.replay.SqlOnlyEntity;
 import google.registry.util.Clock;
 import google.registry.util.Retrier;
 import google.registry.util.SystemSleeper;
@@ -14,7 +14,7 @@

 package google.registry.persistence.transaction;

-import google.registry.schema.replay.SqlOnlyEntity;
+import google.registry.model.replay.SqlOnlyEntity;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -26,7 +26,8 @@ import javax.annotation.Nullable;
 * Base class for specification of command line parameters common to creating and updating reserved
 * lists.
 */
-public abstract class CreateOrUpdateReservedListCommand extends MutatingCommand {
+public abstract class CreateOrUpdateReservedListCommand extends ConfirmingCommand
+    implements CommandWithRemoteApi {

  static final FluentLogger logger = FluentLogger.forEnclosingClass();

@@ -25,9 +25,7 @@ import com.beust.jcommander.Parameters;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
-import com.googlecode.objectify.Key;
 import google.registry.model.tld.label.ReservedList;
-import google.registry.persistence.VKey;
 import java.nio.file.Files;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -48,7 +46,7 @@ final class CreateReservedListCommand extends CreateOrUpdateReservedListCommand
  boolean override;

  @Override
-  protected void init() throws Exception {
+  protected String prompt() throws Exception {
    name = Strings.isNullOrEmpty(name) ? convertFilePathToName(input) : name;
    checkArgument(
        !ReservedList.get(name).isPresent(), "A reserved list already exists by this name");
@@ -66,35 +64,11 @@ final class CreateReservedListCommand extends CreateOrUpdateReservedListCommand
            .setCreationTimestamp(now)
            .build();

-    // calls the stageEntityChange method that takes old entity, new entity and a new vkey;
-    // Because ReservedList is a sqlEntity and its primary key field (revisionId) is only set when
-    // it's being persisted; a vkey has to be created here explicitly for ReservedList instances.
-    stageEntityChange(
-        null, reservedList, VKey.createOfy(ReservedList.class, Key.create(reservedList)));
-  }
-
-  @Override
-  protected String prompt() {
-    return getChangedEntities().isEmpty()
-        ? "No entity changes to apply."
-        : getChangedEntities().stream()
-            .map(
-                entity -> {
-                  if (entity instanceof ReservedList) {
-                    // Format the entries of the reserved list as well.
-                    String entries =
-                        ((ReservedList) entity)
-                            .getReservedListEntries().entrySet().stream()
-                                .map(
-                                    entry ->
-                                        String.format("%s=%s", entry.getKey(), entry.getValue()))
-                                .collect(Collectors.joining(", "));
-                    return String.format("%s\nreservedListMap={%s}\n", entity, entries);
-                  } else {
-                    return entity.toString();
-                  }
-                })
-            .collect(Collectors.joining("\n"));
+    String entries =
+        reservedList.getReservedListEntries().entrySet().stream()
+            .map(entry -> String.format("%s=%s", entry.getKey(), entry.getValue()))
+            .collect(Collectors.joining(", "));
+    return String.format("%s\nreservedListMap={%s}\n", reservedList, entries);
  }

  private static void validateListName(String name) {
@@ -28,10 +28,10 @@ import google.registry.model.billing.BillingEvent;
 import google.registry.model.billing.BillingEvent.Reason;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.domain.DomainHistory;
+import google.registry.model.domain.RegistryLock;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.tld.Registry;
 import google.registry.model.tld.RegistryLockDao;
-import google.registry.schema.domain.RegistryLock;
 import google.registry.util.StringGenerator;
 import java.util.Optional;
 import javax.annotation.Nullable;
@@ -32,8 +32,8 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.googlecode.objectify.Key;
 import google.registry.model.ImmutableObject;
+import google.registry.model.replay.SqlEntity;
 import google.registry.persistence.VKey;
-import google.registry.schema.replay.SqlEntity;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -15,7 +15,7 @@
 package google.registry.tools;

 import static com.google.common.base.Preconditions.checkState;
-import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
+import static google.registry.persistence.transaction.TransactionManagerFactory.ofyTm;
 import static google.registry.tools.Injector.injectReflectively;
 import static java.nio.charset.StandardCharsets.UTF_8;

@@ -244,7 +244,7 @@ final class RegistryCli implements AutoCloseable, CommandRunner {
      ObjectifyService.initOfy();
      // Make sure we start the command with a clean cache, so that any previous command won't
      // interfere with this one.
-      tm().clearSessionCache();
+      ofyTm().clearSessionCache();

      // Enable Cloud SQL for command that needs remote API as they will very likely use
      // Cloud SQL after the database migration. Note that the DB password is stored in Datastore
@@ -14,7 +14,7 @@

 package google.registry.tools;

-import static google.registry.persistence.transaction.TransactionManagerFactory.ofyTm;
+import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;

 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
@@ -47,11 +47,11 @@ public class SetDatabaseMigrationStateCommand extends ConfirmingCommand

  @Override
  protected String prompt() {
-    return ofyTm()
+    return jpaTm()
        .transact(
            () -> {
              StringBuilder result = new StringBuilder();
-              DateTime now = ofyTm().getTransactionTime();
+              DateTime now = jpaTm().getTransactionTime();
              DateTime nextTransition = transitionSchedule.ceilingKey(now);
              if (nextTransition != null && nextTransition.isBefore(now.plusMinutes(10))) {
                result.append(WARNING_MESSAGE);
@@ -64,7 +64,7 @@ public class SetDatabaseMigrationStateCommand extends ConfirmingCommand

  @Override
  protected String execute() {
-    ofyTm().transact(() -> DatabaseMigrationStateSchedule.set(transitionSchedule));
+    jpaTm().transact(() -> DatabaseMigrationStateSchedule.set(transitionSchedule));
    return String.format("Successfully set new migration state schedule %s", transitionSchedule);
  }
 }
@@ -20,7 +20,7 @@ import static google.registry.persistence.transaction.TransactionManagerFactory.
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.google.common.collect.Iterables;
-import google.registry.schema.replay.SqlReplayCheckpoint;
+import google.registry.model.replay.SqlReplayCheckpoint;
 import java.util.List;
 import org.joda.time.DateTime;

@@ -19,18 +19,17 @@ import static java.nio.charset.StandardCharsets.UTF_8;

 import com.beust.jcommander.Parameters;
 import com.google.common.base.Strings;
-import com.googlecode.objectify.Key;
 import google.registry.model.tld.label.ReservedList;
-import google.registry.persistence.VKey;
 import java.nio.file.Files;
 import java.util.List;
+import java.util.stream.Collectors;

 /** Command to safely update {@link ReservedList}. */
@Parameters(separators = " =", commandDescription = "Update a ReservedList.")
 final class UpdateReservedListCommand extends CreateOrUpdateReservedListCommand {

  @Override
-  protected void init() throws Exception {
+  protected String prompt() throws Exception {
    name = Strings.isNullOrEmpty(name) ? convertFilePathToName(input) : name;
    ReservedList existingReservedList =
        ReservedList.get(name)
@@ -53,15 +52,18 @@ final class UpdateReservedListCommand extends CreateOrUpdateReservedListCommand
    if (!existingReservedList
        .getReservedListEntries()
        .equals(reservedList.getReservedListEntries())) {
-      // calls the stageEntityChange method that takes old entity, new entity and a new vkey;
-      // a vkey has to be created here explicitly for ReservedList instances.
-      // ReservedList is a sqlEntity; it triggers the static method Vkey.create(Key<?> ofyCall),
-      // which invokes a static ReservedList.createVkey(Key ofyKey) method that does not exist.
-      // the sql primary key field (revisionId) is only set when it's being persisted;
-      stageEntityChange(
-          existingReservedList,
-          reservedList,
-          VKey.createOfy(ReservedList.class, Key.create(existingReservedList)));
+      String oldEntries =
+          existingReservedList.getReservedListEntries().entrySet().stream()
+              .map(entry -> String.format("%s=%s", entry.getKey(), entry.getValue()))
+              .collect(Collectors.joining(", "));
+      String newEntries =
+          reservedList.getReservedListEntries().entrySet().stream()
+              .map(entry -> String.format("%s=%s", entry.getKey(), entry.getValue()))
+              .collect(Collectors.joining(", "));
+      return String.format(
+          "Update reserved list for %s?\nOld List: %s\n New List: %s",
+          name, oldEntries, newEntries);
    }
+    return "No entity changes to apply.";
  }
 }
@@ -30,11 +30,11 @@ import com.google.common.collect.Streams;
 import com.google.common.flogger.FluentLogger;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.model.domain.DomainBase;
+import google.registry.model.domain.RegistryLock;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.reporting.HistoryEntryDao;
 import google.registry.model.tld.RegistryLockDao;
 import google.registry.persistence.VKey;
-import google.registry.schema.domain.RegistryLock;
 import google.registry.tools.CommandWithRemoteApi;
 import google.registry.tools.ConfirmingCommand;
 import google.registry.util.Clock;
@@ -1,129 +0,0 @@
-// Copyright 2017 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.tools.server;
-
-import static com.google.appengine.api.datastore.DatastoreServiceFactory.getDatastoreService;
-import static com.googlecode.objectify.Key.create;
-import static google.registry.model.ofy.ObjectifyService.auditedOfy;
-import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
-
-import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.datastore.EntityNotFoundException;
-import com.google.appengine.api.datastore.Key;
-import com.google.appengine.api.datastore.KeyFactory;
-import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableList;
-import com.google.common.flogger.FluentLogger;
-import com.googlecode.objectify.impl.EntityMetadata;
-import google.registry.request.Action;
-import google.registry.request.HttpException.BadRequestException;
-import google.registry.request.Parameter;
-import google.registry.request.Response;
-import google.registry.request.auth.Auth;
-import java.util.Optional;
-import javax.inject.Inject;
-
-/**
- * An action to delete entities in Datastore specified by raw key ids, which can be found in
- * Datastore Viewer in the AppEngine console - it's the really long alphanumeric key that is labeled
- * "Entity key" on the page for an individual entity.
- *
- * <p>rawKeys is the only required parameter. It is a comma-delimited list of Strings.
- *
- * <p><b>WARNING:</b> This servlet can be dangerous if used incorrectly as it can bypass checks on
- * deletion (including whether the entity is referenced by other entities) and it does not write
- * commit log entries for non-registered types. It should mainly be used for deleting testing or
- * malformed data that cannot be properly deleted using existing tools. Generally, if there already
- * exists an entity-specific deletion command, then use that one instead.
- */
-@Action(
-    service = Action.Service.TOOLS,
-    path = DeleteEntityAction.PATH,
-    auth = Auth.AUTH_INTERNAL_OR_ADMIN)
-public class DeleteEntityAction implements Runnable {
-
-  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
-
-  public static final String PATH = "/_dr/admin/deleteEntity";
-  public static final String PARAM_RAW_KEYS = "rawKeys";
-
-  private final String rawKeys;
-  private final Response response;
-
-  @Inject
-  DeleteEntityAction(@Parameter(PARAM_RAW_KEYS) String rawKeys, Response response) {
-    this.rawKeys = rawKeys;
-    this.response = response;
-  }
-
-  @Override
-  public void run() {
-    // Get raw key strings from request
-    ImmutableList.Builder<Object> ofyDeletionsBuilder = new ImmutableList.Builder<>();
-    ImmutableList.Builder<Key> rawDeletionsBuilder = new ImmutableList.Builder<>();
-    for (String rawKeyString : Splitter.on(',').split(rawKeys)) {
-      // Convert raw keys string to real keys. Try to load it from Objectify if it's a registered
-      // type, and fall back to DatastoreService if its not registered.
-      Key rawKey = KeyFactory.stringToKey(rawKeyString);
-      Optional<Object> ofyEntity = loadOfyEntity(rawKey);
-      if (ofyEntity.isPresent()) {
-        ofyDeletionsBuilder.add(ofyEntity.get());
-        continue;
-      }
-      Optional<Entity> rawEntity = loadRawEntity(rawKey);
-      if (rawEntity.isPresent()) {
-        rawDeletionsBuilder.add(rawEntity.get().getKey());
-        continue;
-      }
-      // The entity could not be found by either Objectify or the Datastore service
-      throw new BadRequestException("Could not find entity with key " + rawKeyString);
-    }
-    // Delete raw entities.
-    ImmutableList<Key> rawDeletions = rawDeletionsBuilder.build();
-    getDatastoreService().delete(rawDeletions);
-    // Delete ofy entities.
-    final ImmutableList<Object> ofyDeletions = ofyDeletionsBuilder.build();
-    tm().transactNew(() -> auditedOfy().delete().entities(ofyDeletions).now());
-    String message = String.format(
-        "Deleted %d raw entities and %d registered entities",
-        rawDeletions.size(),
-        ofyDeletions.size());
-    logger.atInfo().log(message);
-    response.setPayload(message);
-  }
-
-  private Optional<Object> loadOfyEntity(Key rawKey) {
-    try {
-      EntityMetadata<Object> metadata = auditedOfy().factory().getMetadata(rawKey.getKind());
-      return Optional.ofNullable(
-          metadata == null ? null : auditedOfy().load().key(create(rawKey)).now());
-    } catch (Throwable e) {
-      logger.atWarning().withCause(e).log(
-          "Could not load entity with key %s using Objectify; falling back to raw Datastore.",
-          rawKey);
-      return Optional.empty();
-    }
-  }
-
-  private Optional<Entity> loadRawEntity(Key rawKey) {
-    try {
-      return Optional.ofNullable(getDatastoreService().get(rawKey));
-    } catch (EntityNotFoundException e) {
-      logger.atWarning().withCause(e).log(
-          "Could not load entity from Datastore service with key %s", rawKey);
-      return Optional.empty();
-    }
-  }
-}
@@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.flogger.FluentLogger;
 import com.google.common.net.MediaType;
 import com.google.gson.Gson;
+import google.registry.model.domain.RegistryLock;
 import google.registry.model.registrar.Registrar;
 import google.registry.model.registrar.RegistrarContact;
 import google.registry.model.tld.RegistryLockDao;
@@ -41,7 +42,6 @@ import google.registry.request.auth.Auth;
 import google.registry.request.auth.AuthResult;
 import google.registry.request.auth.AuthenticatedRegistrarAccessor;
 import google.registry.request.auth.AuthenticatedRegistrarAccessor.RegistrarAccessDeniedException;
-import google.registry.schema.domain.RegistryLock;
 import google.registry.security.JsonResponseHelper;
 import java.util.Objects;
 import java.util.Optional;
@@ -31,6 +31,7 @@ import com.google.common.flogger.FluentLogger;
 import com.google.gson.Gson;
 import google.registry.config.RegistryConfig.Config;
 import google.registry.flows.domain.DomainFlowUtils;
+import google.registry.model.domain.RegistryLock;
 import google.registry.model.registrar.Registrar;
 import google.registry.model.registrar.RegistrarContact;
 import google.registry.request.Action;
@@ -42,7 +43,6 @@ import google.registry.request.auth.AuthResult;
 import google.registry.request.auth.AuthenticatedRegistrarAccessor;
 import google.registry.request.auth.AuthenticatedRegistrarAccessor.RegistrarAccessDeniedException;
 import google.registry.request.auth.UserAuthInfo;
-import google.registry.schema.domain.RegistryLock;
 import google.registry.security.JsonResponseHelper;
 import google.registry.tools.DomainLockUtils;
 import google.registry.util.EmailMessage;
@@ -20,10 +20,10 @@ import com.google.common.base.Supplier;
 import com.google.common.base.Throwables;
 import com.google.common.flogger.FluentLogger;
 import com.google.template.soy.tofu.SoyTofu;
+import google.registry.model.domain.RegistryLock;
 import google.registry.request.Action;
 import google.registry.request.Parameter;
 import google.registry.request.auth.Auth;
-import google.registry.schema.domain.RegistryLock;
 import google.registry.tools.DomainLockUtils;
 import google.registry.ui.server.SoyTemplateUtils;
 import google.registry.ui.soy.registrar.RegistryLockVerificationSoyInfo;
@@ -42,6 +42,7 @@
    <class>google.registry.model.billing.BillingEvent$OneTime</class>
    <class>google.registry.model.billing.BillingEvent$Recurring</class>
    <class>google.registry.model.common.Cursor</class>
+    <class>google.registry.model.common.DatabaseMigrationStateSchedule</class>
    <class>google.registry.model.contact.ContactHistory</class>
    <class>google.registry.model.contact.ContactResource</class>
    <class>google.registry.model.domain.DomainBase</class>
@@ -73,8 +74,8 @@
    <class>google.registry.model.tmch.ClaimsEntry</class>
    <class>google.registry.model.tmch.TmchCrl</class>
    <class>google.registry.persistence.transaction.TransactionEntity</class>
-    <class>google.registry.schema.domain.RegistryLock</class>
-    <class>google.registry.schema.replay.SqlReplayCheckpoint</class>
+    <class>google.registry.model.domain.RegistryLock</class>
+    <class>google.registry.model.replay.SqlReplayCheckpoint</class>

    <!-- Customized type converters -->
    <class>google.registry.persistence.converter.AllocationTokenStatusTransitionConverter</class>
@@ -85,13 +86,13 @@
    <class>google.registry.persistence.converter.CreateAutoTimestampConverter</class>
    <class>google.registry.persistence.converter.CurrencyToBillingConverter</class>
    <class>google.registry.persistence.converter.CurrencyUnitConverter</class>
+    <class>google.registry.persistence.converter.DatabaseMigrationScheduleTransitionConverter</class>
    <class>google.registry.persistence.converter.DateTimeConverter</class>
    <class>google.registry.persistence.converter.DurationConverter</class>
    <class>google.registry.persistence.converter.InetAddressSetConverter</class>
    <class>google.registry.persistence.converter.LocalDateConverter</class>
    <class>google.registry.persistence.converter.PostalInfoChoiceListConverter</class>
    <class>google.registry.persistence.converter.RegistrarPocSetConverter</class>
-    <class>google.registry.persistence.converter.ReservedListKeySetConverter</class>
    <class>google.registry.persistence.converter.Spec11ThreatMatchThreatTypeSetConverter</class>
    <class>google.registry.persistence.converter.StatusValueSetConverter</class>
    <class>google.registry.persistence.converter.StringListConverter</class>
@@ -38,7 +38,6 @@ import static org.mockito.Mockito.verify;

 import com.google.cloud.storage.contrib.nio.testing.LocalStorageHelper;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.truth.Truth8;
@@ -55,17 +54,19 @@ import google.registry.model.index.ForeignKeyIndex;
 import google.registry.model.ofy.CommitLogBucket;
 import google.registry.model.ofy.CommitLogManifest;
 import google.registry.model.ofy.CommitLogMutation;
+import google.registry.model.rde.RdeMode;
+import google.registry.model.rde.RdeNamingUtils;
+import google.registry.model.rde.RdeRevision;
 import google.registry.model.registrar.RegistrarContact;
+import google.registry.model.replay.SqlReplayCheckpoint;
 import google.registry.model.server.Lock;
 import google.registry.model.tld.label.PremiumList;
 import google.registry.model.tld.label.PremiumList.PremiumEntry;
-import google.registry.model.tld.label.ReservedList;
 import google.registry.model.tmch.ClaimsList;
 import google.registry.model.translators.VKeyTranslatorFactory;
 import google.registry.persistence.VKey;
 import google.registry.persistence.transaction.JpaTransactionManager;
 import google.registry.persistence.transaction.TransactionManagerFactory;
-import google.registry.schema.replay.SqlReplayCheckpoint;
 import google.registry.testing.AppEngineExtension;
 import google.registry.testing.DatabaseHelper;
 import google.registry.testing.FakeClock;
@@ -135,7 +136,7 @@ public class ReplayCommitLogsToSqlActionTest {
    action.diffLister.gcsUtils = gcsUtils;
    action.diffLister.executorProvider = MoreExecutors::newDirectExecutorService;
    action.diffLister.scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
-    ofyTm()
+    jpaTm()
        .transact(
            () ->
                DatabaseMigrationStateSchedule.set(
@@ -201,7 +202,7 @@ public class ReplayCommitLogsToSqlActionTest {
        CommitLogMutation.create(manifest2Key, TestObject.create("f")));
    jpaTm().transact(() -> SqlReplayCheckpoint.set(now.minusMinutes(1).minusMillis(1)));
    fakeClock.advanceOneMilli();
-    runAndAssertSuccess(now, 2);
+    runAndAssertSuccess(now, 2, 3);
    assertExpectedIds("previous to keep", "b", "d", "e", "f");
  }

@@ -212,7 +213,7 @@ public class ReplayCommitLogsToSqlActionTest {
    saveDiffFileNotToRestore(gcsUtils, now.minusMinutes(1));
    saveDiffFile(gcsUtils, createCheckpoint(now.minusMillis(2)));
    jpaTm().transact(() -> SqlReplayCheckpoint.set(now.minusMillis(1)));
-    runAndAssertSuccess(now.minusMillis(1), 0);
+    runAndAssertSuccess(now.minusMillis(1), 0, 0);
    assertExpectedIds("previous to keep");
  }

@@ -256,7 +257,7 @@ public class ReplayCommitLogsToSqlActionTest {
        CommitLogManifest.create(bucketKey, now, null),
        CommitLogMutation.create(manifestKey, TestObject.create("a")),
        CommitLogMutation.create(manifestKey, TestObject.create("b")));
-    runAndAssertSuccess(now.minusMinutes(1), 1);
+    runAndAssertSuccess(now.minusMinutes(1), 1, 1);
    assertExpectedIds("previous to keep", "a", "b");
  }

@@ -278,7 +279,7 @@ public class ReplayCommitLogsToSqlActionTest {
            getBucketKey(1),
            now,
            ImmutableSet.of(Key.create(TestObject.create("previous to delete")))));
-    runAndAssertSuccess(now.minusMinutes(1), 1);
+    runAndAssertSuccess(now.minusMinutes(1), 1, 1);
    assertExpectedIds("previous to keep");
  }

@@ -350,7 +351,7 @@ public class ReplayCommitLogsToSqlActionTest {
        domainMutation,
        contactMutation);

-    runAndAssertSuccess(now.minusMinutes(1), 1);
+    runAndAssertSuccess(now.minusMinutes(1), 1, 1);
    // Verify two things:
    // 1. that the contact insert occurred before the domain insert (necessary for FK ordering)
    //    even though the domain came first in the file
@@ -393,7 +394,7 @@ public class ReplayCommitLogsToSqlActionTest {
        CommitLogManifest.create(
            getBucketKey(1), now.minusMinutes(1).plusMillis(1), ImmutableSet.of()),
        contactMutation);
-    runAndAssertSuccess(now.minusMinutes(1).plusMillis(1), 1);
+    runAndAssertSuccess(now.minusMinutes(1).plusMillis(1), 1, 2);
    // Verify that the delete occurred first (because it was in the first transaction) even though
    // deletes have higher weight
    ArgumentCaptor<Object> putCaptor = ArgumentCaptor.forClass(Object.class);
@@ -419,8 +420,9 @@ public class ReplayCommitLogsToSqlActionTest {

    createTld("tld");
    // Have a commit log with a couple objects that shouldn't be replayed
-    ReservedList reservedList =
-        new ReservedList.Builder().setReservedListMap(ImmutableMap.of()).setName("name").build();
+    String triplet = RdeNamingUtils.makePartialName("tld", fakeClock.nowUtc(), RdeMode.FULL);
+    RdeRevision rdeRevision =
+        RdeRevision.create(triplet, "tld", fakeClock.nowUtc().toLocalDate(), RdeMode.FULL, 1);
    ForeignKeyIndex<DomainBase> fki = ForeignKeyIndex.create(newDomainBase("foo.tld"), now);
    tm().transact(
            () -> {
@@ -430,15 +432,15 @@ public class ReplayCommitLogsToSqlActionTest {
                    createCheckpoint(now.minusMinutes(1)),
                    CommitLogManifest.create(
                        getBucketKey(1), now.minusMinutes(1), ImmutableSet.of()),
-                    // Reserved list is dually-written non-replicated
-                    CommitLogMutation.create(manifestKey, reservedList),
+                    // RDE Revisions are not replicated
+                    CommitLogMutation.create(manifestKey, rdeRevision),
                    // FKIs aren't replayed to SQL at all
                    CommitLogMutation.create(manifestKey, fki));
              } catch (IOException e) {
                throw new RuntimeException(e);
              }
            });
-    runAndAssertSuccess(now.minusMinutes(1), 1);
+    runAndAssertSuccess(now.minusMinutes(1), 1, 1);
    // jpaTm()::put should only have been called with the checkpoint
    verify(spy, times(2)).put(any(SqlReplayCheckpoint.class));
    verify(spy, times(2)).put(any());
@@ -463,13 +465,13 @@ public class ReplayCommitLogsToSqlActionTest {
            // one object only exists in Datastore, one is dually-written (so isn't replicated)
            ImmutableSet.of(getCrossTldKey(), claimsListKey)));

-    runAndAssertSuccess(now.minusMinutes(1), 1);
+    runAndAssertSuccess(now.minusMinutes(1), 1, 1);
    verify(spy, times(0)).delete(any(VKey.class));
  }

  @Test
  void testFailure_notEnabled() {
-    ofyTm().transact(() -> DatabaseMigrationStateSchedule.set(DEFAULT_TRANSITION_MAP.toValueMap()));
+    jpaTm().transact(() -> DatabaseMigrationStateSchedule.set(DEFAULT_TRANSITION_MAP.toValueMap()));
    action.run();
    assertThat(response.getStatus()).isEqualTo(SC_NO_CONTENT);
    assertThat(response.getPayload())
@@ -506,7 +508,7 @@ public class ReplayCommitLogsToSqlActionTest {
        createCheckpoint(now.minusMinutes(1)),
        CommitLogManifest.create(bucketKey, now, null),
        CommitLogMutation.create(manifestKey, TestObject.create("a")));
-    runAndAssertSuccess(now.minusMinutes(1), 1);
+    runAndAssertSuccess(now.minusMinutes(1), 1, 1);
    assertThat(TestObject.beforeSqlSaveCallCount).isEqualTo(1);
  }

@@ -544,7 +546,7 @@ public class ReplayCommitLogsToSqlActionTest {
        createCheckpoint(now.minusMinutes(1)),
        CommitLogManifest.create(
            getBucketKey(1), now.minusMinutes(3), ImmutableSet.of(Key.create(domain))));
-    runAndAssertSuccess(now.minusMinutes(1), 1);
+    runAndAssertSuccess(now.minusMinutes(1), 1, 1);

    jpaTm()
        .transact(
@@ -596,15 +598,19 @@ public class ReplayCommitLogsToSqlActionTest {
        domainWithoutDsDataMutation,
        CommitLogManifest.create(getBucketKey(1), now.minusMinutes(2), ImmutableSet.of()),
        domainWithOriginalDsDataMutation);
-    runAndAssertSuccess(now.minusMinutes(1), 1);
+    runAndAssertSuccess(now.minusMinutes(1), 1, 2);
  }

-  private void runAndAssertSuccess(DateTime expectedCheckpointTime, int numFiles) {
+  private void runAndAssertSuccess(
+      DateTime expectedCheckpointTime, int numFiles, int numTransactions) {
    action.run();
    assertThat(response.getStatus()).isEqualTo(SC_OK);
    assertThat(response.getPayload())
-        .isEqualTo(
-            String.format("Caught up to current time after replaying %d file(s).", numFiles));
+        .startsWith(
+            String.format(
+                "Caught up to current time after replaying %d file(s) containing %d total"
+                    + " transaction(s)",
+                numFiles, numTransactions));
    assertThat(jpaTm().transact(SqlReplayCheckpoint::get)).isEqualTo(expectedCheckpointTime);
  }

@@ -37,7 +37,7 @@ import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.flogger.LoggerConfig;
 import com.googlecode.objectify.Key;
 import google.registry.model.contact.ContactResource;
-import google.registry.schema.domain.RegistryLock;
+import google.registry.model.domain.RegistryLock;
 import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeSleeper;
@@ -41,8 +41,8 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;

 import com.google.common.collect.ImmutableSet;
 import google.registry.model.domain.DomainBase;
+import google.registry.model.domain.RegistryLock;
 import google.registry.model.host.HostResource;
-import google.registry.schema.domain.RegistryLock;
 import google.registry.testing.AppEngineExtension;
 import google.registry.testing.DeterministicStringGenerator;
 import google.registry.testing.DualDatabaseTest;
@@ -63,7 +63,7 @@ public final class BackupTestStore implements AutoCloseable {
    this.fakeClock = fakeClock;
    this.appEngine =
        new AppEngineExtension.Builder()
-            .withDatastore()
+            .withDatastoreAndCloudSql()
            .withoutCannedData()
            .withClock(fakeClock)
            .build();
@@ -289,7 +289,7 @@ class InvoicingPipelineTest {
    setTmForTest(jpaTm());
    setupCloudSql();
    PCollection<BillingEvent> billingEvents = InvoicingPipeline.readFromCloudSql(options, pipeline);
-    billingEvents = billingEvents.apply(new changeDomainRepo());
+    billingEvents = billingEvents.apply(new ChangeDomainRepo());
    PAssert.that(billingEvents).containsInAnyOrder(INPUT_EVENTS);
    pipeline.run().waitUntilFinish();
    removeTmOverrideForTest();
@@ -590,7 +590,7 @@ class InvoicingPipelineTest {
    return persistResource(billingEventBuilder.build());
  }

-  private static class changeDomainRepo
+  private static class ChangeDomainRepo
      extends PTransform<PCollection<BillingEvent>, PCollection<BillingEvent>> {
    @Override
    public PCollection<BillingEvent> expand(PCollection<BillingEvent> input) {
@@ -22,7 +22,7 @@ import static org.joda.time.DateTimeZone.UTC;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Ignore;
 import google.registry.model.common.CrossTldSingleton;
-import google.registry.schema.replay.EntityTest.EntityForTesting;
+import google.registry.model.replay.EntityTest.EntityForTesting;
 import google.registry.testing.AppEngineExtension;
 import google.registry.testing.DualDatabaseTest;
 import google.registry.testing.TestOfyAndSql;
@@ -29,7 +29,7 @@ import com.google.common.collect.Iterables;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
-import google.registry.schema.replay.EntityTest.EntityForTesting;
+import google.registry.model.replay.EntityTest.EntityForTesting;
 import google.registry.testing.AppEngineExtension;
 import google.registry.util.CidrAddressBlock;
 import java.lang.reflect.Field;
@@ -23,8 +23,8 @@ import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Ignore;
 import google.registry.model.common.CrossTldSingleton;
 import google.registry.model.ofy.Ofy;
+import google.registry.model.replay.EntityTest.EntityForTesting;
 import google.registry.persistence.VKey;
-import google.registry.schema.replay.EntityTest.EntityForTesting;
 import google.registry.testing.AppEngineExtension;
 import google.registry.testing.DualDatabaseTest;
 import google.registry.testing.FakeClock;
@@ -21,7 +21,7 @@ import static google.registry.model.common.DatabaseMigrationStateSchedule.Migrat
 import static google.registry.model.common.DatabaseMigrationStateSchedule.MigrationState.SQL_ONLY;
 import static google.registry.model.common.DatabaseMigrationStateSchedule.MigrationState.SQL_PRIMARY;
 import static google.registry.model.common.DatabaseMigrationStateSchedule.MigrationState.SQL_PRIMARY_READ_ONLY;
-import static google.registry.persistence.transaction.TransactionManagerFactory.ofyTm;
+import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.util.DateTimeUtils.START_OF_TIME;
 import static org.junit.Assert.assertThrows;
@@ -36,6 +36,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

+/** Tests for {@link DatabaseMigrationStateSchedule}. */
 public class DatabaseMigrationStateScheduleTest extends EntityTestCase {

  @BeforeEach
@@ -123,7 +124,7 @@ public class DatabaseMigrationStateScheduleTest extends EntityTestCase {
    assertThat(
            assertThrows(
                IllegalArgumentException.class,
-                () -> ofyTm().transact(() -> DatabaseMigrationStateSchedule.set(nowInvalidMap))))
+                () -> jpaTm().transact(() -> DatabaseMigrationStateSchedule.set(nowInvalidMap))))
        .hasMessageThat()
        .isEqualTo(
            "Cannot transition from current state-as-of-now DATASTORE_ONLY "
@@ -139,7 +140,7 @@ public class DatabaseMigrationStateScheduleTest extends EntityTestCase {
                    DatabaseMigrationStateSchedule.set(
                        DatabaseMigrationStateSchedule.DEFAULT_TRANSITION_MAP.toValueMap())))
        .hasMessageThat()
-        .isEqualTo("Must be called in a transaction");
+        .isEqualTo("Not in a transaction");
  }

  @Test
@@ -154,7 +155,7 @@ public class DatabaseMigrationStateScheduleTest extends EntityTestCase {
  private void runValidTransition(MigrationState from, MigrationState to) {
    ImmutableSortedMap<DateTime, MigrationState> transitions =
        createMapEndingWithTransition(from, to);
-    ofyTm().transact(() -> DatabaseMigrationStateSchedule.set(transitions));
+    jpaTm().transact(() -> DatabaseMigrationStateSchedule.set(transitions));
    assertThat(DatabaseMigrationStateSchedule.getUncached().toValueMap())
        .containsExactlyEntriesIn(transitions);
  }
@@ -165,7 +166,7 @@ public class DatabaseMigrationStateScheduleTest extends EntityTestCase {
    assertThat(
            assertThrows(
                IllegalArgumentException.class,
-                () -> ofyTm().transact(() -> DatabaseMigrationStateSchedule.set(transitions))))
+                () -> jpaTm().transact(() -> DatabaseMigrationStateSchedule.set(transitions))))
        .hasMessageThat()
        .isEqualTo(
            String.format("validStateTransitions map cannot transition from %s to %s.", from, to));
@@ -27,7 +27,7 @@ import com.googlecode.objectify.annotation.Parent;
 import google.registry.model.ImmutableObject;
 import google.registry.model.annotations.InCrossTld;
 import google.registry.model.common.EntityGroupRoot;
-import google.registry.schema.replay.EntityTest.EntityForTesting;
+import google.registry.model.replay.EntityTest.EntityForTesting;
 import google.registry.testing.AppEngineExtension;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -38,7 +38,7 @@ public class DatastoreTransactionManagerTest {
  @RegisterExtension
  public final AppEngineExtension appEngine =
      AppEngineExtension.builder()
-          .withDatastore()
+          .withDatastoreAndCloudSql()
          .withOfyTestEntities(InCrossTldTestEntity.class)
          .build();

@@ -28,7 +28,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 class EntityWritePrioritiesTest {

  @RegisterExtension
-  AppEngineExtension appEngine = new AppEngineExtension.Builder().withDatastore().build();
+  AppEngineExtension appEngine =
+      new AppEngineExtension.Builder().withDatastoreAndCloudSql().build();

  @Test
  void testGetPriority() {
@@ -45,8 +45,8 @@ import google.registry.model.contact.ContactHistory;
 import google.registry.model.contact.ContactResource;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.eppcommon.Trid;
+import google.registry.model.replay.EntityTest.EntityForTesting;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.schema.replay.EntityTest.EntityForTesting;
 import google.registry.testing.AppEngineExtension;
 import google.registry.testing.DatabaseHelper;
 import google.registry.testing.FakeClock;
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package google.registry.schema.replay;
+package google.registry.model.replay;

 import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.truth.Truth.assertThat;
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package google.registry.schema.replay;
+package google.registry.model.replay;

 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
@@ -32,7 +32,6 @@ import google.registry.model.common.DatabaseMigrationStateSchedule.MigrationStat
 import google.registry.model.ofy.CommitLogBucket;
 import google.registry.model.ofy.Ofy;
 import google.registry.persistence.VKey;
-import google.registry.persistence.transaction.JpaTransactionManagerImpl;
 import google.registry.persistence.transaction.TransactionEntity;
 import google.registry.testing.AppEngineExtension;
 import google.registry.testing.DatabaseHelper;
@@ -69,7 +68,6 @@ public class ReplicateToDatastoreActionTest {

  @BeforeEach
  public void setUp() {
-    JpaTransactionManagerImpl.removeReplaySqlToDsOverrideForTest();
    injectExtension.setStaticField(Ofy.class, "clock", fakeClock);
    // Use a single bucket to expose timestamp inversion problems.
    injectExtension.setStaticField(
@@ -196,7 +194,7 @@ public class ReplicateToDatastoreActionTest {
  void testNotInMigrationState_doesNothing() {
    // set a schedule that backtracks the current status to DATASTORE_PRIMARY_READ_ONLY
    DateTime now = fakeClock.nowUtc();
-    ofyTm()
+    jpaTm()
        .transact(
            () ->
                DatabaseMigrationStateSchedule.set(
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package google.registry.schema.replay;
+package google.registry.model.replay;

 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
@@ -19,16 +19,13 @@ import static google.registry.model.ImmutableObjectSubject.assertAboutImmutableO

 import com.google.common.collect.ImmutableMap;
 import google.registry.model.EntityTestCase;
-import google.registry.persistence.transaction.JpaTestRules;
-import google.registry.persistence.transaction.JpaTestRules.JpaIntegrationWithCoverageExtension;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;

 public class SignedMarkRevocationListDaoTest extends EntityTestCase {

-  @RegisterExtension
-  final JpaIntegrationWithCoverageExtension jpa =
-      new JpaTestRules.Builder().withClock(fakeClock).buildIntegrationWithCoverageExtension();
+  public SignedMarkRevocationListDaoTest() {
+    super(JpaEntityCoverageCheck.ENABLED);
+  }

  @Test
  void testSave_success() {
@@ -27,7 +27,7 @@ import static google.registry.testing.SqlHelper.saveRegistryLock;
 import static org.junit.jupiter.api.Assertions.assertThrows;

 import google.registry.model.EntityTestCase;
-import google.registry.schema.domain.RegistryLock;
+import google.registry.model.domain.RegistryLock;
 import java.util.Optional;
 import org.joda.time.Duration;
 import org.junit.jupiter.api.Test;
@@ -33,15 +33,11 @@ import static org.junit.jupiter.api.Assertions.assertThrows;

 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import google.registry.model.ofy.Ofy;
 import google.registry.model.tld.Registry;
-import google.registry.model.tld.label.PremiumList.PremiumEntry;
 import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
-import google.registry.testing.InjectExtension;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;

@@ -50,19 +46,9 @@ class ReservedListTest {

  private FakeClock clock = new FakeClock(DateTime.parse("2010-01-01T10:00:00Z"));

-  @Order(value = Order.DEFAULT - 1)
  @RegisterExtension
-  final InjectExtension inject =
-      new InjectExtension().withStaticFieldOverride(Ofy.class, "clock", clock);
-
-  @RegisterExtension
-  final AppEngineExtension appEngine =
-      AppEngineExtension.builder()
-          .withClock(clock)
-          .withJpaUnitTestEntities(
-              PremiumList.class, PremiumEntry.class, ReservedList.class, ReservedListEntry.class)
-          .withDatastoreAndCloudSql()
-          .build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withClock(clock).withCloudSql().build();

  @BeforeEach
  void beforeEach() {
@@ -27,7 +27,7 @@ import com.googlecode.objectify.annotation.Entity;
 import google.registry.model.common.CrossTldSingleton;
 import google.registry.model.ofy.CommitLogManifest;
 import google.registry.model.ofy.Ofy;
-import google.registry.schema.replay.EntityTest.EntityForTesting;
+import google.registry.model.replay.EntityTest.EntityForTesting;
 import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.InjectExtension;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
sarahcaseybotandGitHub	d18dab3327	Remove ReservedList from Datastore schema (#1285 ) * Remove ReservedList from Datastore schema * Remove some Datastore references * Add a different non-replicated entity to ReplayCommitLogsToSqlActionTest	2021-08-17 16:56:00 -04:00
gbrodmanandGitHub	61932c1809	Use direct ofyTm reference when clearing cache in tool (#1287 ) We shouldn't reference tm() at all before initializing the JPA transaction manager, since tm() looks at the database migration schedule when figuring out which transaction manager to use.	2021-08-17 13:20:17 -06:00
sarahcaseybotandGitHub	8eb8c810e8	Remove DeleteEntityAction (#1282 )	2021-08-16 13:21:00 -04:00
Weimin YuandGitHub	c03a7b0b33	Update cron jobs in crash (#1284 ) * Update cron jobs in crash Add wipeout cron jobs for the duration of migration testing with production data. * Disable Datastore-related cron jobs	2021-08-16 12:03:45 -04:00
gbrodmanandGitHub	7a4c109b36	Remove recursive load in DBMSS cache (#1286 ) * Remove recursive load in DBMSS cache This occurs because if we do a standard transaction, the JpaTxnManager checks to see if we should be doing backups, which involves loading the migration state schedule (causing the recursion). When starting the transaction to load the schedule, we should explicitly transactWithoutBackup so there's no need to check. This wasn't hit in tests because we previously manually set the replication to not occur in the JpaTransactionManagerExtension -- we remove that and related setters.	2021-08-14 12:34:23 -06:00
Ben McIlwainandGitHub	22b1b8d21a	Add instructions for two-step DB schema updates (#1283 ) * Add instructions for two-step DB schema updates These expanded steps are required by the recent enabling of the SQL integration test suite.	2021-08-13 17:21:38 -04:00
Weimin YuandGitHub	5bbabadafd	Generate string to uniquely identify a SqlEntity (#1271 ) * Generate string to uniquely identify a SqlEntity Add a method to SqlEntity that returns a string built from the entity's primary key(s). This string can be used in logging.	2021-08-13 16:22:54 -04:00
Ben McIlwainandGitHub	6c73161ff8	Add the domain DNS refresh request time field to the DB schema (#1280 ) * Add the domain DNS refresh request time field to the DB schema This isn't used yet, but it will eventually be the replacement for the dns-pull task queue once we get further in the migration. * Remove index	2021-08-13 15:32:18 -04:00
Rachel GuanandGitHub	7faee04422	Modify class name to remove checkstyleTest warning (#1281 )	2021-08-13 14:16:58 -04:00
Ben McIlwainandGitHub	b340b2b5e9	Add tx/s instrumentation to replay action and re-enable it on sandbox (#1276 )	2021-08-12 18:33:47 -04:00
gbrodmanandGitHub	7f733cd16d	Store DatabaseMigrationSchedule in SQL instead of Datastore (#1269 ) * Store DatabaseMigrationSchedule in SQL instead of Datastore This requires messing around with some of the JPA unit test rule creation since it requires saving / retrieving the schedule pretty much always (which itself includes the hstore extension).	2021-08-12 15:57:31 -06:00
Ben McIlwainandGitHub	60469479a4	Consolidate all remaining schema classes into model package (#1278 )	2021-08-12 13:38:50 -04:00