Changeset: b8130001bc49 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b8130001bc49
Added Files:
sql/test/BugTracker-2016/Tests/data-uuid.csv.bz2
sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql.in
sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.stable.err
sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.stable.out
Modified Files:
clients/python2/monetdb/mapi.py
clients/python3/monetdb/mapi.py
monetdb5/modules/mal/mat.c
sql/test/BugTracker-2016/Tests/All
Branch: Jun2016
Log Message:
Merge with Jul2015 branch.
diffs (226 lines):
diff --git a/clients/python2/monetdb/mapi.py b/clients/python2/monetdb/mapi.py
--- a/clients/python2/monetdb/mapi.py
+++ b/clients/python2/monetdb/mapi.py
@@ -256,7 +256,7 @@ class Connection(object):
while count > 0:
recv = self.socket.recv(count)
if len(recv) == 0:
- raise OperationalError("Server closed connection")
+ raise socket.error("Server closed connection")
count -= len(recv)
result.write(recv)
return result.getvalue()
diff --git a/clients/python3/monetdb/mapi.py b/clients/python3/monetdb/mapi.py
--- a/clients/python3/monetdb/mapi.py
+++ b/clients/python3/monetdb/mapi.py
@@ -258,7 +258,7 @@ class Connection(object):
while count > 0:
recv = self.socket.recv(count)
if len(recv) == 0:
- raise OperationalError("Server closed connection")
+ raise socket.error("Server closed connection")
count -= len(recv)
result.write(recv)
return result.getvalue()
diff --git a/monetdb5/modules/mal/mat.c b/monetdb5/modules/mal/mat.c
--- a/monetdb5/modules/mal/mat.c
+++ b/monetdb5/modules/mal/mat.c
@@ -167,9 +167,9 @@ MATpackValues(Client cntxt, MalBlkPtr mb
if( bn == NULL)
throw(MAL, "mat.pack", MAL_MALLOC_FAIL);
- if (ATOMvarsized(type)) {
+ if (ATOMextern(type)) {
for(i = first; i < p->argc; i++)
- BUNappend(bn, stk->stk[getArg(p,i)].val.sval, TRUE);
+ BUNappend(bn, stk->stk[getArg(p,i)].val.pval, TRUE);
} else {
for(i = first; i < p->argc; i++)
BUNappend(bn, getArgReference(stk, p, i), TRUE);
diff --git a/sql/test/BugTracker-2016/Tests/All
b/sql/test/BugTracker-2016/Tests/All
--- a/sql/test/BugTracker-2016/Tests/All
+++ b/sql/test/BugTracker-2016/Tests/All
@@ -14,3 +14,4 @@ wrong-nonil-property-with-copy-binary-in
stream_table_crash.Bug-3952
null_in_null.Bug-3900
rank_rewrite.Bug-3890
+HAVE_LIBBZ2?min-max-uuid-column-wrong-results.Bug-3953
diff --git a/sql/test/BugTracker-2016/Tests/data-uuid.csv.bz2
b/sql/test/BugTracker-2016/Tests/data-uuid.csv.bz2
new file mode 100644
index
e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..90b03b56a0ff24e708d77fbeadc169f998762bfc
GIT binary patch
literal 1406
zc$`&Ke@q)y9DjHAl6s6#kh*36*kHq0W3~dNlWlAV)E_l%>9~7K${(gS3<^;*agI4h
zy+a`Dvdp?-(%oPbCT;J9e}*p6X=0iD0cME|kZjZFG-xK73UL|?aq-)CY+=d$@!oyk
zeZQYy@9LVu)#bH;QZaC&Ie3@(t|)+z39+5G_ai%V43)K|5WlreMx%`d&%45F0`?ir
zqLtUqa?))D*Z9q1J4=EJ-ebYuJG}Oni<Z7+@NNtCm~3g-TxZEqfef59i#PRE%$9;p
zh?CZ)S@IgRoa8n5qEf&f=x5-yRR!-d*-|j+-&6c_h5B{Fn@wm3w=ji}jGp+CS!LwB
zEK~2bBmbNSakkjp<a_g7Fc3Otcx{A}pz$#a#R{ue6>JxXs@GvM%&LasB0UM1j=(0&
zYgbtEmVmu6TN)q$=&qzKwZxKlfEj>U5h$OZIcbWv8@lE{=<Z+W3bp>7eR}w)fD8x?
zt`=lBp_kFsJ~fEEn6a0#AG%WwR_DcWPMTmzi%bT7l}SQJ1_JyDW5TrE`5DR_<oX8`
z0vS3e2`KIcMicr<M>5YzcXYv_$xke4R)CKG@~D(IOO%LN%4;ObiBR{rC-w0!Y}2Qk
z{_7n_$bt-iW+N!bE{Ah|GF5mBqNaYJo|!U>r)ZlB7!4djl^Y5!7w9xlNoC1lft<78
zh8|wKtKhwW)nVA&Pn6efnI|P81B(tSuou(?3UI~&r$3^60DDL#LnkSvmCMWq@d8Re
zW=<41H;NagzLt`U2o;lhZ|wa8_ozVUbo<J94ahq!wXH8@Huqw7h9m<p_mYsSrXhWw
zvE=QCNdT*MQPI*6SprEA$RKF@8%x@gwsi9Yy$8YE1_+@-iLQe?)b~}J+`jk-xGBqU
zDuH-hUn9;>qERX2JfNO|*iX|tV1KAVj-`V4flf_Hnq#mQ-t9BdY+a(K9l%N7k36t?
zFX;WES%k36fZKo&AiqMN2*_DQo9<5}$Ku<^KHu@pea3NZOh!h;>{)(F-h#eB#f~||
z<vX&dQQLaFs-otFSx#D{wt{*-=zN??kkBR3;|6uOc)m3qX9v{-Sopx|C7Gy6Dyp7{
zT>d~kB9p-w1zJqq1#CX()y+xw_0%06xpk1|S|3f_b2(fpIgJ3^W1+tJBNT@x7bV(d
z{kmSK*R@)AQ2*7eCk~8#<1E^_9kbtK|1%mkz|C!!$$9v$j3R_wlwX0Q!B;M731o68
zLtSmb{+*|(tMAHuKH_5w8(j5m{L58}ZTXqsjqyZ@XSk@v7>@*_&(>LQ8sjFH+HL*8
z7`M9yCW;Oj<F^X8nOqlw(Mp3mQ{sci6m|5tXA4V{QD>cX$r%5n#OrqrnW7av?w%4)
aZBeAodav7hwQ$=?r&a8IoNfK1bNPSkGYzHy
diff --git
a/sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql.in
b/sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql.in
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.sql.in
@@ -0,0 +1,7 @@
+CREATE TABLE test (c UUID);
+COPY 200000 RECORDS INTO test FROM '$TSTSRCDIR/data-uuid.csv.bz2' DELIMITERS
',';
+SELECT MIN(c) AS mn, MAX(c) AS mx FROM test;
+SELECT MIN(c) AS mn, MAX(c) AS mx FROM test;
+SELECT MIN(c) AS mn, MAX(c) AS mx FROM test;
+DROP TABLE test;
+
diff --git
a/sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.stable.err
b/sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'min-max-uuid-column-wrong-results.Bug-3953` in directory
'sql/test/BugTracker-2016` itself:
+
+
+# 18:32:28 >
+# 18:32:28 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37588" "--set"
"mapi_usock=/var/tmp/mtest-9820/.s.monetdb.37588" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 18:32:28 >
+
+# builtin opt gdk_dbpath =
/export/scratch2/zhang/monet-install/Jul2015/debug/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 = 37588
+# cmdline opt mapi_usock = /var/tmp/mtest-9820/.s.monetdb.37588
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_test_BugTracker-2016
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 18:32:28 >
+# 18:32:28 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9820" "--port=37588"
+# 18:32:28 >
+
+
+# 18:32:29 >
+# 18:32:29 > "Done."
+# 18:32:29 >
+
diff --git
a/sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.stable.out
b/sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.stable.out
@@ -0,0 +1,93 @@
+stdout of test 'min-max-uuid-column-wrong-results.Bug-3953` in directory
'sql/test/BugTracker-2016` itself:
+
+
+# 18:32:28 >
+# 18:32:28 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37588" "--set"
"mapi_usock=/var/tmp/mtest-9820/.s.monetdb.37588" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch2/zhang/monet-install/Jul2015/debug/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 18:32:28 >
+
+# MonetDB 5 server v11.21.16
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2016', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.589 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://toulouse.da.cwi.nl:37588/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-9820/.s.monetdb.37588
+# 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
+
+# 18:32:28 >
+# 18:32:28 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9820" "--port=37588"
+# 18:32:28 >
+
+#CREATE TABLE test (c UUID);
+#COPY 200000 RECORDS INTO test FROM
'/export/scratch2/zhang/monet-source/Jul2015/sql/test/BugTracker-2016/Tests/data-uuid.csv.bz2'
DELIMITERS ',';
+[ 200000 ]
+#SELECT MIN(c) AS mn, MAX(c) AS mx FROM test;
+% sys.L1, sys.L2 # table_name
+% mn, mx # name
+% uuid, uuid # type
+% 0, 0 # length
+[ 1e1a9c62-d656-11e5-9fd7-9b884ad020cd,
1e1a9c62-d656-11e5-9fd7-9b884ad020cd ]
+#SELECT MIN(c) AS mn, MAX(c) AS mx FROM test;
+% sys.L1, sys.L2 # table_name
+% mn, mx # name
+% uuid, uuid # type
+% 0, 0 # length
+[ 1e1a9c62-d656-11e5-9fd7-9b884ad020cd,
1e1a9c62-d656-11e5-9fd7-9b884ad020cd ]
+#SELECT MIN(c) AS mn, MAX(c) AS mx FROM test;
+% sys.L1, sys.L2 # table_name
+% mn, mx # name
+% uuid, uuid # type
+% 0, 0 # length
+[ 1e1a9c62-d656-11e5-9fd7-9b884ad020cd,
1e1a9c62-d656-11e5-9fd7-9b884ad020cd ]
+#DROP TABLE test;
+
+# 18:32:29 >
+# 18:32:29 > "Done."
+# 18:32:29 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
