antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Merged all changes and fixes in src/helma/objectmodel/*

Browse source 
made between helma_1_3_0 and helma_1_3_0_M1
to the helma_1_2 branch.
This commit is contained in:
hns 2003-07-04 12:40:57 +00:00
parent 69428676e5
commit 44e24b29d7
10 changed files with 131 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/helma/objectmodel/db/DbKey.java
View file

@ -17,6 +17,10 @@
package helma.objectmodel.db;
import java.io.Serializable;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.IOException;
/**
* This is the internal representation of a database key. It is constructed
@ -27,14 +31,16 @@ public final class DbKey implements Key, Serializable {
// the name of the prototype which defines the storage of this object.
// this is the name of the object's prototype, or one of its ancestors.
// If null, the object is stored in the embedded db.
private final String storageName;
private String storageName;
// the id that defines this key's object within the above storage space
private final String id;
private String id;
// lazily initialized hashcode
private transient int hashcode = 0;
static final long serialVersionUID = 1618863960930966588L;
/**
* make a key for a persistent Object, describing its datasource and id.
*/
@ -116,4 +122,23 @@ public final class DbKey implements Key, Serializable {
public String toString() {
return (storageName == null) ? ("[" + id + "]") : (storageName + "[" + id + "]");
}
// We implement write/readObject to set storageName
// to the interned version of the string.
private void writeObject(ObjectOutputStream stream) throws IOException {
stream.writeObject(storageName);
stream.writeObject(id);
}
private void readObject(ObjectInputStream stream)
throws IOException, ClassNotFoundException {
storageName = (String) stream.readObject();
id = (String) stream.readObject();
// if storageName is not null, set it to the interned version
if (storageName != null) {
storageName = storageName.intern();
}
}
}

8
src/helma/objectmodel/db/DbMapping.java
View file

