Skip to content

Commit

Permalink
Diagnostic Patch apache#1
Browse files Browse the repository at this point in the history
  • Loading branch information
@jgrassel
jgrassel committed Nov 7, 2018
1 parent b47b9e4 commit 0f5c334
Show file tree
Hide file tree
Showing 5 changed files with 563 additions and 144 deletions.
174 changes: 160 additions & 14 deletions openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@

import java.io.Serializable;
import java.security.AccessController;
import java.security.CodeSource;
import java.security.PrivilegedActionException;
import java.security.ProtectionDomain;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand Down Expand Up @@ -57,6 +59,7 @@
import org.apache.openjpa.util.MetaDataException;
import org.apache.openjpa.util.OpenJPAId;

import jag.JAGDebug;
import serp.util.Strings;

/**
Expand Down Expand Up @@ -1865,9 +1868,77 @@ private void addToCollectionInternal(Map map, Class<?> key, Class<?> value, bool
* Puts the meta class corresponding to the given entity class.
*/
public void setMetaModel(Class<?> m2) {
Class<?> cls = _factory.getManagedClass(m2);
if (cls != null)
_metamodel.put(cls, m2);
JAGDebug.beginReportTracking(true);
try {
JAGDebug.ReportChain rc = JAGDebug.startReportChain();
try {
rc.append("MetaDataRepository.setMetaModel() entry:");
rc.logVariable(" this", this).append(" ").logObjectAddress(this).nl();
rc.logVariable(" m2", m2).append(" ").logObjectAddress(m2).nl();

try {
if (m2 != null) {
final ProtectionDomain pd = AccessController
.doPrivileged(J2DoPrivHelper.getProtectionDomainAction(m2));
// rc.logVariable(" m2 protection domain", pd).nl();
final CodeSource cs = pd.getCodeSource();
rc.logVariable(" m2 CodeSource", cs).nl();

}
} catch (Throwable t) {
t.printStackTrace();
}
} finally {
rc.done();
}

if (_metamodel != null && !_metamodel.isEmpty()) {
rc = JAGDebug.startReportChain();
try {
rc.append("_metamodel (").append(_metamodel.size()).append(")").nl();
for (Map.Entry<Class<?>, Class<?>> entry : _metamodel.entrySet()) {
rc.append(" ").append(entry.getKey()).append(" ").logObjectAddress(entry.getKey())
.append(" |---> ").append(entry.getValue()).append(" ").logObjectAddress(entry.getValue())
.nl();
final ProtectionDomain pd_key = AccessController
.doPrivileged(J2DoPrivHelper.getProtectionDomainAction(entry.getKey()));
final ProtectionDomain pd_val = AccessController
.doPrivileged(J2DoPrivHelper.getProtectionDomainAction(entry.getValue()));
rc.append(" key cs = ").append(pd_key.getCodeSource()).nl();
rc.append(" val cs = ").append(pd_val.getCodeSource()).nl();
}
} catch (Throwable t) {
t.printStackTrace();
} finally {
rc.done();
}
} else {
JAGDebug.report("_metamodel is empty.");
}

Class<?> cls = _factory.getManagedClass(m2);

if (cls != null) {
try {
rc.append("Inserting into _metamodel: ").nl();
rc.append(" cls (key) = ").append(cls).append(" ").logObjectAddress(cls).nl();
rc.append(" m2 (val) = ").append(m2).append(" ").logObjectAddress(m2).nl();
final ProtectionDomain pd_cls = AccessController
.doPrivileged(J2DoPrivHelper.getProtectionDomainAction(cls));
rc.append(" (cls CodeSource) = ").append(pd_cls.getCodeSource()).nl();
} catch (Throwable t) {
t.printStackTrace();
} finally {
rc.done();
}
_metamodel.put(cls, m2);
}
} finally {
JAGDebug.ReportChain rc = JAGDebug.startReportChain();
rc.append("MetaDataRepository.setMetaModel() exit: ");
rc.done();
JAGDebug.endReportTracking();
}
}

