Changeset: 67d8cf4edb63 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=67d8cf4edb63
Modified Files:
clients/Tests/SQL-dump_geom.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
Branch: default
Log Message:
Merged with Oct2014 branch.
diffs (296 lines):
diff --git a/clients/Tests/SQL-dump_geom.stable.out.32bit
b/clients/Tests/SQL-dump_geom.stable.out.32bit
--- a/clients/Tests/SQL-dump_geom.stable.out.32bit
+++ b/clients/Tests/SQL-dump_geom.stable.out.32bit
@@ -707,6 +707,12 @@ external name generator.series;
create function sys.generate_series(first tinyint, last tinyint, stepsize
tinyint)
returns table (value tinyint)
external name generator.series;
+create function sys.generate_series(first smallint, last smallint)
+returns table (value smallint)
+external name generator.series;
+create function sys.generate_series(first smallint, last smallint, stepsize
smallint)
+returns table (value smallint)
+external name generator.series;
create function sys.generate_series(first int, last int)
returns table (value int)
external name generator.series;
@@ -1808,7 +1814,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
-6563 "function_id" "int" 32 0 6564 NULL true 0
NULL
+6574 "function_id" "int" 32 0 6575 NULL true 0
NULL
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."_tables" (
@@ -1861,7 +1867,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
-6564 "systemfunctions" 2000 NULL 0 true 0 false
+6575 "systemfunctions" 2000 NULL 0 true 0 false
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."args" (
@@ -1874,7 +1880,7 @@ CREATE TABLE "sys"."args" (
"inout" TINYINT,
"number" INTEGER
);
-COPY 3693 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
+COPY 3700 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
@@ -5538,36 +5544,43 @@ 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
+6518 6517 "value" "smallint" 16 0 0 0
+6519 6517 "first" "smallint" 16 0 1 1
+6520 6517 "last" "smallint" 16 0 1 2
+6523 6522 "value" "smallint" 16 0 0 0
+6524 6522 "first" "smallint" 16 0 1 1
+6525 6522 "last" "smallint" 16 0 1 2
+6526 6522 "stepsize" "smallint" 16 0 1 3
+6529 6528 "value" "int" 32 0 0 0
+6530 6528 "first" "int" 32 0 1 1
+6531 6528 "last" "int" 32 0 1 2
+6534 6533 "value" "int" 32 0 0 0
+6535 6533 "first" "int" 32 0 1 1
+6536 6533 "last" "int" 32 0 1 2
+6537 6533 "stepsize" "int" 32 0 1 3
+6540 6539 "value" "bigint" 64 0 0 0
+6541 6539 "first" "bigint" 64 0 1 1
+6542 6539 "last" "bigint" 64 0 1 2
+6545 6544 "value" "bigint" 64 0 0 0
+6546 6544 "first" "bigint" 64 0 1 1
+6547 6544 "last" "bigint" 64 0 1 2
+6548 6544 "stepsize" "bigint" 64 0 1 3
+6551 6550 "value" "real" 24 0 0 0
+6552 6550 "first" "real" 24 0 1 1
+6553 6550 "last" "real" 24 0 1 2
+6554 6550 "stepsize" "real" 24 0 1 3
+6557 6556 "value" "double" 53 0 0 0
+6558 6556 "first" "double" 53 0 1 1
+6559 6556 "last" "double" 53 0 1 2
+6560 6556 "stepsize" "double" 53 0 1 3
+6563 6562 "value" "decimal" 10 2 0 0
+6564 6562 "first" "decimal" 10 2 1 1
+6565 6562 "last" "decimal" 10 2 1 2
+6566 6562 "stepsize" "decimal" 10 2 1 3
+6569 6568 "value" "timestamp" 7 0 0 0
+6570 6568 "first" "timestamp" 7 0 1 1
+6571 6568 "last" "timestamp" 7 0 1 2
+6572 6568 "stepsize" "sec_interval" 13 0 1 3
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."auths" (
@@ -5826,7 +5839,7 @@ CREATE TABLE "sys"."functions" (
"vararg" BOOLEAN,
"schema_id" INTEGER
);
-COPY 1318 RECORDS INTO "sys"."functions" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 1320 RECORDS INTO "sys"."functions" FROM stdin USING DELIMITERS
'\t','\n','"';
28 "not_uniques" "not_uniques" "sql" 0 1 false false
false 0
29 "not_uniques" "not_uniques" "sql" 0 1 false false
false 0
30 "hash" "hash" "mkey" 0 1 false false false 0
@@ -7137,14 +7150,16 @@ 6496 "fuse" "-- fuse two (2-byte) smalli
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" 1 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" 1 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" 1 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" 1 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" 1 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" 1 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" 1 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" 1 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" 1 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" 1
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" 1 5
false false false 2000
+6517 "generate_series" "create function sys.generate_series(first
smallint, last smallint)\nreturns table (value smallint)\nexternal name
generator.series;" "generator" 1 5 false false false
2000
+6522 "generate_series" "create function sys.generate_series(first
smallint, last smallint, stepsize smallint)\nreturns table (value
smallint)\nexternal name generator.series;" "generator" 1 5
false false false 2000
+6528 "generate_series" "create function sys.generate_series(first int,
last int)\nreturns table (value int)\nexternal name generator.series;"
"generator" 1 5 false false false 2000
+6533 "generate_series" "create function sys.generate_series(first int,
last int, stepsize int)\nreturns table (value int)\nexternal name
generator.series;" "generator" 1 5 false false false
2000
+6539 "generate_series" "create function sys.generate_series(first
bigint, last bigint)\nreturns table (value bigint)\nexternal name
generator.series;" "generator" 1 5 false false false 2000
+6544 "generate_series" "create function sys.generate_series(first
bigint, last bigint, stepsize bigint)\nreturns table (value bigint)\nexternal
name generator.series;" "generator" 1 5 false false
false 2000
+6550 "generate_series" "create function sys.generate_series(first
real, last real, stepsize real)\nreturns table (value real)\nexternal name
generator.series;" "generator" 1 5 false false false
2000
+6556 "generate_series" "create function sys.generate_series(first
double, last double, stepsize double)\nreturns table (value double)\nexternal
name generator.series;" "generator" 1 5 false false
false 2000
+6562 "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" 1
5 false false false 2000
+6568 "generate_series" "create function sys.generate_series(first
timestamp, last timestamp, stepsize interval second)\nreturns table (value
timestamp)\nexternal name generator.series;" "generator" 1 5
false false false 2000
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."idxs" (
@@ -7198,7 +7213,7 @@ 5193 1 1 0 0
5219 1 1 0 0
5222 1 1 0 0
5226 1 1 0 0
-6564 1 1 3 0
+6575 1 1 3 0
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."schemas" (
@@ -7261,7 +7276,7 @@ START TRANSACTION;
CREATE TABLE "sys"."systemfunctions" (
"function_id" INTEGER
);
-COPY 1318 RECORDS INTO "sys"."systemfunctions" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 1320 RECORDS INTO "sys"."systemfunctions" FROM stdin USING DELIMITERS
'\t','\n','"';
28
29
30
@@ -8577,9 +8592,11 @@ 6522
6528
6533
6539
-6545
-6551
-6557
+6544
+6550
+6556
+6562
+6568
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."triggers" (
diff --git a/sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
b/sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
--- a/sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
+++ b/sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
@@ -110,39 +110,38 @@ function user.s2_1{autoCommit=true}(A0:i
X_95 := bat.mergecand(X_93,X_94);
X_96 := algebra.leftfetchjoin(X_95,X_72);
X_97:bat[:oid,:dbl] := batcalc.dbl(2,X_96);
- X_99 := algebra.selectNotNil(X_97);
- X_100:dbl := aggr.avg(X_99);
- X_101 := sql.single(X_100);
- (X_102,r1_148) := algebra.thetajoin(X_74,X_101,1);
- X_105 := algebra.tinter(X_65,X_102);
- X_106 := algebra.leftfetchjoin(X_105,X_64);
- X_107 := bat.mirror(X_106);
- X_108:bat[:oid,:oid] := sql.tid(X_23,"sys","orders");
- X_111 := sql.bind(X_23,"sys","orders","o_custkey",0);
- (X_114,r1_160) := sql.bind(X_23,"sys","orders","o_custkey",2);
- X_116 := sql.bind(X_23,"sys","orders","o_custkey",1);
- X_117 := sql.delta(X_111,X_114,r1_160,X_116);
- X_118 := algebra.leftfetchjoin(X_108,X_117);
- (X_119,r1_165) := algebra.join(X_106,X_118);
- X_121 := algebra.tdiff(X_107,X_119);
- X_179 := algebra.leftfetchjoin(X_121,X_105);
- X_122:bat[:oid,:str] := algebra.leftfetchjoinPath(X_179,X_52,X_36);
- X_123:bat[:oid,:str] := batstr.substring(X_122,A0,A1);
- (X_124,r1_176,r2_176) := group.subgroupdone(X_123);
- X_127 := algebra.leftfetchjoin(r1_176,X_123);
- X_133:bat[:oid,:wrd] := aggr.subcount(X_124,X_124,r1_176,false);
- X_135:bat[:oid,:lng] := algebra.leftfetchjoin(X_179,X_73);
- X_136:bat[:oid,:lng] := aggr.subsum(X_135,X_124,r1_176,true,true);
- (X_128,r1_180,r2_180) := algebra.subsort(X_127,false,false);
- X_132 := algebra.leftfetchjoin(r1_180,X_127);
- X_138 := algebra.leftfetchjoin(r1_180,X_136);
- X_134 := algebra.leftfetchjoin(r1_180,X_133);
- X_139 := sql.resultSet(3,1,X_132);
- sql.rsColumn(X_139,"sys.custsale","cntrycode","varchar",15,0,X_132);
- sql.rsColumn(X_139,"sys.L2","numcust","wrd",32,0,X_134);
- sql.rsColumn(X_139,"sys.L3","totacctbal","decimal",15,2,X_138);
- X_158 := io.stdout();
- sql.exportResult(X_158,X_139);
+ X_99:dbl := aggr.avg(X_97);
+ X_100 := sql.single(X_99);
+ (X_101,r1_147) := algebra.thetajoin(X_74,X_100,1);
+ X_104 := algebra.tinter(X_65,X_101);
+ X_105 := algebra.leftfetchjoin(X_104,X_64);
+ X_106 := bat.mirror(X_105);
+ X_107:bat[:oid,:oid] := sql.tid(X_23,"sys","orders");
+ X_110 := sql.bind(X_23,"sys","orders","o_custkey",0);
+ (X_113,r1_159) := sql.bind(X_23,"sys","orders","o_custkey",2);
+ X_115 := sql.bind(X_23,"sys","orders","o_custkey",1);
+ X_116 := sql.delta(X_110,X_113,r1_159,X_115);
+ X_117 := algebra.leftfetchjoin(X_107,X_116);
+ (X_118,r1_164) := algebra.join(X_105,X_117);
+ X_120 := algebra.tdiff(X_106,X_118);
+ X_178 := algebra.leftfetchjoin(X_120,X_104);
+ X_121:bat[:oid,:str] := algebra.leftfetchjoinPath(X_178,X_52,X_36);
+ X_122:bat[:oid,:str] := batstr.substring(X_121,A0,A1);
+ (X_123,r1_175,r2_175) := group.subgroupdone(X_122);
+ X_126 := algebra.leftfetchjoin(r1_175,X_122);
+ X_132:bat[:oid,:wrd] := aggr.subcount(X_123,X_123,r1_175,false);
+ X_134:bat[:oid,:lng] := algebra.leftfetchjoin(X_178,X_73);
+ X_135:bat[:oid,:lng] := aggr.subsum(X_134,X_123,r1_175,true,true);
+ (X_127,r1_179,r2_179) := algebra.subsort(X_126,false,false);
+ X_131 := algebra.leftfetchjoin(r1_179,X_126);
+ X_137 := algebra.leftfetchjoin(r1_179,X_135);
+ X_133 := algebra.leftfetchjoin(r1_179,X_132);
+ X_138 := sql.resultSet(3,1,X_131);
+ sql.rsColumn(X_138,"sys.custsale","cntrycode","varchar",15,0,X_131);
+ sql.rsColumn(X_138,"sys.L2","numcust","wrd",32,0,X_133);
+ sql.rsColumn(X_138,"sys.L3","totacctbal","decimal",15,2,X_137);
+ X_157 := io.stdout();
+ sql.exportResult(X_157,X_138);
end s2_1;
# querylog.define("explain select\n\tcntrycode,\n\tcount(*) as
numcust,\n\tsum(c_acctbal) as
totacctbal\nfrom\n\t(\n\t\tselect\n\t\t\tsubstring(c_phone from 1 for 2) as
cntrycode,\n\t\t\tc_acctbal\n\t\tfrom\n\t\t\tcustomer\n\t\twhere\n\t\t\tsubstring(c_phone
from 1 for 2) in\n\t\t\t\t(\\'13\\', \\'31\\', \\'23\\', \\'29\\', \\'30\\',
\\'18\\', \\'17\\')\n\t\t\tand c_acctbal >
(\n\t\t\t\tselect\n\t\t\t\t\tavg(c_acctbal)\n\t\t\t\tfrom\n\t\t\t\t\tcustomer\n\t\t\t\twhere\n\t\t\t\t\tc_acctbal
> 0.00\n\t\t\t\t\tand substring(c_phone from 1 for 2)
in\n\t\t\t\t\t\t(\\'13\\', \\'31\\', \\'23\\', \\'29\\', \\'30\\', \\'18\\',
\\'17\\')\n\t\t\t)\n\t\t\tand not exists
(\n\t\t\t\tselect\n\t\t\t\t\t*\n\t\t\t\tfrom\n\t\t\t\t\torders\n\t\t\t\twhere\n\t\t\t\t\to_custkey
= c_custkey\n\t\t\t)\n\t) as custsale\ngroup by\n\tcntrycode\norder
by\n\tcntrycode;","sequential_pipe")
diff --git
a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
@@ -55,12 +55,12 @@ Operation successful
| X_2 := sql.mvc(); |
| X_9 := sql.bind(X_2,"sys","_tables","type",0); |
| X_6:bat[:oid,:oid] := sql.tid(X_2,"sys","_tables"); |
-| X_65 := algebra.subselect(X_9,X_6,2:sht,2:sht,true,true,true); |
+| X_64 := algebra.subselect(X_9,X_6,2:sht,2:sht,true,true,true); |
| (X_12,r1_12) := sql.bind(X_2,"sys","_tables","type",2); |
-| X_66 := algebra.subselect(r1_12,2:sht,2:sht,true,true,true); |
+| X_65 := algebra.subselect(r1_12,2:sht,2:sht,true,true,true); |
| X_15 := sql.bind(X_2,"sys","_tables","type",1); |
-| X_67 := algebra.subselect(X_15,X_6,2:sht,2:sht,true,true,true); |
-| X_17 := sql.subdelta(X_65,X_6,X_12,X_66,X_67); |
+| X_66 := algebra.subselect(X_15,X_6,2:sht,2:sht,true,true,true); |
+| X_17 := sql.subdelta(X_64,X_6,X_12,X_65,X_66); |
| X_18 := sql.bind(X_2,"sys","_tables","id",0); |
| (X_20,r1_25) := sql.bind(X_2,"sys","_tables","id",2); |
| X_22 := sql.bind(X_2,"sys","_tables","id",1); |
@@ -77,13 +77,12 @@ Operation successful
| X_37 := algebra.leftfetchjoin(X_32,X_36); |
| X_38 := aggr.count(X_37); |
| X_39 := bat.append(X_26,X_38,true); |
-| X_40 := algebra.selectNotNil(X_39); |
-| X_41:wrd := aggr.sum(X_40); |
-| sql.exportValue(1,".L1","L1","wrd",32,0,6,X_41,""); |
+| X_40:wrd := aggr.sum(X_39); |
+| sql.exportValue(1,".L1","L1","wrd",32,0,6,X_40,""); |
| end s3_1; |
| # querylog.define("explain select count(*) from tables;","sequential_pipe") |
+-----------------------------------------------------------------------------+
-32 rows
+31 rows
# 19:39:11 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
