Changeset: 719273b73a30 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=719273b73a30
Modified Files:
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
Branch: default
Log Message:
approved new sql.middle() & aggr.median() signatures
as inrorduced by changeset 5ab030b2a39a
diffs (truncated from 387 to 300 lines):
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out
b/monetdb5/modules/mal/Tests/inspect05.stable.out
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out
@@ -277,6 +277,7 @@ end main;
[ "init", "pattern", "sql", "():void ",
"SQLinitEnvironment;" ]
[ "keepquery", "function", "sql",
"(qid:int,qry:str,parse:lng,optimize:lng):void;",
"nil"
]
[ "logfile", "pattern", "sql",
"(filename:str):void ",
"mvc_logfile;" ]
+[ "middle", "command", "sql",
"(val:bat[:oid,:oid],hist:bat[:oid,:wrd]):bat[:oid,:oid] ",
"SQLmiddle;" ]
[ "ms_trunc", "command", "sql",
"(v:dbl,r:int):dbl ",
"dbl_trunc_wrap;" ]
[ "ms_trunc", "command", "sql",
"(v:flt,r:int):flt ",
"flt_trunc_wrap;" ]
[ "mvc", "pattern", "sql", "():int ",
"SQLmvc;" ]
@@ -4856,6 +4857,8 @@ end main;
[ "count", "command", "aggr",
"(b:bat[:any_1,:any]):wrd ",
"ALGcount_bat;"
]
[ "exist", "command", "aggr",
"(b:bat[:any_1,:any_2],h:any_1):bit ",
"ALGexist;" ]
[ "histogram", "command", "aggr",
"(b:bat[:any_1,:any_2]):bat[:any_2,:int] ",
"ALGhistogram;"
]
+[ "median", "function", "aggr",
"(a:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1];",
"nil" ]
+[ "median", "function", "aggr",
"(a:bat[:oid,:any_1]):any_1;",
"nil" ]
[ "max", "command", "aggr",
"(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1] ",
"AX3aggrX3_max3;"
]
[ "min", "command", "aggr",
"(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1] ",
"AX3aggrX3_min3;"
]
[ "max", "command", "aggr",
"(b:bat[:oid,:any_1],e:bat[:oid,:any_2]):bat[:oid,:any_1] ",
"AX3aggrX3_max;"
]
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
@@ -271,6 +271,7 @@ end main;
[ "init", "pattern", "sql", "():void ",
"SQLinitEnvironment;" ]
[ "keepquery", "function", "sql",
"(qid:int,qry:str,parse:lng,optimize:lng):void;",
"nil"
]
[ "logfile", "pattern", "sql",
"(filename:str):void ",
"mvc_logfile;" ]
+[ "middle", "command", "sql",
"(val:bat[:oid,:oid],hist:bat[:oid,:wrd]):bat[:oid,:oid] ",
"SQLmiddle;" ]
[ "ms_trunc", "command", "sql",
"(v:dbl,r:int):dbl ",
"dbl_trunc_wrap;" ]
[ "ms_trunc", "command", "sql",
"(v:flt,r:int):flt ",
"flt_trunc_wrap;" ]
[ "mvc", "pattern", "sql", "():int ",
"SQLmvc;" ]
@@ -4850,6 +4851,8 @@ end main;
[ "count", "command", "aggr",
"(b:bat[:any_1,:any]):wrd ",
"ALGcount_bat;"
]
[ "exist", "command", "aggr",
"(b:bat[:any_1,:any_2],h:any_1):bit ",
"ALGexist;" ]
[ "histogram", "command", "aggr",
"(b:bat[:any_1,:any_2]):bat[:any_2,:int] ",
"ALGhistogram;"
]
+[ "median", "function", "aggr",
"(a:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1];",
"nil" ]
+[ "median", "function", "aggr",
"(a:bat[:oid,:any_1]):any_1;",
"nil" ]
[ "max", "command", "aggr",
"(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1] ",
"AX3aggrX3_max3;"
]
[ "min", "command", "aggr",
"(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1] ",
"AX3aggrX3_min3;"
]
[ "max", "command", "aggr",
"(b:bat[:oid,:any_1],e:bat[:oid,:any_2]):bat[:oid,:any_1] ",
"AX3aggrX3_max;"
]
diff --git a/sql/test/leaks/Tests/check0.stable.out
b/sql/test/leaks/Tests/check0.stable.out
--- a/sql/test/leaks/Tests/check0.stable.out
+++ b/sql/test/leaks/Tests/check0.stable.out
@@ -53,18 +53,18 @@ Ready.
[ "int", "str", 142 ]
[ "oid", "int", 19 ]
[ "oid", "int", 19 ]
-[ "oid", "int", 1125 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
+[ "oid", "int", 1126 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
[ "oid", "lng", 19 ]
[ "oid", "str", 1 ]
[ "oid", "str", 1 ]
[ "oid", "str", 19 ]
-[ "oid", "str", 3101 ]
-[ "oid", "str", 3101 ]
+[ "oid", "str", 3103 ]
+[ "oid", "str", 3103 ]
#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
% .L1, .bbp # table_name
% L1, L2 # name
diff --git a/sql/test/leaks/Tests/check1.stable.out
b/sql/test/leaks/Tests/check1.stable.out
--- a/sql/test/leaks/Tests/check1.stable.out
+++ b/sql/test/leaks/Tests/check1.stable.out
@@ -35,8 +35,8 @@ Ready.
[ "oid", "bit", 59 ]
[ "oid", "bit", 59 ]
[ "oid", "bit", 300 ]
-[ "oid", "bit", 1125 ]
-[ "oid", "bit", 1125 ]
+[ "oid", "bit", 1126 ]
+[ "oid", "bit", 1126 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -83,15 +83,15 @@ Ready.
[ "oid", "int", 300 ]
[ "oid", "int", 300 ]
[ "oid", "int", 300 ]
-[ "oid", "int", 1125 ]
-[ "oid", "int", 1125 ]
-[ "oid", "int", 1125 ]
-[ "oid", "int", 1125 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
+[ "oid", "int", 1126 ]
+[ "oid", "int", 1126 ]
+[ "oid", "int", 1126 ]
+[ "oid", "int", 1126 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -166,11 +166,11 @@ Ready.
[ "oid", "str", 300 ]
[ "oid", "str", 300 ]
[ "oid", "str", 300 ]
-[ "oid", "str", 1125 ]
-[ "oid", "str", 1125 ]
-[ "oid", "str", 1125 ]
-[ "oid", "str", 3101 ]
-[ "oid", "str", 3101 ]
+[ "oid", "str", 1126 ]
+[ "oid", "str", 1126 ]
+[ "oid", "str", 1126 ]
+[ "oid", "str", 3103 ]
+[ "oid", "str", 3103 ]
[ "oid", "timestamp", 0 ]
[ "oid", "timestamp", 0 ]
[ "oid", "wrd", 0 ]
diff --git a/sql/test/leaks/Tests/check2.stable.out
b/sql/test/leaks/Tests/check2.stable.out
--- a/sql/test/leaks/Tests/check2.stable.out
+++ b/sql/test/leaks/Tests/check2.stable.out
@@ -35,8 +35,8 @@ Ready.
[ "oid", "bit", 59 ]
[ "oid", "bit", 59 ]
[ "oid", "bit", 300 ]
-[ "oid", "bit", 1125 ]
-[ "oid", "bit", 1125 ]
+[ "oid", "bit", 1126 ]
+[ "oid", "bit", 1126 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -83,15 +83,15 @@ Ready.
[ "oid", "int", 300 ]
[ "oid", "int", 300 ]
[ "oid", "int", 300 ]
-[ "oid", "int", 1125 ]
-[ "oid", "int", 1125 ]
-[ "oid", "int", 1125 ]
-[ "oid", "int", 1125 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
+[ "oid", "int", 1126 ]
+[ "oid", "int", 1126 ]
+[ "oid", "int", 1126 ]
+[ "oid", "int", 1126 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -166,11 +166,11 @@ Ready.
[ "oid", "str", 300 ]
[ "oid", "str", 300 ]
[ "oid", "str", 300 ]
-[ "oid", "str", 1125 ]
-[ "oid", "str", 1125 ]
-[ "oid", "str", 1125 ]
-[ "oid", "str", 3101 ]
-[ "oid", "str", 3101 ]
+[ "oid", "str", 1126 ]
+[ "oid", "str", 1126 ]
+[ "oid", "str", 1126 ]
+[ "oid", "str", 3103 ]
+[ "oid", "str", 3103 ]
[ "oid", "timestamp", 0 ]
[ "oid", "timestamp", 0 ]
[ "oid", "wrd", 0 ]
diff --git a/sql/test/leaks/Tests/check3.stable.out
b/sql/test/leaks/Tests/check3.stable.out
--- a/sql/test/leaks/Tests/check3.stable.out
+++ b/sql/test/leaks/Tests/check3.stable.out
@@ -35,8 +35,8 @@ Ready.
[ "oid", "bit", 60 ]
[ "oid", "bit", 60 ]
[ "oid", "bit", 302 ]
-[ "oid", "bit", 1125 ]
-[ "oid", "bit", 1125 ]
+[ "oid", "bit", 1126 ]
+[ "oid", "bit", 1126 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -83,15 +83,15 @@ Ready.
[ "oid", "int", 302 ]
[ "oid", "int", 302 ]
[ "oid", "int", 302 ]
-[ "oid", "int", 1125 ]
-[ "oid", "int", 1125 ]
-[ "oid", "int", 1125 ]
-[ "oid", "int", 1125 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
+[ "oid", "int", 1126 ]
+[ "oid", "int", 1126 ]
+[ "oid", "int", 1126 ]
+[ "oid", "int", 1126 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -166,11 +166,11 @@ Ready.
[ "oid", "str", 302 ]
[ "oid", "str", 302 ]
[ "oid", "str", 302 ]
-[ "oid", "str", 1125 ]
-[ "oid", "str", 1125 ]
-[ "oid", "str", 1125 ]
-[ "oid", "str", 3101 ]
-[ "oid", "str", 3101 ]
+[ "oid", "str", 1126 ]
+[ "oid", "str", 1126 ]
+[ "oid", "str", 1126 ]
+[ "oid", "str", 3103 ]
+[ "oid", "str", 3103 ]
[ "oid", "timestamp", 0 ]
[ "oid", "timestamp", 0 ]
[ "oid", "wrd", 0 ]
diff --git a/sql/test/leaks/Tests/check4.stable.out
b/sql/test/leaks/Tests/check4.stable.out
--- a/sql/test/leaks/Tests/check4.stable.out
+++ b/sql/test/leaks/Tests/check4.stable.out
@@ -35,8 +35,8 @@ Ready.
[ "oid", "bit", 61 ]
[ "oid", "bit", 61 ]
[ "oid", "bit", 304 ]
-[ "oid", "bit", 1125 ]
-[ "oid", "bit", 1125 ]
+[ "oid", "bit", 1126 ]
+[ "oid", "bit", 1126 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -83,15 +83,15 @@ Ready.
[ "oid", "int", 304 ]
[ "oid", "int", 304 ]
[ "oid", "int", 304 ]
-[ "oid", "int", 1125 ]
-[ "oid", "int", 1125 ]
-[ "oid", "int", 1125 ]
-[ "oid", "int", 1125 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
-[ "oid", "int", 3101 ]
+[ "oid", "int", 1126 ]
+[ "oid", "int", 1126 ]
+[ "oid", "int", 1126 ]
+[ "oid", "int", 1126 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
+[ "oid", "int", 3103 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -166,11 +166,11 @@ Ready.
[ "oid", "str", 304 ]
[ "oid", "str", 304 ]
[ "oid", "str", 304 ]
-[ "oid", "str", 1125 ]
-[ "oid", "str", 1125 ]
-[ "oid", "str", 1125 ]
-[ "oid", "str", 3101 ]
-[ "oid", "str", 3101 ]
+[ "oid", "str", 1126 ]
+[ "oid", "str", 1126 ]
+[ "oid", "str", 1126 ]
+[ "oid", "str", 3103 ]
+[ "oid", "str", 3103 ]
[ "oid", "timestamp", 0 ]
[ "oid", "timestamp", 0 ]
[ "oid", "wrd", 0 ]
diff --git a/sql/test/leaks/Tests/check5.stable.out
b/sql/test/leaks/Tests/check5.stable.out
--- a/sql/test/leaks/Tests/check5.stable.out
+++ b/sql/test/leaks/Tests/check5.stable.out
@@ -35,8 +35,8 @@ Ready.
[ "oid", "bit", 61 ]
[ "oid", "bit", 61 ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
