Changeset: 4cee6fa507cf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4cee6fa507cf
Modified Files:
clients/Tests/SQL-dump.stable.out.32bit
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
Branch: generator
Log Message:
approved 32-bit output
diffs (198 lines):
diff --git a/clients/Tests/SQL-dump.stable.out.32bit
b/clients/Tests/SQL-dump.stable.out.32bit
--- a/clients/Tests/SQL-dump.stable.out.32bit
+++ b/clients/Tests/SQL-dump.stable.out.32bit
@@ -1734,7 +1734,7 @@ 6449 "nils" "bigint" 64 0 6453
NULL true
6450 "minval" "clob" 0 0 6453 NULL true 10
NULL
6451 "maxval" "clob" 0 0 6453 NULL true 11
NULL
6452 "sorted" "boolean" 1 0 6453 NULL true
12 NULL
-6506 "function_id" "int" 32 0 6507 NULL true 0
NULL
+6563 "function_id" "int" 32 0 6564 NULL true 0
NULL
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."_tables" (
@@ -1787,7 +1787,7 @@ 6380 "storagemodelinput" 2000 NULL 0
tru
6428 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
6438 "tablestoragemodel" 2000 "-- A summary of the table storage
requirement is is available as a table view.\n-- The auxillary column denotes
the maximum space if all non-sorted columns\n-- would be augmented with a hash
(rare situation)\ncreate view sys.tablestoragemodel\nas select
""schema"",""table"",max(count) as ""count"",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(hashes) as
hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 *
count else 0 end) as auxillary\nfrom sys.storagemodel() group by
""schema"",""table"";" 1 true 0 false
6453 "statistics" 2000 NULL 0 true 0 false
-6507 "systemfunctions" 2000 NULL 0 true 0 false
+6564 "systemfunctions" 2000 NULL 0 true 0 false
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."args" (
@@ -1800,7 +1800,7 @@ CREATE TABLE "sys"."args" (
"inout" TINYINT,
"number" INTEGER
);
-COPY 3656 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
+COPY 3693 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
2155 28 "res_0" "oid" 31 0 0 0
2156 28 "arg_1" "wrd" 32 0 1 1
2157 29 "res_0" "oid" 31 0 0 0
@@ -5457,6 +5457,43 @@ 6499 6496 "two" "smallint" 16 0
1 2
6502 6501 "result" "bigint" 64 0 0 0
6503 6501 "one" "int" 32 0 1 1
6504 6501 "two" "int" 32 0 1 2
+6507 6506 "value" "tinyint" 8 0 0 0
+6508 6506 "first" "tinyint" 8 0 1 1
+6509 6506 "last" "tinyint" 8 0 1 2
+6512 6511 "value" "tinyint" 8 0 0 0
+6513 6511 "first" "tinyint" 8 0 1 1
+6514 6511 "last" "tinyint" 8 0 1 2
+6515 6511 "stepsize" "tinyint" 8 0 1 3
+6518 6517 "value" "int" 32 0 0 0
+6519 6517 "first" "int" 32 0 1 1
+6520 6517 "last" "int" 32 0 1 2
+6523 6522 "value" "int" 32 0 0 0
+6524 6522 "first" "int" 32 0 1 1
+6525 6522 "last" "int" 32 0 1 2
+6526 6522 "stepsize" "int" 32 0 1 3
+6529 6528 "value" "bigint" 64 0 0 0
+6530 6528 "first" "bigint" 64 0 1 1
+6531 6528 "last" "bigint" 64 0 1 2
+6534 6533 "value" "bigint" 64 0 0 0
+6535 6533 "first" "bigint" 64 0 1 1
+6536 6533 "last" "bigint" 64 0 1 2
+6537 6533 "stepsize" "bigint" 64 0 1 3
+6540 6539 "value" "real" 24 0 0 0
+6541 6539 "first" "real" 24 0 1 1
+6542 6539 "last" "real" 24 0 1 2
+6543 6539 "stepsize" "real" 24 0 1 3
+6546 6545 "value" "double" 53 0 0 0
+6547 6545 "first" "double" 53 0 1 1
+6548 6545 "last" "double" 53 0 1 2
+6549 6545 "stepsize" "double" 53 0 1 3
+6552 6551 "value" "decimal" 10 2 0 0
+6553 6551 "first" "decimal" 10 2 1 1
+6554 6551 "last" "decimal" 10 2 1 2
+6555 6551 "stepsize" "decimal" 10 2 1 3
+6558 6557 "value" "timestamp" 7 0 0 0
+6559 6557 "first" "timestamp" 7 0 1 1
+6560 6557 "last" "timestamp" 7 0 1 2
+6561 6557 "stepsize" "sec_interval" 13 0 1 3
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."auths" (
@@ -5715,7 +5752,7 @@ CREATE TABLE "sys"."functions" (
"vararg" BOOLEAN,
"schema_id" INTEGER
);
-COPY 1308 RECORDS INTO "sys"."functions" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 1318 RECORDS INTO "sys"."functions" FROM stdin USING DELIMITERS
'\t','\n','"';
28 "not_uniques" "not_uniques" "sql" false 1 false false
false 0
29 "not_uniques" "not_uniques" "sql" false 1 false false
false 0
30 "hash" "hash" "mkey" false 1 false false false 0
@@ -7024,6 +7061,16 @@ 6487 "reverse" "-- The contents of this
6491 "fuse" "-- fuse two (1-byte) tinyint values into one (2-byte) smallint
value\ncreate function fuse(one tinyint, two tinyint)\nreturns smallint
external name udf.fuse;" "udf" true 1 false false false
2000
6496 "fuse" "-- fuse two (2-byte) smallint values into one (4-byte) integer
value\ncreate function fuse(one smallint, two smallint)\nreturns integer
external name udf.fuse;" "udf" true 1 false false false
2000
6501 "fuse" "-- fuse two (4-byte) integer values into one (8-byte) bigint
value\ncreate function fuse(one integer, two integer)\nreturns bigint external
name udf.fuse;" "udf" true 1 false false false 2000
+6506 "generate_series" "-- The contents of this file are subject to
the MonetDB Public License\n-- Version 1.1 (the ""License""); you may not use
this file except in\n-- compliance with the License. You may obtain a copy of
the License at\n-- http://www.monetdb.org/Legal/MonetDBLicense\n--\n-- Software
distributed under the License is distributed on an ""AS IS""\n-- basis, WITHOUT
WARRANTY OF ANY KIND, either express or implied. See the\n-- License for the
specific language governing rights and limitations\n-- under the
License.\n--\n-- The Original Code is the MonetDB Database System.\n--\n-- The
Initial Developer of the Original Code is CWI.\n-- Portions created by CWI are
Copyright (C) 1997-July 2008 CWI.\n-- Copyright August 2008-2014 MonetDB
B.V.\n-- All Rights Reserved.\n\n-- (c) Author M.Kersten\n\ncreate function
sys.generate_series(first tinyint, last tinyint)\nreturns table (value
tinyint)\nexternal name generator.series;" "generator" true 5
false false false 2000
+6511 "generate_series" "create function sys.generate_series(first
tinyint, last tinyint, stepsize tinyint)\nreturns table (value
tinyint)\nexternal name generator.series;" "generator" true 5
false false false 2000
+6517 "generate_series" "create function sys.generate_series(first int,
last int)\nreturns table (value int)\nexternal name generator.series;"
"generator" true 5 false false false 2000
+6522 "generate_series" "create function sys.generate_series(first int,
last int, stepsize int)\nreturns table (value int)\nexternal name
generator.series;" "generator" true 5 false false false
2000
+6528 "generate_series" "create function sys.generate_series(first
bigint, last bigint)\nreturns table (value bigint)\nexternal name
generator.series;" "generator" true 5 false false false 2000
+6533 "generate_series" "create function sys.generate_series(first
bigint, last bigint, stepsize bigint)\nreturns table (value bigint)\nexternal
name generator.series;" "generator" true 5 false false
false 2000
+6539 "generate_series" "create function sys.generate_series(first
real, last real, stepsize real)\nreturns table (value real)\nexternal name
generator.series;" "generator" true 5 false false false
2000
+6545 "generate_series" "create function sys.generate_series(first
double, last double, stepsize double)\nreturns table (value double)\nexternal
name generator.series;" "generator" true 5 false false
false 2000
+6551 "generate_series" "create function sys.generate_series(first
decimal(10,2), last decimal(10,2), stepsize decimal(10,2))\nreturns table
(value decimal(10,2))\nexternal name generator.series;" "generator" true
5 false false false 2000
+6557 "generate_series" "create function sys.generate_series(first
timestamp, last timestamp, stepsize interval second)\nreturns table (value
timestamp)\nexternal name generator.series;" "generator" true 5
false false false 2000
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."idxs" (
@@ -7077,7 +7124,7 @@ 5193 1 1 0 0
5219 1 1 0 0
5222 1 1 0 0
5226 1 1 0 0
-6507 1 1 3 0
+6564 1 1 3 0
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."schemas" (
@@ -7140,7 +7187,7 @@ START TRANSACTION;
CREATE TABLE "sys"."systemfunctions" (
"function_id" INTEGER
);
-COPY 1308 RECORDS INTO "sys"."systemfunctions" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 1318 RECORDS INTO "sys"."systemfunctions" FROM stdin USING DELIMITERS
'\t','\n','"';
28
29
30
@@ -8449,6 +8496,16 @@ 6487
6491
6496
6501
+6506
+6511
+6517
+6522
+6528
+6533
+6539
+6545
+6551
+6557
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."triggers" (
diff --git a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
@@ -56,12 +56,12 @@ function user.s2_1{autoCommit=true}(A0:b
X_11 := sql.bind(X_7,"sys","lineitem","l_shipdate",0);
X_8:bat[:oid,:oid] := sql.tid(X_7,"sys","lineitem");
X_19 := mtime.date_sub_msec_interval(A3,A4);
- X_183 := algebra.thetasubselect(X_11,X_8,X_19,"<=");
+ X_184 := algebra.thetasubselect(X_11,X_8,X_19,"<=");
(X_14,r1_14) := sql.bind(X_7,"sys","lineitem","l_shipdate",2);
- X_184 := algebra.thetasubselect(r1_14,X_19,"<=");
+ X_185 := algebra.thetasubselect(r1_14,X_19,"<=");
X_17 := sql.bind(X_7,"sys","lineitem","l_shipdate",1);
- X_185 := algebra.thetasubselect(X_17,X_8,X_19,"<=");
- X_20 := sql.subdelta(X_183,X_8,X_14,X_184,X_185);
+ X_186 := algebra.thetasubselect(X_17,X_8,X_19,"<=");
+ X_20 := sql.subdelta(X_184,X_8,X_14,X_185,X_186);
X_22 := sql.bind(X_7,"sys","lineitem","l_linestatus",0);
(X_24,r1_28) := sql.bind(X_7,"sys","lineitem","l_linestatus",2);
X_26 := sql.bind(X_7,"sys","lineitem","l_linestatus",1);
diff --git a/sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
b/sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
@@ -123,10 +123,10 @@ function user.s2_1{autoCommit=true}(A0:s
X_105 := bat.mergecand(X_103,X_104);
X_106 := algebra.leftfetchjoin(X_105,X_62);
(X_107,r1_122) := algebra.join(X_61,X_106);
- X_206 := algebra.leftfetchjoin(r1_122,X_105);
- X_109:bat[:oid,:str] := algebra.leftfetchjoin(X_206,X_77);
- X_110:bat[:oid,:str] := algebra.leftfetchjoin(X_206,X_86);
- X_111:bat[:oid,:int] := algebra.leftfetchjoin(X_206,X_70);
+ X_207 := algebra.leftfetchjoin(r1_122,X_105);
+ X_109:bat[:oid,:str] := algebra.leftfetchjoin(X_207,X_77);
+ X_110:bat[:oid,:str] := algebra.leftfetchjoin(X_207,X_86);
+ X_111:bat[:oid,:int] := algebra.leftfetchjoin(X_207,X_70);
X_112:bat[:oid,:int] := algebra.leftfetchjoinPath(X_107,X_49,X_26);
(X_113,r1_132,r2_132) := group.subgroup(X_112);
(X_116,r1_135,r2_135) := group.subgroup(X_111,X_113);
diff --git a/sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
b/sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
@@ -108,18 +108,18 @@ function user.s2_1{autoCommit=true}(A0:s
X_75 := algebra.leftfetchjoin(X_67,X_74);
X_76 := mtime.addmonths(A3,A4);
X_77 := algebra.subselect(X_75,A2,X_76,true,false,false);
- X_280 := algebra.leftfetchjoin(X_77,X_67);
+ X_281 := algebra.leftfetchjoin(X_77,X_67);
X_80 := sql.bind(X_8,"sys","lineitem","l_partkey",0);
(X_84,r1_91) := sql.bind(X_8,"sys","lineitem","l_partkey",2);
X_87 := sql.bind(X_8,"sys","lineitem","l_partkey",1);
X_89 := sql.delta(X_80,X_84,r1_91,X_87);
- X_90:bat[:oid,:int] := algebra.leftfetchjoin(X_280,X_89);
+ X_90:bat[:oid,:int] := algebra.leftfetchjoin(X_281,X_89);
X_91:bat[:oid,:wrd] := mal.manifold("mkey","hash",X_90);
X_95 := sql.bind(X_8,"sys","lineitem","l_suppkey",0);
(X_98,r1_107) := sql.bind(X_8,"sys","lineitem","l_suppkey",2);
X_100 := sql.bind(X_8,"sys","lineitem","l_suppkey",1);
X_101 := sql.delta(X_95,X_98,r1_107,X_100);
- X_102:bat[:oid,:int] := algebra.leftfetchjoin(X_280,X_101);
+ X_102:bat[:oid,:int] := algebra.leftfetchjoin(X_281,X_101);
X_103:bat[:oid,:wrd] := mkey.bulk_rotate_xor_hash(X_91,11,X_102);
(X_104,r1_114) := algebra.join(X_66,X_103);
X_106 := algebra.leftfetchjoin(X_58,X_31);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
