Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs16:/tmp/cvs-serv15364
Modified Files:
pf_support.mx
Log Message:
Use get_attr_own to get ATTR_OWN values.
Also use find(oid) instead of fetch(oid).
Index: pf_support.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/pf_support.mx,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- pf_support.mx 12 Apr 2007 07:57:41 -0000 1.207
+++ pf_support.mx 13 Apr 2007 12:48:28 -0000 1.208
@@ -2571,12 +2571,12 @@
extend_protect(ws, cont);
var attr_prop_update := ws.fetch(ATTR_PROP_UPDATE).find(cont); #
[ATID,PROPID]
# delattr: attributes of deleted nodes
- var delattr :=
ws.fetch(ATTR_OWN).find(cont).join(ws.fetch(NID_RID_UPDATE).find(cont).uselect(oid_nil));
+ var delattr := get_attr_own(ws,
ws.fetch(NID_RID_UPDATE).find(cont).uselect(oid_nil).hmark([EMAIL PROTECTED]),
cont);
if ((attr_prop_update.count() > 0) or (delattr.count() > 0)) {
# combine attrs from deleted nodes (delattr) with updated
# attributes (attr_prop_update) and figure out old values by
# joining with ATTR_PROP
- var oldprop := kunion(delattr.mirror(),
attr_prop_update.mirror()).leftjoin(ws.fetch(ATTR_PROP).find(cont)).ord_select(oid_nil,
oid_nil); # [ATID,PROPID]
+ var oldprop := kunion(delattr.reverse().mirror(),
attr_prop_update.mirror()).leftjoin(ws.fetch(ATTR_PROP).find(cont)).ord_select(oid_nil,
oid_nil); # [ATID,PROPID]
var oldvx;
if (oldprop.count() > 0) {
var oldval := oldprop.leftfetchjoin(ws.fetch(PROP_VAL).find(cont)); #
[ATID,str]
@@ -2741,10 +2741,10 @@
# ws_postcommit maintains the indices and releases the collection lock
__ws_postcommit(ws, cont,
- new_attr.fetch(cont),
- old_attr.fetch(cont),
- new_text.fetch(cont),
- old_text.fetch(cont),
+ new_attr.find(cont),
+ old_attr.find(cont),
+ new_text.find(cont),
+ old_text.find(cont),
ws.fetch(NID_QN_INS_UPDATE).find(cont).reverse(),
ws.fetch(NID_QN_DEL_UPDATE).find(cont).reverse(),
ws.fetch(QN_URI_UPDATE).find(cont).hmark([EMAIL
PROTECTED]),
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-pf-checkins mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
