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

Jean-Noel Rouvignac
12.32.2015 c2d4f936d6f9c002f0469fff48617532cf1966f5
refs
author Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Thursday, March 12, 2015 17:32 +0100
committer Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Thursday, March 12, 2015 17:32 +0100
commitc2d4f936d6f9c002f0469fff48617532cf1966f5
tree ef54e86a6ee3bb5631bcd9a77b28300be9c23f41 tree | zip | gz
parent 3287f303677c7ec28714ded704a12cd5375d4120 view | diff
Simplified loops in import/rebuild-index code.


Importer.java:
Set the indexKey on the IndexOutputBuffer inside indexBufferMap field + added an IndexKey parameter to getNewIndexBuffer() + simplified code in flushIndexBuffers() as a ceonsequence
In IndexBBWriteTask:
- In call() always create the key buffer, removed duplicated code in a loop.
- Moved call to keyCount.incrementAndGet() from call() to addToDB().
In ScratchFileWriterTask class:
- In call(), removed duplicated code in a loop
- Removed insertOrDeleteKey(), superseded by the more complete insertOrDeleteKeyCheckEntryLimit()
- Renamed insertOrDeleteKeyCheckEntryLimit() to appendNextEntryIDToStream()
- In writeIndexBuffer() and writeIndexBuffers(), simplified the code
In IndexManager class, renamed field limit to indexEntryLimit + changed getter.

IndexInputBuffer.java:
Changed compare(ByteStringBuilder, Integer) to isSameKeyAndIndexID(ByteStringBuilder, Integer) + made it null safe

IndexOutputBuffer.java:
Changed recordsEqual(byte[], int) to isSameKeyAndIndexID(byte[], int) + made it null safe
Renamed byteArraysEqual() to sameKeyAndIndexID().
3 files modified
165 ■■■■■ changed files
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/Importer.java 138 ●●●●● diff | view | raw | blame | history
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexInputBuffer.java 17 ●●●●● diff | view | raw | blame | history
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexOutputBuffer.java 10 ●●●● diff | view | raw | blame | history