Changeset: 50540d74bd88 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=50540d74bd88
Added Files:
sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.sql
sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.stable.err
sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.stable.out
sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.sql
sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.err
sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.out
Modified Files:
clients/mapiclient/dump.c
gdk/gdk_atoms.c
sql/server/rel_select.c
sql/test/BugTracker-2015/Tests/All
sql/test/testdb-upgrade-hge/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (truncated from 416 to 300 lines):
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -38,7 +38,7 @@ quoted_print(stream *f, const char *s, c
mnstr_write(f, "\\t", 1, 2);
break;
default:
- if ((0 < *s && *s < 32) || *s == '\377')
+ if ((0 < *s && *s < 32) || *s == '\177')
mnstr_printf(f, "\\%03o", *s & 0377);
else
mnstr_write(f, s, 1, 1);
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -770,7 +770,7 @@ hgeToStr(char **dst, int *len, const hge
strncpy(*dst, "nil", *len);
return 3;
}
- if ((hge) GDK_lng_min <= *src && *src <= (hge) GDK_lng_max) {
+ if ((hge) GDK_lng_min < *src && *src <= (hge) GDK_lng_max) {
lng s = (lng) *src;
return lngToStr(dst, len, &s);
} else {
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -2915,11 +2915,12 @@ rel_logical_value_exp(mvc *sql, sql_rel
return NULL;
}
case SQL_LIKE:
+ case SQL_NOT_LIKE:
{
symbol *lo = sc->data.lval->h->data.sym;
symbol *ro = sc->data.lval->h->next->data.sym;
int insensitive = sc->data.lval->h->next->next->data.i_val;
- int anti = sc->data.lval->h->next->next->next->data.i_val;
+ int anti = (sc->token == SQL_NOT_LIKE) !=
(sc->data.lval->h->next->next->next->data.i_val != 0);
sql_subtype *st = sql_bind_localtype("str");
sql_exp *le = rel_value_exp(sql, rel, lo, f, ek);
sql_exp *re, *ee = NULL;
@@ -3394,11 +3395,12 @@ rel_logical_exp(mvc *sql, sql_rel *rel,
return rel;
}
case SQL_LIKE:
+ case SQL_NOT_LIKE:
{
symbol *lo = sc->data.lval->h->data.sym;
symbol *ro = sc->data.lval->h->next->data.sym;
int insensitive = sc->data.lval->h->next->next->data.i_val;
- int anti = sc->data.lval->h->next->next->next->data.i_val;
+ int anti = (sc->token == SQL_NOT_LIKE) !=
(sc->data.lval->h->next->next->next->data.i_val != 0);
sql_subtype *st = sql_bind_localtype("str");
sql_exp *le = rel_value_exp(sql, &rel, lo, f, ek);
sql_exp *re, *ee = NULL;
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
@@ -81,3 +81,5 @@ select-push-crash.Bug-3829
coalesce.Bug-3830
null.Bug-3833
date_comparison_incorrect_results.Bug-3834
+hugeint-wrong-value.Bug-3849
+dump-DELETE.Bug-3850
diff --git a/sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.sql
b/sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.sql
@@ -0,0 +1,8 @@
+create table t3850 (
+ s varchar(1)
+);
+insert into t3850 values (code(127));
+
+\D
+
+drop table t3850;
diff --git a/sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.stable.err
b/sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'dump-DELETE.Bug-3850` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 14:38:41 >
+# 14:38:41 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31135" "--set"
"mapi_usock=/var/tmp/mtest-11794/.s.monetdb.31135" "--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"
+# 14:38:41 >
+
+# 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 = 31135
+# cmdline opt mapi_usock = /var/tmp/mtest-11794/.s.monetdb.31135
+# 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
+
+# 14:38:41 >
+# 14:38:41 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11794" "--port=31135"
+# 14:38:41 >
+
+
+# 14:38:42 >
+# 14:38:42 > "Done."
+# 14:38:42 >
+
diff --git a/sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.stable.out
b/sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.stable.out
@@ -0,0 +1,85 @@
+stdout of test 'dump-DELETE.Bug-3850` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 14:38:41 >
+# 14:38:41 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31135" "--set"
"mapi_usock=/var/tmp/mtest-11794/.s.monetdb.31135" "--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"
+# 14:38:41 >
+
+# MonetDB 5 server v11.21.12 (hg id: c6969b8883e4+)
+# 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:31135/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-11794/.s.monetdb.31135
+# 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
+
+# 14:38:41 >
+# 14:38:41 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11794" "--port=31135"
+# 14:38:41 >
+
+#create table t3850 (
+# s varchar(1)
+#);
+#insert into t3850 values (code(127));
+[ 1 ]
+START TRANSACTION;
+SET SCHEMA "sys";
+CREATE TABLE "sys"."t3850" (
+ "s" VARCHAR(1)
+);
+COPY 1 RECORDS INTO "sys"."t3850" FROM stdin USING DELIMITERS '\t','\n','"';
+"\177"
+COMMIT;
+#drop table t3850;
+
+# 14:38:42 >
+# 14:38:42 > "Done."
+# 14:38:42 >
+
diff --git a/sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.sql
b/sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.sql
@@ -0,0 +1,13 @@
+START TRANSACTION;
+
+CREATE TABLE "test_hugeint" (
+ "cHUGEINT" HUGEINT
+);
+
+INSERT INTO "test_hugeint" ("cHUGEINT") VALUES (-9223372036854775807);
+INSERT INTO "test_hugeint" ("cHUGEINT") VALUES (-9223372036854775808);
+INSERT INTO "test_hugeint" ("cHUGEINT") VALUES (-9223372036854775809);
+
+SELECT * FROM "test_hugeint";
+
+ROLLBACK;
diff --git
a/sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.err
b/sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'hugeint-wrong-value.Bug-3849` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 14:34:35 >
+# 14:34:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30405" "--set"
"mapi_usock=/var/tmp/mtest-11647/.s.monetdb.30405" "--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"
+# 14:34:35 >
+
+# 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 = 30405
+# cmdline opt mapi_usock = /var/tmp/mtest-11647/.s.monetdb.30405
+# 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
+
+# 14:34:36 >
+# 14:34:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11647" "--port=30405"
+# 14:34:36 >
+
+
+# 14:34:36 >
+# 14:34:36 > "Done."
+# 14:34:36 >
+
diff --git
a/sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.out
b/sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.out
@@ -0,0 +1,90 @@
+stdout of test 'hugeint-wrong-value.Bug-3849` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 14:34:35 >
+# 14:34:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30405" "--set"
"mapi_usock=/var/tmp/mtest-11647/.s.monetdb.30405" "--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"
+# 14:34:35 >
+
+# MonetDB 5 server v11.21.12 (hg id: c6969b8883e4+)
+# 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:30405/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-11647/.s.monetdb.30405
+# 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
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
