Changeset: 19b8af045b23 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=19b8af045b23
Modified Files:
common/stream/stream.c
sql/backends/monet5/sql.c
Branch: fixed-width-format
Log Message:
stream route is working
diffs (38 lines):
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -4760,13 +4760,13 @@ stream_fwf_close(stream *s)
{
if (strcmp(s->name, STREAM_FWF_NAME) == 0) {
stream_fwf_data *fsd = (stream_fwf_data*) s->stream_data.p;
- fsd->s->close(fsd->s);
+ mnstr_close(fsd->s);
free(fsd->widths);
free(fsd->in_buf);
free(fsd->out_buf);
free(fsd);
}
- destroy(s);
+ // FIXME destroy(s);
}
stream*
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -3483,6 +3483,15 @@ mvc_import_table_wrap(Client cntxt, MalB
return msg;
}
GDKfree(fn);
+
+ // FIXME
+ if (GDKgetenv_isyes("testfwf")) {
+ fprintf(stderr, "### FWF IMPORT ON %s ###\n", *fname);
+ size_t *widths = malloc(sizeof(size_t)*400);
+ size_t i = 0;
+ widths[i++] = 2; widths[i++] = 2; widths[i++] = 9;
widths[i++] = 12; widths[i++] = 8; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 8;
widths[i++] = 8; widths[i++] = 30; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 9; widths[i++] = 4; widths[i++] = 4; widths[i++] = 2;
widths[i++] = 8; widths[i++] = 9; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 9; widths[i++] = 9; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 9; widths[i++] = 9; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 9; widths[i++] = 9; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 9; widths[i++] = 9; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 9; widths[i++] = 2; widths[i++] = 2; widths[i++] = 4;
widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; wi
dths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 3; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 3; widths[i++] = 2; widths[i++] = 2; widths[i++] = 4;
widths[i++] = 2; widths[i++] = 8; widths[i++] = 2; widths[i++] = 3;
widths[i++] = 3; widths[i++] = 3; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i+
+] = 2; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] =
3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 3; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 9; widths[i++] = 9;
widths[i++] = 9; widths[i++] = 8; widths[i++] = 8; widths[i++] = 8;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 9; widths[i++] = 9; widths[i++] = 9;
widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 9; widths[i++] = 9; widths[i++] = 9;
widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 9; widths[i++] = 9;
widths[i++] = 9; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 3;
widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 9; widths[i++] = 9; width
s[i++] = 9; widths[i++] = 4; widths[i++] = 4; widths[i++] = 4; widths[i++]
= 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++]
= 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; w
idths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 12; widths[i++] = 12; widths[i++] = 12; widths[i++] = 8;
widths[i++] = 8; widths[i++] = 8; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 3; widths[i++] = 3; widths[i++] = 3; widths[i++] = 3;
widths[i++] = 3; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 2;
widths[i++] = 2; widths[i++] = 2; widths[i++] = 2; widths[i++] = 40;
+ ss = stream_fwf_create(ss, 376, widths, ' ');
+ }
#if SIZEOF_VOID_P == 4
s = bstream_create(ss, 0x20000);
#else
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
