Changeset: fa01244b6822 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fa01244b6822
Added Files:
sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out.int128
sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out.int128
sql/test/BugTracker-2017/Tests/default-insert-update.Bug-6249.stable.err
sql/test/BugTracker-2017/Tests/default-insert-update.Bug-6249.stable.out
Modified Files:
sql/server/rel_dump.c
sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out
sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out
sql/test/pg_regress/Tests/alter_table.stable.err
sql/test/pg_regress/Tests/alter_table.stable.out
sql/test/pg_regress/Tests/insert.stable.err
Branch: Dec2016
Log Message:
merged
diffs (truncated from 575 to 300 lines):
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -602,15 +602,17 @@ skipIdent( char *r, int *pos)
static void
skipIdentOrSymbol( char *r, int *pos)
{
- if (r[*pos] == '"')
- return skipIdent(r, pos);
- while(r[*pos] && (isalnum(r[*pos]) ||
- r[*pos] == '_' || r[*pos] == '%' ||
- r[*pos] == '<' || r[*pos] == '>' ||
- r[*pos] == '/' || r[*pos] == '*' ||
- r[*pos] == '-' || r[*pos] == '+' ||
- r[*pos] == '~' || r[*pos] == '^' ))
- (*pos)++;
+ if (r[*pos] == '"') {
+ skipIdent(r, pos);
+ } else {
+ while(r[*pos] && (isalnum(r[*pos]) ||
+ r[*pos] == '_' || r[*pos] == '%' ||
+ r[*pos] == '<' || r[*pos] == '>' ||
+ r[*pos] == '/' || r[*pos] == '*' ||
+ r[*pos] == '-' || r[*pos] == '+' ||
+ r[*pos] == '~' || r[*pos] == '^' ))
+ (*pos)++;
+ }
}
static int
diff --git a/sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out
b/sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out
--- a/sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out
+++ b/sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out
@@ -8,7 +8,7 @@ stdout of test 'crash-dce.Bug-6330` in d
# MonetDB 5 server v11.25.24
# This is an unreleased version
# Serving database 'mTests_sql_test_BugTracker-2017', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Compiled for x86_64-unknown-linux-gnu/64bit
# Found 15.588 GiB available main-memory.
# Copyright (c) 1993-July 2008 CWI.
# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
@@ -69,14 +69,14 @@ Ready.
#SELECT 45 - - CASE + + 70 WHEN COUNT ( * ) + SUM ( DISTINCT 91 ) + MIN (
DISTINCT 41 ) / 65 THEN + 98 END * + - 0 - - COUNT ( * ) AS col0;
% .L7 # table_name
% col0 # name
-% hugeint # type
-% 40 # length
+% bigint # type
+% 20 # length
[ NULL ]
#SELECT 45 - CASE + + 70 WHEN COUNT ( * ) + SUM ( DISTINCT 91 ) + MIN (
DISTINCT 41 ) / 65 THEN + 98 END * + - 0 - - COUNT ( * ) AS col0;
% .L7 # table_name
% col0 # name
-% hugeint # type
-% 40 # length
+% bigeint # type
+% 20 # length
[ NULL ]
# 13:53:46 >
diff --git
a/sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out.int128
b/sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out.int128
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/crash-dce.Bug-6330.stable.out.int128
@@ -0,0 +1,85 @@
+stdout of test 'crash-dce.Bug-6330` in directory 'sql/test/BugTracker-2017`
itself:
+
+
+# 13:53:44 >
+# 13:53:44 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30094" "--set"
"mapi_usock=/var/tmp/mtest-30656/.s.monetdb.30094" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch2/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2017"
"--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 13:53:44 >
+
+# MonetDB 5 server v11.25.24
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2017', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 15.588 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://toulouse.da.cwi.nl:30094/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30656/.s.monetdb.30094
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/Python 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: 18_index.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: 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: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_lidar.sql
+# loading sql script: 75_shp.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: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+
+# 13:53:45 >
+# 13:53:45 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-30656" "--port=30094"
+# 13:53:45 >
+
+#SELECT 45 - - CASE + + 70 WHEN COUNT ( * ) + SUM ( DISTINCT 91 ) + MIN (
DISTINCT 41 ) / 65 THEN + 98 END * + - 0 - - COUNT ( * ) AS col0;
+% .L7 # table_name
+% col0 # name
+% hugeint # type
+% 40 # length
+[ NULL ]
+#SELECT 45 - CASE + + 70 WHEN COUNT ( * ) + SUM ( DISTINCT 91 ) + MIN (
DISTINCT 41 ) / 65 THEN + 98 END * + - 0 - - COUNT ( * ) AS col0;
+% .L7 # table_name
+% col0 # name
+% hugeint # type
+% 40 # length
+[ NULL ]
+
+# 13:53:46 >
+# 13:53:46 > "Done."
+# 13:53:46 >
+
diff --git
a/sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out
b/sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out
---
a/sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out
+++
b/sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out
@@ -8,7 +8,7 @@ stdout of test 'crash-select_after_MAL_e
# MonetDB 5 server v11.25.24
# This is an unreleased version
# Serving database 'mTests_sql_test_BugTracker-2017', using 8 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Compiled for x86_64-unknown-linux-gnu/64bit
# Found 15.588 GiB available main-memory.
# Copyright (c) 1993-July 2008 CWI.
# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
@@ -72,7 +72,7 @@ Ready.
#SELECT DISTINCT col1 * + + col1 + + col2 * 0 / + - CAST ( + - col0 AS INTEGER
) AS col1 FROM tab0 cor0;
% sys.L3 # table_name
% col1 # name
-% hugeint # type
+% bigint # type
% 1 # length
#SELECT ALL + 93 + col0 FROM tab0 AS cor0;
% sys.L2 # table_name
diff --git
a/sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out.int128
b/sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out.int128
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2017/Tests/crash-select_after_MAL_error.Bug-6332.stable.out.int128
@@ -0,0 +1,87 @@
+stdout of test 'crash-select_after_MAL_error.Bug-6332` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 14:22:37 >
+# 14:22:37 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36959" "--set"
"mapi_usock=/var/tmp/mtest-11002/.s.monetdb.36959" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch2/dinther/INSTALL/var/MonetDB/mTests_sql_test_BugTracker-2017"
"--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 14:22:37 >
+
+# MonetDB 5 server v11.25.24
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2017', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 15.588 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://toulouse.da.cwi.nl:36959/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-11002/.s.monetdb.36959
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/Python 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: 18_index.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: 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: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_lidar.sql
+# loading sql script: 75_shp.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: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+#WARNING To speedup calc./ a bulk operator implementation is needed
+# X_24965:bat[:lng] :=
mal.multiplex("calc":str,"/":str,0:bte,X_24964:bat[:int]);
+
+# 14:22:38 >
+# 14:22:38 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11002" "--port=36959"
+# 14:22:38 >
+
+#CREATE TABLE tab0(col0 INTEGER, col1 INTEGER, col2 INTEGER);
+#SELECT DISTINCT col1 * + + col1 + + col2 * 0 / + - CAST ( + - col0 AS INTEGER
) AS col1 FROM tab0 cor0;
+% sys.L3 # table_name
+% col1 # name
+% hugeint # type
+% 1 # length
+#SELECT ALL + 93 + col0 FROM tab0 AS cor0;
+% sys.L2 # table_name
+% L2 # name
+% bigint # type
+% 1 # length
+#DROP TABLE tab0;
+
+# 14:22:39 >
+# 14:22:39 > "Done."
+# 14:22:39 >
+
diff --git
a/sql/test/BugTracker-2017/Tests/default-insert-update.Bug-6249.stable.err
b/sql/test/BugTracker-2017/Tests/default-insert-update.Bug-6249.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/default-insert-update.Bug-6249.stable.err
@@ -0,0 +1,41 @@
+stderr of test 'default-insert-update.Bug-6249` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 11:11:43 >
+# 11:11:43 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39704" "--set"
"mapi_usock=/var/tmp/mtest-21586/.s.monetdb.39704" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/ferreira/MonetDB-Dec2016/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 11:11:43 >
+
+# builtin opt gdk_dbpath =
/home/ferreira/MonetDB-Dec2016/BUILD/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 = 39704
+# cmdline opt mapi_usock = /var/tmp/mtest-21586/.s.monetdb.39704
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/ferreira/MonetDB-Dec2016/BUILD/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt gdk_debug = 536870922
+
+# 11:11:43 >
+# 11:11:43 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-21586" "--port=39704"
+# 11:11:43 >
+
+MAPI = (monetdb) /var/tmp/mtest-21586/.s.monetdb.39704
+QUERY = INSERT INTO test2 VALUES (1, 'a', DEFAULT, 'a'); --throw an error
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