/**
Expand All @@ -1891,19 +1962,94 @@ public Class<?> getMetaModel(ClassMetaData meta, boolean load) {
* the meta class.
*/
public Class<?> getMetaModel(Class<?> entity, boolean load) {
if (_metamodel.containsKey(entity))
return _metamodel.get(entity);
String m2 = _factory.getMetaModelClassName(entity.getName());
JAGDebug.beginReportTracking(true);
Class<?> retVal = null;
try {
ClassLoader loader = AccessController.doPrivileged(J2DoPrivHelper.getClassLoaderAction(entity));
Class<?> m2cls = AccessController.doPrivileged(J2DoPrivHelper.getForNameAction(m2, true, loader));
_metamodel.put(entity, m2cls);
return m2cls;
} catch (Throwable t) {
if (_log.isInfoEnabled())
_log.warn(_loc.get("meta-no-model", m2, entity, t));
JAGDebug.ReportChain rc = JAGDebug.startReportChain();
try {
rc.append("MetaDataRepository.getMetaModel() entry:").nl();
rc.logVariable(" this", this).append(" ").logObjectAddress(this).nl();
rc.logVariable(" entity", entity).append(" ").logObjectAddress(entity).nl();
rc.logVariable(" load", load).append(" ").logObjectAddress(load).nl();

try {
if (entity != null) {
final ProtectionDomain pd = AccessController
.doPrivileged(J2DoPrivHelper.getProtectionDomainAction(entity));
// rc.logVariable("entity protection domain", pd).nl();
final CodeSource cs = pd.getCodeSource();
rc.logVariable(" entity CodeSource", cs).nl();

}
} catch (Throwable t) {
t.printStackTrace();
}
} finally {
rc.done();
}

if (_metamodel != null && !_metamodel.isEmpty()) {
rc = JAGDebug.startReportChain();
try {
rc.append("_metamodel (").append(_metamodel.size()).append(")").nl();
for (Map.Entry<Class<?>, Class<?>> entry : _metamodel.entrySet()) {
rc.append(" ").append(entry.getKey()).append(" ").logObjectAddress(entry.getKey())
.append(" |---> ").append(entry.getValue()).append(" ").logObjectAddress(entry.getValue())
.nl();
final ProtectionDomain pd_key = AccessController
.doPrivileged(J2DoPrivHelper.getProtectionDomainAction(entry.getKey()));
final ProtectionDomain pd_val = AccessController
.doPrivileged(J2DoPrivHelper.getProtectionDomainAction(entry.getValue()));
rc.append(" key cs = ").append(pd_key.getCodeSource()).nl();
rc.append(" val cs = ").append(pd_val.getCodeSource()).nl();
}
} catch (Throwable t) {
t.printStackTrace();
} finally {
rc.done();
}
} else {
JAGDebug.report("_metamodel is empty.");
}

if (_metamodel.containsKey(entity)) {
retVal = _metamodel.get(entity);
return retVal;
// return _metamodel.get(entity);
}

String m2 = _factory.getMetaModelClassName(entity.getName());
try {
ClassLoader loader = AccessController.doPrivileged(J2DoPrivHelper.getClassLoaderAction(entity));
Class<?> m2cls = AccessController.doPrivileged(J2DoPrivHelper.getForNameAction(m2, true, loader));
_metamodel.put(entity, m2cls);
rc = JAGDebug.startReportChain();
try {
rc.append("Inserting into _metamodel: ").nl();
rc.append(" entity (key) = ").append(entity).append(" ").logObjectAddress(entity).nl();
rc.append(" m2cls (val) = ").append(m2cls).append(" ").logObjectAddress(m2cls).nl();
final ProtectionDomain pd_m2cls = AccessController
.doPrivileged(J2DoPrivHelper.getProtectionDomainAction(m2cls));
rc.append(" (CodeSource) = ").append(pd_m2cls.getCodeSource()).nl();
} catch (Throwable t) {
t.printStackTrace();
} finally {
rc.done();
}
retVal = m2cls;
return m2cls;
} catch (Throwable t) {
if (_log.isInfoEnabled())
_log.warn(_loc.get("meta-no-model", m2, entity, t));
}
return null;
} finally {
JAGDebug.ReportChain rc = JAGDebug.startReportChain();
rc.append("MetaDataRepository.getMetaModel() exit: ");
rc.append(retVal).append(" ").logObjectAddress(retVal);
rc.done();
JAGDebug.endReportTracking();
}
return null;
}

