zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-07 19:53:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update ListDomainsAction to SQL (#1036)

Browse source
This commit is contained in:
gbrodman 2021-03-29 12:54:45 -04:00 • committed by GitHub
parent a4e078305d
commit 65e468f2bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 61 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

38
core/src/main/java/google/registry/tools/server/ListDomainsAction.java
View file

@ -18,6 +18,8 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableList.toImmutableList;
import static google.registry.model.ofy.ObjectifyService.ofy; import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.model.registry.Registries.assertTldsExist; import static google.registry.model.registry.Registries.assertTldsExist;
import static google.registry.persistence.transaction.TransactionManagerFactory.jpaTm;
import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
import static google.registry.request.Action.Method.GET; import static google.registry.request.Action.Method.GET;
import static google.registry.request.Action.Method.POST; import static google.registry.request.Action.Method.POST;
import static google.registry.request.RequestParameters.PARAM_TLDS; import static google.registry.request.RequestParameters.PARAM_TLDS;
@ -74,10 +76,16 @@ public final class ListDomainsAction extends ListObjectsAction<DomainBase> {
public ImmutableSet<DomainBase> loadObjects() { public ImmutableSet<DomainBase> loadObjects() {
checkArgument(!tlds.isEmpty(), "Must specify TLDs to query"); checkArgument(!tlds.isEmpty(), "Must specify TLDs to query");
assertTldsExist(tlds); assertTldsExist(tlds);
ImmutableList<DomainBase> domains = tm().isOfy() ? loadDomainsOfy() : loadDomainsSql();
return ImmutableSet.copyOf(domains.reverse());
}
private ImmutableList<DomainBase> loadDomainsOfy() {
DateTime now = clock.nowUtc(); DateTime now = clock.nowUtc();
ImmutableList.Builder<DomainBase> domainsBuilder = new ImmutableList.Builder<>(); ImmutableList.Builder<DomainBase> domainsBuilder = new ImmutableList.Builder<>();
// Combine the batches together by sorting all domains together with newest first, applying the
// limit, and then reversing for display order.
for (List<String> tldsBatch : Lists.partition(tlds.asList(), maxNumSubqueries)) { for (List<String> tldsBatch : Lists.partition(tlds.asList(), maxNumSubqueries)) {
domainsBuilder.addAll(
ofy() ofy()
.load() .load()
.type(DomainBase.class) .type(DomainBase.class)
@ -91,17 +99,27 @@ public final class ListDomainsAction extends ListObjectsAction<DomainBase> {
// Deleted entities must be filtered out post-query because queries don't allow // Deleted entities must be filtered out post-query because queries don't allow
// ordering with two filters. // ordering with two filters.
.filter(d -> d.getDeletionTime().isAfter(now)) .filter(d -> d.getDeletionTime().isAfter(now))
.collect(toImmutableList())); .forEach(domainsBuilder::add);
} }
// Combine the batches together by sorting all domains together with newest first, applying the return domainsBuilder.build().stream()
// limit, and then reversing for display order.
return ImmutableSet.copyOf(
domainsBuilder
.build()
.stream()
.sorted(comparing(EppResource::getCreationTime).reversed()) .sorted(comparing(EppResource::getCreationTime).reversed())
.limit(limit) .limit(limit)
.collect(toImmutableList()) .collect(toImmutableList());
.reverse()); }
private ImmutableList<DomainBase> loadDomainsSql() {
return jpaTm()
.transact(
() ->
jpaTm()
.query(
"FROM Domain WHERE tld IN (:tlds) AND deletionTime > "
+ "current_timestamp() ORDER BY creationTime DESC",
DomainBase.class)
.setParameter("tlds", tlds)
.setMaxResults(limit)
.getResultStream()
.map(EppResourceUtils.transformAtTime(jpaTm().getTransactionTime()))
.collect(toImmutableList()));
} }
} }

34
core/src/test/java/google/registry/tools/server/ListDomainsActionTest.java
View file

@ -19,13 +19,15 @@ import static google.registry.testing.DatabaseHelper.createTlds;
import static google.registry.testing.DatabaseHelper.persistActiveDomain; import static google.registry.testing.DatabaseHelper.persistActiveDomain;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import google.registry.testing.DualDatabaseTest;
import google.registry.testing.FakeClock; import google.registry.testing.FakeClock;
import google.registry.testing.TestOfyAndSql;
import java.util.Optional; import java.util.Optional;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/** Unit tests for {@link ListDomainsAction}. */ /** Unit tests for {@link ListDomainsAction}. */
@DualDatabaseTest
class ListDomainsActionTest extends ListActionTestCase { class ListDomainsActionTest extends ListActionTestCase {
private ListDomainsAction action; private ListDomainsAction action;
@ -38,7 +40,7 @@ class ListDomainsActionTest extends ListActionTestCase {
action.limit = Integer.MAX_VALUE; action.limit = Integer.MAX_VALUE;
} }
@Test @TestOfyAndSql
void testRun_invalidRequest_missingTlds() { void testRun_invalidRequest_missingTlds() {
action.tlds = ImmutableSet.of(); action.tlds = ImmutableSet.of();
testRunError( testRunError(
@ -49,7 +51,7 @@ class ListDomainsActionTest extends ListActionTestCase {
"^Must specify TLDs to query$"); "^Must specify TLDs to query$");
} }
@Test @TestOfyAndSql
void testRun_invalidRequest_invalidTld() { void testRun_invalidRequest_invalidTld() {
action.tlds = ImmutableSet.of("%%%badtld%%%"); action.tlds = ImmutableSet.of("%%%badtld%%%");
testRunError( testRunError(
@ -60,13 +62,13 @@ class ListDomainsActionTest extends ListActionTestCase {
"^TLDs do not exist: %%%badtld%%%$"); "^TLDs do not exist: %%%badtld%%%$");
} }
@Test @TestOfyAndSql
void testRun_noParameters() { void testRun_noParameters() {
action.tlds = ImmutableSet.of("foo"); action.tlds = ImmutableSet.of("foo");
testRunSuccess(action, null, null, null); testRunSuccess(action, null, null, null);
} }
@Test @TestOfyAndSql
void testRun_twoLinesWithIdOnly() { void testRun_twoLinesWithIdOnly() {
action.tlds = ImmutableSet.of("foo"); action.tlds = ImmutableSet.of("foo");
createTlds("bar", "sim"); createTlds("bar", "sim");
@ -84,7 +86,7 @@ class ListDomainsActionTest extends ListActionTestCase {
"^example2.foo$"); "^example2.foo$");
} }
@Test @TestOfyAndSql
void testRun_multipleTlds() { void testRun_multipleTlds() {
action.tlds = ImmutableSet.of("bar", "foo"); action.tlds = ImmutableSet.of("bar", "foo");
createTlds("bar", "sim"); createTlds("bar", "sim");
@ -102,7 +104,7 @@ class ListDomainsActionTest extends ListActionTestCase {
"^example2.foo$"); "^example2.foo$");
} }
@Test @TestOfyAndSql
void testRun_moreTldsThanMaxNumSubqueries() { void testRun_moreTldsThanMaxNumSubqueries() {
ListDomainsAction.maxNumSubqueries = 2; ListDomainsAction.maxNumSubqueries = 2;
createTlds("baa", "bab", "bac", "bad"); createTlds("baa", "bab", "bac", "bad");
@ -125,7 +127,7 @@ class ListDomainsActionTest extends ListActionTestCase {
"^domain3.bac$"); "^domain3.bac$");
} }
@Test @TestOfyAndSql
void testRun_twoLinesWithIdOnlyNoHeader() { void testRun_twoLinesWithIdOnlyNoHeader() {
action.tlds = ImmutableSet.of("foo"); action.tlds = ImmutableSet.of("foo");
persistActiveDomain("example1.foo", DateTime.parse("2010-03-04T16:00:00Z")); persistActiveDomain("example1.foo", DateTime.parse("2010-03-04T16:00:00Z"));
@ -139,7 +141,7 @@ class ListDomainsActionTest extends ListActionTestCase {
"^example2.foo$"); "^example2.foo$");
} }
@Test @TestOfyAndSql
void testRun_twoLinesWithIdOnlyExplicitHeader() { void testRun_twoLinesWithIdOnlyExplicitHeader() {
action.tlds = ImmutableSet.of("foo"); action.tlds = ImmutableSet.of("foo");
persistActiveDomain("example1.foo", DateTime.parse("2010-03-04T16:00:00Z")); persistActiveDomain("example1.foo", DateTime.parse("2010-03-04T16:00:00Z"));
@ -155,7 +157,7 @@ class ListDomainsActionTest extends ListActionTestCase {
"^example2.foo\\s*$"); "^example2.foo\\s*$");
} }
@Test @TestOfyAndSql
void testRun_twoLinesWithRepoId() { void testRun_twoLinesWithRepoId() {
action.tlds = ImmutableSet.of("foo"); action.tlds = ImmutableSet.of("foo");
persistActiveDomain("example1.foo", DateTime.parse("2010-03-04T16:00:00Z")); persistActiveDomain("example1.foo", DateTime.parse("2010-03-04T16:00:00Z"));
@ -171,7 +173,7 @@ class ListDomainsActionTest extends ListActionTestCase {
"^example3.foo\\s+4-FOO\\s*$"); "^example3.foo\\s+4-FOO\\s*$");
} }
@Test @TestOfyAndSql
void testRun_twoLinesWithRepoIdNoHeader() { void testRun_twoLinesWithRepoIdNoHeader() {
action.tlds = ImmutableSet.of("foo"); action.tlds = ImmutableSet.of("foo");
persistActiveDomain("example1.foo", DateTime.parse("2010-03-04T16:00:00Z")); persistActiveDomain("example1.foo", DateTime.parse("2010-03-04T16:00:00Z"));
@ -185,7 +187,7 @@ class ListDomainsActionTest extends ListActionTestCase {
"^example3.foo 4-FOO$"); "^example3.foo 4-FOO$");
} }
@Test @TestOfyAndSql
void testRun_twoLinesWithRepoIdExplicitHeader() { void testRun_twoLinesWithRepoIdExplicitHeader() {
action.tlds = ImmutableSet.of("foo"); action.tlds = ImmutableSet.of("foo");
persistActiveDomain("example1.foo", DateTime.parse("2010-03-04T16:00:00Z")); persistActiveDomain("example1.foo", DateTime.parse("2010-03-04T16:00:00Z"));
@ -201,7 +203,7 @@ class ListDomainsActionTest extends ListActionTestCase {
"^example3.foo\\s+4-FOO\\s*$"); "^example3.foo\\s+4-FOO\\s*$");
} }
@Test @TestOfyAndSql
void testRun_twoLinesWithWildcard() { void testRun_twoLinesWithWildcard() {
action.tlds = ImmutableSet.of("foo"); action.tlds = ImmutableSet.of("foo");
persistActiveDomain("example1.foo", DateTime.parse("2010-03-04T16:00:00Z")); persistActiveDomain("example1.foo", DateTime.parse("2010-03-04T16:00:00Z"));
@ -217,7 +219,7 @@ class ListDomainsActionTest extends ListActionTestCase {
"^example3.foo\\s+.*4-FOO"); "^example3.foo\\s+.*4-FOO");
} }
@Test @TestOfyAndSql
void testRun_twoLinesWithWildcardAndAnotherField() { void testRun_twoLinesWithWildcardAndAnotherField() {
action.tlds = ImmutableSet.of("foo"); action.tlds = ImmutableSet.of("foo");
persistActiveDomain("example1.foo", DateTime.parse("2010-03-04T16:00:00Z")); persistActiveDomain("example1.foo", DateTime.parse("2010-03-04T16:00:00Z"));
@ -233,7 +235,7 @@ class ListDomainsActionTest extends ListActionTestCase {
"^example3.foo\\s+.*4-FOO"); "^example3.foo\\s+.*4-FOO");
} }
@Test @TestOfyAndSql
void testRun_withBadField_returnsError() { void testRun_withBadField_returnsError() {
action.tlds = ImmutableSet.of("foo"); action.tlds = ImmutableSet.of("foo");
persistActiveDomain("example2.foo"); persistActiveDomain("example2.foo");
@ -246,7 +248,7 @@ class ListDomainsActionTest extends ListActionTestCase {
"^Field 'badfield' not found - recognized fields are:"); "^Field 'badfield' not found - recognized fields are:");
} }
@Test @TestOfyAndSql
void testRun_limitFiltersOutOldestDomains() { void testRun_limitFiltersOutOldestDomains() {
createTlds("bar", "baz"); createTlds("bar", "baz");
action.tlds = ImmutableSet.of("foo", "bar"); action.tlds = ImmutableSet.of("foo", "bar");