Changeset: 859dc2d50ec1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=859dc2d50ec1
Added Files:
sql/benchmarks/ssbm/Tests/01-plan.stable.out.int128
sql/benchmarks/ssbm/Tests/02-plan.stable.out.int128
sql/benchmarks/ssbm/Tests/03-plan.stable.out.int128
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/Dependencies/Tests/dependency_loop.stable.out.int128
Modified Files:
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/SQL-dump_gsl.stable.out.int128
clients/Tests/SQL-dump_nogeom.stable.out.int128
sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out.int128
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check1_gsl.stable.out.int128
sql/test/leaks/Tests/check1_nogeom.stable.out.int128
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check2_gsl.stable.out.int128
sql/test/leaks/Tests/check2_nogeom.stable.out.int128
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check3_gsl.stable.out.int128
sql/test/leaks/Tests/check3_nogeom.stable.out.int128
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check4_gsl.stable.out.int128
sql/test/leaks/Tests/check4_nogeom.stable.out.int128
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/leaks/Tests/check5_gsl.stable.out.int128
sql/test/leaks/Tests/check5_nogeom.stable.out.int128
Branch: int128
Log Message:
approved output after changeset 0312aebf9e45
diffs (truncated from 984 to 300 lines):
diff --git a/clients/Tests/SQL-dump.stable.out.int128
b/clients/Tests/SQL-dump.stable.out.int128
--- a/clients/Tests/SQL-dump.stable.out.int128
+++ b/clients/Tests/SQL-dump.stable.out.int128
@@ -1930,7 +1930,7 @@ 6779 "count" "bigint" 64 0 6784
NULL tru
6780 "columnsize" "hugeint" 64 0 6784 NULL true
3 NULL
6781 "heapsize" "hugeint" 64 0 6784 NULL true
4 NULL
6782 "indices" "hugeint" 64 0 6784 NULL true
5 NULL
-6783 "auxillary" "hugeint" 53 0 6784 NULL true
6 NULL
+6783 "auxillary" "hugeint" 128 0 6784 NULL true
6 NULL
6786 "schema" "clob" 0 0 6799 NULL true 0
NULL
6787 "table" "clob" 0 0 6799 NULL true 1 NULL
6788 "column" "clob" 0 0 6799 NULL true 2
NULL
@@ -5951,7 +5951,7 @@ CREATE TABLE "sys"."dependencies" (
"depend_id" INTEGER,
"depend_type" SMALLINT
);
-COPY 201 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 202 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
417 5596 7
418 5596 7
1023 5596 7
@@ -6128,7 +6128,7 @@ 193 6736 7
199 6736 7
118 6742 7
35 6742 7
-192 6742 7
+261 6742 7
193 6742 7
34 6748 7
193 6748 7
@@ -6149,6 +6149,7 @@ 6763 6775 5
6763 6784 5
49 6784 5
56 6784 5
+57 6784 5
52 6784 5
36 6784 5
34 6784 5
diff --git a/clients/Tests/SQL-dump_gsl.stable.out.int128
b/clients/Tests/SQL-dump_gsl.stable.out.int128
--- a/clients/Tests/SQL-dump_gsl.stable.out.int128
+++ b/clients/Tests/SQL-dump_gsl.stable.out.int128
@@ -1931,7 +1931,7 @@ 6784 "count" "bigint" 64 0 6789
NULL tru
6785 "columnsize" "hugeint" 64 0 6789 NULL true
3 NULL
6786 "heapsize" "hugeint" 64 0 6789 NULL true
4 NULL
6787 "indices" "hugeint" 64 0 6789 NULL true
5 NULL
-6788 "auxillary" "hugeint" 53 0 6789 NULL true
6 NULL
+6788 "auxillary" "hugeint" 128 0 6789 NULL true
6 NULL
6791 "schema" "clob" 0 0 6804 NULL true 0
NULL
6792 "table" "clob" 0 0 6804 NULL true 1 NULL
6793 "column" "clob" 0 0 6804 NULL true 2
NULL
@@ -5955,7 +5955,7 @@ CREATE TABLE "sys"."dependencies" (
"depend_id" INTEGER,
"depend_type" SMALLINT
);
-COPY 201 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 202 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
417 5596 7
418 5596 7
1023 5596 7
@@ -6132,7 +6132,7 @@ 193 6741 7
199 6741 7
118 6747 7
35 6747 7
-192 6747 7
+261 6747 7
193 6747 7
34 6753 7
193 6753 7
@@ -6153,6 +6153,7 @@ 6768 6780 5
6768 6789 5
49 6789 5
56 6789 5
+57 6789 5
52 6789 5
36 6789 5
34 6789 5
diff --git a/clients/Tests/SQL-dump_nogeom.stable.out.int128
b/clients/Tests/SQL-dump_nogeom.stable.out.int128
--- a/clients/Tests/SQL-dump_nogeom.stable.out.int128
+++ b/clients/Tests/SQL-dump_nogeom.stable.out.int128
@@ -1836,7 +1836,7 @@ 6579 "count" "bigint" 64 0 6584
NULL tru
6580 "columnsize" "hugeint" 64 0 6584 NULL true
3 NULL
6581 "heapsize" "hugeint" 64 0 6584 NULL true
4 NULL
6582 "indices" "hugeint" 64 0 6584 NULL true
5 NULL
-6583 "auxillary" "hugeint" 53 0 6584 NULL true
6 NULL
+6583 "auxillary" "hugeint" 128 0 6584 NULL true
6 NULL
6586 "schema" "clob" 0 0 6599 NULL true 0
NULL
6587 "table" "clob" 0 0 6599 NULL true 1 NULL
6588 "column" "clob" 0 0 6599 NULL true 2
NULL
@@ -5750,7 +5750,7 @@ CREATE TABLE "sys"."dependencies" (
"depend_id" INTEGER,
"depend_type" SMALLINT
);
-COPY 201 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 202 RECORDS INTO "sys"."dependencies" FROM stdin USING DELIMITERS
'\t','\n','"';
417 5596 7
418 5596 7
1023 5596 7
@@ -5927,7 +5927,7 @@ 193 6536 7
199 6536 7
118 6542 7
35 6542 7
-192 6542 7
+261 6542 7
193 6542 7
34 6548 7
193 6548 7
@@ -5948,6 +5948,7 @@ 6563 6575 5
6563 6584 5
49 6584 5
56 6584 5
+57 6584 5
52 6584 5
36 6584 5
34 6584 5
diff --git a/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
b/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
@@ -73,13 +73,13 @@ function user.s2_1{autoCommit=true}(A0:i
X_54 := sql.bind(X_6,"sys","lineorder","lo_extendedprice",1);
X_55 := sql.projectdelta(X_25,X_49,X_52,r1_64,X_54);
X_56 := algebra.leftfetchjoin(X_47,X_55);
- X_57 := batcalc.lng(X_56);
+ X_57 := batcalc.hge(X_56);
X_58 := sql.projectdelta(X_25,X_18,X_20,r1_23,X_22);
X_59 := algebra.leftfetchjoin(X_47,X_58);
- X_60:bat[:oid,:lng] := batcalc.*(X_57,X_59);
+ X_60:bat[:oid,:hge] := batcalc.*(X_57,X_59);
X_61 := algebra.selectNotNil(X_60);
X_62:hge := aggr.sum(X_61);
- sql.exportValue(1,"sys.L1","revenue","hugeint",53,0,6,X_62,"");
+ sql.exportValue(1,"sys.L1","revenue","hugeint",128,0,6,X_62,"");
end s2_1;
# querylog.define("explain\nselect sum(lo_extendedprice*lo_discount) as
revenue\n\tfrom lineorder, dwdate\n\twhere lo_orderdate = d_datekey\n\t\tand
d_year = 1993\n\t\tand lo_discount between 1 and 3\n\t\tand lo_quantity <
25;","sequential_pipe")
diff --git a/sql/benchmarks/ssbm/Tests/01-plan.stable.out.int128
b/sql/benchmarks/ssbm/Tests/01-plan.stable.out.int128
new file mode 100644
--- /dev/null
+++ b/sql/benchmarks/ssbm/Tests/01-plan.stable.out.int128
@@ -0,0 +1,55 @@
+stdout of test '01-plan` in directory 'sql/benchmarks/ssbm` itself:
+
+
+# 23:08:56 >
+# 23:08:56 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36026" "--set"
"mapi_usock=/var/tmp/mtest-16251/.s.monetdb.36026" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/manegold/_/Monet/HG/Feb2013/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_sql_benchmarks_ssbm"
"--set" "mal_listing=0"
+# 23:08:56 >
+
+# MonetDB 5 server v11.15.12
+# This is an unreleased version
+# Serving database 'mTests_sql_benchmarks_ssbm', 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://rome.ins.cwi.nl:36026/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-16251/.s.monetdb.36026
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 23:08:56 >
+# 23:08:56 > "/usr/bin/python2" "01-plan.SQL.py" "01-plan"
+# 23:08:56 >
+
+#plan
+#select sum(lo_extendedprice*lo_discount) as revenue
+# from lineorder, dwdate
+# where lo_orderdate = d_datekey
+# and d_year = 1993
+# and lo_discount between 1 and 3
+# and lo_quantity < 25;
+% .plan # table_name
+% rel # name
+% clob # type
+% 211 # length
+project (
+| group by (
+| | join (
+| | | select (
+| | | | table(sys.lineorder) [ lineorder.lo_quantity,
lineorder.lo_extendedprice, lineorder.lo_discount,
lineorder.%lineorder_lo_orderdate_fkey NOT NULL JOINIDX
sys.lineorder.lineorder_lo_orderdate_fkey ] COUNT
+| | | ) [ int[tinyint "1"] <= lineorder.lo_discount <= int[tinyint "3"],
lineorder.lo_quantity < int[tinyint "25"] ],
+| | | select (
+| | | | table(sys.dwdate) [ dwdate.d_year, dwdate.%TID% NOT NULL ] COUNT
+| | | ) [ dwdate.d_year = int[smallint "1993"] ]
+| | ) [ lineorder.%lineorder_lo_orderdate_fkey NOT NULL = dwdate.%TID% NOT
NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey ]
+| ) [ ] [ sys.sum no nil (sys.sql_mul(hugeint[lineorder.lo_extendedprice] as
lineorder.lo_extendedprice, lineorder.lo_discount)) as L1.L1 ]
+) [ L1 as L1.revenue ]
+
+# 23:08:56 >
+# 23:08:56 > "Done."
+# 23:08:56 >
+
diff --git a/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
b/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
@@ -73,13 +73,13 @@ function user.s2_1{autoCommit=true}(A0:i
X_54 := sql.bind(X_7,"sys","lineorder","lo_extendedprice",1);
X_55 := sql.projectdelta(X_26,X_49,X_52,r1_65,X_54);
X_56 := algebra.leftfetchjoin(X_47,X_55);
- X_57 := batcalc.lng(X_56);
+ X_57 := batcalc.hge(X_56);
X_58 := sql.projectdelta(X_26,X_11,X_14,r1_14,X_17);
X_59 := algebra.leftfetchjoin(X_47,X_58);
- X_60:bat[:oid,:lng] := batcalc.*(X_57,X_59);
+ X_60:bat[:oid,:hge] := batcalc.*(X_57,X_59);
X_61 := algebra.selectNotNil(X_60);
X_62:hge := aggr.sum(X_61);
- sql.exportValue(1,"sys.L1","revenue","hugeint",53,0,6,X_62,"");
+ sql.exportValue(1,"sys.L1","revenue","hugeint",128,0,6,X_62,"");
end s2_1;
# querylog.define("explain\nselect sum(lo_extendedprice*lo_discount) as
revenue\n\tfrom lineorder, dwdate\n\twhere lo_orderdate = d_datekey\n\t\tand
d_yearmonthnum = 199401\n\t\tand lo_discount between 4 and 6\n\t\tand
lo_quantity between 26 and 35;","sequential_pipe")
diff --git a/sql/benchmarks/ssbm/Tests/02-plan.stable.out.int128
b/sql/benchmarks/ssbm/Tests/02-plan.stable.out.int128
new file mode 100644
--- /dev/null
+++ b/sql/benchmarks/ssbm/Tests/02-plan.stable.out.int128
@@ -0,0 +1,55 @@
+stdout of test '02-plan` in directory 'sql/benchmarks/ssbm` itself:
+
+
+# 23:08:56 >
+# 23:08:56 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=36026" "--set"
"mapi_usock=/var/tmp/mtest-16251/.s.monetdb.36026" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/manegold/_/Monet/HG/Feb2013/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_sql_benchmarks_ssbm"
"--set" "mal_listing=0"
+# 23:08:56 >
+
+# MonetDB 5 server v11.15.12
+# This is an unreleased version
+# Serving database 'mTests_sql_benchmarks_ssbm', 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://rome.ins.cwi.nl:36026/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-16251/.s.monetdb.36026
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 23:08:56 >
+# 23:08:56 > "/usr/bin/python2" "02-plan.SQL.py" "02-plan"
+# 23:08:56 >
+
+#plan
+#select sum(lo_extendedprice*lo_discount) as revenue
+# from lineorder, dwdate
+# where lo_orderdate = d_datekey
+# and d_yearmonthnum = 199401
+# and lo_discount between 4 and 6
+# and lo_quantity between 26 and 35;
+% .plan # table_name
+% rel # name
+% clob # type
+% 211 # length
+project (
+| group by (
+| | join (
+| | | select (
+| | | | table(sys.lineorder) [ lineorder.lo_quantity,
lineorder.lo_extendedprice, lineorder.lo_discount,
lineorder.%lineorder_lo_orderdate_fkey NOT NULL JOINIDX
sys.lineorder.lineorder_lo_orderdate_fkey ] COUNT
+| | | ) [ int[tinyint "26"] <= lineorder.lo_quantity <= int[tinyint "35"],
int[tinyint "4"] <= lineorder.lo_discount <= int[tinyint "6"] ],
+| | | select (
+| | | | table(sys.dwdate) [ dwdate.d_yearmonthnum, dwdate.%TID% NOT NULL ]
COUNT
+| | | ) [ dwdate.d_yearmonthnum = int "199401" ]
+| | ) [ lineorder.%lineorder_lo_orderdate_fkey NOT NULL = dwdate.%TID% NOT
NULL JOINIDX sys.lineorder.lineorder_lo_orderdate_fkey ]
+| ) [ ] [ sys.sum no nil (sys.sql_mul(hugeint[lineorder.lo_extendedprice] as
lineorder.lo_extendedprice, lineorder.lo_discount)) as L1.L1 ]
+) [ L1 as L1.revenue ]
+
+# 23:08:56 >
+# 23:08:56 > "Done."
+# 23:08:56 >
+
diff --git a/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
b/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
--- a/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
+++ b/sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
@@ -80,13 +80,13 @@ function user.s2_1{autoCommit=true}(A0:i
X_63 := sql.bind(X_8,"sys","lineorder","lo_extendedprice",1);
X_64 := sql.projectdelta(X_27,X_57,X_60,r1_76,X_63);
X_65 := algebra.leftfetchjoin(X_55,X_64);
- X_66 := batcalc.lng(X_65);
+ X_66 := batcalc.hge(X_65);
X_67 := sql.projectdelta(X_27,X_12,X_15,r1_15,X_18);
X_68 := algebra.leftfetchjoin(X_55,X_67);
- X_69:bat[:oid,:lng] := batcalc.*(X_66,X_68);
+ X_69:bat[:oid,:hge] := batcalc.*(X_66,X_68);
X_70 := algebra.selectNotNil(X_69);
X_71:hge := aggr.sum(X_70);
- sql.exportValue(1,"sys.L1","revenue","hugeint",53,0,6,X_71,"");
+ sql.exportValue(1,"sys.L1","revenue","hugeint",128,0,6,X_71,"");
end s2_1;
# querylog.define("explain\nselect sum(lo_extendedprice*lo_discount) as
revenue\n\tfrom lineorder, dwdate\n\twhere lo_orderdate = d_datekey\n\t\tand
d_weeknuminyear = 6 and d_year = 1994\n\t\tand lo_discount between 5 and
7\n\t\tand lo_quantity between 36 and 40;","sequential_pipe")
diff --git a/sql/benchmarks/ssbm/Tests/03-plan.stable.out.int128
b/sql/benchmarks/ssbm/Tests/03-plan.stable.out.int128
new file mode 100644
--- /dev/null
+++ b/sql/benchmarks/ssbm/Tests/03-plan.stable.out.int128
@@ -0,0 +1,55 @@
+stdout of test '03-plan` in directory 'sql/benchmarks/ssbm` itself:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
