Changeset: 86aab2f459cc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=86aab2f459cc
Modified Files:
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out.int128
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_geom.stable.out.int128
clients/Tests/MAL-signatures_none.stable.out
clients/Tests/MAL-signatures_none.stable.out.int128
monetdb5/modules/kernel/algebra.mal
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (152 lines):
diff --git a/clients/Tests/MAL-signatures_all.stable.out
b/clients/Tests/MAL-signatures_all.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures_all.stable.out
@@ -138,8 +138,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[
address AGGRavg12_dbl;
comment Grouped tail average on bte
-command aggr.avg(b:bat[:oid,:any_2]):dbl
-address ALGavg;
+pattern aggr.avg(b:bat[:oid,:any_2]):dbl
+address CMDcalcavg;
comment Gives the avg of all tail values
function
aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl];
diff --git a/clients/Tests/MAL-signatures_all.stable.out.int128
b/clients/Tests/MAL-signatures_all.stable.out.int128
--- a/clients/Tests/MAL-signatures_all.stable.out.int128
+++ b/clients/Tests/MAL-signatures_all.stable.out.int128
@@ -149,8 +149,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[
address AGGRavg12_dbl;
comment Grouped tail average on bte
-command aggr.avg(b:bat[:oid,:any_2]):dbl
-address ALGavg;
+pattern aggr.avg(b:bat[:oid,:any_2]):dbl
+address CMDcalcavg;
comment Gives the avg of all tail values
function
aggr.corr(e1:bat[:oid,:hge],e2:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:hge];
diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out
b/clients/Tests/MAL-signatures_fits_geom.stable.out
--- a/clients/Tests/MAL-signatures_fits_geom.stable.out
+++ b/clients/Tests/MAL-signatures_fits_geom.stable.out
@@ -138,8 +138,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[
address AGGRavg12_dbl;
comment Grouped tail average on bte
-command aggr.avg(b:bat[:oid,:any_2]):dbl
-address ALGavg;
+pattern aggr.avg(b:bat[:oid,:any_2]):dbl
+address CMDcalcavg;
comment Gives the avg of all tail values
function
aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl];
diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
--- a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
+++ b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
@@ -154,8 +154,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[
address AGGRavg12_dbl;
comment Grouped tail average on bte
-command aggr.avg(b:bat[:oid,:any_2]):dbl
-address ALGavg;
+pattern aggr.avg(b:bat[:oid,:any_2]):dbl
+address CMDcalcavg;
comment Gives the avg of all tail values
function
aggr.corr(e1:bat[:oid,:hge],e2:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:hge];
diff --git a/clients/Tests/MAL-signatures_geom.stable.out
b/clients/Tests/MAL-signatures_geom.stable.out
--- a/clients/Tests/MAL-signatures_geom.stable.out
+++ b/clients/Tests/MAL-signatures_geom.stable.out
@@ -138,8 +138,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[
address AGGRavg12_dbl;
comment Grouped tail average on bte
-command aggr.avg(b:bat[:oid,:any_2]):dbl
-address ALGavg;
+pattern aggr.avg(b:bat[:oid,:any_2]):dbl
+address CMDcalcavg;
comment Gives the avg of all tail values
function
aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl];
diff --git a/clients/Tests/MAL-signatures_geom.stable.out.int128
b/clients/Tests/MAL-signatures_geom.stable.out.int128
--- a/clients/Tests/MAL-signatures_geom.stable.out.int128
+++ b/clients/Tests/MAL-signatures_geom.stable.out.int128
@@ -154,8 +154,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[
address AGGRavg12_dbl;
comment Grouped tail average on bte
-command aggr.avg(b:bat[:oid,:any_2]):dbl
-address ALGavg;
+pattern aggr.avg(b:bat[:oid,:any_2]):dbl
+address CMDcalcavg;
comment Gives the avg of all tail values
function
aggr.corr(e1:bat[:oid,:hge],e2:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:hge];
diff --git a/clients/Tests/MAL-signatures_none.stable.out
b/clients/Tests/MAL-signatures_none.stable.out
--- a/clients/Tests/MAL-signatures_none.stable.out
+++ b/clients/Tests/MAL-signatures_none.stable.out
@@ -137,8 +137,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[
address AGGRavg12_dbl;
comment Grouped tail average on bte
-command aggr.avg(b:bat[:oid,:any_2]):dbl
-address ALGavg;
+pattern aggr.avg(b:bat[:oid,:any_2]):dbl
+address CMDcalcavg;
comment Gives the avg of all tail values
function
aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl];
diff --git a/clients/Tests/MAL-signatures_none.stable.out.int128
b/clients/Tests/MAL-signatures_none.stable.out.int128
--- a/clients/Tests/MAL-signatures_none.stable.out.int128
+++ b/clients/Tests/MAL-signatures_none.stable.out.int128
@@ -152,8 +152,8 @@ command aggr.avg(b:bat[:oid,:bte],e:bat[
address AGGRavg12_dbl;
comment Grouped tail average on bte
-command aggr.avg(b:bat[:oid,:any_2]):dbl
-address ALGavg;
+pattern aggr.avg(b:bat[:oid,:any_2]):dbl
+address CMDcalcavg;
comment Gives the avg of all tail values
function
aggr.corr(e1:bat[:oid,:hge],e2:bat[:oid,:hge],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:hge];
diff --git a/monetdb5/modules/kernel/algebra.mal
b/monetdb5/modules/kernel/algebra.mal
--- a/monetdb5/modules/kernel/algebra.mal
+++ b/monetdb5/modules/kernel/algebra.mal
@@ -653,8 +653,8 @@ command max(b:bat[:any_1,:any_2]):any_2
address ALGmaxany
comment "Return the highest tail value or nil.";
-command avg (b:bat[:oid,:any_2] ) :dbl
-address ALGavg
+pattern avg (b:bat[:oid,:any_2] ) :dbl
+address CMDcalcavg
comment "Gives the avg of all tail values";
# Standard deviation
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,9 +47,9 @@ 20 rows
Operation successful
-+-----------------------------------------------------------------------------+
++-------------------------------------------------------------------------------+
| mal |
-+=============================================================================+
++===============================================================================+
| function user.s3_1{autoCommit=true}():void; |
| X_3:bat[:oid,:wrd] := bat.new(nil:oid,nil:wrd); |
| X_2 := sql.mvc(); |
@@ -80,8 +80,8 @@ Operation successful
| 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") |
-+-----------------------------------------------------------------------------+
+| # querylog.define("explain select count(*) from
tables\n;","sequential_pipe") |
++-------------------------------------------------------------------------------+
31 rows
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