@ -38,7 +38,7 @@ public final class DbMapping implements Updatable {
Application app;
// prototype name of this mapping
String typename;
private String typename;
// properties from where the mapping is read
SystemProperties props;
@ -137,13 +137,9 @@ public final class DbMapping implements Updatable {
*/
public DbMapping(Application app, String typename, SystemProperties props) {
this.app = app;
this.typename = typename;
// create a unique instance of the string. This is useful so
// we can compare types just by using == instead of equals.
if (typename != null) {
typename = typename.intern();
}
this.typename = typename == null ? null : typename.intern();
prop2db = new HashMap();
db2prop = new HashMap();

8
src/helma/objectmodel/db/Key.java
View file

@ -22,24 +22,26 @@ package helma.objectmodel.db;
*
*/
public interface Key {
/**
*
* Get the key's parent key
*
* @return ...
*/
public Key getParentKey();
/**
*
* Get the key's ID part
*
* @return ...
*/
public String getID();
/**
*
* Get the key's storage id
*
* @return ...
*/
public String getStorageName();
}

29
src/helma/objectmodel/db/MultiKey.java
View file

@ -17,6 +17,9 @@
package helma.objectmodel.db;
import java.io.Serializable;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.IOException;
import java.util.Map;
/**
@ -31,14 +34,17 @@ public final class MultiKey implements Key, Serializable {
// the name of the prototype which defines the storage of this object.
// this is the name of the object's prototype, or one of its ancestors.
// If null, the object is stored in the embedded db.
private final String storageName;
private String storageName;
// the id that defines this key's object within the above storage space
private final Map parts;
private Map parts;
// lazily initialized hashcode
private transient int hashcode = 0;
static final long serialVersionUID = -9173409137561990089L;
/**
* make a key for a persistent Object, describing its datasource and key parts.
*/
@ -121,4 +127,23 @@ public final class MultiKey implements Key, Serializable {
public String toString() {
return (storageName == null) ? ("[" + parts + "]") : (storageName + "[" + parts + "]");
}
// We implement write/readObject to set storageName
// to the interned version of the string.
private void writeObject(ObjectOutputStream stream) throws IOException {
stream.writeObject(storageName);
stream.writeObject(parts);
}
private void readObject(ObjectInputStream stream)
throws IOException, ClassNotFoundException {
storageName = (String) stream.readObject();
parts = (Map) stream.readObject();
// if storageName is not null, set it to the interned version
if (storageName != null) {
storageName = storageName.intern();
}
}
}

22
src/helma/objectmodel/db/Node.java
View file

@ -429,8 +429,9 @@ public final class Node implements INode, Serializable {
public String getElementName() {
// if subnodes are also mounted as properties, try to get the "nice" prop value
// instead of the id by turning the anonymous flag off.
if ((parentHandle != null) &&
(lastNameCheck < Math.max(dbmap.getLastTypeChange(), lastmodified))) {
long lastmod = Math.max(dbmap.getLastTypeChange(), lastmodified);
if ((parentHandle != null) && (lastNameCheck < lastmod) &&
(dbmap != null) && (dbmap.isRelational())) {
try {
Node p = parentHandle.getNode(nmgr);
DbMapping parentmap = p.getDbMapping();
@ -1648,9 +1649,12 @@ public final class Node implements INode, Serializable {
// the property does not exist in our propmap - see if we should create it on the fly,
// either because it is mapped to an object from relational database or defined as
// collection aka virtual node
if ((prop == null) && (dbmap != null)) {
if (dbmap != null) {
// the explicitly defined property mapping
Relation propRel = dbmap.getPropertyRelation(propname);
// property was not found in propmap
if (prop == null) {
// if no property relation is defined for this specific property name,
// use the generic property relation, if one is defined.
if (propRel == null) {
@ -1675,7 +1679,6 @@ public final class Node implements INode, Serializable {
// is itself persistent.
else if ((state != TRANSIENT) && propRel.createOnDemand()) {
// this may be a relational node stored by property name
// try {
Node pn = nmgr.getNode(this, propname, propRel);
if (pn != null) {
@ -1688,9 +1691,14 @@ public final class Node implements INode, Serializable {
prop = new Property(propname, this, pn);
}
// } catch (RuntimeException nonode) {
// wasn't a node after all
// }
}
}
} else if (propRel != null && propRel.isVirtual()) {
// prop was found and explicit property relation is collection -
// this is a collection node containing objects stored in the embedded db
INode pn = prop.getNodeValue();
if (pn != null) {
pn.setDbMapping(propRel.getVirtualMapping());
}
}
}

9
src/helma/objectmodel/db/NodeManager.java
View file

@ -274,13 +274,16 @@ public final class NodeManager {
if (rel.isComplexReference()) {
// a key for a complex reference
key = new MultiKey(rel.otherType, rel.getKeyParts(home));
} else if (rel.virtual || (rel.groupby != null) || !rel.usesPrimaryKey()) {
// } else if (rel.virtual || (rel.groupby != null) || !rel.usesPrimaryKey()) {
} else if (rel.createOnDemand()) {
// a key for a virtually defined object that's never actually stored in the db
// or a key for an object that represents subobjects grouped by some property, generated on the fly
// or a key for an object that represents subobjects grouped by some property,
// generated on the fly
key = new SyntheticKey(home.getKey(), kstr);
} else {
// if a key for a node from within the DB
// FIXME: This should never apply, since for every relation-based loading Synthetic Keys are used. Right?
// FIXME: This should never apply, since for every relation-based loading
// Synthetic Keys are used. Right?
key = new DbKey(rel.otherType, kstr);
}

15
src/helma/objectmodel/db/Relation.java
View file

@ -149,7 +149,7 @@ public final class Relation {
if (otherType == null) {
throw new RuntimeException("DbMapping for " + proto +
" not found from " + ownType.typename);
" not found from " + ownType.getTypeName());
}
// make sure the type we're referring to is up to date!
@ -370,12 +370,17 @@ public final class Relation {
/**
* Returns true if the object represented by this Relation has to be
* created dynamically by the Helma objectmodel runtime as a virtual
* node. Virtual nodes are objects which are only generated on demand
* and never stored to a persistent storage.
* created on demand at runtime by the NodeManager. This is true for:
*
* - collection (aka virtual) nodes
* - nodes accessed via accessname
* - group nodes
* - complex reference nodes
*/
public boolean createOnDemand() {
return virtual || (accessName != null) || (groupby != null) || isComplexReference();
return virtual ||
(otherType.isRelational() && accessName != null) ||
(groupby != null) || isComplexReference();
}
/**

9
src/helma/objectmodel/db/Replicator.java
View file

@ -69,15 +69,22 @@ public class Replicator implements Runnable {
String url = (String) urls.elementAt(i);
IReplicationListener listener = (IReplicationListener) Naming.lookup(url);
if (listener == null) {
throw new NullPointerException("Replication listener not bound for URL "+url);
}
listener.replicateCache(currentAdd, currentDelete);
if (nmgr.logReplication) {
nmgr.app.logEvent("Sent cache replication event: " +
add.size() + " added, " + delete.size() +
currentAdd.size() + " added, " + currentDelete.size() +
" deleted");
}
} catch (Exception x) {
nmgr.app.logEvent("Error sending cache replication event: " + x);
if (nmgr.app.debug()) {
x.printStackTrace();
}
}
}
}

6
src/helma/objectmodel/db/SyntheticKey.java
View file

@ -25,12 +25,18 @@ import java.io.Serializable;
* virtual nodes and groupby nodes.
*/
public final class SyntheticKey implements Key, Serializable {
// the parent key
private final Key parentKey;
// the name relative to the parent key
private final String name;
// lazily initialized hashcode
private transient int hashcode = 0;
static final long serialVersionUID = -693454133259421857L;
/**
* make a key for a persistent Object, describing its datasource and id.
*/

2
src/helma/objectmodel/dom/XmlWriter.java
View file

@ -420,7 +420,7 @@ public class XmlWriter extends OutputStreamWriter implements XmlConstants {
}
write("\" name=\"");
write(node.getName());
write(HtmlEncoder.encodeXml(node.getName()));
write("\" prototype=\"");
write(getNodePrototype(node));
write("\" created=\"");