MonetDB: statistics-analytics - Cleaned sql_rank.mal script

[Pedro Ferreira]

Changeset: 7d94a502d1cf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d94a502d1cf
Modified Files:
        sql/backends/monet5/sql_rank.c
        sql/backends/monet5/sql_rank.mal
        sql/backends/monet5/sql_rank.mal.sh
Branch: statistics-analytics
Log Message:

Cleaned sql_rank.mal script


diffs (79 lines):

diff --git a/sql/backends/monet5/sql_rank.c b/sql/backends/monet5/sql_rank.c
--- a/sql/backends/monet5/sql_rank.c
+++ b/sql/backends/monet5/sql_rank.c
@@ -1577,12 +1577,8 @@ SQLstddev_samp(Client cntxt, MalBlkPtr m
                        case TYPE_dbl:
                                *res = dbl_nil;
                                break;
-                       default: {
-                               if (tpe == TYPE_daytime || tpe == TYPE_date || 
tpe == TYPE_timestamp)
-                                       *res = dbl_nil;
-                               else
-                                       throw(SQL, "sql.stddev", 
SQLSTATE(42000) "sql.stddev not available for %s", ATOMname(tpe));
-                       }
+                       default:
+                               throw(SQL, "sql.stddev", SQLSTATE(42000) 
"sql.stddev not available for %s", ATOMname(tpe));
                }
        }
        return msg;
diff --git a/sql/backends/monet5/sql_rank.mal b/sql/backends/monet5/sql_rank.mal
--- a/sql/backends/monet5/sql_rank.mal
+++ b/sql/backends/monet5/sql_rank.mal
@@ -629,30 +629,6 @@ pattern batsql.stdev(b:bat[:dbl], s:bat[
 address SQLstddev_samp
 comment "standard deviation of groups";
 
-pattern sql.stdev(b:daytime, s:lng, e:lng) :dbl
-address SQLstddev_samp
-comment "standard deviation of groups";
-
-pattern batsql.stdev(b:bat[:daytime], s:bat[:lng], e:bat[:lng]) :bat[:dbl]
-address SQLstddev_samp
-comment "standard deviation of groups";
-
-pattern sql.stdev(b:date, s:lng, e:lng) :dbl
-address SQLstddev_samp
-comment "standard deviation of groups";
-
-pattern batsql.stdev(b:bat[:date], s:bat[:lng], e:bat[:lng]) :bat[:dbl]
-address SQLstddev_samp
-comment "standard deviation of groups";
-
-pattern sql.stdev(b:timestamp, s:lng, e:lng) :dbl
-address SQLstddev_samp
-comment "standard deviation of groups";
-
-pattern batsql.stdev(b:bat[:timestamp], s:bat[:lng], e:bat[:lng]) :bat[:dbl]
-address SQLstddev_samp
-comment "standard deviation of groups";
-
 command aggr.exist(b:bat[:any_2], h:any_1):bit
 address ALGexist;
 
diff --git a/sql/backends/monet5/sql_rank.mal.sh 
b/sql/backends/monet5/sql_rank.mal.sh
--- a/sql/backends/monet5/sql_rank.mal.sh
+++ b/sql/backends/monet5/sql_rank.mal.sh
@@ -26,6 +26,14 @@ pattern sql.diff(p:bit, b:any_1) :bit
 address SQLdiff
 comment "return true if cur != prev row";
 
+pattern batsql.diff(p:bit, b:bat[:any_1]) :bat[:bit]
+address SQLdiff
+comment "return true if cur != prev row";
+
+pattern batsql.diff(p:bat[:bit], b:any_1) :bat[:bit]
+address SQLdiff
+comment "return true if cur != prev row";
+
 pattern batsql.diff(p:bat[:bit], b:bat[:any_1]) :bat[:bit]
 address SQLdiff
 comment "return true if cur != prev row";
@@ -372,7 +380,7 @@ comment "return the average of groups";
 EOF
 done
 
-for tp1 in 1:bte 2:sht 4:int 8:lng 4:flt 8:dbl 8:daytime 4:date 8:timestamp; do
+for tp1 in 1:bte 2:sht 4:int 8:lng 4:flt 8:dbl; do
        cat <<EOF
 pattern sql.stdev(b:${tp1#*:}, s:lng, e:lng) :dbl
 address SQLstddev_samp
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list