Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27882
Modified Files:
sql.mx sql_gencode.mx sql_result.mx
Log Message:
We need the errbuf from the Client context.
U sql_result.mx
Index: sql_result.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_result.mx,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- sql_result.mx 7 Aug 2009 15:49:30 -0000 1.120
+++ sql_result.mx 9 Aug 2009 07:19:11 -0000 1.121
@@ -27,6 +27,7 @@
#include <sql_mvc.h>
#include <sql_catalog.h>
#include <sql_qc.h>
+#include "mal_client.h"
extern int mvc_export_affrows(mvc *m, stream *s, lng val, str w);
extern int mvc_export_operation(mvc *m, stream *s, str w);
@@ -36,7 +37,7 @@
extern int mvc_export_prepare(mvc *c, stream *s, cq *q, str w);
extern int mvc_export_chunk(mvc *m, stream *s, int res_id, BUN offset, BUN nr);
-extern BAT *mvc_import_table(mvc *c, bstream *s, char *sname, char *tname,
char *sep, char *rsep, char *ssep, char *ns, lng nr, lng offset);
+extern BAT *mvc_import_table(Client cntxt, mvc *c, bstream *s, char *sname,
char *tname, char *sep, char *rsep, char *ssep, char *ns, lng nr, lng offset);
extern int mvc_result_table(mvc *m, int nr_cols, int type, BAT *order);
extern int mvc_result_column(mvc *m, char *tn, char *name, char *typename, int
digits, int scale, BAT *b);
@@ -420,7 +421,7 @@
BAT *
-mvc_import_table(mvc *m, bstream *bs, char *sname, char *tname, char *sep,
char *rsep, char *ssep, char *ns, lng sz, lng offset)
+mvc_import_table(Client cntxt, mvc *m, bstream *bs, char *sname, char *tname,
char *sep, char *rsep, char *ssep, char *ns, lng sz, lng offset)
{
int i = 0;
sql_schema *s = mvc_bind_schema(m, sname);
@@ -494,7 +495,7 @@
fmt[i].size = ATOMsize(fmt[i].adt);
}
if (TABLETcreate_bats(&as, (BUN) (sz < 0 ? 1000 : sz)) >= 0) {
- if (SQLload_file(&as, bs, out, sep, rsep, *ssep,
offset, sz) != BUN_NONE)
+ if (SQLload_file(cntxt, &as, bs, out, sep, rsep, *ssep,
offset, sz) != BUN_NONE)
bats = TABLETcollect_bats(&as);
}
if (as.error)
U sql_gencode.mx
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -d -r1.333 -r1.334
--- sql_gencode.mx 4 Aug 2009 07:24:13 -0000 1.333
+++ sql_gencode.mx 9 Aug 2009 07:19:11 -0000 1.334
@@ -2025,7 +2025,7 @@
Client c = be->client;
Symbol backup = NULL;
stmt *s;
- int i;
+ int i, retseen =0;
/* nothing to do for internal and ready (not recompiling) functions */
if (!f->sql || f->sql > 1)
@@ -2088,12 +2088,16 @@
backend_dumpstmt(be, curBlk, s);
/* selectively make functions available for inlineing */
/* for the time being we only inline scalar functions */
+ /* and only if we see a single return value */
for( i= 1; i<curBlk->stop; i++){
InstrPtr p = getInstrPtr(curBlk,i);
if ( getFunctionId(p)== bindRef || getFunctionId(p)==
bindidxRef)
break;
+ if ( p->token == RETURNsymbol || p->token == YIELDsymbol ||
+ p->barrier == RETURNsymbol ||
p->barrier == YIELDsymbol)
+ retseen++;
}
- if (i == curBlk->stop)
+ if (i == curBlk->stop && retseen == 1)
varSetProp(curBlk, getArg(curInstr, 0), inlineProp, op_eq,
NULL);
stmt_destroy(s);
addQueryToCache(c);
U sql.mx
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -d -r1.348 -r1.349
--- sql.mx 6 Aug 2009 21:57:24 -0000 1.348
+++ sql.mx 9 Aug 2009 07:19:11 -0000 1.349
@@ -2391,7 +2391,6 @@
lng *sz = (lng *) getArgReference(stk, pci, 8);
lng *offset = (lng *) getArgReference(stk, pci, 9);
- (void) cntxt;
if (msg)
return msg;
len = strlen((char*)(*T));
@@ -2402,7 +2401,7 @@
GDKstrFromStr(ssep=GDKmalloc(len+1), *S, len); len = 0;
len = strlen((char*)(*N));
GDKstrFromStr(ns=GDKmalloc(len+1), *N, len); len = 0;
- b = mvc_import_table(m, *s, *sname, *tname, (char*)tsep, (char*)rsep,
(char*)ssep, (char*)ns, *sz, *offset);
+ b = mvc_import_table(cntxt, m, *s, *sname, *tname, (char*)tsep,
(char*)rsep, (char*)ssep, (char*)ns, *sz, *offset);
GDKfree(tsep);
GDKfree(rsep);
GDKfree(ssep);
------------------------------------------------------------------------------
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
