[prev in list] [next in list] [prev in thread] [next in thread] 

List:       monetdb-checkins
Subject:    MonetDB: default - These functions are available just for integers
From:       Pedro_Ferreira <commits+pedro.ferreira=monetdbsolutions.com () mon
Date:       2020-07-31 20:43:53
Message-ID: hg.90b5cb418b8e.1596228233.-4855986763146063920 () monetdb-vm0 ! spin-off ! cwi ! nl
[Download RAW message or body]

Changeset: 90b5cb418b8e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=90b5cb418b8e
Modified Files:
	sql/backends/monet5/sql_rank.c
Branch: default
Log Message:

These functions are available just for integers


diffs (42 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
@@ -1800,7 +1800,7 @@ do_covariance_and_correlation(Client cnt
 			lng *restrict start = (lng*) Tloc(s, 0), *restrict end = (lng*) Tloc(e, 0);
 			bool has_nils = is_dbl_nil(res);
 
-			switch (ATOMbasetype(tp1)) {
+			switch (tp1) {
 			case TYPE_bte:
 				COVARIANCE_AND_CORRELATION_ONE_SIDE(bte);
 				break;
@@ -1824,27 +1824,8 @@ do_covariance_and_correlation(Client cnt
 			case TYPE_dbl:
 				COVARIANCE_AND_CORRELATION_ONE_SIDE(dbl);
 				break;
-			default: {
-				BATiter bi = bat_iterator(b);
-				const void *restrict nil = ATOMnilptr(tp1);
-				int (*cmp) (const void *, const void *) = ATOMcompare(tp1);
-
-				for (BUN i = 0; i < cnt; i++) {
-					for (lng j = start[i] ; j < end[i] ; j++) {
-						void *curval = BUNtail(bi, (BUN) j);
-						if (!cmp(curval, nil))
-							continue;
-						n++;
-					}
-					if (n > minimum) { /* covariance_samp requires at least one value */
-						rb[i] = res;
-					} else {
-						rb[i] = dbl_nil;
-						has_nils = true;
-					}
-					n = 0;
-				}
-			}
+			default:
+				throw(SQL, op, SQLSTATE(42000) "%s not available for %s", op, ATOMname(tp1));
 			}
 			BATsetcount(r, cnt);
 			r->tnonil = !has_nils;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
[prev in list] [next in list] [prev in thread] [next in thread]