Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28155/modules/pftijah
Modified Files:
serialize_pftijah.mx
Log Message:
propagated changes of Monday Mar 30 2009 - Tuesday Mar 31 2009
from the Feb2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/03/30 - vzzzbx: modules/pftijah/serialize_pftijah.mx,1.68.2.2
-- step 1 in crossing trhe oid32 boundary with PF/TIJAH: remove some casts to
int.
This commit will (partially) fix bug "2722117 PF/TIJAH: dbat_finalize fails".
The fix was suggested by Henning/JanF, and seems to at least partially fix the
indexing of a 30GB XML document. A new bug "2722117 PF/TIJAH: dbat_finalize
fails" has been filed with the next issue. Bug "2722117" can be closed. No test
can be created as the data is simply too large.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/03/31 - jflokstra: modules/pftijah/serialize_pftijah.mx,1.68.2.3
- try to fix monetdb-Bugs-2722117 by removing another faulty int
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: serialize_pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/serialize_pftijah.mx,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- serialize_pftijah.mx 25 Mar 2009 17:01:35 -0000 1.71
+++ serialize_pftijah.mx 31 Mar 2009 10:40:12 -0000 1.72
@@ -103,12 +103,12 @@
}
-int dbat_finalize(dbat* dbat, int topidx) {
+int dbat_finalize(dbat* dbat, oid topidx) {
void* top;
BAT* b = dbat->bat;
- topidx -= (int)dbat->seqbase;
- int bottomTop = topidx;
+ topidx -= dbat->seqbase;
+ oid bottomTop = topidx;
switch( b->ttype ) {
case TYPE_int :
top = &dbat->cast.intCAST[bottomTop];
@@ -982,7 +982,7 @@
--tjctx->doc_height;
oid start = tj_popTag(tjctx); /* oid of the first node of the element */
int size = tjctx->tijahPre - start - 1; /* the Tijah document size */
- dbat_set_int(&tjctx->dbat_collSize,(int)start,size);
+ dbat_set_int(&tjctx->dbat_collSize,start,size);
#else
(void) ctx;
#endif
@@ -1137,7 +1137,7 @@
if ( DOEMIT(tjctx) ) {
oid start = tj_popTag(tjctx); /* oid of the first node of the element
*/
int size = tjctx->tijahPre - start - 1; /* the Tijah element size */
- dbat_set_int(&tjctx->dbat_collSize,(int)start,size);
+ dbat_set_int(&tjctx->dbat_collSize,start,size);
};
#ifdef TJ_TRACE
if ( TJ_TRACE ) stream_printf(GDKout,"C[%s]:empty_endElement: \"%s\"\n",
tjctx->name,"");
@@ -1168,7 +1168,7 @@
if ( DOEMIT(tjctx) ) {
oid start = tj_popTag(tjctx); /* oid of the first node of the element
*/
int size = tjctx->tijahPre - start - 1; /* the Tijah element size */
- dbat_set_int(&tjctx->dbat_collSize,(int)start,size);
+ dbat_set_int(&tjctx->dbat_collSize,start,size);
#ifdef TJ_TRACE
if ( TJ_TRACE ) stream_printf(GDKout,"C[%s]:endElement: \"%s\"\n",
tjctx->name,name);
#endif
------------------------------------------------------------------------------
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
