From 06a2720e00f89a73a5617aabc4ee91cbac62fbee Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 05 Jul 2010 12:08:04 +0000
Subject: [PATCH] Fix performance regression in Import, an issue with --append more and an issue with the way the DB config was used during import (Issue #4473). Memory allocation for import is now based on the usable memory for offline mode and configure DB cache size for online. Computation of usable JVM currently only works properly with Sun JVM for ParallelGC and CMSGC.
---
opends/src/server/org/opends/server/tools/ImportLDIF.java | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/ImportLDIF.java b/opends/src/server/org/opends/server/tools/ImportLDIF.java
index 4773555..2d18ed2 100644
--- a/opends/src/server/org/opends/server/tools/ImportLDIF.java
+++ b/opends/src/server/org/opends/server/tools/ImportLDIF.java
@@ -46,7 +46,6 @@
import org.opends.messages.Message;
import org.opends.server.admin.std.server.BackendCfg;
import org.opends.server.api.Backend;
-import org.opends.server.api.DebugLogPublisher;
import org.opends.server.api.ErrorLogPublisher;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
@@ -58,8 +57,6 @@
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.TextErrorLogPublisher;
import org.opends.server.loggers.TextWriter;
-import org.opends.server.loggers.debug.DebugLogger;
-import org.opends.server.loggers.debug.TextDebugLogPublisher;
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.tasks.ImportTask;
import org.opends.server.tools.makeldif.TemplateFile;
@@ -729,7 +726,7 @@
/**
* {@inheritDoc}
*/
- public Class getTaskClass() {
+ public Class<?> getTaskClass() {
return ImportTask.class;
}
@@ -866,14 +863,10 @@
{
try
{
- ErrorLogPublisher errorLogPublisher =
+ ErrorLogPublisher<?> errorLogPublisher =
TextErrorLogPublisher.getStartupTextErrorPublisher(
new TextWriter.STREAM(out));
- DebugLogPublisher debugLogPublisher =
- TextDebugLogPublisher.getStartupTextDebugPublisher(
- new TextWriter.STREAM(out));
ErrorLogger.addErrorLogPublisher(errorLogPublisher);
- DebugLogger.addDebugLogPublisher(debugLogPublisher);
}
catch(Exception e)
{
--
Gitblit v1.10.0