Changeset: d56f5c668c95 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d56f5c668c95
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statistics.c
sql/server/rel_distribute.c
sql/server/rel_dump.c
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/server/sql_datetime.c
tools/merovingian/client/monetdb.c
Branch: Jan2014
Log Message:
Added fall though comments for missing breaks in switches.
diffs (231 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -3398,10 +3398,13 @@ second_interval(Client cntxt, MalBlkPtr
switch (k) {
case iday:
r *= 24;
+ /* fall through */
case ihour:
r *= 60;
+ /* fall through */
case imin:
r *= 60;
+ /* fall through */
case isec:
r *= 1000;
break;
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -1356,11 +1356,13 @@ tail_type(stmt *st)
} else if (st->op4.idxval->type == join_idx) {
return sql_bind_localtype("oid");
}
+ /* fall through */
case st_join:
case st_join2:
case st_joinN:
if (st->flag == cmp_project || st->flag == cmp_reorder_project)
return tail_type(st->op2);
+ /* fall through */
case st_mark:
case st_reorder:
case st_group:
@@ -1520,6 +1522,7 @@ char *
case st_atom:
if (st->op4.aval->data.vtype == TYPE_str)
return atom2string(sa, st->op4.aval);
+ /* fall through */
case st_var:
case st_temp:
case st_single:
@@ -1530,6 +1533,7 @@ char *
case st_list:
if (list_length(st->op4.lval))
return column_name(sa, st->op4.lval->h->data);
+ /* fall through */
case st_rs_column:
return NULL;
default:
diff --git a/sql/backends/monet5/sql_statistics.c
b/sql/backends/monet5/sql_statistics.c
--- a/sql/backends/monet5/sql_statistics.c
+++ b/sql/backends/monet5/sql_statistics.c
@@ -165,6 +165,7 @@ sql_analyze(Client cntxt, MalBlkPtr mb,
if (sz)
width = (int)
(sum / sz);
}
+ /* fall through */
default:
snprintf(maxval, 8192,
"nil");
diff --git a/sql/server/rel_distribute.c b/sql/server/rel_distribute.c
--- a/sql/server/rel_distribute.c
+++ b/sql/server/rel_distribute.c
@@ -41,7 +41,8 @@ has_remote_or_replica( sql_rel *rel )
if (isReplicaTable(t) || isRemote(t))
return 1;
- }
+ break;
+ }
case op_table:
break;
case op_join:
@@ -71,6 +72,7 @@ has_remote_or_replica( sql_rel *rel )
case op_ddl:
if (has_remote_or_replica( rel->l ))
return 1;
+ /* fall through */
case op_insert:
case op_update:
case op_delete:
@@ -143,6 +145,7 @@ replica(mvc *sql, sql_rel *rel, char *ur
}
}
}
+ break;
}
case op_table:
break;
@@ -215,6 +218,7 @@ distribute(mvc *sql, sql_rel *rel)
p = rel->p = prop_create(sql->sa, PROP_REMOTE, rel->p);
p->value = uri;
}
+ break;
}
case op_table:
break;
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -769,6 +769,7 @@ exp_read(mvc *sql, sql_rel *lrel, sql_re
rexps = read_exps(sql, lrel, rrel, r, pos, '(', 0);
return exp_or(sql->sa, lexps, rexps);
}
+ /* fall through */
case '[':
old = *e;
*e = 0;
@@ -1293,11 +1294,13 @@ rel_read(mvc *sql, char *r, int *pos, li
*pos += (int) strlen("union");
j = op_union;
}
+ /* fall through */
case 'i':
if (j != op_basetable) {
*pos += (int) strlen("intersect");
j = op_inter;
}
+ /* fall through */
case 'e':
if (j != op_basetable) {
*pos += (int) strlen("except");
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -404,6 +404,7 @@ exp_count(int *cnt, int seqnr, sql_exp *
/* functions are more expensive, depending on the number of
columns involved. */
if (e->card == CARD_ATOM)
return 0;
+ /* fall through */
default:
*cnt -= 5;
return -5;
@@ -4705,6 +4706,7 @@ rel_remove_unused(mvc *sql, sql_rel *rel
if (isMergeTable(t) || isReplicaTable(t))
return rel;
}
+ /* fall through */
case op_table:
if (rel->exps) {
node *n;
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
@@ -233,6 +233,7 @@ rel_table_projections( mvc *sql, sql_rel
case op_project:
if (!is_processed(rel))
return rel_table_projections( sql, rel->l, tname);
+ /* fall through */
case op_table:
case op_basetable:
if (rel->exps) {
diff --git a/sql/server/sql_datetime.c b/sql/server/sql_datetime.c
--- a/sql/server/sql_datetime.c
+++ b/sql/server/sql_datetime.c
@@ -64,15 +64,19 @@ qualifier2multiplier( int sk )
switch (sk) {
case iyear:
mul *= 12;
+ /* fall through */
case imonth:
break;
case iday:
mul *= 24;
+ /* fall through */
case ihour:
mul *= 60;
+ /* fall through */
case imin:
mul *= 60000;
+ /* fall through */
case isec:
break;
default:
@@ -99,6 +103,7 @@ parse_interval_(mvc *sql, lng sign, char
switch (sk) {
case iyear:
mul *= 12;
+ /* fall through */
case imonth:
sep = '-';
type = 0;
@@ -107,10 +112,13 @@ parse_interval_(mvc *sql, lng sign, char
case iday:
mul *= 24;
sep = ' ';
+ /* fall through */
case ihour:
mul *= 60;
+ /* fall through */
case imin:
mul *= 60000;
+ /* fall through */
case isec:
type = 1;
break;
@@ -196,6 +204,7 @@ parse_interval(mvc *sql, lng sign, char
switch (sk) {
case iyear:
mul *= 12;
+ /* fall through */
case imonth:
sep = '-';
type = 0;
@@ -204,10 +213,13 @@ parse_interval(mvc *sql, lng sign, char
case iday:
mul *= 24;
sep = ' ';
+ /* fall through */
case ihour:
mul *= 60;
+ /* fall through */
case imin:
mul *= 60000;
+ /* fall through */
case isec:
type = 1;
break;
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -437,6 +437,7 @@ printStatus(sabdb *stats, int mode, int
case SABdbStarting:
snprintf(buf, sizeof(buf), "starting ");
off = sizeof("starting ") - 1;
+ /* fall through */
case SABdbRunning:
t = localtime(&uplog.laststart);
strftime(buf + off, sizeof(buf) - off,
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
