From 40723b2f1f0143d5cd284c537c91398b88a1e561 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 06 Jun 2016 07:06:54 +0000
Subject: [PATCH] OPENDJ-3037 On startup, bulk register matching rules to reduce jitter
---
opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java | 54 ++++++++++++++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java
index cad27ff..0117c3f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/SchemaBackendTestCase.java
@@ -846,8 +846,8 @@
@Test
public void testAddAttributeTypeObsoleteEMR() throws Exception
{
- MatchingRule matchingRule = getMatchingRule("testAddATObsoleteEMRMatch", "1.3.6.1.4.1.26027.1.999.20", true);
- DirectoryServer.getSchema().registerMatchingRule(matchingRule, false);
+ MatchingRule matchingRule =
+ registerNewMatchingRule("testAddATObsoleteEMRMatch", "1.3.6.1.4.1.26027.1.999.20", true);
try
{
@@ -1189,8 +1189,8 @@
@Test
public void testRemoveAttributeTypeReferencedByMRU() throws Exception
{
- MatchingRule matchingRule = getMatchingRule("testRemoveATRefByMRUMatch", "1.3.6.1.4.1.26027.1.999.17", false);
- DirectoryServer.getSchema().registerMatchingRule(matchingRule, false);
+ MatchingRule matchingRule =
+ registerNewMatchingRule("testRemoveATRefByMRUMatch", "1.3.6.1.4.1.26027.1.999.17", false);
try
{
@@ -3695,8 +3695,8 @@
@Test
public void testAddMatchingRuleUseSuccessful() throws Exception
{
- MatchingRule matchingRule = getMatchingRule("testAddMRUSuccessfulMatch", "1.3.6.1.4.1.26027.1.999.10", false);
- DirectoryServer.getSchema().registerMatchingRule(matchingRule, false);
+ MatchingRule matchingRule =
+ registerNewMatchingRule("testAddMRUSuccessfulMatch", "1.3.6.1.4.1.26027.1.999.10", false);
try
{
@@ -3730,8 +3730,8 @@
@Test
public void testAddMatchingRuleUseToAltSchemaFile() throws Exception
{
- MatchingRule matchingRule = getMatchingRule("testAddMRUToAltSchemaFileMatch", "1.3.6.1.4.1.26027.1.999.18", false);
- DirectoryServer.getSchema().registerMatchingRule(matchingRule, false);
+ MatchingRule matchingRule =
+ registerNewMatchingRule("testAddMRUToAltSchemaFileMatch", "1.3.6.1.4.1.26027.1.999.18", false);
try
{
@@ -3775,8 +3775,8 @@
@Test
public void testReplaceMatchingRuleUseSuccessful() throws Exception
{
- MatchingRule matchingRule = getMatchingRule("testReplaceMRUSuccessfulMatch", "1.3.6.1.4.1.26027.1.999.11", false);
- DirectoryServer.getSchema().registerMatchingRule(matchingRule, false);
+ MatchingRule matchingRule =
+ registerNewMatchingRule("testReplaceMRUSuccessfulMatch", "1.3.6.1.4.1.26027.1.999.11", false);
try
{
@@ -3817,8 +3817,8 @@
@Test
public void testRemoveAndAddMatchingRuleUse() throws Exception
{
- MatchingRule matchingRule = getMatchingRule("testRemoveAndAddMRUMatch", "1.3.6.1.4.1.26027.1.999.12", false);
- DirectoryServer.getSchema().registerMatchingRule(matchingRule, false);
+ MatchingRule matchingRule =
+ registerNewMatchingRule("testRemoveAndAddMRUMatch", "1.3.6.1.4.1.26027.1.999.12", false);
try
{
@@ -3865,8 +3865,8 @@
@Test
public void testAddMatchingRuleUseMRConflict() throws Exception
{
- MatchingRule matchingRule = getMatchingRule("testAddMRUMRConflictMatch", "1.3.6.1.4.1.26027.1.999.14", false);
- DirectoryServer.getSchema().registerMatchingRule(matchingRule, false);
+ MatchingRule matchingRule =
+ registerNewMatchingRule("testAddMRUMRConflictMatch", "1.3.6.1.4.1.26027.1.999.14", false);
try
{
@@ -3935,8 +3935,8 @@
@Test
public void testAddMatchingRuleUseAttributeTypeUndefined() throws Exception
{
- MatchingRule matchingRule = getMatchingRule("testAddMRUATUndefinedMatch", "1.3.6.1.4.1.26027.1.999.16", false);
- DirectoryServer.getSchema().registerMatchingRule(matchingRule, false);
+ MatchingRule matchingRule =
+ registerNewMatchingRule("testAddMRUATUndefinedMatch", "1.3.6.1.4.1.26027.1.999.16", false);
try
{
@@ -3969,8 +3969,7 @@
public void testAddMatchingRuleUseAttributeTypeMultipleUndefined() throws Exception
{
MatchingRule matchingRule =
- getMatchingRule("testAddMRUATMultipleUndefinedMatch", "1.3.6.1.4.1.26027.1.999.19", false);
- DirectoryServer.getSchema().registerMatchingRule(matchingRule, false);
+ registerNewMatchingRule("testAddMRUATMultipleUndefinedMatch", "1.3.6.1.4.1.26027.1.999.19", false);
try
{
@@ -4010,8 +4009,8 @@
@Test
public void testAddMatchingRuleUseObsoleteMatchingRule() throws Exception
{
- MatchingRule matchingRule = getMatchingRule("testAddMRUObsoleteMRMatch", "1.3.6.1.4.1.26027.1.999.21", true);
- DirectoryServer.getSchema().registerMatchingRule(matchingRule, false);
+ MatchingRule matchingRule =
+ registerNewMatchingRule("testAddMRUObsoleteMRMatch", "1.3.6.1.4.1.26027.1.999.21", true);
try
{
@@ -4042,8 +4041,8 @@
@Test
public void testAddMatchingRuleUseObsoleteAttributeType() throws Exception
{
- MatchingRule matchingRule = getMatchingRule("testAddMRUObsoleteATMatch", "1.3.6.1.4.1.26027.1.999.22", false);
- DirectoryServer.getSchema().registerMatchingRule(matchingRule, false);
+ MatchingRule matchingRule =
+ registerNewMatchingRule("testAddMRUObsoleteATMatch", "1.3.6.1.4.1.26027.1.999.22", false);
try
{
@@ -4071,6 +4070,13 @@
}
}
+ private MatchingRule registerNewMatchingRule(String name, String oid, boolean obsolete) throws DirectoryException
+ {
+ MatchingRule matchingRule = getMatchingRule(name, oid, obsolete);
+ DirectoryServer.getSchema().registerMatchingRules(Arrays.asList(matchingRule), false);
+ return matchingRule;
+ }
+
private void runModify(String[] args, String ldifContent, ResultCode expectedRC)
{
runModify(args, ldifContent, null, expectedRC);
@@ -4111,8 +4117,8 @@
@Test
public void testRemoveMatchingRuleUseSuccessful() throws Exception
{
- MatchingRule matchingRule = getMatchingRule("testRemoveMRUSuccessfulMatch", "1.3.6.1.4.1.26027.1.999.13", false);
- DirectoryServer.getSchema().registerMatchingRule(matchingRule, false);
+ MatchingRule matchingRule =
+ registerNewMatchingRule("testRemoveMRUSuccessfulMatch", "1.3.6.1.4.1.26027.1.999.13", false);
try
{
--
Gitblit v1.10.0