Changeset: f7a37fe0347d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f7a37fe0347d Modified Files: monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.Windows Branch: jacqueline Log Message:
Merged from default
diffs (84 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
@@ -376,8 +376,6 @@ end main;
[ "centipede", "pattern", "optimizer", "():str ",
"OPTcentipede;" ]
[ "clrDebug", "pattern", "optimizer", "():void ",
"QOTclrdebugOptimizers;"
]
[ "dumpQEP", "pattern", "optimizer", "():void ",
"OPTdumpQEP;"
]
-[ "derivePath", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTderivePath;" ]
-[ "derivePath", "pattern", "optimizer",
"():str ",
"OPTderivePath;" ]
[ "datacyclotron", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTdatacyclotron;" ]
[ "datacyclotron", "pattern", "optimizer",
"():str ",
"OPTdatacyclotron;" ]
[ "deadcode", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTdeadcode;"
]
@@ -392,6 +390,8 @@ end main;
[ "emptySet", "pattern", "optimizer", "():str ",
"OPTemptySet;"
]
[ "factorize", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTfactorize;"
]
[ "factorize", "pattern", "optimizer", "():str ",
"OPTfactorize;"
]
+[ "groups", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTgroups;" ]
+[ "groups", "pattern", "optimizer", "():str ",
"OPTgroups;" ]
[ "garbageCollector", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTgarbageCollector;"
]
[ "garbageCollector", "pattern", "optimizer", "():str ",
"OPTgarbageCollector;"
]
[ "history", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPThistory;"
]
@@ -3555,12 +3555,6 @@ end main;
[ "avg", "command", "group",
"(b:bat[:any_2,:sht],e:bat[:any_2,:any_1]):bat[:any_2,:sht] ",
"GRPavg_sht;"
]
[ "avg", "command", "group",
"(b:bat[:any_2,:bte],e:bat[:any_2,:any_1]):bat[:any_2,:bte] ",
"GRPavg_bte;"
]
[ "count", "command", "group",
"(b:bat[:any_2,:any_1],e:bat[:any_2,:any_3],nonils:bit):bat[:any_2,:wrd] ",
"GRPaggr_count;" ]
-[ "deriveSum", "pattern", "group",
"(s:bat[:oid,:dbl],l:bat[:oid,:any]...):bat[:oid,:dbl] ",
"ALGderiveSum;"
]
-[ "deriveSum", "pattern", "group",
"(s:bat[:oid,:flt],l:bat[:oid,:any]...):bat[:oid,:flt] ",
"ALGderiveSum;"
]
-[ "deriveSum", "pattern", "group",
"(s:bat[:oid,:lng],l:bat[:oid,:any]...):bat[:oid,:lng] ",
"ALGderiveSum;"
]
-[ "deriveSum", "pattern", "group",
"(s:bat[:oid,:int],l:bat[:oid,:any]...):bat[:oid,:int] ",
"ALGderiveSum;"
]
-[ "deriveCount", "pattern", "group",
"(l:bat[:oid,:any]...):bat[:oid,:wrd] ",
"ALGderiveCount;"
]
-[ "derivePath", "pattern", "group",
"(l:bat[:oid,:any]...) (grp:bat[:oid,:any],ext:bat[:oid,:any]) ",
"ALGderivePath;"
]
[ "done", "command", "group",
"(histo:bat[:void,:wrd],map:bat[:void,:oid],a:bat[:oid,:any_2])
(hist:bat[:oid,:wrd],grp:bat[:oid,:oid]) ",
"GRPderive;" ]
[ "done", "command", "group",
"(hist:bat[:any_1,:wrd],map:bat[:any_1,:oid],a:bat[:any_1,:any_2])
(histo:bat[:any_1,:wrd],grp:bat[:any_1,:oid]) ",
"GRPderive;" ]
[ "derive", "command", "group",
"(histo:bat[:void,:wrd],map:bat[:void,:oid],a:bat[:oid,:any_2])
(hist:bat[:oid,:wrd],grp:bat[:oid,:oid]) ",
"GRPderive;" ]
@@ -3568,6 +3562,7 @@ end main;
[ "done", "command", "group",
"(attr:bat[:any_1,:any_2],N:int,rng:int)
(histo:bat[:any_1,:wrd],grp:bat[:any_1,:oid]) ",
"GRPgroup_custom;" ]
[ "done", "command", "group",
"(attr:bat[:any_1,:any_2]) (histo:bat[:any_1,:wrd],grp:bat[:any_1,:oid]) ",
"GRPgroup;"
]
[ "done", "command", "group",
"(attr:bat[:any_1,:any_2]) (histo:bat[:any_1,:wrd],grp:bat[:any_1,:void]) ",
"GRPgroup;"
]
+[ "multicolumns", "pattern", "group",
"(l:bat[:oid,:any]...) (grp:bat[:oid,:any],ext:bat[:oid,:any]) ",
"GRPmulticolumngroup;" ]
[ "max", "command", "group",
"(b:bat[:any_2,:any_1],e:bat[:any_2,:any_3]):bat[:any_2,:any_1] ",
"GRPmax;"
]
[ "min", "command", "group",
"(b:bat[:any_2,:any_1],e:bat[:any_2,:any_3]):bat[:any_2,:any_1] ",
"GRPmin;"
]
[ "new", "command", "group",
"(attr:bat[:any_1,:any_2],N:int,rng:int)
(histo:bat[:any_1,:wrd],grp:bat[:any_1,:oid]) ",
"GRPgroup_custom;" ]
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
@@ -370,8 +370,6 @@ end main;
[ "centipede", "pattern", "optimizer", "():str ",
"OPTcentipede;" ]
[ "clrDebug", "pattern", "optimizer", "():void ",
"QOTclrdebugOptimizers;"
]
[ "dumpQEP", "pattern", "optimizer", "():void ",
"OPTdumpQEP;"
]
-[ "derivePath", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTderivePath;" ]
-[ "derivePath", "pattern", "optimizer",
"():str ",
"OPTderivePath;" ]
[ "datacyclotron", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTdatacyclotron;" ]
[ "datacyclotron", "pattern", "optimizer",
"():str ",
"OPTdatacyclotron;" ]
[ "deadcode", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTdeadcode;"
]
@@ -386,6 +384,8 @@ end main;
[ "emptySet", "pattern", "optimizer", "():str ",
"OPTemptySet;"
]
[ "factorize", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTfactorize;"
]
[ "factorize", "pattern", "optimizer", "():str ",
"OPTfactorize;"
]
+[ "groups", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTgroups;" ]
+[ "groups", "pattern", "optimizer", "():str ",
"OPTgroups;" ]
[ "garbageCollector", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPTgarbageCollector;"
]
[ "garbageCollector", "pattern", "optimizer", "():str ",
"OPTgarbageCollector;"
]
[ "history", "pattern", "optimizer",
"(mod:str,fcn:str):str ",
"OPThistory;"
]
@@ -3549,12 +3549,6 @@ end main;
[ "avg", "command", "group",
"(b:bat[:any_2,:sht],e:bat[:any_2,:any_1]):bat[:any_2,:sht] ",
"GRPavg_sht;"
]
[ "avg", "command", "group",
"(b:bat[:any_2,:bte],e:bat[:any_2,:any_1]):bat[:any_2,:bte] ",
"GRPavg_bte;"
]
[ "count", "command", "group",
"(b:bat[:any_2,:any_1],e:bat[:any_2,:any_3],nonils:bit):bat[:any_2,:wrd] ",
"GRPaggr_count;" ]
-[ "deriveSum", "pattern", "group",
"(s:bat[:oid,:dbl],l:bat[:oid,:any]...):bat[:oid,:dbl] ",
"ALGderiveSum;"
]
-[ "deriveSum", "pattern", "group",
"(s:bat[:oid,:flt],l:bat[:oid,:any]...):bat[:oid,:flt] ",
"ALGderiveSum;"
]
-[ "deriveSum", "pattern", "group",
"(s:bat[:oid,:lng],l:bat[:oid,:any]...):bat[:oid,:lng] ",
"ALGderiveSum;"
]
-[ "deriveSum", "pattern", "group",
"(s:bat[:oid,:int],l:bat[:oid,:any]...):bat[:oid,:int] ",
"ALGderiveSum;"
]
-[ "deriveCount", "pattern", "group",
"(l:bat[:oid,:any]...):bat[:oid,:wrd] ",
"ALGderiveCount;"
]
-[ "derivePath", "pattern", "group",
"(l:bat[:oid,:any]...) (grp:bat[:oid,:any],ext:bat[:oid,:any]) ",
"ALGderivePath;"
]
[ "done", "command", "group",
"(histo:bat[:void,:wrd],map:bat[:void,:oid],a:bat[:oid,:any_2])
(hist:bat[:oid,:wrd],grp:bat[:oid,:oid]) ",
"GRPderive;" ]
[ "done", "command", "group",
"(hist:bat[:any_1,:wrd],map:bat[:any_1,:oid],a:bat[:any_1,:any_2])
(histo:bat[:any_1,:wrd],grp:bat[:any_1,:oid]) ",
"GRPderive;" ]
[ "derive", "command", "group",
"(histo:bat[:void,:wrd],map:bat[:void,:oid],a:bat[:oid,:any_2])
(hist:bat[:oid,:wrd],grp:bat[:oid,:oid]) ",
"GRPderive;" ]
@@ -3562,6 +3556,7 @@ end main;
[ "done", "command", "group",
"(attr:bat[:any_1,:any_2],N:int,rng:int)
(histo:bat[:any_1,:wrd],grp:bat[:any_1,:oid]) ",
"GRPgroup_custom;" ]
[ "done", "command", "group",
"(attr:bat[:any_1,:any_2]) (histo:bat[:any_1,:wrd],grp:bat[:any_1,:oid]) ",
"GRPgroup;"
]
[ "done", "command", "group",
"(attr:bat[:any_1,:any_2]) (histo:bat[:any_1,:wrd],grp:bat[:any_1,:void]) ",
"GRPgroup;"
]
+[ "multicolumns", "pattern", "group",
"(l:bat[:oid,:any]...) (grp:bat[:oid,:any],ext:bat[:oid,:any]) ",
"GRPmulticolumngroup;" ]
[ "max", "command", "group",
"(b:bat[:any_2,:any_1],e:bat[:any_2,:any_3]):bat[:any_2,:any_1] ",
"GRPmax;"
]
[ "min", "command", "group",
"(b:bat[:any_2,:any_1],e:bat[:any_2,:any_3]):bat[:any_2,:any_1] ",
"GRPmin;"
]
[ "new", "command", "group",
"(attr:bat[:any_1,:any_2],N:int,rng:int)
(histo:bat[:any_1,:wrd],grp:bat[:any_1,:oid]) ",
"GRPgroup_custom;" ]
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
