MonetDB: copybinary - Don't forget to close the files

[Joeri van Ruth]

Changeset: 7be0a9e4848a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7be0a9e4848a
Modified Files:
        sql/backends/monet5/sql.c
Branch: copybinary
Log Message:

Don't forget to close the files


diffs (42 lines):

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
@@ -3345,7 +3345,7 @@ convert_timestamp(void *cookie, size_t i
 {
        copy_binary_timestamp *src = (copy_binary_timestamp*) external;
        timestamp *dst = (timestamp*) internal;
-       assert(internal_size == sizeof(*dst));
+       (void)internal_size; assert(internal_size == sizeof(*dst));
 
        COPY_BINARY_CONVERT_TIMESTAMP_ENDIAN(*src);
 
@@ -3364,7 +3364,7 @@ convert_date(void *cookie, size_t intern
 {
        copy_binary_date *src = (copy_binary_date*) external;
        date *dst = (date*) internal;
-       assert(internal_size == sizeof(*dst));
+       (void)internal_size; assert(internal_size == sizeof(*dst));
 
        COPY_BINARY_CONVERT_DATE_ENDIAN(*src);
 
@@ -3381,7 +3381,7 @@ convert_time(void *cookie, size_t intern
 {
        copy_binary_time *src = (copy_binary_time*) external;
        timestamp *dst = (timestamp*) internal;
-       assert(internal_size == sizeof(*dst));
+       (void)internal_size; assert(internal_size == sizeof(*dst));
 
        COPY_BINARY_CONVERT_TIME_ENDIAN(*src);
 
@@ -3596,8 +3596,10 @@ mvc_bin_import_table_wrap(Client cntxt, 
                                        goto bailout;
                        } else {
                                stream *s = open_rstream(fname);
-                               if (s != NULL)
+                               if (s != NULL) {
                                        msg = BATattach_stream(&c, 
col->base.name, tpe, s, 0, NULL);
+                                       close_stream(s);
+                               }
                                else
                                        msg = createException(
                                                SQL, 
"mvc_bin_import_table_wrap",
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list