From 8f4a04835eaa5c44c22116f8f5fde5ad75fa8142 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 19 Dec 2014 09:34:26 +0000
Subject: [PATCH] OPENDJ-1602 New pluggable storage based backend
---
opendj3-server-dev/src/server/org/opends/server/backends/pluggable/RootContainer.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/RootContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/RootContainer.java
index 9770a7d..6e4286f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/RootContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/RootContainer.java
@@ -44,7 +44,6 @@
import org.opends.server.backends.pluggable.spi.StorageRuntimeException;
import org.opends.server.backends.pluggable.spi.WriteOperation;
import org.opends.server.backends.pluggable.spi.WriteableStorage;
-import org.opends.server.core.DefaultCompressedSchema;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
@@ -94,9 +93,8 @@
/** The cached value of the next entry identifier to be assigned. */
private AtomicLong nextid = new AtomicLong(1);
- // FIXME JNR Switch back to a database persisted implementation of CompressedSchema
/** The compressed schema manager for this backend. */
- private CompressedSchema compressedSchema;
+ private JECompressedSchema compressedSchema;
private File backendDirectory;
@@ -320,7 +318,6 @@
}
}
- compressedSchema = new DefaultCompressedSchema();
try
{
storage = new PersistItStorage();
@@ -331,6 +328,7 @@
@Override
public void run(WriteableStorage txn) throws Exception
{
+ compressedSchema = new JECompressedSchema(storage, txn);
openAndRegisterEntryContainers(txn, config.getBaseDN());
}
});
@@ -535,8 +533,7 @@
}
}
- // FIXME JNR call close() for a DB stored compressed schema
- // compressedSchema.close();
+ compressedSchema.close();
config.removePersistitChangeListener(this);
if (storage != null)
--
Gitblit v1.10.0