Changeset: a6120285222e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a6120285222e
Added Files:
sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.sql
sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.stable.err
sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.stable.out
sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.SQL.bat
sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.SQL.sh
sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.pl
sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.stable.err
sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.stable.out
Modified Files:
clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MapiPP.pm
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
sql/test/BugTracker-2013/Tests/All
sql/test/Tests/systemfunctions.stable.out
sql/test/leaks/Tests/check0.stable.out
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (truncated from 340 to 300 lines):
diff --git a/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MapiPP.pm
b/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MapiPP.pm
--- a/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MapiPP.pm
+++ b/clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MapiPP.pm
@@ -14,7 +14,7 @@ sub unquote
{
my ($class, $v) = @_;
- return undef if !$v || $v eq 'NULL' || $v eq 'nil';
+ return undef if !defined($v) || $v eq 'NULL' || $v eq 'nil';
if ( $v =~ /^["']/) {
$v =~ s/^["']//;
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
@@ -96,13 +96,13 @@ mTests_sql_jdbc_tests sys tables SYSTEM
mTests_sql_jdbc_tests sys tablestoragemodel SYSTEM VIEW -- A
summary of the table storage requirement is is available as a table view.
-- The auxillary column denotes the maximum space if all non-sorted columns
-- would be augmented with a hash (rare situation)
-create view tablestoragemodel
+create view sys.tablestoragemodel
as select "schema","table",max(count) as "count",
sum(columnsize) as columnsize,
sum(heapsize) as heapsize,
sum(indices) as indices,
sum(case when sorted = false then 8 * count else 0 end) as auxillary
-from storagemodel() group by "schema","table"; null null null rowid
SYSTEM
+from sys.storagemodel() group by "schema","table"; null null null
rowid SYSTEM
mTests_sql_jdbc_tests sys users SYSTEM VIEW SELECT u."name" AS
"name", ui."fullname", ui."default_schema" FROM db_users() AS u LEFT JOIN
"sys"."db_user_info" AS ui ON u."name" = ui."name" ; null null null
rowid SYSTEM
# 20:09:14 >
diff --git
a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
--- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
+++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
@@ -30,9 +30,9 @@ stderr of test 'predicate_select.Bug-309
# 18:53:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=32323"
# 18:53:13 >
-MAPI = (monetdb) /var/tmp/mtest-14514/.s.monetdb.38632
+MAPI = (monetdb) /var/tmp/mtest-16462/.s.monetdb.36324
QUERY = select * from tables where name;
-ERROR = !conversion of string 'systemfunctions' to type bit failed.
+ERROR = !conversion of string 'r' to type bit failed.
# 18:53:13 >
# 18:53:13 > "Done."
diff --git
a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
--- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
+++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
@@ -27,7 +27,7 @@ Ready.
% .tables, .tables, .tables, .tables, .tables,
.tables, .tables, .tables, .tables # table_name
% id, name, schema_id, query, type, system, commit_action,
readonly, temporary # name
% int, varchar, int, varchar, smallint, boolean,
smallint, boolean, tinyint # type
-% 4, 17, 4, 488, 1, 5, 1, 5, 1 # length
+% 4, 17, 4, 496, 1, 5, 1, 5, 1 # length
[ 2001, "schemas", 2000, NULL, 0, true, 0, false,
0 ]
[ 2006, "types", 2000, NULL, 0, true, 0, false,
0 ]
[ 2015, "functions", 2000, NULL, 0, true, 0, false,
0 ]
diff --git a/sql/test/BugTracker-2013/Tests/All
b/sql/test/BugTracker-2013/Tests/All
--- a/sql/test/BugTracker-2013/Tests/All
+++ b/sql/test/BugTracker-2013/Tests/All
@@ -2,3 +2,5 @@ HAVE_PHP?php-size-limit-bug
select-around-zero.Bug-3220
segfault_in_aggregation.Bug-3225
subtract-one-year.Bug-3215
+perl-undef-0.Bug-3235
+crash-from-optimizer.Bug-3241
diff --git a/sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.sql
b/sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.sql
@@ -0,0 +1,29 @@
+START TRANSACTION;
+
+CREATE TABLE "_dict" (
+ "idstr" CHARACTER LARGE OBJECT,
+ "id" INTEGER NOT NULL,
+ CONSTRAINT "_dict_id_pkey" PRIMARY KEY ("id")
+);
+COPY 7 RECORDS INTO "_dict" FROM stdin USING DELIMITERS ' ','\n','"';
+"entity.department-dummy:11be0f0ab68e55dbbb205fa871914d89" 0
+"entity.person:e1c055925f3783a7631a2efcde7d4413" 1
+"entity.section:3673f53d1a8e1e5981b8bb6726923e68" 2
+"entity.department-dummy:d57100c1f843d4d0f5a611ba7ac711f3" 3
+"entity.department-dummy:2895b2eae68f91e3240e109e1df3296f" 4
+"entity.department-dummy:c3f049405e2d621ff271bb92b4f921b9" 5
+"entity.department-dummy:ce5f9e283849737fcebebd0c973ed0ac" 6
+
+create function pcre_index(pat string, s string) returns int external name
pcre."patindex";
+
+create function gettype(str string) returns string
+begin
+ return substring(str, pcre_index('.', str) + 1,pcre_index(':', str) - 1 -
pcre_index('.', str));
+end;
+
+create view dict as select *, gettype(idstr) as type, 1.0e0 as prob from _dict;
+
+
+SELECT * FROM dict WHERE type='company';
+
+ROLLBACK;
diff --git
a/sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.stable.err
b/sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.stable.err
@@ -0,0 +1,1 @@
+to be filled
diff --git
a/sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.stable.out
b/sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/crash-from-optimizer.Bug-3241.stable.out
@@ -0,0 +1,1 @@
+to be filled
diff --git a/sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.SQL.bat
b/sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.SQL.bat
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.SQL.bat
@@ -0,0 +1,6 @@
+@echo off
+
+prompt # $t $g
+echo on
+
+perl "%TSTSRCDIR%\perl-undef-0.Bug-3235.pl" %MAPIPORT% %TSTDB%
diff --git a/sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.SQL.sh
b/sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.SQL.sh
new file mode 100755
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.SQL.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+Mlog -x "perl $TSTSRCDIR/perl-undef-0.Bug-3235.pl $MAPIPORT $TSTDB"
diff --git a/sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.pl
b/sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.pl
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.pl
@@ -0,0 +1,26 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use Data::Dumper;
+
+$|++;
+
+use DBI();
+
+my $dbh = DBI->connect(
+ "dbi:monetdb:host=localhost;port=$ARGV[0];database=$ARGV[1]", 'monetdb',
'monetdb'
+);
+
+my $query = qq{
+ select 0;
+};
+
+my $sth = $dbh->prepare($query);
+$sth->execute;
+
+my $r = $sth->fetchall_arrayref();
+
+print Dumper($r);
+
+$dbh->disconnect();
diff --git a/sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.stable.err
b/sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.stable.err
@@ -0,0 +1,40 @@
+stderr of test 'perl-undef-0.Bug-3235` in directory 'sql/test/BugTracker-2013`
itself:
+
+
+# 15:23:26 >
+# 15:23:26 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31984" "--set"
"mapi_usock=/var/tmp/mtest-29493/.s.monetdb.31984" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 15:23:26 >
+
+# builtin opt gdk_dbpath =
/ufs/sjoerd/Monet-candidate/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = yes
+# 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 = 31984
+# cmdline opt mapi_usock = /var/tmp/mtest-29493/.s.monetdb.31984
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2013
+# cmdline opt mal_listing = 0
+
+# 15:23:26 >
+# 15:23:26 > "./perl-undef-0.Bug-3235.SQL.sh" "perl-undef-0.Bug-3235"
+# 15:23:26 >
+
+
+# 15:23:26 >
+# 15:23:26 > perl
/net/madrid/export/scratch2/sjoerd/src/MonetDB/candidate/sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.pl
31984 mTests_sql_test_BugTracker-2013
+# 15:23:26 >
+
+
+# 15:23:26 >
+# 15:23:26 > "Done."
+# 15:23:26 >
+
diff --git a/sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.stable.out
b/sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.stable.out
@@ -0,0 +1,65 @@
+stdout of test 'perl-undef-0.Bug-3235` in directory 'sql/test/BugTracker-2013`
itself:
+
+
+# 15:23:26 >
+# 15:23:26 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31984" "--set"
"mapi_usock=/var/tmp/mtest-29493/.s.monetdb.31984" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 15:23:26 >
+
+# MonetDB 5 server v11.15.2 (hg id: 6f180aa7ae7f)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2013', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.629 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 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:31984/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-29493/.s.monetdb.31984
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL 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_history.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_compress.sql
+# loading sql script: 18_dictionary.sql
+# loading sql script: 19_cluster.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: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+
+# 15:23:26 >
+# 15:23:26 > "./perl-undef-0.Bug-3235.SQL.sh" "perl-undef-0.Bug-3235"
+# 15:23:26 >
+
+
+# 15:23:26 >
+# 15:23:26 > perl
/net/madrid/export/scratch2/sjoerd/src/MonetDB/candidate/sql/test/BugTracker-2013/Tests/perl-undef-0.Bug-3235.pl
31984 mTests_sql_test_BugTracker-2013
+# 15:23:26 >
+
+$VAR1 = [
+ [
+ '0'
+ ]
+ ];
+
+# 15:23:26 >
+# 15:23:26 > "Done."
+# 15:23:26 >
+
diff --git a/sql/test/Tests/systemfunctions.stable.out
b/sql/test/Tests/systemfunctions.stable.out
--- a/sql/test/Tests/systemfunctions.stable.out
+++ b/sql/test/Tests/systemfunctions.stable.out
@@ -49,7 +49,7 @@ Ready.
% sys.s, sys.f, sys.a, sys.a, sys. # table_name
% schema, function, argno, argtype, definition # name
% varchar, varchar, int, varchar, varchar # type
-% 3, 35, 1, 15, 1579 # length
+% 3, 35, 1, 15, 1582 # length
[ "sys", "Intersect", 0, "boolean", "create function
\"Intersect\"(a geometry, b geometry) returns boolean external name
geom.\"Intersect\";" ]
[ "sys", "Intersect", 1, "geometry", "" ]
[ "sys", "Intersect", 2, "geometry", "" ]
@@ -78,7 +78,7 @@ Ready.
[ "sys", "cluster1", 1, "clob", "" ]
[ "sys", "cluster2", 0, "clob", "create procedure cluster2(sys
string, tab string)\n\texternal name sql.cluster2;" ]
[ "sys", "cluster2", 1, "clob", "" ]
-[ "sys", "columnsize", 0, "bigint", "-- The predicted
storage footprint of the complete database \n-- determines the amount of
diskspace needed for persistent storage\n-- and the upperbound when all
possible index structures are created.\n-- The storage requirement for foreign
key joins is split amongst the participants.\n\ncreate function columnsize(nme
string, i bigint, d bigint)\nreturns bigint\nbegin\n\tcase\n\twhen nme =
'boolean' then return i;\n\twhen nme = 'char' then return 2*i;\n\twhen nme =
'smallint' then return 2 * i;\n\twhen nme = 'int'\t then return 4 * i;\n\twhen
nme = 'bigint'\t then return 8 * i;\n\twhen nme = 'timestamp' then return 8 *
i;\n\twhen nme = 'varchar' then \n\t\tcase\n\t\twhen cast(d as bigint) << 8
then return i;\n\t\twhen cast(d as bigint) << 16 then return 2 * i;\n\t\twhen
cast(d as bigint) << 32 then return 4 * i;\n\t\telse return 8 * i;\n\t\tend
case;\n\telse return 8 * i;\n\tend case;\nend;" ]
+[ "sys", "columnsize", 0, "bigint", "-- The predicted
storage footprint of the complete database\n-- determines the amount of
diskspace needed for persistent storage\n-- and the upperbound when all
possible index structures are created.\n-- The storage requirement for foreign
key joins is split amongst the participants.\n\ncreate function
sys.columnsize(nme string, i bigint, d bigint)\nreturns
bigint\nbegin\n\tcase\n\twhen nme = 'boolean' then return i;\n\twhen nme =
'char' then return 2*i;\n\twhen nme = 'smallint' then return 2 * i;\n\twhen nme
= 'int'\t then return 4 * i;\n\twhen nme = 'bigint'\t then return 8 *
i;\n\twhen nme = 'timestamp' then return 8 * i;\n\twhen nme = 'varchar'
then\n\t\tcase\n\t\twhen cast(d as bigint) << 8 then return i;\n\t\twhen cast(d
as bigint) << 16 then return 2 * i;\n\t\twhen cast(d as bigint) << 32 then
return 4 * i;\n\t\telse return 8 * i;\n\t\tend case;\n\telse return 8 *
i;\n\tend case;\nend;" ]
[ "sys", "columnsize", 1, "clob", "" ]
[ "sys", "columnsize", 2, "bigint", "" ]
[ "sys", "columnsize", 3, "bigint", "" ]
@@ -204,7 +204,7 @@ Ready.
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
