From 5ceb2e9601d2501d021d0c61188ec913076555a0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.
---
opends/src/server/org/opends/server/backends/jeb/ImportJob.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/ImportJob.java b/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
index a159f47..9e7a270 100644
--- a/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
+++ b/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
@@ -57,7 +57,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.messages.JebMessages.*;
-import org.opends.server.admin.std.server.JEBackendCfg;
+import org.opends.server.admin.std.server.LocalDBBackendCfg;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.config.ConfigException;
@@ -74,7 +74,7 @@
/**
* The JE backend configuration.
*/
- private JEBackendCfg config;
+ private LocalDBBackendCfg config;
/**
* The root container used for this import job.
@@ -183,7 +183,7 @@
this.config = rootContainer.getConfiguration();
this.mergePassNumber = 1;
this.entriesProcessed = 0;
- this.importPassSize = config.getBackendImportPassSize();
+ this.importPassSize = config.getImportPassSize();
if (importPassSize <= 0)
{
importPassSize = Integer.MAX_VALUE;
@@ -196,8 +196,8 @@
{
// Divide the total buffer size by the number of threads
// and give that much to each thread.
- int importThreadCount = config.getBackendImportThreadCount();
- long bufferSize = config.getBackendImportBufferSize() /
+ int importThreadCount = config.getImportThreadCount();
+ long bufferSize = config.getImportBufferSize() /
(importThreadCount*rootContainer.getBaseDNs().size());
message = INFO_JEB_IMPORT_THREAD_COUNT.get(importThreadCount);
@@ -228,7 +228,7 @@
startTime = System.currentTimeMillis();
// Create a temporary work directory.
- File tempDir = getFileForPath(config.getBackendImportTempDirectory());
+ File tempDir = getFileForPath(config.getImportTempDirectory());
if(!tempDir.exists() && !tempDir.mkdir())
{
Message msg = ERR_JEB_IMPORT_CREATE_TMPDIR_ERROR.get(
@@ -367,7 +367,7 @@
// For each configured attribute index.
for (AttributeIndex attrIndex : entryContainer.getAttributeIndexes())
{
- int indexEntryLimit = config.getBackendIndexEntryLimit();
+ int indexEntryLimit = config.getIndexEntryLimit();
if(attrIndex.getConfiguration().getIndexEntryLimit() != null)
{
indexEntryLimit = attrIndex.getConfiguration().getIndexEntryLimit();
@@ -434,7 +434,7 @@
new IndexMergeThread(config,
ldifImportConfig,
id2Children,
- config.getBackendIndexEntryLimit());
+ config.getIndexEntryLimit());
mergers.add(indexMergeThread);
// Id2Subtree index.
@@ -443,7 +443,7 @@
new IndexMergeThread(config,
ldifImportConfig,
id2Subtree,
- config.getBackendIndexEntryLimit());
+ config.getIndexEntryLimit());
mergers.add(indexMergeThread);
}
@@ -515,7 +515,7 @@
private void startWorkerThreads() throws DatabaseException
{
// Create one set of worker threads for each base DN.
- int importThreadCount = config.getBackendImportThreadCount();
+ int importThreadCount = config.getImportThreadCount();
for (ImportContext ic : importMap.values())
{
for (int i = 0; i < importThreadCount; i++)
@@ -1188,7 +1188,7 @@
// Create an entry queue.
LinkedBlockingQueue<Entry> queue =
- new LinkedBlockingQueue<Entry>(config.getBackendImportQueueSize());
+ new LinkedBlockingQueue<Entry>(config.getImportQueueSize());
importContext.setQueue(queue);
// Set the include and exclude branches
--
Gitblit v1.10.0