Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14477/src/backends/monet5
Modified Files:
Tag: SQL_2-22
sql.mx sql_gencode.mx sql_result.mx
Log Message:
fixed bug in copy into, we now properly pass the schema(name) to the mil/mal
level.
Index: sql_result.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_result.mx,v
retrieving revision 1.82.2.1
retrieving revision 1.82.2.2
diff -u -d -r1.82.2.1 -r1.82.2.2
--- sql_result.mx 15 Feb 2008 14:24:44 -0000 1.82.2.1
+++ sql_result.mx 21 Mar 2008 08:39:00 -0000 1.82.2.2
@@ -34,7 +34,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, size_t offset,
size_t nr);
-extern BAT *mvc_import_table(mvc *c, bstream *s, char *tname, char *sep, char
*rsep, char *ssep, int nr, int offset);
+extern BAT *mvc_import_table(mvc *c, bstream *s, char *sname, char *tname,
char *sep, char *rsep, char *ssep, int nr, int 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);
@@ -454,10 +454,11 @@
BAT *
-mvc_import_table(mvc *m, bstream *bs, char *tname, char *sep, char *rsep, char
*ssep, int sz, int offset)
+mvc_import_table(mvc *m, bstream *bs, char *sname, char *tname, char *sep,
char *rsep, char *ssep, int sz, int offset)
{
int i = 0;
- sql_table *t = mvc_bind_table(m, m->session->schema, tname);
+ sql_schema *s = mvc_bind_schema(m, sname);
+ sql_table *t = mvc_bind_table(m, s, tname);
node *n;
BAT *bats = NULL;
Tablet as;
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v
retrieving revision 1.267.2.1
retrieving revision 1.267.2.2
diff -u -d -r1.267.2.1 -r1.267.2.2
--- sql_gencode.mx 15 Feb 2008 14:24:44 -0000 1.267.2.1
+++ sql_gencode.mx 21 Mar 2008 08:38:59 -0000 1.267.2.2
@@ -1469,6 +1469,7 @@
s->nr = getDestVar(q);
} break;
case st_import:{
+ char *sname = s->op1.stval->op1.tval->s->base.name;
char *tname = s->op1.stval->op1.tval->base.name;
node *n = s->op2.lval->h;
char *sep = n->data;
@@ -1502,6 +1503,7 @@
q = newStmt1(mb, sqlRef, "importTable");
q = pushArgument(mb, q, bs);
+ q = pushStr(mb, q, sname);
q = pushStr(mb, q, tname);
q = pushStr(mb, q, sep);
q = pushStr(mb, q, rsep);
@@ -1522,6 +1524,7 @@
q = newStmt1(mb, sqlRef, "importTable");
q = pushArgument(mb, q, io_stdin);
+ q = pushStr(mb, q, sname);
q = pushStr(mb, q, tname);
q = pushStr(mb, q, sep);
q = pushStr(mb, q, rsep);
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.251.2.4
retrieving revision 1.251.2.5
diff -u -d -r1.251.2.4 -r1.251.2.5
--- sql.mx 6 Mar 2008 21:28:40 -0000 1.251.2.4
+++ sql.mx 21 Mar 2008 08:38:58 -0000 1.251.2.5
@@ -202,7 +202,7 @@
address mvc_export_value_wrap
comment "export a single value onto the stream s";
-command importTable( s:bstream, tname:str,
+command importTable( s:bstream, sname:str, tname:str,
sep:str, rsep:str, ssep:str, nr:int, offset:int) :bat[:str,:bat]
address mvc_import_table_wrap
comment "Import a table from bstream s with the
@@ -707,7 +707,7 @@
sql5_export str mvc_export_result_wrap(int *ret, int *res_id, str *w);
sql5_export str mvc_export_operation_wrap(int *ret, str *w);
sql5_export str mvc_export_value_wrap(MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-sql5_export str mvc_import_table_wrap(int *res, bstream **s, str *tname,
unsigned char* *sep, unsigned char* *rsep, unsigned char* *ssep, int *sz, int
*offset);
+sql5_export str mvc_import_table_wrap(int *res, bstream **s, str *sname, str
*tname, unsigned char* *sep, unsigned char* *rsep, unsigned char* *ssep, int
*sz, int *offset);
sql5_export str bathash_wrap(int *res, int *bid );
sql5_export str hash_wrap(MalBlkPtr m, MalStkPtr s, InstrPtr p);
sql5_export str setVariable(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -1740,7 +1740,7 @@
}
str
-mvc_import_table_wrap(int *res, bstream **s, str *tname, unsigned char* *T,
unsigned char* *R, unsigned char* *S, int *sz, int *offset)
+mvc_import_table_wrap(int *res, bstream **s, str *sname, str *tname, unsigned
char* *T, unsigned char* *R, unsigned char* *S, int *sz, int *offset)
{
BAT *b;
mvc *m = NULL;
@@ -1756,7 +1756,7 @@
GDKstrFromStr(rsep=GDKmalloc(len+1), *R, len); len = 0;
len = strlen((char*)(*S));
GDKstrFromStr(ssep=GDKmalloc(len+1), *S, len); len = 0;
- b = mvc_import_table(m, *s, *tname, (char*)tsep, (char*)rsep,
(char*)ssep, *sz, *offset);
+ b = mvc_import_table(m, *s, *sname, *tname, (char*)tsep, (char*)rsep,
(char*)ssep, *sz, *offset);
GDKfree(tsep);
GDKfree(rsep);
GDKfree(ssep);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
