Changeset: 94f2735ddd81 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=94f2735ddd81
Modified Files:
monetdb5/modules/kernel/group.mx
sql/backends/monet5/sql_gencode.c
sql/server/rel_select.c
Branch: Feb2013
Log Message:
English: it's "subtract", i.e. no "s" in the middle.
diffs (63 lines):
diff --git a/monetdb5/modules/kernel/group.mx b/monetdb5/modules/kernel/group.mx
--- a/monetdb5/modules/kernel/group.mx
+++ b/monetdb5/modules/kernel/group.mx
@@ -1317,7 +1317,7 @@ str GRPvar_@1(int *ret, int *bid, int *e
}
/* postprocess by dividing sumsquares and sum by counts and
- substracting square of the averages from the average sum of
+ subtracting square of the averages from the average sum of
squares */
idx = 0;
BATloop(e, p, q) {
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -942,7 +942,7 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st
/* since both arguments of algebra.slice are
inclusive correct the LIMIT value by
- substracting 1 */
+ subtracting 1 */
if (s->op2->op4.aval->data.val.wval) {
assert(0);
q = newStmt1(mb, calcRef, "-");
@@ -964,7 +964,7 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st
/* since both arguments of algebra.subslice are
inclusive correct the LIMIT value by
- substracting 1 */
+ subtracting 1 */
q = newStmt1(mb, calcRef, "-");
q = pushArgument(mb, q, len);
q = pushInt(mb, q, 1);
@@ -1258,7 +1258,7 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st
break;
}
/* if st_join2 try to convert to bandjoin */
- /* ie check if we substract/add a constant, to the
+ /* ie check if we subtract/add a constant, to the
same column */
if (s->type == st_join2 &&
range_join_convertable(s, &base, &low, &high)) {
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -3390,7 +3390,7 @@ rel_unop(mvc *sql, sql_rel **rel, symbol
#define is_addition(fname) (strcmp(fname, "sql_add") == 0)
-#define is_substraction(fname) (strcmp(fname, "sql_sub") == 0)
+#define is_subtraction(fname) (strcmp(fname, "sql_sub") == 0)
sql_exp *
rel_binop_(mvc *sql, sql_exp *l, sql_exp *r, sql_schema *s,
@@ -3415,7 +3415,7 @@ rel_binop_(mvc *sql, sql_exp *l, sql_exp
if (!t1 || !t2)
return sql_error(sql, 01, "Cannot have a parameter (?) on both
sides of an expression");
- if ((is_addition(fname) || is_substraction(fname)) && t1->type->eclass
== EC_NUM && t2->type->eclass == EC_NUM) {
+ if ((is_addition(fname) || is_subtraction(fname)) && t1->type->eclass
== EC_NUM && t2->type->eclass == EC_NUM) {
sql_subtype ntp;
sql_find_numeric(&ntp, t1->type->localtype, t1->digits+1);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
