mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Jean-Noel Rouvignac
30.20.2015 5d07ec161328a94de355aa4bf93918a2da5a8602
refs
author Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Thursday, April 30, 2015 16:20 +0200
committer Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Thursday, April 30, 2015 16:20 +0200
commit5d07ec161328a94de355aa4bf93918a2da5a8602
tree 6da3276265f088f269498f3a52b2fa2ba4939f21 tree | zip | gz
parent f70b1ff6c0970f3e6a80856b4e69fa053db47438 view | diff
OPENDJ-1801 (CR-6815) Revise usage of storage.open() and startImport()

This change brings back to life the usage of Storage.startImport() for the import.


pluggable/spi/Importer.java:
Added read() and delete().

Storage.java:
Changed exception thrown from startImport().

PersistItStorage.java, TracedStorage.java:
Implemented the changes in Storage and Importer.


Index.java, DefaultIndex.java, Importer.java:
Used Importer instead of WriteableTransaction.

Importer.java:
For import, used Importer instead of WriteableTransaction.
In processIndexFiles(), closed the storage before starting the import.
In IndexDBWriteTask.endWriteTask(), called DNState.finalFlush() instead of DNState.flush().
In DNState, added finalFlush().

ID2Count.java:
Added importPut(), importPutTotalCount() and importPut0() methods for import. It is sad but they duplicate a bit the WriteableTransaction ones.
8 files modified
418 ■■■■■ changed files
opendj-server-legacy/src/main/java/org/opends/server/backends/persistit/PersistItStorage.java 166 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DefaultIndex.java 21 ●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ID2Count.java 29 ●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java 122 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Index.java 5 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/TracedStorage.java 45 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/Importer.java 23 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/Storage.java 7 ●●●● diff | view | raw | blame | history