Changeset: feb06ff0e20b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=feb06ff0e20b
Added Files:
sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out.int128
sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.sql
sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.stable.err
sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.stable.out
sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.SQL.py
Removed Files:
sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.sql
Modified Files:
configure.ag
java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
monetdb5/modules/mal/pcre.c
sql/test/BugTracker-2015/Tests/All
sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.stable.err
tools/mserver/mserver5.c
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (truncated from 398 to 300 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2168,9 +2168,14 @@ fi
AM_CONDITIONAL(HAVE_CURL, test x"$have_curl" != xno)
PKG_CHECK_MODULES([zlib], [zlib], [have_zlib="yes"], [have_zlib="no";
why_have_zlib="(zlib not found)"])
+if test x"$have_zlib" = x"no" ; then
+ # Solaris doesn't provide zlib.pc, but zlib may well be present
+ AC_CHECK_LIB(z, gzopen, [ have_zlib=yes zlib_LIBS="-lz" zlib_CFLAGS= ])
+elif test x"$have_zlib" = x"yes" ; then
+ AC_SUBST(PKG_ZLIB, zlib)
+fi
if test x"$have_zlib" = x"yes" ; then
AC_DEFINE(HAVE_LIBZ, 1, [Define if you have the z library])
- AC_SUBST(PKG_ZLIB, zlib)
fi
AM_CONDITIONAL(HAVE_LIBZ, test x"$have_zlib" != xno)
diff --git a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
--- a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
+++ b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
@@ -1318,7 +1318,7 @@ public class MonetConnection extends Mon
public void setSchema(String schema) throws SQLException {
if (closed)
throw new SQLException("Cannot call on closed
Connection", "M1M20");
- createStatement().executeUpdate("SET SCHEMA = \"" + schema +
"\"");
+ createStatement().executeUpdate("SET SCHEMA \"" + schema +
"\"");
}
/**
diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c
--- a/monetdb5/modules/mal/pcre.c
+++ b/monetdb5/modules/mal/pcre.c
@@ -1038,7 +1038,7 @@ PCRElike3(bit *ret, const str *s, const
str
PCRElike2(bit *ret, const str *s, const str *pat)
{
- char *esc = "\\";
+ char *esc = "";
return PCRElike3(ret, s, pat, &esc);
}
diff --git a/sql/test/BugTracker-2015/Tests/All
b/sql/test/BugTracker-2015/Tests/All
--- a/sql/test/BugTracker-2015/Tests/All
+++ b/sql/test/BugTracker-2015/Tests/All
@@ -65,10 +65,11 @@ string_split.Bug-3564
schemadiff.Bug-3778
fractional_precision_limitation.Bug-3808
not-like-without-wildcard.Bug-3811
-copy_into.Bug-3813
+HAVE_LIBZ?copy_into.Bug-3813
select-tilde-arg.Bug-3814
timestamp_convert.Bug-3815
crash_timestamp_convert.Bug-3816
crash_in_reduce_groupby.Bug-3818
duplicate-constraint.Bug-3820
case_type.Bug-3821
+like-escape.Bug-3822
diff --git
a/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
--- a/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
+++ b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out
@@ -40,7 +40,7 @@ Ready.
# GROUP BY cods, elrik, ether, jaelen, sora;
% .L2, .L2, .L2, .L2, .L2, .L2 # table_name
% cods, elrik, ether, jaelen, sora, L1 # name
-% int, int, int, int, int, hugeint # type
+% int, int, int, int, int, bigint # type
% 1, 1, 1, 1, 1, 1 # length
[ 0, 0, 0, 0, 0, NULL ]
#SELECT 0 AS cods, 0 AS elrik, 0 AS ether, 0 AS jaelen, 0 AS sora, SUM(tib0)
@@ -48,8 +48,8 @@ Ready.
#GROUP BY cods, elrik, ether, jaelen, sora;
% .L, .L, .L, .L, .L, sys.L1 # table_name
% cods, elrik, ether, jaelen, sora, L1 # name
-% tinyint, tinyint, tinyint, tinyint, tinyint,
hugeint # type
-% 1, 1, 1, 1, 1, 40 # length
+% tinyint, tinyint, tinyint, tinyint, tinyint,
bigint # type
+% 1, 1, 1, 1, 1, 20 # length
[ 0, 0, 0, 0, 0, NULL ]
#drop table t2a;
#drop table t1a;
diff --git
a/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out.int128
b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out.int128
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out.int128
@@ -0,0 +1,60 @@
+stdout of test 'crash_in_reduce_groupby.Bug-3818` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 11:28:41 >
+# 11:28:41 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34815" "--set"
"mapi_usock=/var/tmp/mtest-10633/.s.monetdb.34815" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/scratch/niels/build/rc/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 11:28:41 >
+
+# MonetDB 5 server v11.21.6
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.586 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://rocks101.scilens.private:34815/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-10633/.s.monetdb.34815
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.45'
+# Finished reading the write-ahead log 'sql_logs/sql/log.45'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 11:28:41 >
+# 11:28:41 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10633" "--port=34815"
+# 11:28:41 >
+
+#CREATE TABLE t1a (cods int, elrik int, ether int, jaelen int, otter int, sora
int);
+#CREATE TABLE t2a (tib0 int);
+#SELECT cods, elrik, ether, jaelen, sora, SUM(otter)
+# FROM t1a
+# GROUP BY cods, elrik, ether, jaelen, sora
+# UNION ALL
+# SELECT 0 AS cods, 0 AS elrik, 0 AS ether, 0 AS jaelen, 0 AS sora, SUM(tib0)
+# FROM t2a
+# GROUP BY cods, elrik, ether, jaelen, sora;
+% .L2, .L2, .L2, .L2, .L2, .L2 # table_name
+% cods, elrik, ether, jaelen, sora, L1 # name
+% int, int, int, int, int, hugeint # type
+% 1, 1, 1, 1, 1, 1 # length
+[ 0, 0, 0, 0, 0, NULL ]
+#SELECT 0 AS cods, 0 AS elrik, 0 AS ether, 0 AS jaelen, 0 AS sora, SUM(tib0)
+# FROM t2a
+#GROUP BY cods, elrik, ether, jaelen, sora;
+% .L, .L, .L, .L, .L, sys.L1 # table_name
+% cods, elrik, ether, jaelen, sora, L1 # name
+% tinyint, tinyint, tinyint, tinyint, tinyint,
hugeint # type
+% 1, 1, 1, 1, 1, 40 # length
+[ 0, 0, 0, 0, 0, NULL ]
+#drop table t2a;
+#drop table t1a;
+
+# 11:28:42 >
+# 11:28:42 > "Done."
+# 11:28:42 >
+
diff --git a/sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.sql
b/sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.sql
@@ -0,0 +1,4 @@
+select '_' like '\\_';
+select '_' like '\\_' escape '\\';
+select * from (select '_' as foo) AS t0 WHERE foo LIKE '\\_';
+select * from (select '_' as foo) AS t0 WHERE foo LIKE '\\_' escape '\\';
diff --git a/sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.stable.err
b/sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'like-escape.Bug-3822` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 16:42:21 >
+# 16:42:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34019" "--set"
"mapi_usock=/var/tmp/mtest-11859/.s.monetdb.34019" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 16:42:21 >
+
+# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-stable/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 = 34019
+# cmdline opt mapi_usock = /var/tmp/mtest-11859/.s.monetdb.34019
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 16:42:22 >
+# 16:42:22 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11859" "--port=34019"
+# 16:42:22 >
+
+
+# 16:42:22 >
+# 16:42:22 > "Done."
+# 16:42:22 >
+
diff --git a/sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.stable.out
b/sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/like-escape.Bug-3822.stable.out
@@ -0,0 +1,94 @@
+stdout of test 'like-escape.Bug-3822` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 16:42:21 >
+# 16:42:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34019" "--set"
"mapi_usock=/var/tmp/mtest-11859/.s.monetdb.34019" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 16:42:21 >
+
+# MonetDB 5 server v11.21.6 (hg id: 80b049a4c169+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.590 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://madrid.ins.cwi.nl:34019/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-11859/.s.monetdb.34019
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# 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: 74_netcdf.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
+
+# 16:42:22 >
+# 16:42:22 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11859" "--port=34019"
+# 16:42:22 >
+
+#select '_' like '\\_';
+% .L # table_name
+% like_single_value # name
+% boolean # type
+% 5 # length
+[ false ]
+#select '_' like '\\_' escape '\\';
+% .L # table_name
+% like_single_value # name
+% boolean # type
+% 5 # length
+[ true ]
+#select * from (select '_' as foo) AS t0 WHERE foo LIKE '\\_';
+% .t0 # table_name
+% foo # name
+% char # type
+% 1 # length
+#select * from (select '_' as foo) AS t0 WHERE foo LIKE '\\_' escape '\\';
+% .t0 # table_name
+% foo # name
+% char # type
+% 1 # length
+[ "_" ]
+
+# 16:42:22 >
+# 16:42:22 > "Done."
+# 16:42:22 >
+
diff --git
a/sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.SQL.py
b/sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.SQL.py
new file mode 100644
--- /dev/null
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
