Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,11 @@ public class DynamicOffHeapSizingMemoryTarget implements MemoryTarget, KnownName
private final String name = MemoryTargetUtil.toUniqueName("DynamicOffHeapSizing");
private final SimpleMemoryUsageRecorder recorder = new SimpleMemoryUsageRecorder();

public DynamicOffHeapSizingMemoryTarget() {}
private final MemoryTarget target;

public DynamicOffHeapSizingMemoryTarget(MemoryTarget target) {
this.target = target;
}

@Override
public long borrow(long size) {
Expand Down Expand Up @@ -197,13 +201,15 @@ public void run() {

USED_OFF_HEAP_BYTES.addAndGet(size);
recorder.inc(size);
target.borrow(size);
return size;
}

@Override
public long repay(long size) {
USED_OFF_HEAP_BYTES.addAndGet(-size);
recorder.inc(-size);
target.repay(size);
return size;
}

Expand All @@ -227,6 +233,10 @@ public MemoryUsageStats stats() {
return recorder.toStats();
}

public MemoryTarget target() {
return target;
}

public static boolean isJava9OrLater() {
String spec = System.getProperty("java.specification.version", "1.8");
// "1.8" → 8, "9" → 9, "11" → 11, etc.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static MemoryTarget overAcquire(
@Experimental
public static MemoryTarget dynamicOffHeapSizingIfEnabled(MemoryTarget memoryTarget) {
if (GlutenCoreConfig.get().dynamicOffHeapSizingEnabled()) {
return new DynamicOffHeapSizingMemoryTarget();
return new DynamicOffHeapSizingMemoryTarget(memoryTarget);
}

return memoryTarget;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ object SparkMemoryUtil {
prettyPrintStats(
"Dynamic off-heap sizing memory target stats: ",
dynamicOffHeapSizingMemoryTarget)
dynamicOffHeapSizingMemoryTarget.target().accept(this)
}

override def visit(retryOnOomMemoryTarget: RetryOnOomMemoryTarget): String = {
Expand Down