You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by al...@apache.org on 2015/10/12 11:00:16 UTC
svn commit: r1708051 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/PersistedCompactionMap.java
Author: alexparvulescu
Date: Mon Oct 12 09:00:15 2015
New Revision: 1708051
URL: http://svn.apache.org/viewvc?rev=1708051&view=rev
Log:
OAK-3501 PersistedCompactionMap could release reference to records early
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/PersistedCompactionMap.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/PersistedCompactionMap.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/PersistedCompactionMap.java?rev=1708051&r1=1708050&r2=1708051&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/PersistedCompactionMap.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/PersistedCompactionMap.java Mon Oct 12 09:00:15 2015
@@ -178,7 +178,7 @@ public class PersistedCompactionMap impl
return;
}
- SegmentWriter writer = store.createSegmentWriter();
+ SegmentWriter writer = null;
Map<String, RecordId> segmentIdMap = newHashMap();
for (Entry<UUID, RecordIdMap> recentEntry : recent.entrySet()) {
UUID uuid = recentEntry.getKey();
@@ -192,6 +192,10 @@ public class PersistedCompactionMap impl
MapEntry baseEntry = entries == null ? null : entries.getEntry(uuid.toString());
base = baseEntry == null ? null : new MapRecord(baseEntry.getValue());
+ if (writer == null) {
+ writer = store.createSegmentWriter();
+ }
+
Map<String, RecordId> offsetMap = newHashMap();
for (int k = 0; k < newSegment.size(); k++) {
offsetMap.put(String.valueOf(newSegment.getKey(k)),
@@ -212,15 +216,25 @@ public class PersistedCompactionMap impl
}
}
- RecordId previousBaseId = entries == null ? null : entries.getRecordId();
- entries = writer.writeMap(entries, segmentIdMap);
- entries.getSegment().getSegmentId().pin();
- String mapInfo = PERSISTED_COMPACTION_MAP + '{' +
- "id=" + entries.getRecordId() +
- ", baseId=" + previousBaseId + '}';
- writer.writeString(mapInfo);
- writer.flush();
- recent.clear();
+ if (!segmentIdMap.isEmpty()) {
+ if (writer == null) {
+ writer = store.createSegmentWriter();
+ }
+
+ RecordId previousBaseId = entries == null ? null : entries.getRecordId();
+ entries = writer.writeMap(entries, segmentIdMap);
+ entries.getSegment().getSegmentId().pin();
+ String mapInfo = PERSISTED_COMPACTION_MAP + '{' +
+ "id=" + entries.getRecordId() +
+ ", baseId=" + previousBaseId + '}';
+ writer.writeString(mapInfo);
+ writer.flush();
+ recent.clear();
+ }
+
+ if (recordCount == 0) {
+ entries = null;
+ }
}
/**