Changeset: 7a3cc480b34d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a3cc480b34d
Modified Files:
monetdb5/modules/kernel/aggr.mal
monetdb5/modules/kernel/aggr.mal.sh
sql/scripts/39_analytics.sql
Branch: default
Log Message:
moved the comments to the correct place, no SQL qantiles for now
diffs (94 lines):
diff --git a/monetdb5/modules/kernel/aggr.mal b/monetdb5/modules/kernel/aggr.mal
--- a/monetdb5/modules/kernel/aggr.mal
+++ b/monetdb5/modules/kernel/aggr.mal
@@ -1475,6 +1475,5 @@ comment "Grouped quantile aggregate";
command
subquantile(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2],s:bat[:oid,:oid],q:dbl,skip_nils:bit)
:bat[:oid,:any_1]
address AGGRsubquantilecand
-comment "Grouped quantile with candidate list";
+comment "Grouped median quantile with candidate list";
-
diff --git a/monetdb5/modules/kernel/aggr.mal.sh
b/monetdb5/modules/kernel/aggr.mal.sh
--- a/monetdb5/modules/kernel/aggr.mal.sh
+++ b/monetdb5/modules/kernel/aggr.mal.sh
@@ -320,25 +320,25 @@ address AGGRsubmediancand
comment "Grouped median aggregate with candidate list";
-# command
quantile(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2],q:dbl)
:bat[:oid,:any_1]
-# address AGGRquantile3
-# comment "Grouped quantile aggregate";
+command quantile(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2],q:dbl)
:bat[:oid,:any_1]
+address AGGRquantile3
+comment "Grouped quantile aggregate";
-# function quantile(b:bat[:oid,:any_1],q:dbl) :any_1;
-# bn := subquantile(b, q, false);
-# return algebra.fetch(bn, 0);
-# end aggr.quantile;
+function quantile(b:bat[:oid,:any_1],q:dbl) :any_1;
+ bn := subquantile(b, q, false);
+ return algebra.fetch(bn, 0);
+end aggr.quantile;
-# command subquantile(b:bat[:oid,:any_1],q:dbl,skip_nils:bit) :bat[:oid,:any_1]
-# address AGGRquantile
-# comment "Quantile aggregate";
+command subquantile(b:bat[:oid,:any_1],q:dbl,skip_nils:bit) :bat[:oid,:any_1]
+address AGGRquantile
+comment "Quantile aggregate";
-# command
subquantile(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2],q:dbl,skip_nils:bit)
:bat[:oid,:any_1]
-# address AGGRsubquantile
-# comment "Grouped quantile aggregate";
+command
subquantile(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2],q:dbl,skip_nils:bit)
:bat[:oid,:any_1]
+address AGGRsubquantile
+comment "Grouped quantile aggregate";
-# command
subquantile(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2],s:bat[:oid,:oid],q:dbl,skip_nils:bit)
:bat[:oid,:any_1]
-# address AGGRsubquantilecand
-# comment "Grouped median quantile with candidate list";
+command
subquantile(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2],s:bat[:oid,:oid],q:dbl,skip_nils:bit)
:bat[:oid,:any_1]
+address AGGRsubquantilecand
+comment "Grouped median quantile with candidate list";
EOF
diff --git a/sql/scripts/39_analytics.sql b/sql/scripts/39_analytics.sql
--- a/sql/scripts/39_analytics.sql
+++ b/sql/scripts/39_analytics.sql
@@ -108,20 +108,20 @@ create aggregate median(val TIME) return
create aggregate median(val TIMESTAMP) returns TIMESTAMP
external name "aggr"."median";
-create aggregate quantile(val TINYINT, q DOUBLE) returns TINYINT
- external name "aggr"."quantile";
-create aggregate quantile(val SMALLINT, q DOUBLE) returns SMALLINT
- external name "aggr"."quantile";
-create aggregate quantile(val INTEGER, q DOUBLE) returns INTEGER
- external name "aggr"."quantile";
-create aggregate quantile(val WRD, q DOUBLE) returns WRD
- external name "aggr"."quantile";
-create aggregate quantile(val BIGINT, q DOUBLE) returns BIGINT
- external name "aggr"."quantile";
-create aggregate quantile(val REAL, q DOUBLE) returns REAL
- external name "aggr"."quantile";
-create aggregate quantile(val DOUBLE, q DOUBLE) returns DOUBLE
- external name "aggr"."quantile";
+-- create aggregate quantile(val TINYINT, q DOUBLE) returns TINYINT
+-- external name "aggr"."quantile";
+-- create aggregate quantile(val SMALLINT, q DOUBLE) returns SMALLINT
+-- external name "aggr"."quantile";
+-- create aggregate quantile(val INTEGER, q DOUBLE) returns INTEGER
+-- external name "aggr"."quantile";
+-- create aggregate quantile(val WRD, q DOUBLE) returns WRD
+-- external name "aggr"."quantile";
+-- create aggregate quantile(val BIGINT, q DOUBLE) returns BIGINT
+-- external name "aggr"."quantile";
+-- create aggregate quantile(val REAL, q DOUBLE) returns REAL
+-- external name "aggr"."quantile";
+-- create aggregate quantile(val DOUBLE, q DOUBLE) returns DOUBLE
+-- external name "aggr"."quantile";
create aggregate quantile(val DATE, q DOUBLE) returns DATE
external name "aggr"."quantile";
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
