Changeset: 019136c8acee for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=019136c8acee
Modified Files:
sql/backends/monet5/UDF/pyapi/convert_loops.h
sql/backends/monet5/generator/generator.c
Branch: default
Log Message:
Merge with Apr2019 branch.
diffs (25 lines):
diff --git a/sql/backends/monet5/UDF/pyapi/convert_loops.h
b/sql/backends/monet5/UDF/pyapi/convert_loops.h
--- a/sql/backends/monet5/UDF/pyapi/convert_loops.h
+++ b/sql/backends/monet5/UDF/pyapi/convert_loops.h
@@ -290,7 +290,8 @@ convert_and_append(BAT* b, const char* t
size_t len = 0;
gdk_return ret;
- BATatoms[b->ttype].atomFromStr(text, &len, &element, false);
+ if (BATatoms[b->ttype].atomFromStr(text, &len, &element, false)
< 0)
+ return GDK_FAIL;
ret = BUNappend(b, element, force);
GDKfree(element);
return ret;
diff --git a/sql/backends/monet5/generator/generator.c
b/sql/backends/monet5/generator/generator.c
--- a/sql/backends/monet5/generator/generator.c
+++ b/sql/backends/monet5/generator/generator.c
@@ -647,7 +647,7 @@ str VLTgenerator_thetasubselect(Client c
if ( strcmp(oper,">") == 0){
lng one = 1;
low= *getArgReference_TYPE(stk,pci,idx,
timestamp);
- if ((msg = MTIMEtimestamp_add(&hgh, &hgh,
&one)) != MAL_SUCCEED) {
+ if ((msg = MTIMEtimestamp_add(&low, &low,
&one)) != MAL_SUCCEED) {
if (cand)
BBPunfix(cand->batCacheid);
return msg;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
