Changeset: b0b48be77b7d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b0b48be77b7d
Modified Files:
gdk/gdk_batop.c
sql/test/BugTracker-2016/Tests/All
sql/test/emptydb/updatetests
sql/test/lateral/Tests/lateral.sql
Branch: default
Log Message:
Merge with Dec2016 branch.
diffs (107 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1729,6 +1729,8 @@ BATcount_no_nil(BAT *b)
return cnt;
}
+/* create a new, dense candidate list with values from `first' up to,
+ * but not including, `last' */
static BAT *
newdensecand(oid first, oid last)
{
@@ -1738,7 +1740,7 @@ newdensecand(oid first, oid last)
return NULL;
if (last < first)
first = last = 0; /* empty range */
- BATsetcount(bn, last - first + 1);
+ BATsetcount(bn, last - first);
BATtseqbase(bn, first);
return bn;
}
@@ -1790,19 +1792,19 @@ BATmergecand(BAT *a, BAT *b)
if (af <= bf && bf <= al + 1) {
/* partial overlap starting with a, or b is
* smack bang after a */
- return newdensecand(af, al < bl ? bl : al);
+ return newdensecand(af, al < bl ? bl + 1 : al + 1);
}
if (bf <= af && af <= bl + 1) {
/* partial overlap starting with b, or a is
* smack bang after b */
- return newdensecand(bf, al < bl ? bl : al);
+ return newdensecand(bf, al < bl ? bl + 1 : al + 1);
}
}
if (ad && af <= bf && al >= bl) {
- return newdensecand(af, al);
+ return newdensecand(af, al + 1);
}
if (bd && bf <= af && bl >= al) {
- return newdensecand(bf, bl);
+ return newdensecand(bf, bl + 1);
}
bn = COLnew(0, TYPE_oid, BATcount(a) + BATcount(b), TRANSIENT);
@@ -1912,7 +1914,7 @@ BATintersectcand(BAT *a, BAT *b)
if ((af + BATcount(a) - 1 == al) && (bf + BATcount(b) - 1 == bl)) {
/* both lists are VOID */
- return newdensecand(MAX(af, bf), MIN(al, bl));
+ return newdensecand(MAX(af, bf), MIN(al, bl) + 1);
}
bn = COLnew(0, TYPE_oid, MIN(BATcount(a), BATcount(b)), TRANSIENT);
diff --git a/sql/test/BugTracker-2016/Tests/All
b/sql/test/BugTracker-2016/Tests/All
--- a/sql/test/BugTracker-2016/Tests/All
+++ b/sql/test/BugTracker-2016/Tests/All
@@ -57,7 +57,7 @@ cast_and_floor.Bug-6071
union.Bug-6069
ifthenelse-void.Bug-6075
assert-on-table-producing-function.Bug-6076
-HAVE_NETCDF?assert-on-push-project-up.Bug-6077
+HAVE_NETCDF&HAVE_SAMTOOLS?assert-on-push-project-up.Bug-6077
HAVE_SAMTOOLS?assert-on-project.Bug-6078
crash.Bug-6081
merge-table-edit.Bug-6084
diff --git a/sql/test/emptydb/updatetests b/sql/test/emptydb/updatetests
--- a/sql/test/emptydb/updatetests
+++ b/sql/test/emptydb/updatetests
@@ -3,7 +3,7 @@
case $# in
1)
- if [ -d "$1" ] && [ -f "$1"/Tests/load.sql ] && [ -f
"$1"/Tests/check.SQL.py.src ]; then
+ if [ -d "$1" ] && [ -f "$1"/Tests/load.sql ] && [ -f
"$1"/Tests/check.SQL.py ]; then
cd "$1" || exit 1
else
echo "bad argument"
@@ -14,7 +14,7 @@ 0)
case $0 in
*/*) cd ${0%/*};;
esac
- if [ -f Tests/load.sql ] && [ -f Tests/check.SQL.py.src ]; then
+ if [ -f Tests/load.sql ] && [ -f Tests/check.SQL.py ]; then
:
else
echo "bad directory"
diff --git a/sql/test/lateral/Tests/lateral.sql
b/sql/test/lateral/Tests/lateral.sql
--- a/sql/test/lateral/Tests/lateral.sql
+++ b/sql/test/lateral/Tests/lateral.sql
@@ -36,12 +36,12 @@ INSERT INTO employees VALUES (7566,'JONE
INSERT INTO employees VALUES
(7654,'MARTIN','SALESMAN',7698,to_date('28-9-1981','dd-mm-yyyy'),1250,1400,30);
INSERT INTO employees VALUES
(7698,'BLAKE','MANAGER',7839,to_date('1-5-1981','dd-mm-yyyy'),2850,NULL,30);
INSERT INTO employees VALUES
(7782,'CLARK','MANAGER',7839,to_date('9-6-1981','dd-mm-yyyy'),2450,NULL,10);
---INSERT INTO employees VALUES
(7788,'SCOTT','ANALYST',7566,to_date('13-JUL-87','dd-mm-rr')-85,3000,NULL,20);
-INSERT INTO employees VALUES
(7788,'SCOTT','ANALYST',7566,to_date('13-6-87','dd-mm-rr')-85,3000,NULL,20);
+--INSERT INTO employees VALUES
(7788,'SCOTT','ANALYST',7566,to_date('13-JUL-1987','dd-mm-rr')-85,3000,NULL,20);
+INSERT INTO employees VALUES
(7788,'SCOTT','ANALYST',7566,to_date('13-6-1987','dd-mm-rr')-85,3000,NULL,20);
INSERT INTO employees VALUES
(7839,'KING','PRESIDENT',NULL,to_date('17-11-1981','dd-mm-yyyy'),5000,NULL,10);
INSERT INTO employees VALUES
(7844,'TURNER','SALESMAN',7698,to_date('8-9-1981','dd-mm-yyyy'),1500,0,30);
---INSERT INTO employees VALUES (7876,'ADAMS','CLERK',7788,to_date('13-JUL-87',
'dd-mm-rr')-51,1100,NULL,20);
-INSERT INTO employees VALUES (7876,'ADAMS','CLERK',7788,to_date('13-6-87',
'dd-mm-rr')-51,1100,NULL,20);
+--INSERT INTO employees VALUES
(7876,'ADAMS','CLERK',7788,to_date('13-JUL-1987', 'dd-mm-rr')-51,1100,NULL,20);
+INSERT INTO employees VALUES (7876,'ADAMS','CLERK',7788,to_date('13-6-1987',
'dd-mm-rr')-51,1100,NULL,20);
INSERT INTO employees VALUES
(7900,'JAMES','CLERK',7698,to_date('3-12-1981','dd-mm-yyyy'),950,NULL,30);
INSERT INTO employees VALUES
(7902,'FORD','ANALYST',7566,to_date('3-12-1981','dd-mm-yyyy'),3000,NULL,20);
INSERT INTO employees VALUES
(7934,'MILLER','CLERK',7782,to_date('23-1-1982','dd-mm-yyyy'),1300,NULL,10);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
