MonetDB: Apr2012 - intialize via extra script

[Niels Nes]

Changeset: f73124962457 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f73124962457
Modified Files:
        sql/common/sql_types.c
        sql/scripts/39_analytics.sql
        sql/scripts/Makefile.ag
Branch: Apr2012
Log Message:

intialize via extra script
(transplanted from 81a21a63f10c0618e25839136c8da386990b76a9)


diffs (55 lines):

diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -1229,8 +1229,6 @@ sqltypeinit( sql_allocator *sa)
        sql_create_aggr(sa, "max", "aggr", "max", ANY, ANY);
        sql_create_func(sa, "sql_min", "calc", "min", ANY, ANY, ANY, SCALE_FIX);
        sql_create_func(sa, "sql_max", "calc", "max", ANY, ANY, ANY, SCALE_FIX);
-       sql_create_aggr(sa, "median", "aggr", "median", ANY, ANY);
-       sql_create_aggr2(sa, "corr", "aggr", "corr", ANY, ANY, ANY);
        sql_create_func3(sa, "ifthenelse", "calc", "ifthenelse", BIT, ANY, ANY, 
ANY, SCALE_FIX);
 
        /* sum for numerical and decimals */
diff --git a/sql/scripts/39_analytics.sql b/sql/scripts/39_analytics.sql
new file mode 100644
--- /dev/null
+++ b/sql/scripts/39_analytics.sql
@@ -0,0 +1,26 @@
+
+create aggregate median(val TINYINT) returns TINYINT
+       external name "aggr"."median";
+create aggregate median(val SMALLINT) returns SMALLINT
+       external name "aggr"."median";
+create aggregate median(val INTEGER) returns INTEGER
+       external name "aggr"."median";
+create aggregate median(val BIGINT) returns BIGINT
+       external name "aggr"."median";
+create aggregate median(val REAL) returns REAL
+       external name "aggr"."median";
+create aggregate median(val DOUBLE) returns DOUBLE
+       external name "aggr"."median";
+
+create aggregate corr(e1 TINYINT, e2 TINYINT) returns TINYINT
+       external name "aggr"."corr";
+create aggregate corr(e1 SMALLINT, e2 SMALLINT) returns SMALLINT
+       external name "aggr"."corr";
+create aggregate corr(e1 INTEGER, e2 INTEGER) returns INTEGER
+       external name "aggr"."corr";
+create aggregate corr(e1 BIGINT, e2 BIGINT) returns BIGINT
+       external name "aggr"."corr";
+create aggregate corr(e1 REAL, e2 REAL) returns FLOAT
+       external name "aggr"."corr";
+create aggregate corr(e1 DOUBLE, e2 DOUBLE) returns DOUBLE
+       external name "aggr"."corr";
diff --git a/sql/scripts/Makefile.ag b/sql/scripts/Makefile.ag
--- a/sql/scripts/Makefile.ag
+++ b/sql/scripts/Makefile.ag
@@ -20,7 +20,7 @@ MT_SAFE
 headers_sql = {
        HEADERS = sql
        DIR = libdir/monetdb5/createdb
-       SOURCES = 09_like.sql 10_math.sql 11_times.sql 12_url.sql 13_date.sql 
14_inet.sql 15_history.sql 16_tracelog.sql 17_compress.sql 18_dictionary.sql 
19_cluster.sql 20_vacuum.sql 21_dependency_functions.sql 22_clients.sql 
23_skyserver.sql 24_zorder.sql 25_debug.sql 99_system.sql
+       SOURCES = 09_like.sql 10_math.sql 11_times.sql 12_url.sql 13_date.sql 
14_inet.sql 15_history.sql 16_tracelog.sql 17_compress.sql 18_dictionary.sql 
19_cluster.sql 20_vacuum.sql 21_dependency_functions.sql 22_clients.sql 
23_skyserver.sql 24_zorder.sql 25_debug.sql 39_analytics.sql 99_system.sql
 }
 
 headers_moresql = {
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list