Changeset: af15ecc5d946 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af15ecc5d946
Modified Files:
sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
sql/backends/monet5/rest/Tests/jsonstore00.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.Solaris
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
sql/test/Tests/decimal2.stable.out
sql/test/Tests/setoptimizer.stable.out.Windows
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/trace.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check1_bam.stable.out
sql/test/leaks/Tests/check1_gsl.stable.out
sql/test/leaks/Tests/check1_gsl.stable.out.int128
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check1_nogeom.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check2_bam.stable.out
sql/test/leaks/Tests/check2_gsl.stable.out
sql/test/leaks/Tests/check2_gsl.stable.out.int128
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check2_nogeom.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check3_bam.stable.out
sql/test/leaks/Tests/check3_gsl.stable.out
sql/test/leaks/Tests/check3_gsl.stable.out.int128
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check3_nogeom.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check4_bam.stable.out
sql/test/leaks/Tests/check4_gsl.stable.out
sql/test/leaks/Tests/check4_gsl.stable.out.int128
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check4_nogeom.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/leaks/Tests/check5_bam.stable.out
sql/test/leaks/Tests/check5_gsl.stable.out
sql/test/leaks/Tests/check5_gsl.stable.out.int128
sql/test/leaks/Tests/check5_nogeom.stable.out
sql/test/leaks/Tests/check5_nogeom.stable.out.int128
Branch: default
Log Message:
Approvals.
diffs (truncated from 2700 to 300 lines):
diff --git a/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
b/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
--- a/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
+++ b/sql/backends/monet5/UDF/Tests/udf-fuse.stable.out
@@ -44,11 +44,11 @@ end user.s2_1;
% mal # name
% clob # type
% 88 # length
-function user.s3_1{autoCommit=true}(A0:sht,A1:sht):void;
+function user.s4_1{autoCommit=true}(A0:sht,A1:sht):void;
X_14:void := querylog.define("explain select
fuse(1000,2000);","sequential_pipe",5);
X_4 := udf.fuse(A0,A1);
sql.exportValue(1,".L","fuse_single_value","int",32,0,7,X_4,"");
-end user.s3_1;
+end user.s4_1;
#select fuse(1000,2000);
% .L # table_name
% fuse_single_value # name
@@ -60,11 +60,11 @@ end user.s3_1;
% mal # name
% clob # type
% 94 # length
-function user.s4_1{autoCommit=true}(A0:int,A1:int):void;
+function user.s6_1{autoCommit=true}(A0:int,A1:int):void;
X_14:void := querylog.define("explain select
fuse(1000000,2000000);","sequential_pipe",5);
X_4 := udf.fuse(A0,A1);
sql.exportValue(1,".L","fuse_single_value","bigint",64,0,7,X_4,"");
-end user.s4_1;
+end user.s6_1;
#select fuse(1000000,2000000);
% .L # table_name
% fuse_single_value # name
@@ -94,7 +94,7 @@ end user.s4_1;
% mal # name
% clob # type
% 97 # length
-function user.s8_1{autoCommit=true}():void;
+function user.s14_1{autoCommit=true}():void;
X_32:void := querylog.define("explain select fuse(a,b) from
udf_fuse;","sequential_pipe",20);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","udf_fuse");
@@ -113,13 +113,13 @@ function user.s8_1{autoCommit=true}():vo
sql.rsColumn(X_24,"sys.L","fuse_a","smallint",16,0,X_23);
X_30 := io.stdout();
sql.exportResult(X_30,X_24);
-end user.s8_1;
+end user.s14_1;
#explain select fuse(c,d) from udf_fuse;
% .explain # table_name
% mal # name
% clob # type
% 97 # length
-function user.s9_1{autoCommit=true}():void;
+function user.s15_1{autoCommit=true}():void;
X_32:void := querylog.define("explain select fuse(c,d) from
udf_fuse;","sequential_pipe",20);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","udf_fuse");
@@ -138,13 +138,13 @@ function user.s9_1{autoCommit=true}():vo
sql.rsColumn(X_24,"sys.L","fuse_c","int",32,0,X_23);
X_30 := io.stdout();
sql.exportResult(X_30,X_24);
-end user.s9_1;
+end user.s15_1;
#explain select fuse(e,f) from udf_fuse;
% .explain # table_name
% mal # name
% clob # type
% 97 # length
-function user.s10_1{autoCommit=true}():void;
+function user.s16_1{autoCommit=true}():void;
X_32:void := querylog.define("explain select fuse(e,f) from
udf_fuse;","sequential_pipe",20);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","udf_fuse");
@@ -163,7 +163,7 @@ function user.s10_1{autoCommit=true}():v
sql.rsColumn(X_24,"sys.L","fuse_e","bigint",64,0,X_23);
X_30 := io.stdout();
sql.exportResult(X_30,X_24);
-end user.s10_1;
+end user.s16_1;
#select fuse(a,b) from udf_fuse;
% sys.L # table_name
% fuse_a # name
diff --git a/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
b/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
--- a/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
+++ b/sql/backends/monet5/UDF/Tests/udf-reverse.stable.out
@@ -83,7 +83,7 @@ end user.s2_1;
% mal # name
% clob # type
% 101 # length
-function user.s6_1{autoCommit=true}():void;
+function user.s10_1{autoCommit=true}():void;
X_24:void := querylog.define("explain select reverse(x) from
udf_reverse;","sequential_pipe",15);
X_2 := sql.mvc();
X_3:bat[:oid,:oid] := sql.tid(X_2,"sys","udf_reverse");
@@ -97,7 +97,7 @@ function user.s6_1{autoCommit=true}():vo
sql.rsColumn(X_17,"sys.L","reverse_x","clob",0,0,X_16);
X_22 := io.stdout();
sql.exportResult(X_22,X_17);
-end user.s6_1;
+end user.s10_1;
#select reverse(x) from udf_reverse;
% sys.L # table_name
% reverse_x # name
diff --git a/sql/backends/monet5/rest/Tests/jsonstore00.stable.out
b/sql/backends/monet5/rest/Tests/jsonstore00.stable.out
--- a/sql/backends/monet5/rest/Tests/jsonstore00.stable.out
+++ b/sql/backends/monet5/rest/Tests/jsonstore00.stable.out
@@ -182,7 +182,7 @@ Ready.
% .L # table_name
% error # name
% char # type
-% 21 # length
+% 20 # length
[ "No Parameter Allowed" ]
#SELECT 'Missing Attachment PATH' AS error;
% .L # table_name
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
@@ -95,40 +95,40 @@ function user.s2_1{autoCommit=true}(A0:s
X_70:bat[:oid,:int] := sql.bind(X_13,"sys","part","p_size",1);
X_71 := sql.delta(X_66,X_68,r1_72,X_70);
X_72 := algebra.leftfetchjoin(X_64,X_71);
- X_73:bat[:oid,:str] := sql.bind(X_13,"sys","part","p_brand",0);
- (X_75,r1_80) := sql.bind(X_13,"sys","part","p_brand",2);
- X_78:bat[:oid,:str] := sql.bind(X_13,"sys","part","p_brand",1);
+ X_73:bat[:oid,:str] := sql.bind(X_13,"sys","part","p_type",0);
+ (X_75,r1_80) := sql.bind(X_13,"sys","part","p_type",2);
+ X_78:bat[:oid,:str] := sql.bind(X_13,"sys","part","p_type",1);
X_79 := sql.delta(X_73,X_75,r1_80,X_78);
X_80 := algebra.leftfetchjoin(X_64,X_79);
- X_81:bat[:oid,:str] := sql.bind(X_13,"sys","part","p_type",0);
- (X_83,r1_89) := sql.bind(X_13,"sys","part","p_type",2);
- X_85:bat[:oid,:str] := sql.bind(X_13,"sys","part","p_type",1);
- X_86 := sql.delta(X_81,X_83,r1_89,X_85);
- X_87 := algebra.leftfetchjoin(X_64,X_86);
- X_89 := algebra.likesubselect(X_87,nil:BAT,A1,"",true);
- X_92 := algebra.subselect(X_80,X_89,A0,A0,true,true,true);
- X_93 := algebra.subselect(X_72,X_92,A2,A2,true,true,false);
- X_95 := algebra.subselect(X_72,X_92,A3,A3,true,true,false);
- X_96 := bat.mergecand(X_93,X_95);
- X_97 := algebra.subselect(X_72,X_92,A4,A4,true,true,false);
- X_98 := bat.mergecand(X_96,X_97);
- X_99 := algebra.subselect(X_72,X_92,A5,A5,true,true,false);
- X_100 := bat.mergecand(X_98,X_99);
- X_101 := algebra.subselect(X_72,X_92,A6,A6,true,true,false);
- X_102 := bat.mergecand(X_100,X_101);
- X_103 := algebra.subselect(X_72,X_92,A7,A7,true,true,false);
- X_104 := bat.mergecand(X_102,X_103);
- X_105 := algebra.subselect(X_72,X_92,A8,A8,true,true,false);
- X_106 := bat.mergecand(X_104,X_105);
- X_107 := algebra.subselect(X_72,X_92,A9,A9,true,true,false);
- X_108 := bat.mergecand(X_106,X_107);
- X_109 := algebra.leftfetchjoin(X_108,X_64);
- (X_110,r1_125) :=
algebra.subjoin(X_63,X_109,nil:BAT,nil:BAT,false,nil:lng);
- X_211 := algebra.leftfetchjoin(r1_125,X_108);
- X_113:bat[:oid,:str] := algebra.leftfetchjoin(X_211,X_87);
- X_114:bat[:oid,:str] := algebra.leftfetchjoin(X_211,X_80);
+ X_82:bat[:oid,:str] := sql.bind(X_13,"sys","part","p_brand",0);
+ (X_84,r1_91) := sql.bind(X_13,"sys","part","p_brand",2);
+ X_86:bat[:oid,:str] := sql.bind(X_13,"sys","part","p_brand",1);
+ X_87 := sql.delta(X_82,X_84,r1_91,X_86);
+ X_88 := algebra.leftfetchjoin(X_64,X_87);
+ X_89 := algebra.subselect(X_88,A0,A0,true,true,true);
+ X_91 := algebra.likesubselect(X_80,X_89,A1,"",true);
+ X_92 := algebra.subselect(X_72,X_91,A2,A2,true,true,false);
+ X_94 := algebra.subselect(X_72,X_91,A3,A3,true,true,false);
+ X_95 := bat.mergecand(X_92,X_94);
+ X_96 := algebra.subselect(X_72,X_91,A4,A4,true,true,false);
+ X_97 := bat.mergecand(X_95,X_96);
+ X_98 := algebra.subselect(X_72,X_91,A5,A5,true,true,false);
+ X_99 := bat.mergecand(X_97,X_98);
+ X_100 := algebra.subselect(X_72,X_91,A6,A6,true,true,false);
+ X_101 := bat.mergecand(X_99,X_100);
+ X_102 := algebra.subselect(X_72,X_91,A7,A7,true,true,false);
+ X_103 := bat.mergecand(X_101,X_102);
+ X_104 := algebra.subselect(X_72,X_91,A8,A8,true,true,false);
+ X_105 := bat.mergecand(X_103,X_104);
+ X_106 := algebra.subselect(X_72,X_91,A9,A9,true,true,false);
+ X_107 := bat.mergecand(X_105,X_106);
+ X_108 := algebra.leftfetchjoin(X_107,X_64);
+ (X_109,r1_124) :=
algebra.subjoin(X_63,X_108,nil:BAT,nil:BAT,false,nil:lng);
+ X_211 := algebra.leftfetchjoin(r1_124,X_107);
+ X_113:bat[:oid,:str] := algebra.leftfetchjoin(X_211,X_80);
+ X_114:bat[:oid,:str] := algebra.leftfetchjoin(X_211,X_88);
X_115:bat[:oid,:int] := algebra.leftfetchjoin(X_211,X_72);
- X_116:bat[:oid,:int] := algebra.leftfetchjoinPath(X_110,X_52,X_26);
+ X_116:bat[:oid,:int] := algebra.leftfetchjoinPath(X_109,X_52,X_26);
(X_117,r1_136,r2_136) := group.subgroup(X_116);
(X_120,r1_139,r2_139) := group.subgroup(X_115,X_117);
(X_123,r1_142,r2_142) := group.subgroup(X_114,X_120);
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
---
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
+++
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
@@ -28,13 +28,13 @@ Ready.
% .plan # table_name
% rel # name
% clob # type
-% 191 # length
+% 173 # length
insert(
| table(sys.cm_tmp) [ cm_tmp.i, cm_tmp.%TID% NOT NULL ]
| union (
-| | table sys.copyfrom(varchar "sys", varchar "cm_tmp", varchar "|", varchar
"\n", varchar "NULL", varchar "null", varchar "a:\file1", bigint "-1", bigint
"0", int "0"), [ cm_tmp.i ] COUNT ,
-| | table sys.copyfrom(varchar "sys", varchar "cm_tmp", varchar "|", varchar
"\n", varchar "NULL", varchar "null", varchar "Z:/file2", bigint "-1", bigint
"0", int "0"), [ cm_tmp.i ] COUNT
-| ) [ ]
+| | table sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar
"NULL", varchar "null", varchar "a:\file1", bigint "-1", bigint "0", int "0"),
[ cm_tmp.i ] COUNT ,
+| | table sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar
"NULL", varchar "null", varchar "Z:/file2", bigint "-1", bigint "0", int "0"),
[ cm_tmp.i ] COUNT
+| ) [ int "NULL" ]
)
# 08:59:53 >
diff --git
a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.Solaris
b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.Solaris
--- a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.Solaris
+++ b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.Solaris
@@ -25,8 +25,8 @@ Ready.
# 22:26:13 >
#select cast(power(2,63) as bigint);
-% . # table_name
-% power_single_value # name
+% .L1 # table_name
+% L1 # name
% bigint # type
% 19 # length
[ 9223372036854775807 ]
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
@@ -47,20 +47,21 @@ 20 rows
Operation successful
-+-------------------------------------------------------------------------------+
++--------------------------------------------------------------------------------------------------+
| mal |
-+===============================================================================+
++==================================================================================================+
| function user.s3_1{autoCommit=true}():void; |
+| X_49:void := querylog.define("explain select count(*) from
tables\n;","sequential_pipe",31); |
| X_3:bat[:oid,:wrd] := bat.new(nil:oid,nil:wrd); |
| X_2 := sql.mvc(); |
| X_9:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",0); |
| X_6:bat[:oid,:oid] := sql.tid(X_2,"sys","_tables"); |
| 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,2:sht,2:sht,true,true,true); |
+| X_65 :=
algebra.subselect(r1_12,nil:bat[:oid,:oid],2:sht,2:sht,true,true,true);
|
| X_15:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1); |
-| 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_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: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); |
@@ -79,9 +80,8 @@ Operation successful
| X_39 := bat.append(X_26,X_38,true); |
| X_40:wrd := aggr.sum(X_39); |
| sql.exportValue(1,".L1","L1","wrd",32,0,7,X_40,"");
|
-| end s3_1; |
-| # querylog.define("explain select count(*) from
tables\n;","sequential_pipe") |
-+-------------------------------------------------------------------------------+
+| end user.s3_1;
|
++--------------------------------------------------------------------------------------------------+
31 rows
diff --git a/sql/test/Tests/decimal2.stable.out
b/sql/test/Tests/decimal2.stable.out
--- a/sql/test/Tests/decimal2.stable.out
+++ b/sql/test/Tests/decimal2.stable.out
@@ -70,7 +70,7 @@ Ready.
% .L # table_name
% single_value # name
% decimal # type
-% 3 # length
+% 2 # length
[ 0 ]
# 20:26:51 >
diff --git a/sql/test/Tests/setoptimizer.stable.out.Windows
b/sql/test/Tests/setoptimizer.stable.out.Windows
--- a/sql/test/Tests/setoptimizer.stable.out.Windows
+++ b/sql/test/Tests/setoptimizer.stable.out.Windows
@@ -42,37 +42,36 @@ Ready.
# 02:57:35 >
#select optimizer;
-% . # table_name
+% .L # table_name
% single_value # name
% varchar # type
% 12 # length
[ "minimal_pipe" ]
#set optimizer=' optimizer.inline(); optimizer.remap(); optimizer.evaluate();
optimizer.costModel(); optimizer.coercions(); optimizer.emptySet();
optimizer.aliases(); optimizer.mergetable(); optimizer.deadcode();
optimizer.commonTerms(); optimizer.joinPath(); optimizer.reorder();
optimizer.deadcode(); optimizer.reduce(); optimizer.history();
optimizer.multiplex(); optimizer.accumulators(); optimizer.garbageCollector();';
#select optimizer;
-% . # table_name
+% .L # table_name
% single_value # name
% varchar # type
-% 6 # length
-[ "user_1" ]
+% 12 # length
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
