Changeset: 3094e5a63def for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3094e5a63def
Removed Files:
monetdb5/extras/rapi/Tests/rapi06.malC
monetdb5/extras/rapi/Tests/rapi06.stable.err
monetdb5/extras/rapi/Tests/rapi06.stable.out
sql/backends/monet5/Tests/rapi04.sql
sql/backends/monet5/Tests/rapi04.stable.err
sql/backends/monet5/Tests/rapi04.stable.out
Modified Files:
monetdb5/extras/rapi/Tests/All
monetdb5/modules/mal/sysmon.c
sql/backends/monet5/Tests/All
sql/backends/monet5/sql_upgrades.c
sql/scripts/26_sysmon.sql
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
Branch: default
Log Message:
Merge with Apr2019 branch.
diffs (truncated from 776 to 300 lines):
diff --git a/monetdb5/extras/rapi/Tests/All b/monetdb5/extras/rapi/Tests/All
--- a/monetdb5/extras/rapi/Tests/All
+++ b/monetdb5/extras/rapi/Tests/All
@@ -4,7 +4,6 @@ HAVE_LIBR&HAVE_HGE&NOT_WIN32?rapi02
HAVE_LIBR&NOT_WIN32?rapi03
HAVE_LIBR&NOT_WIN32?rapi04
HAVE_LIBR&NOT_WIN32?rapi05
-HAVE_LIBR&NOT_WIN32?rapi06
HAVE_LIBR&NOT_WIN32?rapi07
HAVE_LIBR&NOT_WIN32?rapi08
HAVE_LIBR&NOT_WIN32?rapi10
diff --git a/monetdb5/extras/rapi/Tests/rapi06.malC
b/monetdb5/extras/rapi/Tests/rapi06.malC
deleted file mode 100644
--- a/monetdb5/extras/rapi/Tests/rapi06.malC
+++ /dev/null
@@ -1,10 +0,0 @@
-ts:= bat.new(:int);
-bat.append(ts,1387360138);
-bat.append(ts,451665720);
-bat.append(ts,514382400);
-bat.append(ts,1000209600);
-bat.append(ts,1326272400);
-
-r:bat[:int] :=
rapi.eval(nil:ptr,"library(moonsun);options(latitude=arg2,longitude=arg3);angles
<- sapply(arg1,FUN=function(x){ts <- as.POSIXlt(x,origin =
\"1970-01-01\",tz=\"UTC\");moon(jd(epoch=ts)+ts$hour/24)$angle});return(arg1[angles
> 0])",ts,52.3,4.8);
-
-io.print(r);
diff --git a/monetdb5/extras/rapi/Tests/rapi06.stable.err
b/monetdb5/extras/rapi/Tests/rapi06.stable.err
deleted file mode 100644
--- a/monetdb5/extras/rapi/Tests/rapi06.stable.err
+++ /dev/null
@@ -1,37 +0,0 @@
-stderr of test 'rapi06` in directory 'monetdb5/extras/rapi` itself:
-
-
-# 16:45:17 >
-# 16:45:17 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33997" "--set"
"mapi_usock=/var/tmp/mtest-95437/.s.monetdb.33997" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/hannes/monetdb-rint-install/var/MonetDB/mTests_monetdb5_extras_rapi"
"--set" "mal_listing=2" "--set" "embedded_r=yes"
-# 16:45:17 >
-
-# builtin opt gdk_dbpath =
/Users/hannes/monetdb-rint-install/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 33997
-# cmdline opt mapi_usock = /var/tmp/mtest-95437/.s.monetdb.33997
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/Users/hannes/monetdb-rint-install/var/MonetDB/mTests_monetdb5_extras_rapi
-# cmdline opt mal_listing = 2
-# cmdline opt embedded_r = yes
-# cmdline opt gdk_debug = 536870922
-
-# 16:45:18 >
-# 16:45:18 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-95437" "--port=33997"
-# 16:45:18 >
-
-
-# 16:45:18 >
-# 16:45:18 > "Done."
-# 16:45:18 >
-
diff --git a/monetdb5/extras/rapi/Tests/rapi06.stable.out
b/monetdb5/extras/rapi/Tests/rapi06.stable.out
deleted file mode 100644
--- a/monetdb5/extras/rapi/Tests/rapi06.stable.out
+++ /dev/null
@@ -1,40 +0,0 @@
-stdout of test 'rapi06` in directory 'monetdb5/extras/rapi` itself:
-
-
-# 16:45:17 >
-# 16:45:17 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33997" "--set"
"mapi_usock=/var/tmp/mtest-95437/.s.monetdb.33997" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/hannes/monetdb-rint-install/var/MonetDB/mTests_monetdb5_extras_rapi"
"--set" "mal_listing=2" "--set" "embedded_r=yes"
-# 16:45:17 >
-
-# MonetDB 5 server v11.18.0
-# This is an unreleased version
-# Serving database 'mTests_monetdb5_extras_rapi', using 8 threads
-# Compiled for x86_64-apple-darwin13.2.0/64bit with 64bit OIDs dynamically
linked
-# Found 16.000 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://herbert2.local:33997/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-95437/.s.monetdb.33997
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-Ready.
-
-# 16:45:18 >
-# 16:45:18 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-95437" "--port=33997"
-# 16:45:18 >
-
-#io.print(r);
-#--------------------------#
-# h t # name
-# void int # type
-#--------------------------#
-[ 0@0, 1387360138 ]
-[ 1@0, 451665720 ]
-[ 2@0, 1000209600 ]
-[ 3@0, 1326272400 ]
-
-# 16:45:18 >
-# 16:45:18 > "Done."
-# 16:45:18 >
-
diff --git a/monetdb5/modules/mal/sysmon.c b/monetdb5/modules/mal/sysmon.c
--- a/monetdb5/modules/mal/sysmon.c
+++ b/monetdb5/modules/mal/sysmon.c
@@ -58,7 +58,7 @@ SYSMONqueue(Client cntxt, MalBlkPtr mb,
MT_lock_set(&mal_delayLock);
for ( i = 0; i< qtop; i++)
- if( QRYqueue[i].query && (QRYqueue[i].cntxt->idx == 0 ||
QRYqueue[i].cntxt->user == cntxt->user)) {
+ if( QRYqueue[i].query && (QRYqueue[i].cntxt->idx == 0 || cntxt->user ==
0 || QRYqueue[i].cntxt->user == cntxt->user)) {
now= (lng) time(0);
if ( (now-QRYqueue[i].start) > QRYqueue[i].runtime)
prog =QRYqueue[i].runtime > 0 ? 100: int_nil;
diff --git a/sql/backends/monet5/Tests/All b/sql/backends/monet5/Tests/All
--- a/sql/backends/monet5/Tests/All
+++ b/sql/backends/monet5/Tests/All
@@ -4,7 +4,6 @@ HAVE_LIBR&NOT_WIN32?rapi00
HAVE_LIBR&NOT_WIN32?rapi01
HAVE_LIBR&NOT_WIN32?rapi02
HAVE_LIBR&NOT_WIN32?rapi03
-HAVE_LIBR&NOT_WIN32?rapi04
HAVE_LIBR&NOT_WIN32?rapi05
HAVE_LIBR&NOT_WIN32?rapi06
HAVE_LIBR&NOT_WIN32?rapi07
diff --git a/sql/backends/monet5/Tests/rapi04.sql
b/sql/backends/monet5/Tests/rapi04.sql
deleted file mode 100644
--- a/sql/backends/monet5/Tests/rapi04.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-START TRANSACTION;
-
-CREATE TABLE ts (ts INTEGER);
-INSERT INTO ts VALUES
(1387360138),(451665720),(514382400),(1000209600),(1326272400);
-
-CREATE FUNCTION moon(ts integer,lat float, long float) returns integer
language R {
- library(moonsun)
- options(latitude=lat,longitude=long)
- angles <- sapply(ts,FUN=function(x){
- ts <- as.POSIXlt(x,origin = "1970-01-01",tz="UTC")
- moon(jd(epoch=ts)+ts$hour/24)$angle
- })
- return(as.integer(ts[angles > 0]))
-};
-
-SELECT * FROM ts WHERE moon(ts,52.3,4.8) > 0;
-DROP FUNCTION moon;
-DROP TABLE ts;
-
-ROLLBACK;
diff --git a/sql/backends/monet5/Tests/rapi04.stable.err
b/sql/backends/monet5/Tests/rapi04.stable.err
deleted file mode 100644
--- a/sql/backends/monet5/Tests/rapi04.stable.err
+++ /dev/null
@@ -1,35 +0,0 @@
-stderr of test 'rapi04` in directory 'sql/backends/monet5` itself:
-
-
-# 17:37:11 >
-# 17:37:11 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35474" "--set"
"mapi_usock=/var/tmp/mtest-20729/.s.monetdb.35474" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/hannes/fakefs/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0"
-# 17:37:11 >
-
-# builtin opt gdk_dbpath =
/export/scratch2/hannes/monetdb-rint-install/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 35474
-# cmdline opt mapi_usock = /var/tmp/mtest-20729/.s.monetdb.35474
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/export/scratch1/hannes/fakefs/var/MonetDB/mTests_sql_backends_monet5
-# cmdline opt mal_listing = 0
-
-# 17:37:11 >
-# 17:37:11 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-20729" "--port=35474"
-# 17:37:11 >
-
-
-# 17:37:14 >
-# 17:37:14 > "Done."
-# 17:37:14 >
-
diff --git a/sql/backends/monet5/Tests/rapi04.stable.out
b/sql/backends/monet5/Tests/rapi04.stable.out
deleted file mode 100644
--- a/sql/backends/monet5/Tests/rapi04.stable.out
+++ /dev/null
@@ -1,60 +0,0 @@
-stdout of test 'rapi04` in directory 'sql/backends/monet5` itself:
-
-
-# 17:37:11 >
-# 17:37:11 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35474" "--set"
"mapi_usock=/var/tmp/mtest-20729/.s.monetdb.35474" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/hannes/fakefs/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0"
-# 17:37:11 >
-
-# MonetDB 5 server v11.18.0
-# This is an unreleased version
-# Serving database 'mTests_sql_backends_monet5', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 15.592 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://bristol.ins.cwi.nl:35474/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-20729/.s.monetdb.35474
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL module loaded
-
-Ready.
-# trying URL 'http://cran.rstudio.com/src/contrib/moonsun_0.1.3.tar.gz'
-# Content type 'application/x-gzip'# length 153796 bytes (150 Kb)
-# opened URL
-# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =#
=# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =# =#
-# downloaded 150 Kb
-
-# 15:05:30 >
-# 15:05:30 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-8747" "--port=32948"
-# 15:05:30 >
-
-#CREATE TABLE ts (ts INTEGER);
-#insert into ts values
(1387360138),(451665720),(514382400),(1000209600),(1326272400);
-[ 5 ]
-#create function moon(arg1 integer,arg2 float, arg3 float) returns integer
language R {
-# library(moonsun)
-# options(latitude=arg2,longitude=arg3)
-# angles <- sapply(arg1,FUN=function(x){
-# ts <- as.POSIXlt(x,origin = "1970-01-01",tz="UTC")
-# moon(jd(epoch=ts)+ts$hour/24)$angle
-# })
-# return(as.integer(arg1[angles > 0]))
-#};
-#select * from ts where moon(ts,52.3,4.8) > 0;
-% sys.ts # table_name
-% ts # name
-% int # type
-% 10 # length
-[ 1387360138 ]
-[ 451665720 ]
-[ 514382400 ]
-[ 1000209600 ]
-#drop function moon;
-#drop table ts;
-
-# 17:37:14 >
-# 17:37:14 > "Done."
-# 17:37:14 >
-
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
@@ -1435,6 +1435,91 @@ sql_update_aug2018(Client c, mvc *sql)
}
static str
+sql_update_aug2018_sp2(Client c, mvc *sql)
+{
+ size_t bufsize = 1000, pos = 0;
+ char *buf, *err;
+ char *schema;
+ res_table *output;
+ BAT *b;
+
+ schema = stack_get_string(sql, "current_schema");
+ if ((buf = GDKmalloc(bufsize)) == NULL)
+ throw(SQL, "sql_update_aug2018_sp2", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+
+ /* required update for changeset 23e1231ada99 */
+ pos += snprintf(buf + pos, bufsize - pos,
+ "select id from sys.functions where language <> 0 and
not side_effect and type <> 4 and (type = 2 or (language <> 2 and id not in
(select func_id from sys.args where inout = 1)));\n");
+ err = SQLstatementIntern(c, &buf, "update", 1, 0, &output);
+ if (err) {
+ GDKfree(buf);
+ return err;
+ }
+ b = BATdescriptor(output->cols[0].b);
+ if (b) {
+ if (BATcount(b) > 0) {
+ pos = 0;
+ pos += snprintf(buf + pos, bufsize - pos, "set schema
sys;\n");
+ pos += snprintf(buf + pos, bufsize - pos,
+ "update sys.functions set side_effect =
true where language <> 0 and not side_effect and type <> 4 and (type = 2 or
(language <> 2 and id not in (select func_id from sys.args where inout =
1)));\n");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
