From fc6ff5cd4f579042078b4103af7931804895f344 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Mon, 05 Sep 2016 09:59:31 +0000
Subject: [PATCH] OPENDJ-3263: import with DN validation on JE is using high disk space
---
opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java | 17 +----------------
1 files changed, 1 insertions(+), 16 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
index aec0b2c..c19d5c2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
@@ -35,7 +35,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.DN;
-import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.server.api.Backend;
@@ -134,7 +133,6 @@
private StringArgument rejectFile;
private StringArgument skipFile;
private StringArgument templateFile;
- private BooleanArgument skipDNValidation;
private IntegerArgument threadCount;
private StringArgument tmpDirectory;
@@ -348,10 +346,6 @@
.shortIdentifier('S')
.description(INFO_LDIFIMPORT_DESCRIPTION_SKIP_SCHEMA_VALIDATION.get())
.buildAndAddToParser(argParser);
- skipDNValidation =
- BooleanArgument.builder("skipDNValidation")
- .description(INFO_LDIFIMPORT_DESCRIPTION_DN_VALIDATION.get())
- .buildAndAddToParser(argParser);
threadCount =
IntegerArgument.builder("threadCount")
.description(INFO_LDIFIMPORT_DESCRIPTION_THREAD_COUNT.get())
@@ -413,7 +407,6 @@
addAttribute2(attributes, ATTR_IMPORT_OVERWRITE, overwrite);
addAttribute2(attributes, ATTR_IMPORT_SKIP_SCHEMA_VALIDATION, skipSchemaValidation);
addAttribute2(attributes, ATTR_IMPORT_TMP_DIRECTORY, tmpDirectory);
- addAttribute2(attributes, ATTR_IMPORT_SKIP_DN_VALIDATION, skipDNValidation);
addAttribute2(attributes, ATTR_IMPORT_IS_COMPRESSED, isCompressed);
addAttribute2(attributes, ATTR_IMPORT_IS_ENCRYPTED, isEncrypted);
addAttribute2(attributes, ATTR_IMPORT_CLEAR_BACKEND, clearBackend);
@@ -771,7 +764,6 @@
importConfig.setIncludeBranches(includeBranches);
importConfig.setIncludeFilters(includeFilters);
importConfig.setValidateSchema(!skipSchemaValidation.isPresent());
- importConfig.setSkipDNValidation(skipDNValidation.isPresent());
importConfig.setTmpDirectory(tmpDirectory.getValue());
try
@@ -872,14 +864,7 @@
catch (DirectoryException de)
{
LocalizableMessage msg;
- if (de.getResultCode() == ResultCode.CONSTRAINT_VIOLATION)
- {
- msg = ERR_LDIFIMPORT_ERROR_CONSTRAINT_VIOLATION.get();
- }
- else
- {
- msg = de.getMessageObject();
- }
+ msg = de.getMessageObject();
logger.error(ERR_LDIFIMPORT_ERROR_DURING_IMPORT.get(msg));
retCode = 1;
}
--
Gitblit v1.10.0