From 8466db8c12700bbab0835f5f1bfa71762e34ba4d Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 31 Aug 2007 17:55:26 +0000
Subject: [PATCH] Add support into the JE backend that can be used to store its compact schema encoding data in the database itself, and re-enable compact encoding by default in the configuration.  By storing the compact schema encoding data in the database (a separate copy for each backend), we have eliminated the potential problems in backup/restore and binary copy initialization if there are dependencies on an external schematokens.dat file.

---
 opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java
index b905de5..6b76bed 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java
@@ -207,7 +207,8 @@
     while ((entryBefore = reader.readEntry(false)) != null) {
       byte[] bytes = JebFormat.entryToDatabase(entryBefore);
 
-      entryAfter = JebFormat.entryFromDatabase(bytes);
+      entryAfter = JebFormat.entryFromDatabase(bytes,
+                        DirectoryServer.getDefaultCompressedSchema());
 
       // check DN and number of attributes
       assertEquals(entryBefore.getAttributes().size(), entryAfter
@@ -329,14 +330,15 @@
     Entry entryBefore, entryAfterGeneric, entryAfterV2;
     while ((entryBefore = reader.readEntry(false)) != null) {
       byte[] entryBytes = entryBefore.encodeV2(config);
-      entryAfterGeneric = Entry.decode(entryBytes);
+      entryAfterGeneric = Entry.decode(entryBytes,
+                                       config.getCompressedSchema());
       if (config.excludeDN())
       {
         entryAfterGeneric.setDN(entryBefore.getDN());
       }
       assertEquals(entryBefore, entryAfterGeneric);
 
-      entryAfterV2 = Entry.decodeV2(entryBytes);
+      entryAfterV2 = Entry.decodeV2(entryBytes, config.getCompressedSchema());
       if (config.excludeDN())
       {
         entryAfterV2.setDN(entryBefore.getDN());

--
Gitblit v1.10.0