Changeset: 3cbcfcec0a50 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3cbcfcec0a50
Modified Files:
sql/server/rel_psm.c
Branch: linear-hashing
Log Message:
Don't break sample parameter at ANALYZE
diffs (20 lines):
diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -1371,13 +1371,9 @@ psm_analyze(sql_query *query, char *anal
append(exps, mm_exp = exp_atom_int(sql->sa, minmax));
append(tl, exp_subtype(mm_exp));
if (sample) {
- sql_subtype *tpe = sql_bind_localtype("lng");
- dlist* sample_parameters = sample->data.lval;
-
- if (sample_parameters->cnt == 1 && (sample_exp =
rel_value_exp(query, NULL, sample_parameters->h->data.sym, 0, ek)))
- sample_exp = rel_check_type(sql, tpe, NULL, sample_exp,
type_cast);
- else
- return sql_error(sql, 01, SQLSTATE(42000) "Analyze
sample size incorrect");
+ sample_exp = rel_value_exp(query, NULL, sample, 0, ek);
+ if (!sample_exp || !(sample_exp = rel_check_type(sql,
sql_bind_localtype("lng"), NULL, sample_exp, type_cast)))
+ return NULL;
} else {
sample_exp = exp_atom_lng(sql->sa, 0);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
