Changeset: c3366c9d6eb0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c3366c9d6eb0
Modified Files:
sql/backends/monet5/sql_result.c
Branch: protocol
Log Message:
Any required protocol string conversion is now done while transferring rather
than converting the entire BAT before transferring.
diffs (21 lines):
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -1414,7 +1414,16 @@ mvc_export_table_prot10(backend *b, stre
blob *b = (blob*)
BUNtail(iterators[i], row);
rowsize += sizeof(lng)
+ ((b->nitems == ~(size_t) 0) ? 0 : b->nitems);
} else {
- size_t slen =
strlen((const char*) BUNtail(iterators[i], row));
+ size_t slen = 0;
+ if (convert_to_string) {
+ void *element =
(void*) BUNtail(iterators[i], crow);
+ if ((slen =
BATatoms[mtype].atomToStr(&result, &length, element)) == 0) {
+ fres =
-1;
+ goto
cleanup;
+ }
+ } else {
+ slen =
strlen((const char*) BUNtail(iterators[i], row));
+ }
rowsize += slen + 1;
}
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
