Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28745
Modified Files:
sql_result.mx
Log Message:
Necessary change to call the SQL parallel loader.
U sql_result.mx
Index: sql_result.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_result.mx,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- sql_result.mx 20 Jul 2009 13:56:38 -0000 1.116
+++ sql_result.mx 4 Aug 2009 17:58:08 -0000 1.117
@@ -481,8 +481,9 @@
fmt[i].ws = !(has_whitespace(fmt[i].sep));
fmt[i].quote = ssep?ssep[0]:0;
fmt[i].nullstr = _strdup(ns);
- fmt[i].nildata = GDKmalloc(fmt[i].nillen);
- memcpy(fmt[i].nildata, ATOMnilptr(fmt[i].adt),
fmt[i].nillen);
+ fmt[i].null_length = strlen(ns);
+ fmt[i].nildata = GDKmalloc(fmt[i].nillen);
+ memcpy(fmt[i].nildata, ATOMnilptr(fmt[i].adt),
fmt[i].nillen);
if (col->type.type->eclass == EC_DEC) {
fmt[i].tostr = &dec_tostr;
fmt[i].frstr = &dec_frstr;
@@ -493,7 +494,7 @@
fmt[i].size = ATOMsize(fmt[i].adt);
}
if (TABLETcreate_bats(&as, (BUN) (sz < 0 ? 1000 : sz)) >= 0) {
- if (TABLETload_file(&as, bs, out) != BUN_NONE)
+ if (SQLload_file(&as, bs, out, sep, rsep, *ssep, sz,
offset) != BUN_NONE)
bats = TABLETcollect_bats(&as);
}
if (as.error)
------------------------------------------------------------------------------
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
