Changeset: 89c945c1fc65 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=89c945c1fc65
Removed Files:
sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.sql
Modified Files:
gdk/gdk_setop.mx
monetdb5/optimizer/opt_wrapper.c
sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.SQL.py
sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (98 lines):
diff --git a/gdk/gdk_setop.mx b/gdk/gdk_setop.mx
--- a/gdk/gdk_setop.mx
+++ b/gdk/gdk_setop.mx
@@ -72,12 +72,12 @@ All Rights Reserved.
#include "gdk_private.h"
#include "gdk_search.h"
-#define HITk(t1,t2) TRUE
-#define HITs(t1,t2) ((*cmp)(t1,t2) == 0)
-#define EQUALs(t1,t2) ((*cmp)(t1,t2) == 0 && (*cmp)(t1,tnil))
-#define EQUALk(t1,t2) TRUE
-#define FLIPs(l,r) TRUE
-#define FLIPk(l,r) FALSE
+#define HITk(t1,t2) TRUE
+#define HITs(t1,t2) ((*cmp)(t1,t2) == 0)
+#define EQUALs(t1,t2) ((*cmp)(t1,t2) == 0 && (*cmp)(t1,tnil))
+#define EQUALk(t1,t2) TRUE
+#define FLIPs TRUE
+#define FLIPk FALSE
#define HITintersect(h,t) bunfastins(bn,h,t)
#define HITdiff(h,t)
@@ -622,7 +622,9 @@ BATins_@1@2(BAT *bn, BAT *l, BAT *r)
/* determine how to do the intersect */
if (BAThordered(l) & BAThordered(r)) {
hash = FALSE;
- } else if (FLIP@1(l, r)) {
+ }
+#if FLIP@1
+ else {
int flip = BATtordered(l) & BATtordered(r);
if (flip) {
@@ -636,6 +638,7 @@ BATins_@1@2(BAT *bn, BAT *l, BAT *r)
bn = BATmirror(bn);
}
}
+#endif
merge = BATatoms[l->htype].atomCmp;
cmp = BATatoms[l->ttype].atomCmp;
hnil = ATOMnilptr(l->htype);
diff --git a/monetdb5/optimizer/opt_wrapper.c b/monetdb5/optimizer/opt_wrapper.c
--- a/monetdb5/optimizer/opt_wrapper.c
+++ b/monetdb5/optimizer/opt_wrapper.c
@@ -175,9 +175,7 @@ str OPTwrapper (Client cntxt, MalBlkPtr
break;
}
if ( codes[i].nme == 0){
- char buf[1024];
- snprintf(buf,1024, "%s.%s",modnme,fcnnme);
- throw(MAL, optimizer, RUNTIME_OBJECT_UNDEFINED ":%s", buf);
+ throw(MAL, optimizer, RUNTIME_OBJECT_UNDEFINED ":%s.%s",
modnme, fcnnme);
}
msg= optimizerCheck(cntxt, mb, optimizer, actions, t=(GDKusec() -
clk),OPT_CHECK_ALL);
diff --git
a/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.SQL.py
b/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.SQL.py
--- a/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.SQL.py
+++ b/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.SQL.py
@@ -14,7 +14,7 @@ insert into t1 values(8);
insert into t1 values(9);
insert into t1 values(0);
select * from t1;
-drop table t1;
+--drop table t1;
'''
class Client(threading.Thread):
diff --git a/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.sql
b/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.sql
deleted file mode 100644
--- a/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-select count(*) from tables;
-create table t1(i int);
-insert into t1 values(1);
-insert into t1 values(2);
-select * from t1;
-drop table t1;
diff --git
a/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
b/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
--- a/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
+++ b/sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
@@ -19,11 +19,11 @@ Ready.
# 11:01:29 > "/usr/bin/python" "crash_on_concurrent_use.SF-1411926.SQL.py"
"crash_on_concurrent_use.SF-1411926"
# 11:01:29 >
-(0, [(30,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
-(1, [(30,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
-(2, [(30,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
-(3, [(30,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
-(4, [(30,), (1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
+(0, [(1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
+(1, [(1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
+(2, [(1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
+(3, [(1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
+(4, [(1,), (2,), (3,), (4,), (5,), (6,), (7,), (8,), (9,), (0,)])
# 11:01:30 >
# 11:01:30 > "Done."
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
