Changeset: 51680e011d30 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=51680e011d30
Modified Files:
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_subquery.c
testing/Mtest.py.in
Branch: sq2default
Log Message:
fixed problem with void types in SQLall
fixed issue with remote relational functions returning single values (while we
expect bats)
small change in the Mtest detection of java jdbctest jars.
diffs (38 lines):
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -199,7 +199,9 @@ static int
}
/* add return statement */
- r = rel_psm_stmt(m->sa, exp_return(m->sa, exp_rel(m, r), 0));
+ sql_exp *e;
+ r = rel_psm_stmt(m->sa, e = exp_return(m->sa, exp_rel(m, r), 0));
+ e->card = CARD_MULTI;
be->mvc->argc = 0;
if (backend_dumpstmt(be, curBlk, r, 0, 1, NULL) < 0) {
freeSymbol(curPrg);
diff --git a/sql/backends/monet5/sql_subquery.c
b/sql/backends/monet5/sql_subquery.c
--- a/sql/backends/monet5/sql_subquery.c
+++ b/sql/backends/monet5/sql_subquery.c
@@ -155,6 +155,8 @@ SQLall(ptr ret, const bat *bid)
}
}
_s = ATOMsize(ATOMtype(b->ttype));
+ if (b->ttype == TYPE_void)
+ p = &oid_nil;
if (ATOMextern(b->ttype)) {
_s = ATOMlen(ATOMtype(b->ttype), p);
*(ptr *) ret = GDKmalloc(_s);
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3343,7 +3343,7 @@ def CheckClassPath() :
JARS = {
'HAVE_MONETDBJDBC_JAR' :
re.compile('^monetdb-jdbc-[0-9]\.[0-9]+(-[a-f0-9]{12})?\.jre[0-9]+\.jar$'),
'HAVE_JDBCCLIENT_JAR' : re.compile('^jdbcclient\.jre[0-9]+\.jar$'),
- 'HAVE_JDBCTESTS_JAR' : re.compile('^jdbctests\.jar$'),
+ 'HAVE_JDBCTESTS_JAR' : re.compile('^jdbctests\.jre[0-9]+\.jar$'),
}
# check for known JARs in CLASSPATH files
for p in cp.split(os.pathsep):
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
