Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15186/src/backends/monet5
Modified Files:
sql.mx sql_gencode.mx sql_result.mx
Log Message:
we correctly us lng's now to pass the limit/offset
U sql_result.mx
Index: sql_result.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_result.mx,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- sql_result.mx 13 Jan 2009 14:47:54 -0000 1.110
+++ sql_result.mx 27 Jan 2009 09:23:51 -0000 1.111
@@ -36,7 +36,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, int nr, int offset);
+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 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);
@@ -407,7 +407,7 @@
BAT *
-mvc_import_table(mvc *m, bstream *bs, char *sname, char *tname, char *sep,
char *rsep, char *ssep, char *ns, int sz, int offset)
+mvc_import_table(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);
U sql_gencode.mx
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -d -r1.310 -r1.311
--- sql_gencode.mx 26 Jan 2009 16:09:42 -0000 1.310
+++ sql_gencode.mx 27 Jan 2009 09:23:51 -0000 1.311
@@ -1504,9 +1504,8 @@
char *rsep = n->next->data;
char *ssep = n->next->next->data;
char *ns = n->next->next->next->data;
-/* XXX shouldn't these be lng? see stmt_import() in sql_statement.mx */
- int nr_rec = *(int*)(n->next->next->next->next->data);
- int offset =
*(int*)(n->next->next->next->next->next->data);
+ lng nr_rec = *(lng*)(n->next->next->next->next->data);
+ lng offset =
*(lng*)(n->next->next->next->next->next->data);
if (sep == NULL) {
/* COPY INTO from binary files */
@@ -1554,8 +1553,8 @@
q = pushStr(mb, q, rsep);
q = pushStr(mb, q, ssep);
q = pushStr(mb, q, ns);
- q = pushInt(mb, q, nr_rec);
- q = pushInt(mb, q, offset);
+ q = pushLng(mb, q, nr_rec);
+ q = pushLng(mb, q, offset);
s->nr = getDestVar(q);
q = newStmt(mb, "bstream", "destroy");
@@ -1576,8 +1575,8 @@
q = pushStr(mb, q, rsep);
q = pushStr(mb, q, ssep);
q = pushStr(mb, q, ns);
- q = pushInt(mb, q, nr_rec);
- q = pushInt(mb, q, offset);
+ q = pushLng(mb, q, nr_rec);
+ q = pushLng(mb, q, offset);
s->nr = getDestVar(q);
}
}
U sql.mx
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -d -r1.318 -r1.319
--- sql.mx 26 Jan 2009 16:09:42 -0000 1.318
+++ sql.mx 27 Jan 2009 09:23:48 -0000 1.319
@@ -260,7 +260,7 @@
comment "export a single value onto the stream s";
pattern importTable{unsafe}( s:bstream, sname:str, tname:str,
- sep:str, rsep:str, ssep:str, ns:str, nr:int, offset:int) :bat[:str,:bat]
+ sep:str, rsep:str, ssep:str, ns:str, nr:lng, offset:lng) :bat[:str,:bat]
address mvc_import_table_wrap
comment "Import a table from bstream s with the
given tuple and seperators (sep/rsep)";
@@ -2209,7 +2209,7 @@
return MAL_SUCCEED;
}
-/* str mvc_import_table_wrap(int *res, bstream **s, str *sname, str *tname,
unsigned char* *T, unsigned char* *R, unsigned char* *S, unsigned char* *N, int
*sz, int *offset); */
+/* str mvc_import_table_wrap(int *res, bstream **s, str *sname, str *tname,
unsigned char* *T, unsigned char* *R, unsigned char* *S, unsigned char* *N, lng
*sz, lng *offset); */
str
mvc_import_table_wrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
@@ -2226,8 +2226,8 @@
unsigned char **R = (unsigned char **) getArgReference(stk, pci, 5);
unsigned char **S = (unsigned char **) getArgReference(stk, pci, 6);
unsigned char **N = (unsigned char **) getArgReference(stk, pci, 7);
- int *sz = (int *) getArgReference(stk, pci, 8);
- int *offset = (int *) getArgReference(stk, pci, 9);
+ lng *sz = (lng *) getArgReference(stk, pci, 8);
+ lng *offset = (lng *) getArgReference(stk, pci, 9);
(void) cntxt;
if (msg)
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
