Changeset: a61598b86505 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a61598b86505
Modified Files:
sql/src/backends/monet5/sql_gencode.mx
sql/src/test/BugTracker-2010/Tests/between-timestamp.Bug-2718.stable.out
Branch: Oct2010
Log Message:
backport of fix for Bug 2718
(don't use bandjoin for external types)
diffs (30 lines):
diff -r 6e3a607bc001 -r a61598b86505 sql/src/backends/monet5/sql_gencode.mx
--- a/sql/src/backends/monet5/sql_gencode.mx Wed Nov 24 18:59:26 2010 +0100
+++ b/sql/src/backends/monet5/sql_gencode.mx Wed Nov 24 19:13:25 2010 +0100
@@ -274,7 +274,10 @@
int ls = 0, hs = 0;
stmt *l = NULL, *h = NULL;
stmt *bl = s->op2.stval, *bh = s->op3.stval;
+ int tt = tail_type(s->op2.stval)->type->localtype;
+ if (tt > TYPE_lng)
+ return 0;
if (s->op2.stval->type == st_binop) {
bl = s->op2.stval->op1.stval;
l = s->op2.stval->op2.stval;
diff -r 6e3a607bc001 -r a61598b86505
sql/src/test/BugTracker-2010/Tests/between-timestamp.Bug-2718.stable.out
--- a/sql/src/test/BugTracker-2010/Tests/between-timestamp.Bug-2718.stable.out
Wed Nov 24 18:59:26 2010 +0100
+++ b/sql/src/test/BugTracker-2010/Tests/between-timestamp.Bug-2718.stable.out
Wed Nov 24 19:13:25 2010 +0100
@@ -47,9 +47,9 @@
#where t2.time between (t1.time - interval '1' second) and (t1.time + interval
'1' second)
#group by t1.time
#order by t1.time;
-% sys.bug2718, sys.bug2718 # table_name
-% time, val # name
-% timestamp, int # type
+% sys.t1, sys.t2 # table_name
+% time, L3 # name
+% timestamp, wrd # type
% 26, 1 # length
[ 2010-11-17 13:37:55.000000, 2 ]
[ 2010-11-17 13:37:56.000000, 3 ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
