Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13077/src/backends/monet5
Modified Files:
sql.mx
Log Message:
propagated changes of Sunday Nov 08 2009 - Monday Nov 09 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/11/08 - mlkersten: src/backends/monet5/sql.mx,1.358.2.10
Fix the null refs.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -d -r1.367 -r1.368
--- sql.mx 5 Nov 2009 20:29:53 -0000 1.367
+++ sql.mx 8 Nov 2009 23:56:56 -0000 1.368
@@ -274,7 +274,9 @@
f := str.iconv(fname, "UTF-8", cs);
s := streams.openRead(f);
#bs := bstream.create(s, 1048576);
- bs := bstream.create(s, 8388608);
+ #bs := bstream.create(s, 8388608);
+ bs := bstream.create(s, 33554432);
+ #bs := bstream.create(s, 67108864);
res := sql.importTable(bs, sname, tname, tsep, rsep, ssep, ns, nr,
offset);
bstream.destroy(bs);
@@ -4222,7 +4224,7 @@
str msg = getContext(cntxt,mb, &m, NULL);
int first=1;
bat mid, hid, bid;
- BAT *map= NULL, *b;
+ BAT *b;
node *o;
if (msg)
@@ -4278,10 +4280,6 @@
}
/* bat was cleared */
t->cleared = 1;
- if (map) {
- BBPreleaseref(map->batCacheid);
- BBPdecref(mid, TRUE);
- }
return MAL_SUCCEED;
}
@@ -4395,6 +4393,11 @@
g = (bat *) Tloc(graph, BUNfirst(graph));
s = BATdescriptor(g[MAP_LEX]);
+ if ( s == NULL){
+ BBPreleaseref(graph->batCacheid);
+ throw(SQL, "sql.rdfShred", "map_lex is missing");
+ }
+
store_funcs.append_col(m->session->tr,
mvc_bind_column(m, map_tbl, "lexical"), s, TYPE_bat);
store_funcs.append_col(m->session->tr,
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
