Changeset: 856682539ccf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=856682539ccf
Modified Files:
sql/common/sql_types.c
sql/server/rel_dump.c
sql/test/BugDay_2005-11-09_2.9.3/Tests/sql_server_crash.SF-1080024.stable.out
sql/test/remote/Tests/ssbm.SQL.py
sql/test/remote/Tests/ssbm.stable.out
sql/test/remote/Tests/ssbm.stable.out.int128
Branch: default
Log Message:
merged with Jun2016
diffs (99 lines):
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -691,6 +691,21 @@ sql_dup_subfunc(sql_allocator *sa, sql_f
list_append(fres->res, res);
}
}
+ if (member) { /* check that the types of all EC_ANY's are equal
*/
+ sql_subtype *st = NULL;
+ node *m;
+
+ if (ops) for (tn = ops->h, m = f->ops->h; tn; tn =
tn->next, m = m->next) {
+ sql_arg *s = m->data;
+
+ if (s->type.type->eclass == EC_ANY) {
+ if (!st)
+ st = tn->data;
+ else if (subtype_cmp(st, tn->data))
+ return NULL;
+ }
+ }
+ }
}
return fres;
}
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -872,11 +872,13 @@ exp_read(mvc *sql, sql_rel *lrel, sql_re
}
}
if (!exp && lrel) {
+ char *cname;
old = *e;
*e = 0;
- exp = rel_bind_column(sql, lrel, b, 0);
+ cname = sa_strdup(sql->sa, b);
+ exp = rel_bind_column(sql, lrel, cname, 0);
if (!exp && rrel)
- exp = rel_bind_column(sql, rrel, b, 0);
+ exp = rel_bind_column(sql, rrel, cname, 0);
*e = old;
skipWS(r,pos);
}
diff --git
a/sql/test/BugDay_2005-11-09_2.9.3/Tests/sql_server_crash.SF-1080024.stable.out
b/sql/test/BugDay_2005-11-09_2.9.3/Tests/sql_server_crash.SF-1080024.stable.out
---
a/sql/test/BugDay_2005-11-09_2.9.3/Tests/sql_server_crash.SF-1080024.stable.out
+++
b/sql/test/BugDay_2005-11-09_2.9.3/Tests/sql_server_crash.SF-1080024.stable.out
@@ -28,7 +28,7 @@ Ready.
% .L # table_name
% isnull_=_single_value # name
% char # type
-% 5 # length
+% 6 # length
[ NULL ]
# 12:45:31 >
diff --git a/sql/test/remote/Tests/ssbm.SQL.py
b/sql/test/remote/Tests/ssbm.SQL.py
--- a/sql/test/remote/Tests/ssbm.SQL.py
+++ b/sql/test/remote/Tests/ssbm.SQL.py
@@ -184,6 +184,9 @@ for workerrec in workers:
c.execute(atable)
# sanity check
+c.execute("select count(*) from lineorder_0")
+print str(c.fetchall()[0][0]) + ' rows in remote table'
+
c.execute("select count(*) from lineorder")
print str(c.fetchall()[0][0]) + ' rows in mergetable'
diff --git a/sql/test/remote/Tests/ssbm.stable.out
b/sql/test/remote/Tests/ssbm.stable.out
--- a/sql/test/remote/Tests/ssbm.stable.out
+++ b/sql/test/remote/Tests/ssbm.stable.out
@@ -6,6 +6,11 @@ Ready.
# 14:14:37 > "/usr/local/opt/python/bin/python2.7" "ssbm.SQL.py" "ssbm"
# 14:14:37 >
+# 11:09:02 >
+# 11:09:02 > "/usr/bin/python2" "ssbm.SQL.py" "ssbm"
+# 11:09:02 >
+
+12036 rows in remote table
60175 rows in mergetable
356
356
diff --git a/sql/test/remote/Tests/ssbm.stable.out.int128
b/sql/test/remote/Tests/ssbm.stable.out.int128
--- a/sql/test/remote/Tests/ssbm.stable.out.int128
+++ b/sql/test/remote/Tests/ssbm.stable.out.int128
@@ -2,6 +2,11 @@ stdout of test 'ssbm` in directory 'sql/
Ready.
+# 11:09:02 >
+# 11:09:02 > "/usr/bin/python2" "ssbm.SQL.py" "ssbm"
+# 11:09:02 >
+
+12036 rows in remote table
60175 rows in mergetable
356
356
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
