MonetDB: copybinary - Move prompting to the bs stream

[Joeri van Ruth]

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

Move prompting to the bs stream


diffs (36 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
@@ -3151,17 +3151,12 @@ mvc_import_table_wrap(Client cntxt, MalB
 static bool
 read_more(bstream *in, stream *out)
 {
+       (void)out;
+       bool success = false;
        do {
-               if (bstream_next(in) < 0)
-                       return false;
-               if (in->eof) {
-                       if (mnstr_write(out, PROMPT2, sizeof(PROMPT2) - 1, 1) 
!= 1
-                           || mnstr_flush(out, MNSTR_FLUSH_DATA) < 0)
-                               return false;
-                       in->eof = false;
-                       if (bstream_next(in) <= 0)
-                               return false;
-               }
+               if (bstream_next(in) <= 0)
+                       return success;
+               success = true;
        } while (in->len <= in->pos);
        return true;
 }
@@ -3332,7 +3327,9 @@ mvc_bin_import_table_wrap(Client cntxt, 
                                        msg = createException(SQL, "sql", 
SQLSTATE(HY013) MAL_MALLOC_FAIL);
                                        goto bailout;
                                }
+                               set_prompting(rs, PROMPT2, ws);
                                c = 
BATattach_bstream(col->type.type->localtype, s, ws, cnt);
+                               set_prompting(rs, NULL, NULL);
                                if (!c) {
                                        bstream_destroy(s);
                                        msg = createException(SQL, "sql", 
SQLSTATE(HY013) MAL_MALLOC_FAIL);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list