Changeset: ed0d629f93ca for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed0d629f93ca
Added Files:
sql/test/BugTracker-2015/Tests/msqldump_generates_incorrect_syntax_ON_UPDATE_null.Bug-3839.sql
sql/test/BugTracker-2015/Tests/msqldump_generates_incorrect_syntax_ON_UPDATE_null.Bug-3839.stable.err
sql/test/BugTracker-2015/Tests/msqldump_generates_incorrect_syntax_ON_UPDATE_null.Bug-3839.stable.out
sql/test/BugTracker-2015/Tests/update_with_without_parenthesis.Bug-3838.sql
sql/test/BugTracker-2015/Tests/update_with_without_parenthesis.Bug-3838.stable.err
sql/test/BugTracker-2015/Tests/update_with_without_parenthesis.Bug-3838.stable.out
Modified Files:
clients/R/Tests/install.R
clients/mapiclient/dump.c
clients/mapiclient/mclient.c
sql/backends/monet5/Tests/All
sql/backends/monet5/Tests/rapi18.sql
sql/backends/monet5/Tests/rapi18.stable.err
sql/backends/monet5/Tests/rapi18.stable.out
sql/test/BugTracker-2015/Tests/date_comparison_incorrect_results.Bug-3834.sql
sql/test/BugTracker-2015/Tests/date_comparison_incorrect_results.Bug-3834.stable.out
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (truncated from 1360 to 300 lines):
diff --git a/clients/R/Tests/install.R b/clients/R/Tests/install.R
--- a/clients/R/Tests/install.R
+++ b/clients/R/Tests/install.R
@@ -11,7 +11,7 @@ dir.create(installdir)
file.copy(from=file.path(srcdir, "..", "MonetDB.R"), to=builddir, recursive=T)
dd <- capture.output(suppressMessages( {
sink(file=file(tempfile(), open = "wt"), type = "message")
- install.packages(file.path(builddir, "MonetDB.R"), repos=NULL,
lib=installdir, quiet=T)
+ install.packages(file.path(builddir, "MonetDB.R"), repos=NULL,
lib=installdir, quiet=T, type="source")
sink(type = "message")
}))
library(MonetDB.R,quietly=T,lib.loc=installdir)
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -372,13 +372,13 @@ dump_foreign_keys(Mapi mid, const char *
int on_update;
int on_delete;
- if (action > 0 &&
- (on_delete = action & 255) < NR_ACTIONS &&
+ if ((on_delete = action & 255) != 0 &&
+ on_delete < NR_ACTIONS &&
on_delete != 2 /* RESTRICT -- default */)
mnstr_printf(toConsole, " ON DELETE %s",
actions[on_delete]);
- if (action > 0 &&
- (on_update = (action >> 8) & 255) < NR_ACTIONS &&
+ if ((on_update = (action >> 8) & 255) != 0 &&
+ on_update < NR_ACTIONS &&
on_update != 2 /* RESTRICT -- default */)
mnstr_printf(toConsole, " ON UPDATE %s",
actions[on_update]);
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -936,9 +936,24 @@ classify(const char *s, size_t l)
(l == 5 && strcmp(s, "false") == 0))
return "bit";
while (l != 0) {
- if (*s == 0 || !isascii(*s))
+ if (*s == 0)
return "str";
- if (isdigit((int) *s)) {
+ switch (*s) {
+ case '0':
+ if (state == 12) {
+ state = 13; /* int + '@0' (oid) */
+ break;
+ }
+ /* fall through */
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
switch (state) {
case 0:
case 1:
@@ -951,36 +966,43 @@ classify(const char *s, size_t l)
case 6:
state = 7; /* digit after exponent marker
and optional sign */
break;
- case 12:
- if (*s == '0') /* only @0 allowed */
- state = 13;
- else
- return "str";
- break;
+ case 2:
+ case 4:
+ case 7:
+ break; /* more digits */
+ default:
+ return "str";
}
- } else if (*s == '.') {
+ break;
+ case '.':
if (state == 2)
state = 3; /* decimal point */
else
return "str";
- } else if (*s == 'e' || *s == 'E') {
+ break;
+ case 'e':
+ case 'E':
if (state == 2 || state == 4)
state = 5; /* exponent marker */
else
return "str";
- } else if (*s == '+' || *s == '-') {
+ break;
+ case '+':
+ case '-':
if (state == 0)
state = 1; /* sign at start */
else if (state == 5)
state = 6; /* sign after exponent marker */
else
return "str";
- } else if (*s == '@') {
+ break;
+ case '@':
if (state == 2)
state = 12; /* OID marker */
else
return "str";
- } else if (*s == 'L') {
+ break;
+ case 'L':
switch (state) {
case 2:
state = 8; /* int + 'L' */
@@ -998,6 +1020,9 @@ classify(const char *s, size_t l)
default:
return "str";
}
+ break;
+ default:
+ return "str";
}
s++;
l--;
diff --git a/sql/backends/monet5/Tests/rapi18.sql
b/sql/backends/monet5/Tests/rapi18.sql
--- a/sql/backends/monet5/Tests/rapi18.sql
+++ b/sql/backends/monet5/Tests/rapi18.sql
@@ -1,26 +1,23 @@
-- https://www.monetdb.org/pipermail/users-list/2015-October/008472.html
+-- used this to create test output
+--set optimizer='sequential_pipe';
START TRANSACTION;
-- the (fake) aggregate function
CREATE AGGREGATE rapi18(n int) RETURNS DOUBLE LANGUAGE R {
- sow_aggr <- function(df) { 42.0 }
- aggregate(n, list(aggr_group), sow_aggr)$x
+ aggregate(x=n, by=list(aggr_group), FUN=function(df){42})$x
};
-- function to generate input data
CREATE FUNCTION rapi18datagen() RETURNS TABLE (g int, n int) LANGUAGE R {
- g <- rep(1:500, rep(400,500))
+ g <- rep(1:500, rep(400, 500))
data.frame(g, 10L)
};
-CREATE TABLE rapi18good as select * from rapi18datagen() limit 199999 with
data;
CREATE TABLE rapi18bad as select * from rapi18datagen() limit 200000 with data;
-select count(distinct g) from rapi18good;
select count(distinct g) from rapi18bad;
-
-select g, rapi18(n) from rapi18good group by g;
select g, rapi18(n) from rapi18bad group by g;
ROLLBACK;
diff --git a/sql/backends/monet5/Tests/rapi18.stable.err
b/sql/backends/monet5/Tests/rapi18.stable.err
--- a/sql/backends/monet5/Tests/rapi18.stable.err
+++ b/sql/backends/monet5/Tests/rapi18.stable.err
@@ -1,11 +1,11 @@
stderr of test 'rapi18` in directory 'sql/backends/monet5` itself:
-# 10:13:24 >
-# 10:13:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31229" "--set"
"mapi_usock=/var/tmp/mtest-17804/.s.monetdb.31229" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
-# 10:13:24 >
+# 17:22:19 >
+# 17:22:19 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33608" "--set"
"mapi_usock=/var/tmp/mtest-93553/.s.monetdb.33608" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/hannes/monetdb-install/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 17:22:19 >
-# builtin opt gdk_dbpath =
/home/niels/scratch/monetdb/Linux-x86_64/var/monetdb5/dbfarm/demo
+# builtin opt gdk_dbpath =
/Users/hannes/monetdb-install/var/monetdb5/dbfarm/demo
# builtin opt gdk_debug = 0
# builtin opt gdk_vmtrim = no
# builtin opt monet_prompt = >
@@ -17,21 +17,21 @@ stderr of test 'rapi18` in directory 'sq
# builtin opt sql_debug = 0
# cmdline opt gdk_nr_threads = 0
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 31229
-# cmdline opt mapi_usock = /var/tmp/mtest-17804/.s.monetdb.31229
+# cmdline opt mapi_port = 33608
+# cmdline opt mapi_usock = /var/tmp/mtest-93553/.s.monetdb.33608
# cmdline opt monet_prompt =
# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_backends_monet5
+# cmdline opt gdk_dbpath =
/Users/hannes/monetdb-install/var/MonetDB/mTests_sql_backends_monet5
# cmdline opt mal_listing = 0
# cmdline opt embedded_r = yes
# cmdline opt gdk_debug = 536870922
-# 10:13:25 >
-# 10:13:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17804" "--port=31229"
-# 10:13:25 >
+# 17:22:20 >
+# 17:22:20 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-93553" "--port=33608"
+# 17:22:20 >
-# 10:13:26 >
-# 10:13:26 > "Done."
-# 10:13:26 >
+# 17:22:21 >
+# 17:22:21 > "Done."
+# 17:22:21 >
diff --git a/sql/backends/monet5/Tests/rapi18.stable.out
b/sql/backends/monet5/Tests/rapi18.stable.out
--- a/sql/backends/monet5/Tests/rapi18.stable.out
+++ b/sql/backends/monet5/Tests/rapi18.stable.out
@@ -1,34 +1,68 @@
stdout of test 'rapi18` in directory 'sql/backends/monet5` itself:
-# 10:13:24 >
-# 10:13:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31229" "--set"
"mapi_usock=/var/tmp/mtest-17804/.s.monetdb.31229" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
-# 10:13:24 >
+# 17:22:19 >
+# 17:22:19 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33608" "--set"
"mapi_usock=/var/tmp/mtest-93553/.s.monetdb.33608" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/hannes/monetdb-install/var/MonetDB/mTests_sql_backends_monet5"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 17:22:19 >
-# MonetDB 5 server v11.22.0
+# MonetDB 5 server v11.21.8
# This is an unreleased version
# Serving database 'mTests_sql_backends_monet5', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
-# Found 7.333 GiB available main-memory.
+# Compiled for x86_64-apple-darwin15.0.0/64bit with 64bit OIDs and 128bit
integers 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://localhost.nes.nl:31229/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-17804/.s.monetdb.31229
+# Listening for connection requests on mapi:monetdb://dakar.da.cwi.nl:33608/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-93553/.s.monetdb.33608
# MonetDB/GIS module loaded
# Start processing logs sql/sql_logs version 52200
-# Start reading the write-ahead log 'sql_logs/sql/log.4'
-# Finished reading the write-ahead log 'sql_logs/sql/log.4'
# Finished processing logs sql/sql_logs
# MonetDB/SQL module loaded
# MonetDB/R module loaded
Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
-# 10:13:25 >
-# 10:13:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17804" "--port=31229"
-# 10:13:25 >
+# 17:22:20 >
+# 17:22:20 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-93553" "--port=33608"
+# 17:22:20 >
+#set optimizer='sequential_pipe';
#START TRANSACTION;
#CREATE AGGREGATE rapi18(n int) RETURNS DOUBLE LANGUAGE R {
# sow_aggr <- function(df) { 42.0 }
@@ -40,523 +74,12 @@ Ready.
#};
#CREATE TABLE rapi18good as select * from rapi18datagen() limit 199999 with
data;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
