Changeset: 7b45edc33e2e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7b45edc33e2e
Modified Files:
MonetDB.spec
gdk/gdk_join.c
Branch: default
Log Message:
Merge with Jul2021 branch.
diffs (278 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -829,7 +829,6 @@ fi
%changelog
* Mon May 03 2021 Sjoerd Mullender <sjo...@acm.org> - 11.39.17-20210503
- Rebuilt.
-- GH#2430: JDBC: support for streams
- GH#3336: DB files not removed if all rows are deleted, even after restart
- GH#7104: Monetdbe NTILE function does not produce correct ordering
- GH#7108: Monetdb crashes on query execution
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
monetdb (11.39.17) unstable; urgency=low
* Rebuilt.
- * GH#2430: JDBC: support for streams
* GH#3336: DB files not removed if all rows are deleted, even after restart
* GH#7104: Monetdbe NTILE function does not produce correct ordering
* GH#7108: Monetdb crashes on query execution
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -1860,7 +1860,7 @@ mergejoin(BAT **r1p, BAT **r2p, BAT *l,
lordering = l->tsorted && (r->tsorted || !equal_order) ? 1 : -1;
rordering = equal_order ? lordering : -lordering;
if (!l->tnonil && !nil_matches && !nil_on_miss) {
- nl = binsearch(NULL, 0, l->ttype, lvals, lvars, lwidth,
0, BATcount(l), nil, lordering, 1);
+ nl = binsearch(NULL, 0, l->ttype, lvals, lvars, lwidth,
0, BATcount(l), nil, l->tsorted ? 1 : -1, 1);
nl = canditer_search(lci, nl + l->hseqbase, true);
if (l->tsorted) {
canditer_setidx(lci, nl);
diff --git a/misc/packages/deb/changelog b/misc/packages/deb/changelog
--- a/misc/packages/deb/changelog
+++ b/misc/packages/deb/changelog
@@ -1,7 +1,6 @@
monetdb (11.39.17) unstable; urgency=low
* Rebuilt.
- * GH#2430: JDBC: support for streams
* GH#3336: DB files not removed if all rows are deleted, even after restart
* GH#7104: Monetdbe NTILE function does not produce correct ordering
* GH#7108: Monetdb crashes on query execution
diff --git a/misc/packages/rpm/changelog b/misc/packages/rpm/changelog
--- a/misc/packages/rpm/changelog
+++ b/misc/packages/rpm/changelog
@@ -1,6 +1,5 @@
* Mon May 03 2021 Sjoerd Mullender <sjo...@acm.org> - 11.39.17-20210503
- Rebuilt.
-- GH#2430: JDBC: support for streams
- GH#3336: DB files not removed if all rows are deleted, even after restart
- GH#7104: Monetdbe NTILE function does not produce correct ordering
- GH#7108: Monetdb crashes on query execution
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -2396,7 +2396,9 @@ sql_update_jul2021(Client c, mvc *sql, c
"create function
sys.deltas (\"schema\" string, \"table\" string, \"column\" string)\n"
"returns table (id int,
segments bigint, \"all\" bigint, inserted bigint, updates bigint, deletes
bigint, level int)\n"
- "external name
sql.deltas;\n");
+ "external name
sql.deltas;\n"
+ "update sys.functions
set system = true"
+ " where schema_id =
2000 and name = 'deltas';\n");
/* fix up dependencies for function getproj4 (if it
exists) */
pos += snprintf(buf + pos, bufsize - pos,
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -4151,6 +4151,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git
a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128
@@ -4151,6 +4151,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -3556,6 +3556,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -3556,6 +3556,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -4225,6 +4225,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64
@@ -3556,6 +3556,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
@@ -4225,6 +4225,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -4151,6 +4151,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
@@ -3556,6 +3556,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
@@ -3556,6 +3556,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
@@ -4225,6 +4225,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -4151,6 +4151,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
@@ -3556,6 +3556,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -3556,6 +3556,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -4225,6 +4225,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -4151,6 +4151,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
@@ -3556,6 +3556,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
@@ -3556,6 +3556,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
@@ -4225,6 +4225,7 @@ external name sql.deltas;
create function sys.deltas ("schema" string, "table" string, "column" string)
returns table (id int, segments bigint, "all" bigint, inserted bigint, updates
bigint, deletes bigint, level int)
external name sql.deltas;
+update sys.functions set system = true where schema_id = 2000 and name =
'deltas';
delete from sys.dependencies d where d.depend_id = (select id from
sys.functions where name = 'getproj4' and schema_id = 2000) and id in (select
id from sys._columns where name not in ('proj4text', 'srid'));
drop function json.isobject(string);
drop function json.isarray(string);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
