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

Jean-Noel Rouvignac
26.14.2015 06e460f4e1b092e615753982b4080f1deaeeec4c
refs
author Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Thursday, March 26, 2015 14:14 +0100
committer Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Thursday, March 26, 2015 14:14 +0100
commit06e460f4e1b092e615753982b4080f1deaeeec4c
tree c1a7607dba09555ea6d357be37f952ef5ab72cc5 tree | zip | gz
parent 8e0d5f3a797086debc032940660eac14e42e2c6f view | diff
OPENDJ-1707 Persistit: various import problems

Switched the import to use on-disk merge.
Remains to fix the multithreading issue (threadCount is currently hardcoded to 1).


BackendImpl.java:
In importLDIF(), do not forget to close the RootContainer.
Moved import preliminary code here from RootContainer.

Importer.java:
In processImport(), did the same fix as in r11932: split processImport() into several transactions to do commits after each step and expose data to all threads for the final on-disk merge.
In TmpEnv constructor expanded the scope of the proxy.

RootContainer.java:
In importLDIF(), extracted method importLDIFWithSuccessiveAdds() + added importLDIFWithOnDiskMerge() to offer several import strategies.
Import initialization code has been moved to BackendImpl.importLDIF().
3 files modified
237 ■■■■ changed files
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java 64 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java 108 ●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java 65 ●●●●● diff | view | raw | blame | history