Changeset: ebd8390d9191 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ebd8390d9191
Added Files:
sql/test/BugTracker-2014/Tests/null_in_string.Bug-2014.sql
sql/test/BugTracker-2014/Tests/null_in_string.Bug-2014.stable.err
sql/test/BugTracker-2014/Tests/null_in_string.Bug-2014.stable.out
Modified Files:
monetdb5/modules/mal/tablet.c
sql/server/rel_optimizer.c
sql/test/BugTracker-2014/Tests/All
sql/test/SQLite_regress/sqllogictest/Tests/select3.test.timeout
sql/test/SQLite_regress/sqllogictest/Tests/select4.test.timeout
sql/test/SQLite_regress/sqllogictest/Tests/select5.test.timeout
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (199 lines):
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -989,9 +989,11 @@ SQLload_parse_line(READERtask *task, int
if (task->quote || task->seplen != 1) {
for (i = 0; i < as->nr_attrs; i++) {
+ int quote = 0;
task->fields[i][idx] = line;
/* recognize fields starting with a quote, keep them */
if (*line && *line == task->quote) {
+ quote = 1;
#ifdef _DEBUG_TABLET_
mnstr_printf(GDKout, "before #1 %s\n", s =
line);
#endif
@@ -1038,7 +1040,7 @@ SQLload_parse_line(READERtask *task, int
endoffieldcheck:
;
/* check for user defined NULL string */
- if (!fmt->skip && fmt->nullstr && task->fields[i][idx]
&& strncasecmp(task->fields[i][idx], fmt->nullstr, fmt->null_length + 1) == 0)
+ if (!fmt->skip && (!quote || !fmt->null_length) &&
fmt->nullstr && task->fields[i][idx] && strncasecmp(task->fields[i][idx],
fmt->nullstr, fmt->null_length + 1) == 0)
task->fields[i][idx] = 0;
}
goto endofline;
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -7166,7 +7166,7 @@ rel_apply_rename(mvc *sql, sql_rel *rel)
}
static sql_rel *
-rel_add_identity(mvc *sql, sql_rel *rel, sql_exp **exp)
+_rel_add_identity(mvc *sql, sql_rel *rel, sql_exp **exp)
{
list *exps = rel_projections(sql, rel, NULL, 1, 1);
sql_exp *e;
@@ -7183,6 +7183,28 @@ rel_add_identity(mvc *sql, sql_rel *rel,
return rel;
}
+static sql_exp *
+exps_find_identity(list *exps)
+{
+ node *n;
+
+ for (n=exps->h; n; n = n->next) {
+ sql_exp *e = n->data;
+
+ if (is_identity(e, NULL))
+ return e;
+ }
+ return NULL;
+}
+
+static sql_rel *
+rel_add_identity(mvc *sql, sql_rel *rel, sql_exp **exp)
+{
+ if (rel && is_project(rel->op) && (*exp =
exps_find_identity(rel->exps)) != NULL)
+ return rel;
+ return _rel_add_identity(sql, rel, exp);
+}
+
static int
exps_from_rel( list *exps, sql_rel *rel )
{
diff --git a/sql/test/BugTracker-2014/Tests/All
b/sql/test/BugTracker-2014/Tests/All
--- a/sql/test/BugTracker-2014/Tests/All
+++ b/sql/test/BugTracker-2014/Tests/All
@@ -69,3 +69,4 @@ combined_WHERE_conditions.Bug-3642
copy-into.Bug-3481
empty_intermediate_quantile.Bug-3611
uppercaseboolean.Bug-3519
+null_in_string.Bug-2014
diff --git a/sql/test/BugTracker-2014/Tests/null_in_string.Bug-2014.sql
b/sql/test/BugTracker-2014/Tests/null_in_string.Bug-2014.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/null_in_string.Bug-2014.sql
@@ -0,0 +1,8 @@
+
+CREATE TABLE x (a CLOB);
+COPY 3 RECORDS INTO x FROM STDIN USING DELIMITERS ',', '\n', '\'';
+'null'
+'aap'
+'beer'
+SELECT * FROM x WHERE a IS NULL;
+DROP TABLE x;
diff --git a/sql/test/BugTracker-2014/Tests/null_in_string.Bug-2014.stable.err
b/sql/test/BugTracker-2014/Tests/null_in_string.Bug-2014.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/null_in_string.Bug-2014.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'null_in_string.Bug-2014` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 17:30:12 >
+# 17:30:12 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34120" "--set"
"mapi_usock=/var/tmp/mtest-26024/.s.monetdb.34120" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 17:30:12 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/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 = 34120
+# cmdline opt mapi_usock = /var/tmp/mtest-26024/.s.monetdb.34120
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 17:30:13 >
+# 17:30:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26024" "--port=34120"
+# 17:30:13 >
+
+
+# 17:30:13 >
+# 17:30:13 > "Done."
+# 17:30:13 >
+
diff --git a/sql/test/BugTracker-2014/Tests/null_in_string.Bug-2014.stable.out
b/sql/test/BugTracker-2014/Tests/null_in_string.Bug-2014.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/null_in_string.Bug-2014.stable.out
@@ -0,0 +1,48 @@
+stdout of test 'null_in_string.Bug-2014` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 17:30:12 >
+# 17:30:12 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34120" "--set"
"mapi_usock=/var/tmp/mtest-26024/.s.monetdb.34120" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 17:30:12 >
+
+# MonetDB 5 server v11.21.12
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2014', 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.
+# 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:34120/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26024/.s.monetdb.34120
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.28'
+# Finished reading the write-ahead log 'sql_logs/sql/log.28'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 17:30:13 >
+# 17:30:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26024" "--port=34120"
+# 17:30:13 >
+
+#CREATE TABLE x (a CLOB);
+#COPY 3 RECORDS INTO x FROM STDIN USING DELIMITERS ',', '\n', '\'';
+#'null'
+#'aap'
+#'beer'
+[ 3 ]
+#SELECT * FROM x WHERE a IS NULL;
+% sys.x # table_name
+% a # name
+% clob # type
+% 0 # length
+#DROP TABLE x;
+
+# 17:30:13 >
+# 17:30:13 > "Done."
+# 17:30:13 >
+
diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.timeout
b/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.timeout
--- a/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.timeout
+++ b/sql/test/SQLite_regress/sqllogictest/Tests/select3.test.timeout
@@ -1,1 +1,1 @@
-12
+2
diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/select4.test.timeout
b/sql/test/SQLite_regress/sqllogictest/Tests/select4.test.timeout
--- a/sql/test/SQLite_regress/sqllogictest/Tests/select4.test.timeout
+++ b/sql/test/SQLite_regress/sqllogictest/Tests/select4.test.timeout
@@ -1,1 +1,1 @@
-8
+4
diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/select5.test.timeout
b/sql/test/SQLite_regress/sqllogictest/Tests/select5.test.timeout
--- a/sql/test/SQLite_regress/sqllogictest/Tests/select5.test.timeout
+++ b/sql/test/SQLite_regress/sqllogictest/Tests/select5.test.timeout
@@ -1,1 +1,1 @@
-33
+19
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
