From 6efc31d8324c4c09d951e0fb4c90549ea6667ad1 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 20 May 2015 11:29:13 +0000
Subject: [PATCH] OnDiskMergeBufferImporter.java: Changed IndexManager constructor.
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeBufferImporter.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeBufferImporter.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeBufferImporter.java
index 0592108..96a0a74 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeBufferImporter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeBufferImporter.java
@@ -2389,8 +2389,7 @@
{
return;
}
- boolean isDN2ID = DN2ID_INDEX_NAME.equals(indexKey.getIndexID());
- IndexManager indexMgr = new IndexManager(indexKey.getName(), isDN2ID, indexKey.getEntryLimit());
+ IndexManager indexMgr = new IndexManager(indexKey);
indexMgrList.add(indexMgr);
BlockingQueue<IndexOutputBuffer> newQueue = new ArrayBlockingQueue<>(phaseOneBufferCount);
ScratchFileWriterTask indexWriter = new ScratchFileWriterTask(newQueue, indexMgr);
@@ -2421,13 +2420,16 @@
private long totalDNs;
private volatile IndexDBWriteTask writer;
- private IndexManager(String bufferFileName, boolean isDN2ID, int indexEntryLimit)
+ private IndexManager(IndexKey indexKey)
{
+ final String bufferFileName = indexKey.getName();
+ final int entryLimit = indexKey.getEntryLimit();
+
this.bufferFile = new File(tempDir, bufferFileName);
this.bufferIndexFile = new File(tempDir, bufferFileName + ".index");
- this.isDN2ID = isDN2ID;
- this.indexEntryLimit = indexEntryLimit > 0 ? indexEntryLimit : Integer.MAX_VALUE;
+ this.isDN2ID = DN2ID_INDEX_NAME.equals(indexKey.getIndexID());
+ this.indexEntryLimit = entryLimit > 0 ? entryLimit : Integer.MAX_VALUE;
}
private void setIndexDBWriteTask(IndexDBWriteTask writer)
--
Gitblit v1.10.0