Changeset: 601b9a58ff94 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=601b9a58ff94 Modified Files: clients/Tests/exports.stable.out Branch: protocol Log Message:
Approve exports test. diffs (93 lines): diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -541,6 +541,7 @@ char *mapi_get_type(MapiHdl hdl, int fnr char *mapi_get_uri(Mapi mid); char *mapi_get_user(Mapi mid); int mapi_is_connected(Mapi mid); +int mapi_is_protocol10(MapiHdl hdl); MapiMsg mapi_log(Mapi mid, const char *nme); Mapi mapi_mapi(const char *host, int port, const char *username, const char *password, const char *lang, const char *dbname); Mapi mapi_mapiuri(const char *url, const char *user, const char *pass, const char *lang); @@ -576,6 +577,11 @@ mapi_int64 mapi_rows_affected(MapiHdl hd MapiMsg mapi_seek_row(MapiHdl hdl, mapi_int64 rowne, int whence); MapiHdl mapi_send(Mapi mid, const char *cmd); MapiMsg mapi_setAutocommit(Mapi mid, int autocommit); +void mapi_set_blocksize(Mapi mid, size_t blocksize); +MapiMsg mapi_set_column_compression(Mapi mid, const char *colcomp); +MapiMsg mapi_set_compression(Mapi mid, const char *compression); +void mapi_set_compute_column_width(Mapi mid, int compute_column_width); +MapiMsg mapi_set_protocol(Mapi mid, const char *prot); MapiMsg mapi_set_size_header(Mapi mid, int value); int mapi_split_line(MapiHdl hdl); MapiMsg mapi_start_talking(Mapi mid); @@ -1397,7 +1403,7 @@ char *MSP_locate_sqlscript(const char *m void MSinitClientPrg(Client cntxt, str mod, str nme); void MSresetInstructions(MalBlkPtr mb, int start); void MSresetVariables(Client cntxt, MalBlkPtr mb, MalStkPtr glb, int start); -void MSscheduleClient(str command, str challenge, bstream *fin, stream *fout); +void MSscheduleClient(str command, str challenge, bstream *fin, stream *fout, protocol_version protocol, size_t blocksize, int compute_column_widths); void MSserveClient(void *dummy); str MTIMEcompute_rule_foryear(date *ret, const rule *val, const int *year); str MTIMEcurrent_date(date *d); @@ -1448,6 +1454,7 @@ str MTIMEdaytime_extract_sql_seconds_bul str MTIMEdaytime_fromstr(daytime *ret, const char *const *s); str MTIMEepilogue(void *ret); str MTIMEepoch2int(int *res, const timestamp *ts); +str MTIMEepoch_bulk(bat *ret, bat *bid); str MTIMElocal_timezone(lng *res); str MTIMEmonth_from_str(int *ret, const char *const *month); str MTIMEmonth_to_str(str *ret, const int *month); @@ -2517,6 +2524,12 @@ str zero_or_oneRef; stream *append_wastream(const char *filename); stream *append_wstream(const char *filename); stream *block_stream(stream *s); +stream *block_stream2(stream *s, size_t bufsiz, compression_method comp, column_compression colcomp); +buffer bs2_buffer(stream *s); +void *bs2_getbuf(stream *ss); +void bs2_resetbuf(stream *ss); +void bs2_setpos(stream *ss, size_t pos); +stream *bs_stream(stream *s); bstream *bstream_create(stream *rs, size_t chunk_size); void bstream_destroy(bstream *s); ssize_t bstream_next(bstream *s); @@ -2538,6 +2551,7 @@ size_t getFileSize(stream *s); stream *iconv_rstream(stream *ss, const char *charset, const char *name); stream *iconv_wstream(stream *ss, const char *charset, const char *name); int isa_block_stream(stream *s); +int isa_fixed_block_stream(stream *s); int mnstr_byteorder(stream *s); void mnstr_clearerr(stream *s); void mnstr_close(stream *s); @@ -2556,6 +2570,7 @@ int mnstr_printf(stream *s, _In_z_ _Prin ssize_t mnstr_read(stream *s, void *buf, size_t elmsize, size_t cnt); int mnstr_readBte(stream *s, signed char *val); int mnstr_readBteArray(stream *s, signed char *val, size_t cnt); +int mnstr_readChr(stream *s, char *val); int mnstr_readHge(stream *s, hge *val); int mnstr_readHgeArray(stream *s, hge *val, size_t cnt); int mnstr_readInt(stream *s, int *val); @@ -2564,6 +2579,7 @@ int mnstr_readLng(stream *s, lng *val); int mnstr_readLngArray(stream *s, lng *val, size_t cnt); int mnstr_readSht(stream *s, short *val); int mnstr_readShtArray(stream *s, short *val, size_t cnt); +int mnstr_readStr(stream *s, char *val); ssize_t mnstr_read_block(stream *s, void *buf, size_t elmsize, size_t cnt); ssize_t mnstr_readline(stream *s, void *buf, size_t maxcnt); stream *mnstr_rstream(stream *s); @@ -2573,6 +2589,7 @@ int mnstr_type(stream *s); ssize_t mnstr_write(stream *s, const void *buf, size_t elmsize, size_t cnt); int mnstr_writeBte(stream *s, signed char val); int mnstr_writeBteArray(stream *s, const signed char *val, size_t cnt); +int mnstr_writeChr(stream *s, char val); int mnstr_writeHge(stream *s, hge val); int mnstr_writeHgeArray(stream *s, const hge *val, size_t cnt); int mnstr_writeInt(stream *s, int val); @@ -2581,6 +2598,7 @@ int mnstr_writeLng(stream *s, lng val); int mnstr_writeLngArray(stream *s, const lng *val, size_t cnt); int mnstr_writeSht(stream *s, short val); int mnstr_writeShtArray(stream *s, const short *val, size_t cnt); +int mnstr_writeStr(stream *s, const char *val); stream *mnstr_wstream(stream *s); stream *open_rastream(const char *filename); stream *open_rstream(const char *filename); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
