Update of /cvsroot/monetdb/MonetDB4/src/modules/plain
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2653/src/modules/plain
Modified Files:
Tag: GDK-2
bat.mx xtables.mx
Log Message:
removed the Dimention structure
Index: bat.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/modules/plain/bat.mx,v
retrieving revision 1.15.2.5
retrieving revision 1.15.2.6
diff -u -d -r1.15.2.5 -r1.15.2.6
--- bat.mx 11 Aug 2007 22:26:21 -0000 1.15.2.5
+++ bat.mx 15 Aug 2007 09:37:31 -0000 1.15.2.6
@@ -1903,7 +1903,7 @@
if (partial < nbytes) {
/* fill a partial page with nils */
ptr nil = ATOMnilptr(bn->ttype);
- BUN cur = BUNfirst(bn) + ((dst_off +
partial)>>bn->T->dim.shift);
+ BUN cur = BUNfirst(bn) + ((dst_off +
partial)>>bn->T->shift);
BUN end = BUNlast(bn);
for (; cur < end; cur++) {
@@ -1987,13 +1987,21 @@
bni = bat_iterator(bn);
if (bn == NULL) return GDK_FAIL;
BATinit_idents(bn);
- bn->H->dim = b->H->dim;
- bn->T->dim = b->T->dim;
- bn->htype = TYPE_void;
- bn->hvarsized = 1;
+
+ bn->H->type = TYPE_void;
+ bn->H->varsized = 1;
+ bn->H->shift = 0;
+ bn->H->width = 0;
+ bn->H->seq = 0;
+
+ bn->T->type = b->T->type;
+ bn->T->varsized = b->T->varsized;
+ bn->T->shift = b->T->shift;
+ bn->T->width = b->T->width;
+ bn->T->seq = b->T->seq;
+
bn->tsorted = 0;
bn->tkey = 0;
- bn->hseqbase = 0;
bn->batRestricted = BAT_READ;
BATsetcount(bn, n = (cnt << REMAP_PAGE_BITS));
n = tailsize(b,n);
Index: xtables.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/modules/plain/xtables.mx,v
retrieving revision 1.3.4.5
retrieving revision 1.3.4.6
diff -u -d -r1.3.4.5 -r1.3.4.6
--- xtables.mx 11 Aug 2007 22:26:22 -0000 1.3.4.5
+++ xtables.mx 15 Aug 2007 09:37:31 -0000 1.3.4.6
@@ -1175,7 +1175,7 @@
@2
}
@1
- offp[cur] = (base) ? r<<a->T->dim.shift :
((var_t*)a->T->heap.base)[r];
+ offp[cur] = (base) ? r<<a->T->shift :
((var_t*)a->T->heap.base)[r];
ids[cur] = o;
cur++;
this += sizeof(oid);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
