Changeset: 84f47dcc0b15 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=84f47dcc0b15
Added Files:
sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out.int128
Removed Files:
sql/test/mergetables/Tests/mergequery.stable.out.single
Modified Files:
clients/mapiclient/mclient.c
java/pom.xml
sql/test/BugTracker-2015/Tests/All
sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out
sql/test/mergetables/Tests/All
sql/test/testdb-upgrade-chain-hge/Tests/All
sql/test/testdb-upgrade-hge/Tests/All
testing/Mtest.py.in
Branch: Jul2015
Log Message:
merged
diffs (truncated from 476 to 300 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3056,7 +3056,7 @@ main(int argc, char **argv)
* ".OCP" if we knew for sure that we were running in a cmd
* window) */
#ifdef HAVE_SETLOCALE
- setlocale(LC_ALL, "");
+ setlocale(LC_CTYPE, "");
#endif
#endif
toConsole = stdout_stream = file_wastream(stdout, "stdout");
diff --git a/java/pom.xml b/java/pom.xml
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -6,7 +6,7 @@
<groupId>monetdb</groupId>
<artifactId>monetdb-jdbc</artifactId>
- <version>2.18-SNAPSHOT</version>
+ <version>2.17</version>
<name>${project.groupId}:${project.artifactId}</name>
<description>MonetDB JDBC driver</description>
<url>https://www.monetdb.org</url>
@@ -118,7 +118,7 @@
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
+
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
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
@@ -50,7 +50,7 @@ cast_on_groupby_col_crash.Bug-3769
apply_merge_distinct.Bug-3760
cardinality.Bug-3761
set_default_role.Bug-3364
-useless_casts.Bug-3756
+THREADS>=3?useless_casts.Bug-3756
sum_interval.Bug-3785
nil_cast.Bug-3787
sql2pcre.Bug-3800
diff --git a/sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out
b/sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out
--- a/sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out
+++ b/sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out
@@ -34,7 +34,7 @@ Ready.
#select count(y),sum(z) from (select '',false,a=200 from foo union all select
'',null,a=200 from foo) as t(x,y,z) group by x;
% .L7, .L10 # table_name
% L7, L10 # name
-% wrd, hugeint # type
+% wrd, bigint # type
% 1, 1 # length
#ROLLBACK;
diff --git a/sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out.int128
b/sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out.int128
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out.int128
@@ -0,0 +1,44 @@
+stdout of test 'nil_cast.Bug-3787` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 12:38:57 >
+# 12:38:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36703" "--set"
"mapi_usock=/var/tmp/mtest-27290/.s.monetdb.36703" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 12:38:57 >
+
+# MonetDB 5 server v11.21.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', 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:36703/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-27290/.s.monetdb.36703
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.36'
+# Finished reading the write-ahead log 'sql_logs/sql/log.36'
+# Finished processing logs sql/sql_logs
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 12:38:58 >
+# 12:38:58 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27290" "--port=36703"
+# 12:38:58 >
+
+#START TRANSACTION;
+#create table foo (a smallint);
+#select count(y),sum(z) from (select '',false,a=200 from foo union all select
'',null,a=200 from foo) as t(x,y,z) group by x;
+% .L7, .L10 # table_name
+% L7, L10 # name
+% wrd, hugeint # type
+% 1, 1 # length
+#ROLLBACK;
+
+# 12:38:58 >
+# 12:38:58 > "Done."
+# 12:38:58 >
+
diff --git a/sql/test/mergetables/Tests/All b/sql/test/mergetables/Tests/All
--- a/sql/test/mergetables/Tests/All
+++ b/sql/test/mergetables/Tests/All
@@ -1,7 +1,7 @@
mergeinit
mergeload
mergeloadidx
-mergequery
+THREADS>=4?mergequery
emptymergequery
alter
types
diff --git a/sql/test/mergetables/Tests/mergequery.stable.out.single
b/sql/test/mergetables/Tests/mergequery.stable.out.single
deleted file mode 100644
--- a/sql/test/mergetables/Tests/mergequery.stable.out.single
+++ /dev/null
@@ -1,225 +0,0 @@
-stdout of test 'mergequery` in directory 'sql/test/mergetables` itself:
-
-
-# 16:20:23 >
-# 16:20:23 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30678" "--set"
"mapi_usock=/var/tmp/mtest-11019/.s.monetdb.30678" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_test_mergetables"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
-# 16:20:23 >
-
-# MonetDB 5 server v11.20.0
-# This is an unreleased version
-# Serving database 'mTests_sql_test_mergetables', 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://vienna.ins.cwi.nl:30678/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-11019/.s.monetdb.30678
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-# MonetDB/R module loaded
-
-Ready.
-
-# 16:20:23 >
-# 16:20:23 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11019" "--port=30678"
-# 16:20:23 >
-
-#CREATE TABLE part1 ( x double, y double, z double);
-#COPY 4 RECORDS INTO part1 FROM stdin USING DELIMITERS ' ','\n';
-#0.0 0.0 0.0
-#1.0 0.0 0.0
-#0.0 1.0 0.0
-#1.0 1.0 0.0
-[ 4 ]
-#CREATE TABLE part2 ( x double, y double, z double);
-#COPY 4 RECORDS INTO part2 FROM stdin USING DELIMITERS ' ','\n';
-#2.0 0.0 0.0
-#3.0 0.0 0.0
-#2.0 1.0 0.0
-#3.0 1.0 0.0
-[ 4 ]
-#CREATE MERGE TABLE complete ( x double, y double, z double);
-#ALTER TABLE complete ADD TABLE part1;
-#ALTER TABLE complete ADD TABLE part2;
-#SELECT * FROM COMPLETE;
-% .complete, .complete, .complete # table_name
-% x, y, z # name
-% double, double, double # type
-% 24, 24, 24 # length
-[ 0, 0, 0 ]
-[ 1, 0, 0 ]
-[ 0, 1, 0 ]
-[ 1, 1, 0 ]
-[ 2, 0, 0 ]
-[ 3, 0, 0 ]
-[ 2, 1, 0 ]
-[ 3, 1, 0 ]
-#SELECT * FROM complete where x>=0.0 AND x <=1.0;
-% .complete, .complete, .complete # table_name
-% x, y, z # name
-% double, double, double # type
-% 24, 24, 24 # length
-[ 0, 0, 0 ]
-[ 1, 0, 0 ]
-[ 0, 1, 0 ]
-[ 1, 1, 0 ]
-#SELECT * FROM complete where x>=2.0 AND x <=3.0;
-% .complete, .complete, .complete # table_name
-% x, y, z # name
-% double, double, double # type
-% 24, 24, 24 # length
-[ 2, 0, 0 ]
-[ 3, 0, 0 ]
-[ 2, 1, 0 ]
-[ 3, 1, 0 ]
-#SELECT * FROM complete where x>=1.0 AND x <=2.0;
-% .complete, .complete, .complete # table_name
-% x, y, z # name
-% double, double, double # type
-% 24, 24, 24 # length
-[ 1, 0, 0 ]
-[ 1, 1, 0 ]
-[ 2, 0, 0 ]
-[ 2, 1, 0 ]
-#CREATE TABLE answ( LIKE complete);
-#EXPLAIN INSERT INTO answ
-#SELECT * FROM complete where x>=1.0 AND x <=2.0;
-% .explain # table_name
-% mal # name
-% clob # type
-% 129 # length
-function user.s13_1{autoCommit=true}(A0:dbl,A1:dbl):void;
- X_83:void := querylog.define("explain insert into answ\nselect * from
complete where x>=1.0 and x <=2.0;","default_pipe",52);
- X_4 := sql.mvc();
- X_5:bat[:oid,:dbl] := bat.new(nil:oid,nil:dbl);
- X_11:bat[:oid,:dbl] := sql.bind(X_4,"sys","part1","x",0);
- X_8:bat[:oid,:oid] := sql.tid(X_4,"sys","part1");
- X_97 := algebra.subselect(X_11,X_8,A0,A1,true,true,false);
- (X_14,r1_14) := sql.bind(X_4,"sys","part1","x",2);
- X_98 := algebra.subselect(r1_14,nil:bat[:oid,:oid],A0,A1,true,true,false);
- X_17:bat[:oid,:dbl] := sql.bind(X_4,"sys","part1","x",1);
- X_100 := algebra.subselect(X_17,X_8,A0,A1,true,true,false);
- X_19 := sql.subdelta(X_97,X_8,X_14,X_98,X_100);
- X_21 := sql.projectdelta(X_19,X_11,X_14,r1_14,X_17);
- X_22 := bat.append(X_5,X_21,true);
- X_25:bat[:oid,:dbl] := sql.bind(X_4,"sys","part2","x",0);
- X_23:bat[:oid,:oid] := sql.tid(X_4,"sys","part2");
- X_101 := algebra.subselect(X_25,X_23,A0,A1,true,true,false);
- (X_26,r1_30) := sql.bind(X_4,"sys","part2","x",2);
- X_102 := algebra.subselect(r1_30,nil:bat[:oid,:oid],A0,A1,true,true,false);
- X_28:bat[:oid,:dbl] := sql.bind(X_4,"sys","part2","x",1);
- X_104 := algebra.subselect(X_28,X_23,A0,A1,true,true,false);
- X_29 := sql.subdelta(X_101,X_23,X_26,X_102,X_104);
- X_31 := sql.projectdelta(X_29,X_25,X_26,r1_30,X_28);
- X_32 := bat.append(X_22,X_31,true);
- X_33 := sql.append(X_4,"sys","answ","x",X_32);
- X_37:bat[:oid,:dbl] := bat.new(nil:oid,nil:dbl);
- X_40:bat[:oid,:dbl] := sql.bind(X_33,"sys","part1","y",0);
- (X_44,r1_53) := sql.bind(X_33,"sys","part1","y",2);
- X_47:bat[:oid,:dbl] := sql.bind(X_33,"sys","part1","y",1);
- X_49 := sql.projectdelta(X_19,X_40,X_44,r1_53,X_47);
- X_50 := bat.append(X_37,X_49,true);
- X_51:bat[:oid,:dbl] := sql.bind(X_33,"sys","part2","y",0);
- (X_53,r1_64) := sql.bind(X_33,"sys","part2","y",2);
- X_55:bat[:oid,:dbl] := sql.bind(X_33,"sys","part2","y",1);
- X_56 := sql.projectdelta(X_29,X_51,X_53,r1_64,X_55);
- X_57 := bat.append(X_50,X_56,true);
- X_59 := sql.append(X_33,"sys","answ","y",X_57);
- X_60:bat[:oid,:dbl] := bat.new(nil:oid,nil:dbl);
- X_61:bat[:oid,:dbl] := sql.bind(X_59,"sys","part1","z",0);
- (X_64,r1_78) := sql.bind(X_59,"sys","part1","z",2);
- X_66:bat[:oid,:dbl] := sql.bind(X_59,"sys","part1","z",1);
- X_67 := sql.projectdelta(X_19,X_61,X_64,r1_78,X_66);
- X_68 := bat.append(X_60,X_67,true);
- X_69:bat[:oid,:dbl] := sql.bind(X_59,"sys","part2","z",0);
- (X_71,r1_87) := sql.bind(X_59,"sys","part2","z",2);
- X_74:bat[:oid,:dbl] := sql.bind(X_59,"sys","part2","z",1);
- X_76 := sql.projectdelta(X_29,X_69,X_71,r1_87,X_74);
- X_77 := bat.append(X_68,X_76,true);
- X_78 := sql.append(X_59,"sys","answ","z",X_77);
- X_80 := aggr.count(X_77);
- sql.affectedRows(X_78,X_80,"");
-end user.s13_1;
-#INSERT INTO answ
-#SELECT * FROM complete where x>=1.0 AND x <=2.0;
-[ 4 ]
-#EXPLAIN INSERT INTO answ
-#SELECT * FROM complete
-#WHERE x BETWEEN 0 AND 2 AND Y BETWEEN 0 AND 2;
-% .explain # table_name
-% mal # name
-% clob # type
-% 151 # length
-function user.s14_1{autoCommit=true}(A0:dbl,A1:dbl,A2:dbl,A3:dbl):void;
- X_88:void := querylog.define("explain insert into answ\nselect * from
complete\nwhere x between 0 and 2 and y between 0 and 2;","default_pipe",60);
- X_6 := sql.mvc();
- X_7:bat[:oid,:dbl] := bat.new(nil:oid,nil:dbl);
- X_13:bat[:oid,:dbl] := sql.bind(X_6,"sys","part1","x",0);
- X_21:bat[:oid,:dbl] := sql.bind(X_6,"sys","part1","y",0);
- X_10:bat[:oid,:oid] := sql.tid(X_6,"sys","part1");
- X_102 := algebra.subselect(X_21,X_10,A2,A3,true,true,false);
- (X_23,r1_27) := sql.bind(X_6,"sys","part1","y",2);
- X_103 := algebra.subselect(r1_27,nil:bat[:oid,:oid],A2,A3,true,true,false);
- X_25:bat[:oid,:dbl] := sql.bind(X_6,"sys","part1","y",1);
- X_105 := algebra.subselect(X_25,X_10,A2,A3,true,true,false);
- X_26 := sql.subdelta(X_102,X_10,X_23,X_103,X_105);
- X_106 := algebra.subselect(X_13,X_26,A0,A1,true,true,false);
- (X_16,r1_16) := sql.bind(X_6,"sys","part1","x",2);
- X_107 := algebra.subselect(r1_16,nil:bat[:oid,:oid],A0,A1,true,true,false);
- X_19:bat[:oid,:dbl] := sql.bind(X_6,"sys","part1","x",1);
- X_109 := algebra.subselect(X_19,X_26,A0,A1,true,true,false);
- X_28 := sql.subdelta(X_106,X_26,X_16,X_107,X_109);
- X_29 := sql.projectdelta(X_28,X_13,X_16,r1_16,X_19);
- X_30 := bat.append(X_7,X_29,true);
- X_34:bat[:oid,:dbl] := sql.bind(X_6,"sys","part2","x",0);
- X_40:bat[:oid,:dbl] := sql.bind(X_6,"sys","part2","y",0);
- X_32:bat[:oid,:oid] := sql.tid(X_6,"sys","part2");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
