Refactor tidy NodeUsageCollector, remove unused loadProperty and unnecessary WeakReference for State.listener

This commit is contained in:
Rob Bygrave committed 2022-04-21 08:59:53 +12:00
1 parent e1b9bf62a3
commit cacbee5fd5
5 files changed
+24 -38

No files matched your search

@@ -874,9 +874,6 @@ public final class EntityBeanIntercept implements Serializable {
} }
if (lazyLoadProperty == -1) { if (lazyLoadProperty == -1) {
lazyLoadProperty = loadProperty; lazyLoadProperty = loadProperty;
if (nodeUsageCollector != null) {
nodeUsageCollector.setLoadProperty(getProperty(lazyLoadProperty));
}
loader.loadBean(this); loader.loadBean(this);
if (lazyLoadFailure) { if (lazyLoadFailure) {
// failed when lazy loading this bean // failed when lazy loading this bean
@@ -1,7 +1,6 @@
package io.ebean.bean; package io.ebean.bean;
import java.lang.ref.Cleaner; import java.lang.ref.Cleaner;
import java.lang.ref.WeakReference;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
@@ -15,7 +14,8 @@ public final class NodeUsageCollector {
private final static Cleaner cleaner = Cleaner.create(); private final static Cleaner cleaner = Cleaner.create();
public static final class State implements Runnable { public static final class State implements Runnable {
private final WeakReference<NodeUsageListener> managerRef;
private final NodeUsageListener listener;
/** /**
* The properties used at this profile point. * The properties used at this profile point.
*/ */
@@ -29,14 +29,9 @@ public final class NodeUsageCollector {
*/ */
private boolean modified; private boolean modified;
/** private State(ObjectGraphNode node, NodeUsageListener listener) {
* The property that cause a reference to lazy load.
*/
private String loadProperty;
private State(ObjectGraphNode node, WeakReference<NodeUsageListener> managerRef) {
this.node = node; this.node = node;
this.managerRef = managerRef; this.listener = listener;
} }
@Override @Override
@@ -46,10 +41,7 @@ public final class NodeUsageCollector {
@Override @Override
public void run() { public void run() {
NodeUsageListener manager = managerRef.get(); listener.collectNodeUsage(this);
if (manager != null) {
manager.collectNodeUsage(this);
}
} }
/** /**
@@ -84,8 +76,8 @@ public final class NodeUsageCollector {
private final State state; private final State state;
public NodeUsageCollector(ObjectGraphNode node, WeakReference<NodeUsageListener> managerRef) { public NodeUsageCollector(ObjectGraphNode node, NodeUsageListener listener) {
this.state = new State(node, managerRef); this.state = new State(node, listener);
cleaner.register(this, state); cleaner.register(this, state);
} }
@@ -110,13 +102,6 @@ public final class NodeUsageCollector {
state.used.add(property); state.used.add(property);
} }
/**
* The property that invoked a lazy load.
*/
public void setLoadProperty(String loadProperty) {
state.loadProperty = loadProperty;
}
@Override @Override
public String toString() { public String toString() {
return state.toString(); return state.toString();
@@ -3,24 +3,21 @@ package io.ebean.bean;
import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.lang.ref.WeakReference;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
class NodeUsageCollectorTest { class NodeUsageCollectorTest {
private final Listener listener = new Listener(); private final Listener listener = new Listener();
private final ObjectGraphNode node = new ObjectGraphNode((ObjectGraphOrigin) null, "foo");
/** /**
* Run this manually as we make explicit GC call here. * Run this manually as we make use of explicit GC call here which is dubious.
*/ */
@Disabled @Disabled
@Test @Test
void test() throws InterruptedException { void test() throws InterruptedException {
WeakReference<NodeUsageListener> profilingListenerRef = new WeakReference<>(listener); NodeUsageCollector c = new NodeUsageCollector(node, listener);
ObjectGraphNode node = new ObjectGraphNode((ObjectGraphOrigin)null, "foo");
NodeUsageCollector c = new NodeUsageCollector(node, profilingListenerRef);
c.addUsed("a"); c.addUsed("a");
c.addUsed("b"); c.addUsed("b");
c = null; c = null;
@@ -29,6 +26,7 @@ class NodeUsageCollectorTest {
Thread.sleep(100); Thread.sleep(100);
assertThat(listener.collectCount).isEqualTo(1); assertThat(listener.collectCount).isEqualTo(1);
assertThat(node).isNotNull();
} }
static class Listener implements NodeUsageListener { static class Listener implements NodeUsageListener {
@@ -1,6 +1,7 @@
package io.ebeaninternal.server.autotune.service; package io.ebeaninternal.server.autotune.service;
import io.ebean.bean.NodeUsageCollector; import io.ebean.bean.NodeUsageCollector;
import io.ebean.bean.NodeUsageListener;
import io.ebean.bean.ObjectGraphNode; import io.ebean.bean.ObjectGraphNode;
import io.ebean.bean.ObjectGraphOrigin; import io.ebean.bean.ObjectGraphOrigin;
import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanDescriptor;
@@ -13,6 +14,15 @@ import static org.assertj.core.api.Assertions.assertThat;
public class ProfileOriginTest extends BaseTestCase { public class ProfileOriginTest extends BaseTestCase {
static class Noop implements NodeUsageListener {
@Override
public void collectNodeUsage(NodeUsageCollector.State state) {
// do nothing
}
}
private final NodeUsageListener listener = new Noop();
private final BeanDescriptor<Order> desc = getBeanDescriptor(Order.class); private final BeanDescriptor<Order> desc = getBeanDescriptor(Order.class);
@Test @Test
@@ -121,7 +131,7 @@ public class ProfileOriginTest extends BaseTestCase {
private NodeUsageCollector node(String path) { private NodeUsageCollector node(String path) {
ObjectGraphNode node = new ObjectGraphNode((ObjectGraphOrigin)null, path); ObjectGraphNode node = new ObjectGraphNode((ObjectGraphOrigin)null, path);
return new NodeUsageCollector(node, null); return new NodeUsageCollector(node, listener);
} }
// @Test // @Test
@@ -18,7 +18,6 @@ import io.ebeaninternal.server.core.SpiOrmQueryRequest;
import io.ebeaninternal.server.deploy.*; import io.ebeaninternal.server.deploy.*;
import javax.persistence.PersistenceException; import javax.persistence.PersistenceException;
import java.lang.ref.WeakReference;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
@@ -149,8 +148,6 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
private final ProfilingListener profilingListener; private final ProfilingListener profilingListener;
private final WeakReference<NodeUsageListener> profilingListenerRef;
private final Boolean readOnly; private final Boolean readOnly;
private long profileOffset; private long profileOffset;
@@ -189,7 +186,6 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
this.objectGraphNode = query.getParentNode(); this.objectGraphNode = query.getParentNode();
this.profilingListener = query.getProfilingListener(); this.profilingListener = query.getProfilingListener();
this.autoTuneProfiling = profilingListener != null; this.autoTuneProfiling = profilingListener != null;
this.profilingListenerRef = autoTuneProfiling ? new WeakReference<>(profilingListener) : null;
// set the generated sql back to the query // set the generated sql back to the query
// so its available to the user... // so its available to the user...
query.setGeneratedSql(queryPlan.getSql()); query.setGeneratedSql(queryPlan.getSql());
@@ -673,7 +669,7 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
@Override @Override
public void profileBean(EntityBeanIntercept ebi, String prefix) { public void profileBean(EntityBeanIntercept ebi, String prefix) {
ObjectGraphNode node = request.loadContext().getObjectGraphNode(prefix); ObjectGraphNode node = request.loadContext().getObjectGraphNode(prefix);
ebi.setNodeUsageCollector(new NodeUsageCollector(node, profilingListenerRef)); ebi.setNodeUsageCollector(new NodeUsageCollector(node, profilingListener));
} }
@Override @Override