mirror of
https://github.com/google/nomulus.git
synced 2025-05-15 08:57:12 +02:00
Add nomulus count_domains command
This efficiently counts domains without having to load them (as opposed to the existing list_domains command which does load then). ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=194559095
This commit is contained in:
parent
d95f286e58
commit
c242a4d08f
4 changed files with 129 additions and 0 deletions
57
java/google/registry/tools/CountDomainsCommand.java
Normal file
57
java/google/registry/tools/CountDomainsCommand.java
Normal file
|
@ -0,0 +1,57 @@
|
||||||
|
// Copyright 2018 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;
|
||||||
|
|
||||||
|
import static google.registry.model.ofy.ObjectifyService.ofy;
|
||||||
|
import static google.registry.model.registry.Registries.assertTldsExist;
|
||||||
|
|
||||||
|
import com.beust.jcommander.Parameter;
|
||||||
|
import com.beust.jcommander.Parameters;
|
||||||
|
import com.google.common.collect.Iterators;
|
||||||
|
import google.registry.model.domain.DomainResource;
|
||||||
|
import google.registry.tools.Command.RemoteApiCommand;
|
||||||
|
import google.registry.util.Clock;
|
||||||
|
import java.util.List;
|
||||||
|
import javax.inject.Inject;
|
||||||
|
import org.joda.time.DateTime;
|
||||||
|
|
||||||
|
/** Command to show the count of active domains on a given TLD. */
|
||||||
|
@Parameters(separators = " =", commandDescription = "Show count of domains on TLD")
|
||||||
|
final class CountDomainsCommand implements RemoteApiCommand {
|
||||||
|
|
||||||
|
@Parameter(description = "TLD(s) to count domains on", required = true)
|
||||||
|
private List<String> mainParameters;
|
||||||
|
|
||||||
|
@Inject Clock clock;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
DateTime now = clock.nowUtc();
|
||||||
|
assertTldsExist(mainParameters)
|
||||||
|
.forEach(tld -> System.out.printf("%s,%d\n", tld, getCountForTld(tld, now)));
|
||||||
|
}
|
||||||
|
|
||||||
|
private int getCountForTld(String tld, DateTime now) {
|
||||||
|
return Iterators.size(
|
||||||
|
ofy()
|
||||||
|
.load()
|
||||||
|
.type(DomainResource.class)
|
||||||
|
.filter("tld", tld)
|
||||||
|
.filter("deletionTime >", now)
|
||||||
|
.chunkAll()
|
||||||
|
.keys()
|
||||||
|
.iterator());
|
||||||
|
}
|
||||||
|
}
|
|
@ -36,6 +36,7 @@ public final class RegistryTool {
|
||||||
.put("check_domain_fee", CheckDomainFeeCommand.class)
|
.put("check_domain_fee", CheckDomainFeeCommand.class)
|
||||||
.put("check_snapshot", CheckSnapshotCommand.class)
|
.put("check_snapshot", CheckSnapshotCommand.class)
|
||||||
.put("convert_idn", ConvertIdnCommand.class)
|
.put("convert_idn", ConvertIdnCommand.class)
|
||||||
|
.put("count_domains", CountDomainsCommand.class)
|
||||||
.put("create_anchor_tenant", CreateAnchorTenantCommand.class)
|
.put("create_anchor_tenant", CreateAnchorTenantCommand.class)
|
||||||
.put("create_auction_credits", CreateAuctionCreditsCommand.class)
|
.put("create_auction_credits", CreateAuctionCreditsCommand.class)
|
||||||
.put("create_cdns_tld", CreateCdnsTld.class)
|
.put("create_cdns_tld", CreateCdnsTld.class)
|
||||||
|
|
|
@ -75,6 +75,7 @@ import javax.inject.Singleton;
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
interface RegistryToolComponent {
|
interface RegistryToolComponent {
|
||||||
|
void inject(CountDomainsCommand command);
|
||||||
void inject(CreateAnchorTenantCommand command);
|
void inject(CreateAnchorTenantCommand command);
|
||||||
void inject(CreateCdnsTld command);
|
void inject(CreateCdnsTld command);
|
||||||
void inject(CreateContactCommand command);
|
void inject(CreateContactCommand command);
|
||||||
|
|
70
javatests/google/registry/tools/CountDomainsCommandTest.java
Normal file
70
javatests/google/registry/tools/CountDomainsCommandTest.java
Normal file
|
@ -0,0 +1,70 @@
|
||||||
|
// Copyright 2018 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;
|
||||||
|
|
||||||
|
import static google.registry.testing.DatastoreHelper.createTlds;
|
||||||
|
import static google.registry.testing.DatastoreHelper.persistActiveDomain;
|
||||||
|
import static google.registry.testing.DatastoreHelper.persistDeletedDomain;
|
||||||
|
import static org.joda.time.DateTimeZone.UTC;
|
||||||
|
|
||||||
|
import google.registry.model.ofy.Ofy;
|
||||||
|
import google.registry.testing.FakeClock;
|
||||||
|
import google.registry.testing.InjectRule;
|
||||||
|
import org.joda.time.DateTime;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Rule;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
/** Unit tests for {@link CountDomainsCommand}. */
|
||||||
|
public class CountDomainsCommandTest extends CommandTestCase<CountDomainsCommand> {
|
||||||
|
|
||||||
|
protected FakeClock clock = new FakeClock(DateTime.now(UTC));
|
||||||
|
|
||||||
|
@Rule public final InjectRule inject = new InjectRule();
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public final void before() {
|
||||||
|
inject.setStaticField(Ofy.class, "clock", clock);
|
||||||
|
command.clock = clock;
|
||||||
|
createTlds("foo", "bar", "baz", "qux");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testSuccess_singleTld() throws Exception {
|
||||||
|
for (int i = 0; i < 51; i++) {
|
||||||
|
persistActiveDomain(String.format("test-%d.foo", i));
|
||||||
|
if (i > 31) {
|
||||||
|
persistActiveDomain(String.format("test-%d.baz", i));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
runCommand("foo");
|
||||||
|
assertStdoutIs("foo,51\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testSuccess_multipleTlds() throws Exception {
|
||||||
|
command.clock = clock;
|
||||||
|
for (int i = 0; i < 29; i++) {
|
||||||
|
persistActiveDomain(String.format("test-%d.foo", i));
|
||||||
|
}
|
||||||
|
for (int j = 0; j < 17; j++) {
|
||||||
|
persistActiveDomain(String.format("test-%d.baz", j));
|
||||||
|
persistDeletedDomain(String.format("del-%d.foo", j), clock.nowUtc().minusYears(1));
|
||||||
|
}
|
||||||
|
persistActiveDomain("not-counted.qux");
|
||||||
|
runCommand("foo", "bar", "baz");
|
||||||
|
assertStdoutIs("foo,29\nbar,0\nbaz,17\n");
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue