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

use accessor methods for Relation.localField and Relation.remoteField

Browse source
This commit is contained in:
hns 2001-01-25 20:58:18 +00:00
parent 857544fd9b
commit 8d63fd35af
3 changed files with 47 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -154,7 +154,7 @@ public class Node implements INode, Serializable {
if (rel.direction != Relation.PRIMITIVE && rel.direction != Relation.FORWARD) if (rel.direction != Relation.PRIMITIVE && rel.direction != Relation.FORWARD)
continue; continue;
Value val = rec.getValue (rel.localField); Value val = rec.getValue (rel.getDbField ());
if (val.isNull ()) if (val.isNull ())
continue; continue;
@ -411,8 +411,8 @@ public class Node implements INode, Serializable {
// instead of the id by turning the anonymous flag off. // instead of the id by turning the anonymous flag off.
if (anonymous && parentmap != null) { if (anonymous && parentmap != null) {
Relation prel = parentmap.getPropertyRelation(); Relation prel = parentmap.getPropertyRelation();
if (prel != null && prel.subnodesAreProperties) try { if (prel != null && prel.subnodesAreProperties && !prel.usesPrimaryKey ()) try {
Relation localrel = dbmap.columnNameToProperty (prel.remoteField); Relation localrel = dbmap.columnNameToProperty (prel.getRemoteField ());
String propvalue = getString (localrel.propname, false); String propvalue = getString (localrel.propname, false);
if (propvalue != null && propvalue.length() > 0) { if (propvalue != null && propvalue.length() > 0) {
setName (propvalue); setName (propvalue);
@ -644,10 +644,10 @@ public class Node implements INode, Serializable {
// check if properties are subnodes (_properties.aresubnodes=true) // check if properties are subnodes (_properties.aresubnodes=true)
if (dbmap != null && node.dbmap != null) { if (dbmap != null && node.dbmap != null) {
Relation prel = dbmap.getPropertyRelation(); Relation prel = dbmap.getPropertyRelation();
if (prel != null && prel.subnodesAreProperties) { if (prel != null && prel.subnodesAreProperties && !prel.usesPrimaryKey ()) {
Relation localrel = node.dbmap.columnNameToProperty (prel.remoteField); Relation localrel = node.dbmap.columnNameToProperty (prel.getRemoteField ());
// if no relation from db column to prop name is found, assume that both are equal // if no relation from db column to prop name is found, assume that both are equal
String propname = localrel == null ? prel.remoteField : localrel.propname; String propname = localrel == null ? prel.getRemoteField() : localrel.propname;
String prop = node.getString (propname, false); String prop = node.getString (propname, false);
if (prop != null && prop.length() > 0) { if (prop != null && prop.length() > 0) {
INode old = getNode (prop, false); INode old = getNode (prop, false);
@ -672,7 +672,7 @@ public class Node implements INode, Serializable {
if (dbmap != null) { if (dbmap != null) {
Relation srel = dbmap.getSubnodeRelation (); Relation srel = dbmap.getSubnodeRelation ();
if (srel != null && srel.direction == Relation.BACKWARD) { if (srel != null && srel.direction == Relation.BACKWARD) {
Relation backlink = srel.other.columnNameToProperty (srel.remoteField); Relation backlink = srel.other.columnNameToProperty (srel.getRemoteField());
if (backlink != null && backlink.propname != null) { if (backlink != null && backlink.propname != null) {
if (node.get (backlink.propname, false) == null) { if (node.get (backlink.propname, false) == null) {
if (this.state == VIRTUAL) if (this.state == VIRTUAL)
@ -814,7 +814,7 @@ public class Node implements INode, Serializable {
node.setDbMapping (dbm); node.setDbMapping (dbm);
String snrel = "WHERE "+srel.groupby +"='"+sid+"'"; String snrel = "WHERE "+srel.groupby +"='"+sid+"'";
if (gsrel.direction == Relation.BACKWARD) if (gsrel.direction == Relation.BACKWARD)
snrel += " AND "+gsrel.remoteField+"='"+getNonVirtualHomeID()+"'"; snrel += " AND "+gsrel.getRemoteField()+"='"+getNonVirtualHomeID()+"'";
if (gsrel.order != null) if (gsrel.order != null)
snrel += " ORDER BY "+gsrel.order; snrel += " ORDER BY "+gsrel.order;
node.setSubnodeRelation (snrel); node.setSubnodeRelation (snrel);
@ -866,7 +866,7 @@ public class Node implements INode, Serializable {
if (dbmap != null) { if (dbmap != null) {
Relation srel = dbmap.getSubnodeRelation (); Relation srel = dbmap.getSubnodeRelation ();
if (srel != null && srel.direction == Relation.BACKWARD) { if (srel != null && srel.direction == Relation.BACKWARD) {
Relation backlink = srel.other.columnNameToProperty (srel.remoteField); Relation backlink = srel.other.columnNameToProperty (srel.getRemoteField ());
if (backlink != null && id.equals (node.getString (backlink.propname, false))) if (backlink != null && id.equals (node.getString (backlink.propname, false)))
node.unset (backlink.propname); node.unset (backlink.propname);
} }
@ -875,10 +875,10 @@ public class Node implements INode, Serializable {
// check if subnodes are handled as virtual fs // check if subnodes are handled as virtual fs
if (dbmap != null && node.dbmap != null) { if (dbmap != null && node.dbmap != null) {
Relation prel = dbmap.getPropertyRelation(); Relation prel = dbmap.getPropertyRelation();
if (prel != null && prel.subnodesAreProperties) { if (prel != null && prel.subnodesAreProperties && !prel.usesPrimaryKey ()) {
Relation localrel = node.dbmap.columnNameToProperty (prel.remoteField); Relation localrel = node.dbmap.columnNameToProperty (prel.getRemoteField());
// if no relation from db column to prop name is found, assume that both are equal // if no relation from db column to prop name is found, assume that both are equal
String propname = localrel == null ? prel.remoteField : localrel.propname; String propname = localrel == null ? prel.getRemoteField () : localrel.propname;
String prop = node.getString (propname, false); String prop = node.getString (propname, false);
if (prop != null && getNode (prop, false) == node) if (prop != null && getNode (prop, false) == node)
unset (prop); unset (prop);
@ -1240,7 +1240,7 @@ public class Node implements INode, Serializable {
parentmap = parent.getDbMapping (); parentmap = parent.getDbMapping ();
Relation prel = parentmap.getPropertyRelation (); Relation prel = parentmap.getPropertyRelation ();
if (prel != null && prel.subnodesAreProperties && propname.equals (prel.remoteField)) { if (prel != null && prel.subnodesAreProperties && propname.equals (prel.getRemoteField())) {
INode n = parent.getNode (value, false); INode n = parent.getNode (value, false);
if (n != null && n != this) { if (n != null && n != this) {
parent.unset (value); parent.unset (value);

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

@ -140,7 +140,6 @@ public final class NodeManager {
if (kstr == null) if (kstr == null)
return null; return null;
Transactor tx = (Transactor) Thread.currentThread (); Transactor tx = (Transactor) Thread.currentThread ();
// tx.timer.beginEvent ("getNode "+kstr); // tx.timer.beginEvent ("getNode "+kstr);
Key key = tx.key; Key key = tx.key;
@ -176,7 +175,6 @@ public final class NodeManager {
if (node != null) if (node != null)
tx.visitCleanNode (key.duplicate(), node); tx.visitCleanNode (key.duplicate(), node);
// tx.timer.endEvent ("getNode "+kstr); // tx.timer.endEvent ("getNode "+kstr);
return node; return node;
} }
@ -191,19 +189,18 @@ public final class NodeManager {
Key key = tx.key; Key key = tx.key;
// If what we want is a virtual node create a "synthetic" key // If what we want is a virtual node create a "synthetic" key
if (rel.virtual /*&& home.getState() != INode.VIRTUAL */ || rel.groupby != null) if (rel.virtual || rel.groupby != null)
key.recycle (null, home.getKey ().getVirtualID (kstr)); key.recycle (null, home.getKey ().getVirtualID (kstr));
// if a key for a node from within the DB // if a key for a node from within the DB
else else
key.recycle (rel.other, rel.getKeyID (home, kstr)); key.recycle (rel.other, rel.getKeyID (home, kstr));
// See if Transactor has already come across this node // See if Transactor has already come across this node
Node node = tx.getVisitedNode (key); Node node = tx.getVisitedNode (key);
if (node != null && node.getState() != Node.INVALID) { if (node != null && node.getState() != Node.INVALID) {
// System.err.println ("CACHE HIT THREAD 2");
// tx.timer.endEvent ("getNode "+kstr); // tx.timer.endEvent ("getNode "+kstr);
// if we didn't fetch the node via its primary key, refresh the primary key in the cache. // if we didn't fetch the node via its primary key, refresh the primary key in the cache.
// otherwise we risk cache corroption (duplicate node creation) if the node is fetched by its primary key // otherwise we risk cache corroption (duplicate node creation) if the node is fetched by its primary key
if (!rel.usesPrimaryKey ()) { if (!rel.usesPrimaryKey ()) {
@ -223,12 +220,21 @@ public final class NodeManager {
node = (Node) cache.get (key); node = (Node) cache.get (key);
if (node == null || node.getState() == Node.INVALID) { if (node == null || node.getState() == Node.INVALID) {
// System.err.println ("CACHE MISS 2");
// The requested node isn't in the shared cache. Synchronize with key to make sure only one // The requested node isn't in the shared cache. Synchronize with key to make sure only one
// version is fetched from the database. // version is fetched from the database.
node = getNodeByRelation (db, tx.txn, home, kstr, rel); node = getNodeByRelation (db, tx.txn, home, kstr, rel);
// HACK: on some occasions (groupby nodes), transactor.key is used recursively
// so re-initializing it here is the safest thing to do.
if (rel.virtual || rel.groupby != null)
key.recycle (null, home.getKey ().getVirtualID (kstr));
else
key.recycle (rel.other, rel.getKeyID (home, kstr));
if (node != null) { if (node != null) {
Key primKey = node.getKey (); Key primKey = node.getKey ();
boolean keyIsPrimary = primKey.equals (key); boolean keyIsPrimary = primKey.equals (key);
synchronized (cache) { synchronized (cache) {
@ -244,7 +250,6 @@ public final class NodeManager {
} // synchronized } // synchronized
} }
} else { } else {
// System.err.println ("CACHE HIT 2");
// update primary key in cache, see above // update primary key in cache, see above
if (!rel.usesPrimaryKey ()) { if (!rel.usesPrimaryKey ()) {
synchronized (cache) { synchronized (cache) {
@ -317,32 +322,32 @@ public final class NodeManager {
if (p != null && rel != null) { if (p != null && rel != null) {
switch (p.getType ()) { switch (p.getType ()) {
case IProperty.STRING: case IProperty.STRING:
rec.setValue (rel.localField, p.getStringValue ()); rec.setValue (rel.getDbField(), p.getStringValue ());
break; break;
case IProperty.BOOLEAN: case IProperty.BOOLEAN:
rec.setValue (rel.localField, p.getBooleanValue ()); rec.setValue (rel.getDbField(), p.getBooleanValue ());
break; break;
case IProperty.DATE: case IProperty.DATE:
Timestamp t = new Timestamp (p.getDateValue ().getTime ()); Timestamp t = new Timestamp (p.getDateValue ().getTime ());
rec.setValue (rel.localField, t); rec.setValue (rel.getDbField(), t);
break; break;
case IProperty.INTEGER: case IProperty.INTEGER:
rec.setValue (rel.localField, p.getIntegerValue ()); rec.setValue (rel.getDbField(), p.getIntegerValue ());
break; break;
case IProperty.FLOAT: case IProperty.FLOAT:
rec.setValue (rel.localField, p.getFloatValue ()); rec.setValue (rel.getDbField(), p.getFloatValue ());
break; break;
case IProperty.NODE: case IProperty.NODE:
if (rel.direction == Relation.FORWARD) { if (rel.direction == Relation.FORWARD) {
// INode n = p.getNodeValue (); // INode n = p.getNodeValue ();
// String foreignID = n == null ? null : n.getID (); // String foreignID = n == null ? null : n.getID ();
rec.setValue (rel.localField, p.getStringValue ()); rec.setValue (rel.getDbField(), p.getStringValue ());
} }
break; break;
} }
p.dirty = false; p.dirty = false;
} else if (rel != null && rel.localField != null) { } else if (rel != null && rel.getDbField() != null) {
rec.setValueNull (rel.localField); rec.setValueNull (rel.getDbField());
} }
} }
rec.markForInsert (); rec.markForInsert ();
@ -388,26 +393,26 @@ public final class NodeManager {
if (p.dirty) { if (p.dirty) {
switch (p.getType ()) { switch (p.getType ()) {
case IProperty.STRING: case IProperty.STRING:
rec.setValue (rel.localField, p.getStringValue ()); rec.setValue (rel.getDbField(), p.getStringValue ());
break; break;
case IProperty.BOOLEAN: case IProperty.BOOLEAN:
rec.setValue (rel.localField, p.getBooleanValue ()); rec.setValue (rel.getDbField(), p.getBooleanValue ());
break; break;
case IProperty.DATE: case IProperty.DATE:
Timestamp t = new Timestamp (p.getDateValue ().getTime ()); Timestamp t = new Timestamp (p.getDateValue ().getTime ());
rec.setValue (rel.localField, t); rec.setValue (rel.getDbField(), t);
break; break;
case IProperty.INTEGER: case IProperty.INTEGER:
rec.setValue (rel.localField, p.getIntegerValue ()); rec.setValue (rel.getDbField(), p.getIntegerValue ());
break; break;
case IProperty.FLOAT: case IProperty.FLOAT:
rec.setValue (rel.localField, p.getFloatValue ()); rec.setValue (rel.getDbField(), p.getFloatValue ());
break; break;
case IProperty.NODE: case IProperty.NODE:
if (rel.direction == Relation.FORWARD) { if (rel.direction == Relation.FORWARD) {
// INode n = p.getNodeValue (); // INode n = p.getNodeValue ();
// String foreignID = n == null ? null : n.getID (); // String foreignID = n == null ? null : n.getID ();
rec.setValue (rel.localField, p.getStringValue ()); rec.setValue (rel.getDbField(), p.getStringValue ());
} }
break; break;
} }
@ -415,9 +420,9 @@ public final class NodeManager {
p.dirty = false; p.dirty = false;
} }
} else if (rel != null && rel.localField != null) { } else if (rel != null && rel.getDbField() != null) {
updated++; updated++;
rec.setValueNull (rel.localField); rec.setValueNull (rel.getDbField());
} }
} }
if (updated > 0) { if (updated > 0) {
@ -524,7 +529,7 @@ public final class NodeManager {
String q = "SELECT "+idfield+" FROM "+table; String q = "SELECT "+idfield+" FROM "+table;
if (subrel.direction == Relation.BACKWARD) { if (subrel.direction == Relation.BACKWARD) {
String homeid = home.getNonVirtualHomeID (); // home.getState() == Node.VIRTUAL ? home.parentID : home.getID (); String homeid = home.getNonVirtualHomeID (); // home.getState() == Node.VIRTUAL ? home.parentID : home.getID ();
q += " WHERE "+subrel.remoteField+" = '"+homeid+"'"; q += " WHERE "+subrel.getRemoteField()+" = '"+homeid+"'";
} }
// set order, if specified and if not using subnode's relation // set order, if specified and if not using subnode's relation
if (rel.groupby != null) if (rel.groupby != null)
@ -581,7 +586,7 @@ public final class NodeManager {
tds.where (home.getSubnodeRelation().trim().substring(5)); tds.where (home.getSubnodeRelation().trim().substring(5));
} else if (subrel.direction == Relation.BACKWARD) { } else if (subrel.direction == Relation.BACKWARD) {
String homeid = home.getState() == Node.VIRTUAL ? home.parentID : home.getID (); String homeid = home.getState() == Node.VIRTUAL ? home.parentID : home.getID ();
tds.where (subrel.remoteField+" = '"+homeid+"'"); tds.where (subrel.getRemoteField()+" = '"+homeid+"'");
// set order if specified // set order if specified
if (rel.order != null) if (rel.order != null)
tds.order (rel.order); tds.order (rel.order);
@ -644,7 +649,7 @@ public final class NodeManager {
qds = new QueryDataSet (con, "SELECT count(*) FROM "+table+" "+home.getSubnodeRelation()); qds = new QueryDataSet (con, "SELECT count(*) FROM "+table+" "+home.getSubnodeRelation());
} else if (subrel.direction == Relation.BACKWARD) { } else if (subrel.direction == Relation.BACKWARD) {
String homeid = home.getState() == Node.VIRTUAL ? home.parentID : home.getID (); String homeid = home.getState() == Node.VIRTUAL ? home.parentID : home.getID ();
qds = new QueryDataSet (con, "SELECT count(*) FROM "+table+" WHERE "+subrel.remoteField+" = '"+homeid+"'"); qds = new QueryDataSet (con, "SELECT count(*) FROM "+table+" WHERE "+subrel.getRemoteField()+" = '"+homeid+"'");
} else { } else {
qds = new QueryDataSet (con, "SELECT count(*) FROM "+table); qds = new QueryDataSet (con, "SELECT count(*) FROM "+table);
} }
@ -775,7 +780,7 @@ public final class NodeManager {
subrel = subrel.getFilter (); subrel = subrel.getFilter ();
if (subrel != null && subrel.direction == Relation.BACKWARD) { if (subrel != null && subrel.direction == Relation.BACKWARD) {
where.append (" and "); where.append (" and ");
where.append (subrel.remoteField); where.append (subrel.getRemoteField());
where.append (" = '"); where.append (" = '");
where.append (homeid); where.append (homeid);
where.append ("'"); where.append ("'");

4
src/helma/objectmodel/db/Property.java
View file

@ -236,10 +236,10 @@ public final class Property implements IProperty, Serializable, Cloneable {
// check if this is a forward relation, i.e. if we point to a field in the value object // check if this is a forward relation, i.e. if we point to a field in the value object
// if so, we may use something else than the object's id to refer to it. // if so, we may use something else than the object's id to refer to it.
if (!rel.virtual && rel.direction == Relation.FORWARD) { if (!rel.virtual && rel.direction == Relation.FORWARD) {
if (rel.remoteField == null || vmap.getIDField().equals (rel.remoteField)) { if (rel.usesPrimaryKey ()) {
this.nvalueID = value.getID (); this.nvalueID = value.getID ();
} else try { } else try {
this.nvalueID = value.getString (vmap.columnNameToProperty (rel.remoteField).propname, false); this.nvalueID = value.getString (vmap.columnNameToProperty (rel.getRemoteField()).propname, false);
} catch (Exception x) { } catch (Exception x) {
throw new RuntimeException ("Can't set "+propname+" to "+value+": error retrieving target property"); throw new RuntimeException ("Can't set "+propname+" to "+value+": error retrieving target property");
} }