From bafcb0a8cb31028290458ca6396badc78813274f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 17 Dec 2014 00:14:47 +0000
Subject: [PATCH] OPENDJ-1602 (CR-5566) New pluggable storage based backend
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java | 10 +++-------
opendj3-server-dev/build.xml | 6 ++++--
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/build.xml b/opendj3-server-dev/build.xml
index eccc6dc..f10960e 100644
--- a/opendj3-server-dev/build.xml
+++ b/opendj3-server-dev/build.xml
@@ -43,6 +43,7 @@
<!-- General server-wide properties -->
<property name="src.dir" location="src/server" />
<property name="pluggablebackend.pkg" value="org/opends/server/backends/pluggable" />
+ <property name="persistit.pkg" value="org/opends/server/backends/persistit" />
<property name="build.dir" location="build" />
<property name="classes.dir" location="${build.dir}/classes" />
<property name="build.lib.dir" location="${build.dir}/lib" />
@@ -680,6 +681,7 @@
<include name="**/*.java"/>
<exclude name="**/PublicAPI.java" />
<exclude name="${pluggablebackend.pkg}/*.java" />
+ <exclude name="${persistit.pkg}/*.java" />
</fileset>
<formatter type="plain" />
</checkstyle>
@@ -758,7 +760,7 @@
<mkdir dir="${build.lib.dir}" />
<javac srcdir="${src.dir}:${admin.src.dir}:${msg.src.dir}:${msg.javagen.dir}:${ads.src.dir}:${quicksetup.src.dir}:${guitools.src.dir}"
- excludes="${pluggablebackend.pkg}/**"
+ excludes="${pluggablebackend.pkg}/**,${persistit.pkg}/**"
destdir="${classes.dir}">
<classpath>
<fileset refid="opendj.runtime.jars"/>
@@ -1857,7 +1859,7 @@
<mkdir dir="${classes.dir}" />
<javac srcdir="${src.dir}:${admin.src.dir}:${msg.src.dir}:${msg.javagen.dir}:${ads.src.dir}:${quicksetup.src.dir}:${guitools.src.dir}"
- excludes="${pluggablebackend.pkg}/**"
+ excludes="${pluggablebackend.pkg}/**,${persistit.pkg}/**"
destdir="${classes.dir}">
<classpath>
<fileset refid="opendj.runtime.jars"/>
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
index a667fa4..908f0e2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -3182,15 +3182,13 @@
/**
* Clear the contents of this entry container.
*
- * @return The number of records deleted.
* @throws DatabaseException If an error occurs while removing the entry
* container.
*/
- public long clear() throws DatabaseException
+ public void clear() throws DatabaseException
{
List<DatabaseContainer> databases = new ArrayList<DatabaseContainer>();
listDatabases(databases);
- long count = 0;
for(DatabaseContainer db : databases)
{
@@ -3206,7 +3204,7 @@
{
for(DatabaseContainer db : databases)
{
- count += env.truncateDatabase(txn, db.getName(), true);
+ env.truncateDatabase(txn, db.getName(), false);
}
transactionCommit(txn);
@@ -3221,7 +3219,7 @@
{
for(DatabaseContainer db : databases)
{
- count += env.truncateDatabase(null, db.getName(), true);
+ env.truncateDatabase(null, db.getName(), false);
}
}
}
@@ -3268,8 +3266,6 @@
}
}
}
-
- return count;
}
/**
--
Gitblit v1.10.0