// /////////////////////////////
Expand Down
17 changes: 17 additions & 0 deletions openjpa-lib/src/main/java/jag/JAGDebug.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,23 @@ public ReportChain logVariableAddress(String varName, Object o) {
return this;
}

public ReportChain logObjectAddress(Object o) {
if (!isDone) {
append(" ");
try {
if (o != null) {
append("(").append("@");
append(Integer.toHexString(System.identityHashCode(o)));
append(")");
} else {
append("null");
}
} catch (Throwable t) {}
}

return this;
}

private void logObjectInternal(Object o, boolean runToStringOnPCClass) {
if (o == null) {
append(o);
Expand Down
44 changes: 38 additions & 6 deletions ...pa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerFactoryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@

import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.security.AccessController;
import java.security.CodeSource;
import java.security.ProtectionDomain;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
Expand All @@ -28,6 +31,10 @@
import javax.persistence.Cache;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceUnitUtil;
import javax.persistence.metamodel.EmbeddableType;
import javax.persistence.metamodel.EntityType;
import javax.persistence.metamodel.MappedSuperclassType;
import javax.persistence.metamodel.Type;
import javax.persistence.spi.LoadState;

import org.apache.commons.lang.StringUtils;
Expand All @@ -42,15 +49,19 @@
import org.apache.openjpa.lib.conf.Value;
import org.apache.openjpa.lib.log.Log;
import org.apache.openjpa.lib.util.Closeable;
import org.apache.openjpa.lib.util.J2DoPrivHelper;
import org.apache.openjpa.lib.util.Localizer;
import org.apache.openjpa.meta.MetaDataRepository;
import org.apache.openjpa.persistence.criteria.CriteriaBuilderImpl;
import org.apache.openjpa.persistence.criteria.OpenJPACriteriaBuilder;
import org.apache.openjpa.persistence.meta.MetamodelImpl;
import org.apache.openjpa.persistence.meta.Types;
import org.apache.openjpa.persistence.query.OpenJPAQueryBuilder;
import org.apache.openjpa.persistence.query.QueryBuilderImpl;
import org.apache.openjpa.util.UserException;

import jag.JAGDebug;

/**
* Implementation of {@link EntityManagerFactory} that acts as a
* facade to a {@link BrokerFactory}.
Expand Down Expand Up @@ -343,13 +354,34 @@ public Set<String> getSupportedProperties() {
}

public MetamodelImpl getMetamodel() {
if (_metaModel == null) {
MetaDataRepository mdr = getConfiguration().getMetaDataRepositoryInstance();
mdr.setValidate(MetaDataRepository.VALIDATE_RUNTIME, true);
mdr.setResolve(MetaDataRepository.MODE_MAPPING_INIT, true);
_metaModel = new MetamodelImpl(mdr);
JAGDebug.beginReportTracking(true);
MetamodelImpl retVal = null;
try {
JAGDebug.ReportChain rc = JAGDebug.startReportChain();
try {
rc.append("EntityManagerFactoryImpl.getMetamodel() entry:").nl();
rc.logVariable(" this", this).append(" ").logObjectAddress(this).nl();

} finally {
rc.done();
}

if (_metaModel == null) {
MetaDataRepository mdr = getConfiguration().getMetaDataRepositoryInstance();
mdr.setValidate(MetaDataRepository.VALIDATE_RUNTIME, true);
mdr.setResolve(MetaDataRepository.MODE_MAPPING_INIT, true);
_metaModel = new MetamodelImpl(mdr);
}

retVal = _metaModel;
return _metaModel;
} finally {
JAGDebug.ReportChain rc = JAGDebug.startReportChain();
rc.append("EntityManagerFactoryImpl.getMetamodel() exit: ").nl();
rc.logVariable("retVal", retVal);
rc.done();
JAGDebug.endReportTracking();
}
return _metaModel;
}

public PersistenceUnitUtil getPersistenceUnitUtil() {
Expand Down
Loading

0 comments on commit 0f5c334

Please sign in to comment.