Update of /cvsroot/monetdb/pathfinder/runtime
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5609/runtime
Modified Files:
shredder.mx vx_index.mx xrpc_common.mx
Log Message:
runtime/shredder.mx
runtime/vx_index.mx
runtime/xrpc_common.mx
- support for GDK_VARSHIFT
U xrpc_common.mx
Index: xrpc_common.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc_common.mx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- xrpc_common.mx 8 Jan 2009 16:54:18 -0000 1.11
+++ xrpc_common.mx 13 Apr 2009 23:40:10 -0000 1.12
@@ -460,7 +460,7 @@
oid end_pre = hdr_node_pre + pre_sizeT[hdr_node_pre];
while(++hdr_node_pre <= end_pre) {
if (pre_kindT[hdr_node_pre] == TEXT) {
- s = text_base +
prop_textT[pre_propT[hdr_node_pre]];
+ s = text_base +
(prop_textT[pre_propT[hdr_node_pre]] << GDK_VARSHIFT);
BUNappend(participants, s, FALSE);
}
}
@@ -483,7 +483,7 @@
oid end_pre = hdr_node_pre + pre_sizeT[hdr_node_pre];
while(++hdr_node_pre <= end_pre) {
if (pre_kindT[hdr_node_pre] == TEXT) {
- s = text_base +
prop_textT[pre_propT[hdr_node_pre]];
+ s = text_base +
(prop_textT[pre_propT[hdr_node_pre]] << GDK_VARSHIFT);
if (isqid) {
qid = GDKstrdup(s);
} else {
@@ -637,7 +637,7 @@
"is expected to have a simple value",
msg+strlen(XRPC_NS)+1, i, j, k);
goto cleanup;
}
- req->argval[req->nr_args] = text_base +
prop_textT[pre_propT[val_node_pre]];
+ req->argval[req->nr_args] = text_base +
(prop_textT[pre_propT[val_node_pre]] << GDK_VARSHIFT);
} else if (strcmp(pul, XRPC_NS"|attribute") == 0) {
while(ao_ptr < nattrs && attr_ownT[ao_ptr] < tpe_node_pre)
ao_ptr++;
if (attr_ownT[ao_ptr] == tpe_node_pre) {
U vx_index.mx
Index: vx_index.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/vx_index.mx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- vx_index.mx 8 Jan 2009 16:54:18 -0000 1.11
+++ vx_index.mx 13 Apr 2009 23:40:10 -0000 1.12
@@ -90,7 +90,7 @@
var_t *src = (var_t*) Tloc(b, BUNfirst(b));
int *dst = (int*) Tloc(bn, BUNfirst(bn));
for(i=0; i<cnt; i++)
- dst[i] = XQH_H(base + src[i]);
+ dst[i] = XQH_H(base + (src[i]<<GDK_VARSHIFT));
ALIGNsetH(bn, b);
BATsetcount(bn, cnt);
@@ -588,12 +588,12 @@
* to be only of kind TEXT. This is not true during updates,
* since there might *not* be a text node (deleted).
*/
-pre_hsh[pre] = XQH_H(text_base + pre_text[pre_prop[pre]]);
+pre_hsh[pre] = XQH_H(text_base + (pre_text[pre_prop[pre]]<<GDK_VARSHIFT));
cur++;
@= found_update_string
if (pre_kind[pre] == TEXT) {
- pre_hsh[pre] = XQH_H(text_base + pre_text[pre_prop[pre]]);
+ pre_hsh[pre] = XQH_H(text_base + (pre_text[pre_prop[pre]]<<GDK_VARSHIFT));
cur++;
} else {
/* deal with non-text nodes */
@@ -604,12 +604,12 @@
* to be only of kind TEXT. This is not true during updates,
* since there might *not* be a text node (deleted).
*/
-pre_state[pre] = dbl_fsm(text_base + pre_text[pre_prop[pre]]);
+pre_state[pre] = dbl_fsm(text_base + (pre_text[pre_prop[pre]] <<
GDK_VARSHIFT));
cur++;
@= found_update_dbl
if (pre_kind[pre] == TEXT) {
- pre_state[pre] = dbl_fsm(text_base + pre_text[pre_prop[pre]]);
+ pre_state[pre] = dbl_fsm(text_base + (pre_text[pre_prop[pre]] <<
GDK_VARSHIFT));
cur++;
} else {
/* deal with non-text nodes */
U shredder.mx
Index: shredder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/shredder.mx,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- shredder.mx 26 Feb 2009 21:20:16 -0000 1.157
+++ shredder.mx 13 Apr 2009 23:40:10 -0000 1.158
@@ -1722,7 +1722,7 @@
GDKerror("shredder_create: malloc failure\n");
return shredder_free(shredCtx,0);
}
- memcpy(sb->heapBackup, sb->bat->theap->base,
GDK_STRHASHTABLE*sizeof(var_t));
+ memcpy(sb->heapBackup, sb->bat->theap->base,
GDK_STRHASHTABLE*sizeof(stridx_t));
}
}
} else {
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
