Changeset: 168abd844b56 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=168abd844b56
Added Files:
debian/libmonetdb-stream5.install
debian/libmonetdb10.install
sql/test/BugTracker-2014/Tests/All
sql/test/BugTracker-2014/Tests/groupby.Bug-3421.sql
sql/test/BugTracker-2014/Tests/groupby.Bug-3421.stable.err
sql/test/BugTracker-2014/Tests/groupby.Bug-3421.stable.out
sql/test/BugTracker-2014/Tests/query-crash.Bug-3418.sql
sql/test/BugTracker-2014/Tests/query-crash.Bug-3418.stable.err
sql/test/BugTracker-2014/Tests/query-crash.Bug-3418.stable.out
Removed Files:
debian/libmonetdb-stream3.install
debian/libmonetdb9.install
Modified Files:
debian/control
gdk/gdk_batop.c
sql/test/BugTracker-2014/Tests/nested_common_table_exp.Bug-3417.stable.err
sql/test/BugTracker-2014/Tests/nested_common_table_exp.Bug-3417.stable.out
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (truncated from 501 to 300 lines):
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Standards-Version: 3.8.0
X-Python-Version: >= 2.6
X-Python3-Version: >= 3.0
-Package: libmonetdb9
+Package: libmonetdb10
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libmonetdb1, libmonetdb2
@@ -35,7 +35,7 @@ Description: MonetDB core library
Package: libmonetdb-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb9
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb10
Description: MonetDB development files
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -45,7 +45,7 @@ Description: MonetDB development files
This package contains files needed to develop extensions to the core
functionality of MonetDB.
-Package: libmonetdb-stream3
+Package: libmonetdb-stream5
Conflicts: libmonetdb-stream2
Replaces: libmonetdb-stream2
Architecture: any
@@ -61,7 +61,7 @@ Description: MonetDB stream library
Package: libmonetdb-stream-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb-stream3
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb-stream5
Description: MonetDB stream library development files
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -69,7 +69,7 @@ Description: MonetDB stream library deve
accelerators. It also has an SQL frontend.
.
This package contains the files to develop with the
- libmonetdb-stream3 library.
+ libmonetdb-stream5 library.
Package: libmonetdb-client6
Architecture: any
diff --git a/debian/libmonetdb-stream3.install
b/debian/libmonetdb-stream5.install
rename from debian/libmonetdb-stream3.install
rename to debian/libmonetdb-stream5.install
diff --git a/debian/libmonetdb9.install b/debian/libmonetdb10.install
rename from debian/libmonetdb9.install
rename to debian/libmonetdb10.install
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -826,10 +826,7 @@ BATslice(BAT *b, BUN l, BUN h)
if (BAThrestricted(b) == BAT_READ && BATtrestricted(b) == BAT_READ) {
BUN cnt = h - l;
- if (BAThdense(b))
- bn = BATmirror(VIEWhead(BATmirror(b)));
- else
- bn = VIEWcreate_(b, b, TRUE);
+ bn = VIEWcreate_(b, b, TRUE);
bn->batFirst = bn->batDeleted = bn->batInserted = 0;
bn->H->heap.base = (bn->htype) ? BUNhloc(bi, l) : NULL;
bn->T->heap.base = (bn->ttype) ? BUNtloc(bi, l) : NULL;
diff --git a/sql/test/BugTracker-2014/Tests/All
b/sql/test/BugTracker-2014/Tests/All
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/All
@@ -0,0 +1,3 @@
+nested_common_table_exp.Bug-3417
+query-crash.Bug-3418
+groupby.Bug-3421
diff --git a/sql/test/BugTracker-2014/Tests/groupby.Bug-3421.sql
b/sql/test/BugTracker-2014/Tests/groupby.Bug-3421.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/groupby.Bug-3421.sql
@@ -0,0 +1,49 @@
+-- Bug 3421
+
+
+create table OrderConnectorMetrics (
+ toplevelorderid bigint not null,
+ businessdate date,
+ connector varchar(256),
+ filledValue real,
+ filledQty real,
+ numberOfFills int,
+ chargeUsd real,
+ unique (toplevelorderid, connector)
+);
+
+insert into OrderConnectorMetrics values (5508, '2013-02-01', 'C1', 3000000,
3000000, 4, null);
+insert into OrderConnectorMetrics values (5508, '2013-02-01', 'C2', 2000000,
2000000, 2, null);
+
+create table t2 as select * from orderconnectormetrics where
+toplevelorderid = 5508 with data;
+
+select * from t2;
+
+-- first round
+select toplevelorderid, count(*), sum(numberoffills) from t2 group by
toplevelorderid;
+
+select toplevelorderid, count(*), sum(numberoffills) from t2 where
+toplevelorderid = 5508 group by toplevelorderid;
+
+-- second round
+select toplevelorderid, count(*), sum(numberoffills) from t2 group by
toplevelorderid;
+
+select toplevelorderid, count(*), sum(numberoffills) from t2 where
+toplevelorderid = 5508 group by toplevelorderid;
+
+select toplevelorderid, count(*), sum(numberoffills) from
+orderconnectormetrics where toplevelorderid = 5508 group by toplevelorderid;
+
+delete from t2;
+insert into t2 select * from orderconnectormetrics where toplevelorderid =
5508;
+
+-- problem less
+insert into t2 values (5508, '2013-02-01', 'C1', 3000000, 3000000, 4, null);
+insert into t2 values (5508, '2013-02-01', 'C2', 2000000, 2000000, 2, null);
+
+select toplevelorderid, count(*), sum(numberoffills) from t2 where
+toplevelorderid = 5508 group by toplevelorderid;
+
+drop table t2;
+drop table OrderConnectorMetrics;
diff --git a/sql/test/BugTracker-2014/Tests/groupby.Bug-3421.stable.err
b/sql/test/BugTracker-2014/Tests/groupby.Bug-3421.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/groupby.Bug-3421.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'groupby.Bug-3421` in directory 'sql/test/BugTracker-2014`
itself:
+
+
+# 10:34:33 >
+# 10:34:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30277" "--set"
"mapi_usock=/var/tmp/mtest-29232/.s.monetdb.30277" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/Jan2014//Linux/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0"
+# 10:34:33 >
+
+# builtin opt gdk_dbpath =
/export/scratch1/mk/Jan2014//Linux/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 = 30277
+# cmdline opt mapi_usock = /var/tmp/mtest-29232/.s.monetdb.30277
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/Jan2014//Linux/var/MonetDB/mTests_sql_test_BugTracker-2014
+# cmdline opt mal_listing = 0
+
+# 10:34:33 >
+# 10:34:33 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-29232" "--port=30277"
+# 10:34:33 >
+
+
+
+# 10:34:33 >
+# 10:34:33 > "Done."
+# 10:34:33 >
+
diff --git a/sql/test/BugTracker-2014/Tests/groupby.Bug-3421.stable.out
b/sql/test/BugTracker-2014/Tests/groupby.Bug-3421.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/groupby.Bug-3421.stable.out
@@ -0,0 +1,127 @@
+stdout of test 'groupby.Bug-3421` in directory 'sql/test/BugTracker-2014`
itself:
+
+
+# 10:34:33 >
+# 10:34:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30277" "--set"
"mapi_usock=/var/tmp/mtest-29232/.s.monetdb.30277" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/Jan2014//Linux/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0"
+# 10:34:33 >
+
+# MonetDB 5 server v11.17.2
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2014', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.591 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 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:30277/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-29232/.s.monetdb.30277
+# 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_querylog.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: 26_sysmon.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+
+# 10:34:33 >
+# 10:34:33 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-29232" "--port=30277"
+# 10:34:33 >
+
+#create table OrderConnectorMetrics (
+# toplevelorderid bigint not null,
+# businessdate date,
+# connector varchar(256),
+# filledValue real,
+# filledQty real,
+# numberOfFills int,
+# chargeUsd real,
+# unique (toplevelorderid, connector)
+#);
+#insert into OrderConnectorMetrics values (5508, '2013-02-01', 'C1', 3000000,
3000000, 4, null);
+[ 1 ]
+#insert into OrderConnectorMetrics values (5508, '2013-02-01', 'C2', 2000000,
2000000, 2, null);
+[ 1 ]
+#create table t2 as select * from orderconnectormetrics where
+#toplevelorderid = 5508 with data;
+#select * from t2;
+% sys.t2, sys.t2, sys.t2, sys.t2, sys.t2, sys.t2, sys.t2 # table_name
+% toplevelorderid, businessdate, connector, filledvalue,
filledqty, numberoffills, chargeusd # name
+% bigint, date, varchar, real, real, int, real # type
+% 4, 10, 2, 15, 15, 1, 15 # length
+[ 5508, 2013-02-01, "C1", 3000000, 3000000, 4,
NULL ]
+[ 5508, 2013-02-01, "C2", 2000000, 2000000, 2,
NULL ]
+#select toplevelorderid, count(*), sum(numberoffills) from t2 group by
toplevelorderid;
+% sys.t2, sys.L1, sys.L2 # table_name
+% toplevelorderid, L1, L2 # name
+% bigint, wrd, bigint # type
+% 4, 1, 1 # length
+[ 5508, 2, 6 ]
+#select toplevelorderid, count(*), sum(numberoffills) from t2 where
+#toplevelorderid = 5508 group by toplevelorderid;
+% sys.t2, sys.L1, sys.L2 # table_name
+% toplevelorderid, L1, L2 # name
+% bigint, wrd, bigint # type
+% 4, 1, 1 # length
+[ 5508, 2, 6 ]
+#select toplevelorderid, count(*), sum(numberoffills) from t2 group by
toplevelorderid;
+% sys.t2, sys.L1, sys.L2 # table_name
+% toplevelorderid, L1, L2 # name
+% bigint, wrd, bigint # type
+% 4, 1, 1 # length
+[ 5508, 2, 6 ]
+#select toplevelorderid, count(*), sum(numberoffills) from t2 where
+#toplevelorderid = 5508 group by toplevelorderid;
+% sys.t2, sys.L1, sys.L2 # table_name
+% toplevelorderid, L1, L2 # name
+% bigint, wrd, bigint # type
+% 4, 1, 1 # length
+[ 5508, 2, 6 ]
+#select toplevelorderid, count(*), sum(numberoffills) from
+#orderconnectormetrics where toplevelorderid = 5508 group by toplevelorderid;
+% sys.orderconnectormetrics, sys.L1, sys.L2 # table_name
+% toplevelorderid, L1, L2 # name
+% bigint, wrd, bigint # type
+% 4, 1, 1 # length
+[ 5508, 2, 6 ]
+#delete from t2;
+[ 2 ]
+#insert into t2 select * from orderconnectormetrics where toplevelorderid =
5508;
+[ 2 ]
+#insert into t2 values (5508, '2013-02-01', 'C1', 3000000, 3000000, 4, null);
+[ 1 ]
+#insert into t2 values (5508, '2013-02-01', 'C2', 2000000, 2000000, 2, null);
+[ 1 ]
+#select toplevelorderid, count(*), sum(numberoffills) from t2 where
+#toplevelorderid = 5508 group by toplevelorderid;
+% sys.t2, sys.L1, sys.L2 # table_name
+% toplevelorderid, L1, L2 # name
+% bigint, wrd, bigint # type
+% 4, 1, 2 # length
+[ 5508, 4, 12 ]
+#drop table t2;
+#drop table OrderConnectorMetrics;
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
