Changeset: d340c83ee6ad for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d340c83ee6ad
Modified Files:
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
Branch: default
Log Message:
approved output
diffs (234 lines):
diff --git
a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
--- a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
+++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
@@ -48,11 +48,11 @@ project (
function user.s4_1(A0:hge,A1:bte):void;
X_3 := sql.mvc();
X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","dbg");
- X_7 := sql.bind(X_3,"sys","dbg","a",0);
+ X_7:bat[:oid,:int] := sql.bind(X_3,"sys","dbg","a",0);
X_10 := algebra.leftfetchjoin(X_4,X_7);
(X_11,r1_11,r2_11) := group.subgroupdone(X_10);
X_14 := algebra.leftfetchjoin(r1_11,X_10);
- X_15 := sql.bind(X_3,"sys","dbg","b",0);
+ X_15:bat[:oid,:int] := sql.bind(X_3,"sys","dbg","b",0);
X_17 := algebra.leftfetchjoin(X_4,X_15);
X_18:bat[:oid,:hge] := aggr.subsum(X_17,X_11,r1_11,true,true);
X_20 := algebra.project(X_10,A1);
@@ -101,11 +101,11 @@ project (
function user.s10_1(A0:hge,A1:bte):void;
X_3 := sql.mvc();
X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","dbg");
- X_7 := sql.bind(X_3,"sys","dbg","a",0);
+ X_7:bat[:oid,:int] := sql.bind(X_3,"sys","dbg","a",0);
X_10 := algebra.leftfetchjoin(X_4,X_7);
(X_11,r1_11,r2_11) := group.subgroupdone(X_10);
X_14 := algebra.leftfetchjoin(r1_11,X_10);
- X_15 := sql.bind(X_3,"sys","dbg","b",0);
+ X_15:bat[:oid,:int] := sql.bind(X_3,"sys","dbg","b",0);
X_17 := algebra.leftfetchjoin(X_4,X_15);
X_18:bat[:oid,:hge] := aggr.subsum(X_17,X_11,r1_11,true,true);
X_20 := algebra.project(X_10,A1);
diff --git
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
---
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
+++
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
@@ -37,13 +37,13 @@ function user.s2_1(A0:str):void;
X_47 := algebra.likesubselect(X_6,X_3,A0,"",false);
(X_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
X_48 := algebra.likesubselect(r1_9,nil:bat[:oid,:oid],A0,"",false);
- X_12 := sql.bind(X_2,"sys","functions","name",1);
+ X_12:bat[:oid,:str] := sql.bind(X_2,"sys","functions","name",1);
X_50 := algebra.likesubselect(X_12,X_3,A0,"",false);
X_15 := sql.subdelta(X_47,X_3,X_9,X_48,X_50);
X_17 := sql.projectdelta(X_15,X_6,X_9,r1_9,X_12);
- X_18 := sql.bind(X_2,"sys","functions","func",0);
+ X_18:bat[:oid,:str] := sql.bind(X_2,"sys","functions","func",0);
(X_20,r1_25) := sql.bind(X_2,"sys","functions","func",2);
- X_22 := sql.bind(X_2,"sys","functions","func",1);
+ X_22:bat[:oid,:str] := sql.bind(X_2,"sys","functions","func",1);
X_23 := sql.projectdelta(X_15,X_18,X_20,r1_25,X_22);
X_24 := sql.resultSet(2,1,X_17);
sql.rsColumn(X_24,"sys.functions","name","varchar",256,0,X_17);
@@ -64,13 +64,13 @@ function user.s3_1(A0:str):void;
X_47 := algebra.likesubselect(X_6,X_3,A0,"",true);
(X_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
X_48 := algebra.likesubselect(r1_9,nil:bat[:oid,:oid],A0,"",true);
- X_12 := sql.bind(X_2,"sys","functions","name",1);
+ X_12:bat[:oid,:str] := sql.bind(X_2,"sys","functions","name",1);
X_50 := algebra.likesubselect(X_12,X_3,A0,"",true);
X_15 := sql.subdelta(X_47,X_3,X_9,X_48,X_50);
X_17 := sql.projectdelta(X_15,X_6,X_9,r1_9,X_12);
- X_18 := sql.bind(X_2,"sys","functions","func",0);
+ X_18:bat[:oid,:str] := sql.bind(X_2,"sys","functions","func",0);
(X_20,r1_25) := sql.bind(X_2,"sys","functions","func",2);
- X_22 := sql.bind(X_2,"sys","functions","func",1);
+ X_22:bat[:oid,:str] := sql.bind(X_2,"sys","functions","func",1);
X_23 := sql.projectdelta(X_15,X_18,X_20,r1_25,X_22);
X_24 := sql.resultSet(2,1,X_17);
sql.rsColumn(X_24,"sys.functions","name","varchar",256,0,X_17);
@@ -91,13 +91,13 @@ function user.s4_1(A0:str):void;
X_47 := algebra.ilikesubselect(X_6,X_3,A0,"",false);
(X_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
X_48 := algebra.ilikesubselect(r1_9,nil:bat[:oid,:oid],A0,"",false);
- X_12 := sql.bind(X_2,"sys","functions","name",1);
+ X_12:bat[:oid,:str] := sql.bind(X_2,"sys","functions","name",1);
X_50 := algebra.ilikesubselect(X_12,X_3,A0,"",false);
X_15 := sql.subdelta(X_47,X_3,X_9,X_48,X_50);
X_17 := sql.projectdelta(X_15,X_6,X_9,r1_9,X_12);
- X_18 := sql.bind(X_2,"sys","functions","func",0);
+ X_18:bat[:oid,:str] := sql.bind(X_2,"sys","functions","func",0);
(X_20,r1_25) := sql.bind(X_2,"sys","functions","func",2);
- X_22 := sql.bind(X_2,"sys","functions","func",1);
+ X_22:bat[:oid,:str] := sql.bind(X_2,"sys","functions","func",1);
X_23 := sql.projectdelta(X_15,X_18,X_20,r1_25,X_22);
X_24 := sql.resultSet(2,1,X_17);
sql.rsColumn(X_24,"sys.functions","name","varchar",256,0,X_17);
@@ -118,13 +118,13 @@ function user.s5_1(A0:str):void;
X_47 := algebra.ilikesubselect(X_6,X_3,A0,"",true);
(X_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
X_48 := algebra.ilikesubselect(r1_9,nil:bat[:oid,:oid],A0,"",true);
- X_12 := sql.bind(X_2,"sys","functions","name",1);
+ X_12:bat[:oid,:str] := sql.bind(X_2,"sys","functions","name",1);
X_50 := algebra.ilikesubselect(X_12,X_3,A0,"",true);
X_15 := sql.subdelta(X_47,X_3,X_9,X_48,X_50);
X_17 := sql.projectdelta(X_15,X_6,X_9,r1_9,X_12);
- X_18 := sql.bind(X_2,"sys","functions","func",0);
+ X_18:bat[:oid,:str] := sql.bind(X_2,"sys","functions","func",0);
(X_20,r1_25) := sql.bind(X_2,"sys","functions","func",2);
- X_22 := sql.bind(X_2,"sys","functions","func",1);
+ X_22:bat[:oid,:str] := sql.bind(X_2,"sys","functions","func",1);
X_23 := sql.projectdelta(X_15,X_18,X_20,r1_25,X_22);
X_24 := sql.resultSet(2,1,X_17);
sql.rsColumn(X_24,"sys.functions","name","varchar",256,0,X_17);
@@ -167,7 +167,7 @@ function user.s10_1(A0:str):void;
X_50 := algebra.likesubselect(X_6,X_3,X_47,"",false,false);
(X_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
X_51 := algebra.likesubselect(r1_9,nil:bat[:oid,:oid],X_47,"",false,false);
- X_12 := sql.bind(X_2,"sys","functions","name",1);
+ X_12:bat[:oid,:str] := sql.bind(X_2,"sys","functions","name",1);
X_53 := algebra.likesubselect(X_12,X_3,X_47,"",false,false);
X_14 := sql.subdelta(X_50,X_3,X_9,X_51,X_53);
X_15 := sql.projectdelta(X_14,X_6,X_9,r1_9,X_12);
@@ -196,7 +196,7 @@ function user.s11_1(A0:str):void;
X_51 := algebra.likesubselect(X_6,X_3,X_47,"",false,true);
(X_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
X_52 := algebra.likesubselect(r1_9,nil:bat[:oid,:oid],X_47,"",false,true);
- X_12 := sql.bind(X_2,"sys","functions","name",1);
+ X_12:bat[:oid,:str] := sql.bind(X_2,"sys","functions","name",1);
X_54 := algebra.likesubselect(X_12,X_3,X_47,"",false,true);
X_14 := sql.subdelta(X_51,X_3,X_9,X_52,X_54);
X_15 := sql.projectdelta(X_14,X_6,X_9,r1_9,X_12);
@@ -225,7 +225,7 @@ function user.s12_1(A0:str):void;
X_51 := algebra.likesubselect(X_6,X_3,X_47,"",true,false);
(X_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
X_52 := algebra.likesubselect(r1_9,nil:bat[:oid,:oid],X_47,"",true,false);
- X_12 := sql.bind(X_2,"sys","functions","name",1);
+ X_12:bat[:oid,:str] := sql.bind(X_2,"sys","functions","name",1);
X_54 := algebra.likesubselect(X_12,X_3,X_47,"",true,false);
X_14 := sql.subdelta(X_51,X_3,X_9,X_52,X_54);
X_15 := sql.projectdelta(X_14,X_6,X_9,r1_9,X_12);
@@ -254,7 +254,7 @@ function user.s13_1(A0:str):void;
X_50 := algebra.likesubselect(X_6,X_3,X_47,"",true,true);
(X_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
X_51 := algebra.likesubselect(r1_9,nil:bat[:oid,:oid],X_47,"",true,true);
- X_12 := sql.bind(X_2,"sys","functions","name",1);
+ X_12:bat[:oid,:str] := sql.bind(X_2,"sys","functions","name",1);
X_53 := algebra.likesubselect(X_12,X_3,X_47,"",true,true);
X_14 := sql.subdelta(X_50,X_3,X_9,X_51,X_53);
X_15 := sql.projectdelta(X_14,X_6,X_9,r1_9,X_12);
diff --git a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
--- a/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
+++ b/sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
@@ -46,18 +46,18 @@ Ready.
% clob # type
% 173 # length
function user.s2_1():void;
-barrier X_49 := language.dataflow();
+barrier X_50 := language.dataflow();
X_1 := sql.mvc();
X_2:bat[:oid,:oid] := sql.tid(X_1,"sys","treeitems");
- X_5 := sql.bind(X_1,"sys","treeitems","pre",0);
+ X_5:bat[:oid,:lng] := sql.bind(X_1,"sys","treeitems","pre",0);
X_8 := algebra.leftfetchjoin(X_2,X_5);
X_9 := batcalc.hge(X_8);
- X_10 := sql.bind(X_1,"sys","treeitems","size",0);
+ X_10:bat[:oid,:lng] := sql.bind(X_1,"sys","treeitems","size",0);
X_12 := algebra.leftfetchjoin(X_2,X_10);
X_13 := batcalc.hge(X_12);
X_14:bat[:oid,:hge] := batcalc.+(X_9,X_13);
(X_15,r1_22) := algebra.join(X_9,X_9,X_14,true,true);
- X_18 := sql.bind(X_1,"sys","treeitems","subject",0);
+ X_18:bat[:oid,:int] := sql.bind(X_1,"sys","treeitems","subject",0);
X_20 := algebra.leftfetchjoin(X_2,X_18);
X_21 := algebra.leftfetchjoin(r1_22,X_20);
X_22 := algebra.leftfetchjoin(X_15,X_20);
@@ -65,7 +65,7 @@ barrier X_49 := language.dataflow();
language.pass(X_9);
language.pass(X_2);
language.pass(X_20);
-exit X_49;
+exit X_50;
X_23 := sql.resultSet(2,1,X_21);
sql.rsColumn(X_23,"sys.L","id1","int",32,0,X_21);
sql.rsColumn(X_23,"sys.L","id2","int",32,0,X_22);
diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
+++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
@@ -34,10 +34,10 @@ Operation successful
| X_59 := 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_60 :=
algebra.subselect(r1_12,nil:bat[:oid,:oid],2:sht,2:sht,true,true,true); |
-| X_15 := sql.bind(X_2,"sys","_tables","type",1); |
+| X_15:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1);
|
| X_62 := algebra.subselect(X_15,X_6,2:sht,2:sht,true,true,true);
|
| X_17 := sql.subdelta(X_59,X_6,X_12,X_60,X_62);
|
-| X_18 := sql.bind(X_2,"sys","_tables","name",0); |
+| X_18:bat[:oid,:str] := sql.bind(X_2,"sys","_tables","name",0);
|
| (X_20,r1_25) := sql.bind(X_2,"sys","_tables","name",2); |
| X_22:bat[:oid,:str] := sql.bind(X_2,"sys","_tables","name",1);
|
| X_23 := sql.projectdelta(X_17,X_18,X_20,r1_25,X_22); |
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
@@ -58,10 +58,10 @@ Operation successful
| 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_65 :=
algebra.subselect(r1_12,nil:bat[:oid,:oid],2:sht,2:sht,true,true,true); |
-| X_15 := sql.bind(X_2,"sys","_tables","type",1); |
+| X_15:bat[:oid,:sht] := 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_64,X_6,X_12,X_65,X_67);
|
-| X_18 := sql.bind(X_2,"sys","_tables","id",0); |
+| X_18:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",0);
|
| (X_20,r1_25) := sql.bind(X_2,"sys","_tables","id",2); |
| X_22:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",1); |
| X_23 := sql.projectdelta(X_17,X_18,X_20,r1_25,X_22); |
diff --git a/sql/test/Tests/systemfunctions.stable.out.int128
b/sql/test/Tests/systemfunctions.stable.out.int128
--- a/sql/test/Tests/systemfunctions.stable.out.int128
+++ b/sql/test/Tests/systemfunctions.stable.out.int128
@@ -388,9 +388,11 @@ Ready.
[ "sys", "host", 1, "inet", "" ]
[ "sys", "hostmask", 0, "inet", "create function \"hostmask\"
(p inet) returns inet\n\texternal name inet.\"hostmask\";" ]
[ "sys", "hostmask", 1, "inet", "" ]
-[ "sys", "ilike", 0, "clob", "create filter function
\"ilike\"(val string, pat string, esc string) external name
algebra.ilikesubselect;" ]
+[ "sys", "ilike", 0, "clob", "create filter function
\"ilike\"(val string, pat string, esc string) external name algebra.\"ilike\";"
]
[ "sys", "ilike", 1, "clob", "" ]
[ "sys", "ilike", 2, "clob", "" ]
+[ "sys", "ilike", 0, "clob", "create filter function
\"ilike\"(val string, pat string) external name algebra.\"ilike\";" ]
+[ "sys", "ilike", 1, "clob", "" ]
[ "sys", "imprintsize", 0, "bigint", "create function
sys.imprintsize(i bigint, nme string)\nreturns bigint\nbegin\n\tif nme =
'boolean'\n\t\tor nme = 'tinyint'\n\t\tor nme = 'smallint'\n\t\tor nme =
'int'\t\n\t\tor nme = 'bigint'\t\n\t\tor nme = 'hugeint'\t\n\t\tor nme =
'decimal'\t\n\t\tor nme = 'date'\n\t\tor nme = 'timestamp'\n\t\tor nme =
'real'\n\t\tor nme = 'double'\n\tthen\n\t\treturn cast( i * 0.12 as
bigint);\n\tend if ;\n\treturn 0;\nend;" ]
[ "sys", "imprintsize", 1, "bigint", "" ]
[ "sys", "imprintsize", 2, "clob", "" ]
@@ -409,9 +411,11 @@ Ready.
[ "sys", "issimple", 1, "geometry", "" ]
[ "sys", "length", 0, "double", "create function
length(g geometry) returns float external name geom.\"Length\";" ]
[ "sys", "length", 1, "geometry", "" ]
-[ "sys", "like", 0, "clob", "-- 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\ncreate filter function \"like\"(val string, pat string, esc
string) external name algebra.likesubselect;" ]
+[ "sys", "like", 0, "clob", "-- 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\ncreate filter function \"like\"(val string, pat string, esc
string) external name algebra.\"like\";" ]
[ "sys", "like", 1, "clob", "" ]
[ "sys", "like", 2, "clob", "" ]
+[ "sys", "like", 0, "clob", "create filter function \"like\"(val
string, pat string) external name algebra.\"like\";" ]
+[ "sys", "like", 1, "clob", "" ]
[ "sys", "linefromtext", 0, "linestring", "create function
linefromtext(wkt string, srid smallint) returns linestring external name
geom.\"LineFromText\";" ]
[ "sys", "linefromtext", 1, "clob", "" ]
[ "sys", "linefromtext", 2, "smallint", "" ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
