Changeset: 80f5e079528a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=80f5e079528a
Modified Files:
Branch: default
Log Message:
merge with Jun2010 branch
diffs (111 lines):
diff -r f3eb0723df0c -r 80f5e079528a MonetDB5/src/modules/mal/pqueue.mx
--- a/MonetDB5/src/modules/mal/pqueue.mx Wed Aug 18 11:10:17 2010 +0200
+++ b/MonetDB5/src/modules/mal/pqueue.mx Wed Aug 18 13:34:04 2010 +0200
@@ -315,7 +315,7 @@
BUN i, n = BATcount(t);
oid idx = t->hseqbase;
- if ((BUN) *N < n)
+ if (*N != wrd_nil && *N >= 0 && *N <= (wrd) BUN_MAX && (BUN) *N < n)
n = (BUN) *N;
if (do_pqueue_init(H,t,n) == GDK_FAIL)
return GDK_FAIL;
@@ -337,7 +337,7 @@
BUN i, n = BATcount(t);
BUN p = BUNfirst(t);
- if ((BUN) *N < n)
+ if (*N != wrd_nil && *N >= 0 && *N <= (wrd) BUN_MAX && (BUN) *N < n)
n = (BUN) *N;
if (do_pqueue_init(H,t,n) == GDK_FAIL)
return GDK_FAIL;
@@ -362,7 +362,9 @@
BUN i, j, n, cnt = BATcount(t), p;
oid idx = t->hseqbase;
- n = (BUN) *N;
+ n = cnt;
+ if (*N != wrd_nil && *N >= 0 && *N <= (wrd) BUN_MAX)
+ n = (BUN) *N;
if (do_pqueue_init(H,t,n) == GDK_FAIL)
return GDK_FAIL;
duplicates = BATnew(TYPE_oid, TYPE_oid, n);
@@ -410,7 +412,9 @@
BUN i, j, n, cnt = BATcount(t), p;
oid *idx;
- n = (BUN) *N;
+ n = cnt;
+ if (*N != wrd_nil && *N >= 0 && *N <= (wrd) BUN_MAX)
+ n = (BUN) *N;
if (do_pqueue_init(H,t,n) == GDK_FAIL)
return GDK_FAIL;
duplicates = BATnew(TYPE_oid, TYPE_oid, n);
@@ -596,7 +600,7 @@
BUN p = BUNfirst(t);
int tpe = BATttype(t);
- if ((BUN) *N < n)
+ if (*N != wrd_nil && *N >= 0 && *N <= (wrd) BUN_MAX && (BUN) *N < n)
n = (BUN) *N;
if (do_pqueue_init(H,t,n) == GDK_FAIL)
return GDK_FAIL;
@@ -618,7 +622,7 @@
BUN p = BUNfirst(t);
int tpe = BATttype(t);
- if ((BUN) *N < n)
+ if (*N != wrd_nil && *N >= 0 && *N <= (wrd) BUN_MAX && (BUN) *N < n)
n = (BUN) *N;
if (do_pqueue_init(H,t,n) == GDK_FAIL)
return GDK_FAIL;
@@ -643,7 +647,9 @@
oid idx = t->hseqbase;
int tpe = BATttype(t);
- n = (BUN) *N;
+ n = cnt;
+ if (*N != wrd_nil && *N >= 0 && *N <= (wrd) BUN_MAX)
+ n = (BUN) *N;
if (do_pqueue_init(H,t,n) == GDK_FAIL)
return GDK_FAIL;
duplicates = BATnew(TYPE_oid, TYPE_oid, n);
@@ -695,7 +701,9 @@
ptr v;
int tpe = BATttype(t);
- n = (BUN) *N;
+ n = cnt;
+ if (*N != wrd_nil && *N >= 0 && *N <= (wrd) BUN_MAX)
+ n = (BUN) *N;
if (do_pqueue_init(H,t,n) == GDK_FAIL)
return GDK_FAIL;
duplicates = BATnew(TYPE_oid, TYPE_oid, n);
diff -r f3eb0723df0c -r 80f5e079528a
sql/src/test/BugTracker-2009/Tests/recursion-problem.SF-2827784.timeout
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2009/Tests/recursion-problem.SF-2827784.timeout
Wed Aug 18 13:34:04 2010 +0200
@@ -0,0 +1,1 @@
+4
diff -r f3eb0723df0c -r 80f5e079528a
sql/src/test/Skyserver/Tests/Skyserver.timeout
--- a/sql/src/test/Skyserver/Tests/Skyserver.timeout Wed Aug 18 11:10:17
2010 +0200
+++ b/sql/src/test/Skyserver/Tests/Skyserver.timeout Wed Aug 18 13:34:04
2010 +0200
@@ -1,1 +1,1 @@
-2
+3
diff -r f3eb0723df0c -r 80f5e079528a
sql/src/test/Skyserver/Tests/Skyserver_v6.timeout
--- a/sql/src/test/Skyserver/Tests/Skyserver_v6.timeout Wed Aug 18 11:10:17
2010 +0200
+++ b/sql/src/test/Skyserver/Tests/Skyserver_v6.timeout Wed Aug 18 13:34:04
2010 +0200
@@ -1,1 +1,1 @@
-2
+3
diff -r f3eb0723df0c -r 80f5e079528a sql/src/test/VOC/Tests/VOC.timeout
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/VOC/Tests/VOC.timeout Wed Aug 18 13:34:04 2010 +0200
@@ -0,0 +1,1 @@
+2
diff -r f3eb0723df0c -r 80f5e079528a sql/src/test/xquery/Tests/create.timeout
--- a/sql/src/test/xquery/Tests/create.timeout Wed Aug 18 11:10:17 2010 +0200
+++ b/sql/src/test/xquery/Tests/create.timeout Wed Aug 18 13:34:04 2010 +0200
@@ -1,1 +1,1 @@
-3
+10
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
