Changeset: 5612f04a594d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5612f04a594d
Modified Files:
configure.ag
gdk/gdk_logger.mx
monetdb5/extras/crackers/crackers_index.mx
monetdb5/extras/crackers/crackers_sortmerge.mx
monetdb5/mal/mal_recycle.mx
monetdb5/modules/mal/mat.mx
monetdb5/modules/mal/pma.mx
monetdb5/optimizer/opt_cluster.mx
monetdb5/optimizer/opt_mergetable.mx
monetdb5/optimizer/opt_mitosis.mx
monetdb5/optimizer/opt_prejoin.mx
monetdb5/optimizer/opt_support.mx
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_gencode.mx
sql/backends/monet5/sql_scenario.mx
sql/backends/monet5/vaults/vault.mx
sql/include/sql_relation.h
sql/server/bin_optimizer.c
sql/server/rel_bin.c
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/server/rel_updates.c
sql/server/sql_rel2bin.c
sql/server/sql_statement.c
sql/storage/store.c
Branch: Apr2011
Log Message:
warning: C++ style comments are not allowed in ISO C90
diffs (truncated from 588 to 300 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -110,7 +110,7 @@
dft_optimi=no
dft_develop=no
fi
-dft_warning=no
+dft_warning=yes
dnl small hack to get icc -no-gcc, done here because AC_PROG_CC shouldn't
dnl set GCC=yes if we use icc.
diff --git a/gdk/gdk_logger.mx b/gdk/gdk_logger.mx
--- a/gdk/gdk_logger.mx
+++ b/gdk/gdk_logger.mx
@@ -1896,7 +1896,7 @@
}
BUNdelHead(lg->catalog, &bid, FALSE);
-//assert( BBP[bid].lrefs == 0 );
+/*assert( BBP[bid].lrefs == 0 );*/
}
log_bid
diff --git a/monetdb5/extras/crackers/crackers_index.mx
b/monetdb5/extras/crackers/crackers_index.mx
--- a/monetdb5/extras/crackers/crackers_index.mx
+++ b/monetdb5/extras/crackers/crackers_index.mx
@@ -442,7 +442,7 @@
if (maxCrackMap > 0)
units = (int) (1.2 * maxCrackMap);
x = (CrackerIndexNode *)
GDKmalloc(sizeof(CrackerIndexNode) * units);
- //memset(x, 0, sizeof(CrackerIndexNode) * units);
+ /*memset(x, 0, sizeof(CrackerIndexNode) * units);*/
if (CrackerIndex) {
fprintf(stderr, "reallocate index \n");
memcpy(x, CrackerIndex,
sizeof(CrackerIndexNode) * i);
diff --git a/monetdb5/extras/crackers/crackers_sortmerge.mx
b/monetdb5/extras/crackers/crackers_sortmerge.mx
--- a/monetdb5/extras/crackers/crackers_sortmerge.mx
+++ b/monetdb5/extras/crackers/crackers_sortmerge.mx
@@ -1045,7 +1045,7 @@
hghResultNode=nexNode;
BBPunfix(slice->batCacheid);
}else{
- @:FullMerge(@1,@2,@3,@4)@ //TODO this
might need to be a mergemid
+ @:FullMerge(@1,@2,@3,@4)@ /*TODO this
might need to be a mergemid*/
}
goto done;
}
diff --git a/monetdb5/mal/mal_recycle.mx b/monetdb5/mal/mal_recycle.mx
--- a/monetdb5/mal/mal_recycle.mx
+++ b/monetdb5/mal/mal_recycle.mx
@@ -1673,7 +1673,7 @@
/* check for max-sized contained piece x */
for( j = 0; j < scnt; j++)
- if ( sol[j]->ovhd == 0 ) // contained in query
+ if ( sol[j]->ovhd == 0 ) /* contained in query */
if ( sol[j]->cnt > max_x ) {
max_x = sol[j]->cnt;
x = j;
@@ -2442,7 +2442,7 @@
}
break;
/* case ADM_ADAPT:
-// ADM_ADAPT: searching the cache may take too long?
+ ADM_ADAPT: searching the cache may take too long?
if ( RECYCLEfind(cntxt,mb,stk,p)< 0){
if (recycleSearchTime > recycleTime)
RECYCLEcleanCache(cntxt, wr);
diff --git a/monetdb5/modules/mal/mat.mx b/monetdb5/modules/mal/mat.mx
--- a/monetdb5/modules/mal/mat.mx
+++ b/monetdb5/modules/mal/mat.mx
@@ -550,7 +550,7 @@
BAT *res = NULL;
if (ATOMstorage(bats[0]->ttype) <= TYPE_void) {
- //error
+ /*error*/
} else if (ATOMvarsized(bats[0]->ttype)) {
res = MATproject_any(map, bats, len);
} else if (ATOMsize(bats[0]->ttype) == sizeof(bte)) {
@@ -836,7 +836,7 @@
}
if (ATOMstorage(bats[0]->ttype) <= TYPE_void) {
- //error
+ /*error*/
} else if (ATOMvarsized(bats[0]->ttype)) {
res = MATsort_any(&map, bats, len, pcnt, rev);
} else if (ATOMsize(bats[0]->ttype) == sizeof(bte)) {
diff --git a/monetdb5/modules/mal/pma.mx b/monetdb5/modules/mal/pma.mx
--- a/monetdb5/modules/mal/pma.mx
+++ b/monetdb5/modules/mal/pma.mx
@@ -564,11 +564,11 @@
(dens > dent) ? (fgw = TRUE) : (dent += step);
}
lv--;
- if (!fgw) { // the whole PMA is required to be rebalanced
- if (cnt == 0) { // an empty PMA
+ if (!fgw) { /* the whole PMA is required to be rebalanced */
+ if (cnt == 0) { /* an empty PMA */
BATdelete(b);
bid = NULL;
- } else if (psz != PMA_SEG){ // shrink this PMA into half
size
+ } else if (psz != PMA_SEG){ /* shrink this PMA into half
size */
tpe = TYPE_@1;
psz >>= 1;
nsz = psz;
@@ -585,10 +585,10 @@
}
}
BATdelete(b);
- } // else: only 1 segment, simply delete the element
- } else { // a window is required to be rebalanced
+ } /* else: only 1 segment, simply delete the element */
+ } else { /* a window is required to be rebalanced */
fg = FALSE;
- if (*lo >= wbeg + (wsz >> 1)) { // rebalance from the beginning
of the window
+ if (*lo >= wbeg + (wsz >> 1)) { /* rebalance from the beginning
of the window */
k = wbeg + wsz;
for (i = j = wbeg; i < k; i++) {
if (base[i] == @1_nil) {
@@ -602,7 +602,7 @@
j = i;
}
}
- } else { // rebalance from the end of the window
+ } else { /* rebalance from the end of the window */
for (i = j = wbeg + wsz - 1; i >= wbeg; i--) {
if (base[i] == @1_nil) {
fg = TRUE;
diff --git a/monetdb5/optimizer/opt_cluster.mx
b/monetdb5/optimizer/opt_cluster.mx
--- a/monetdb5/optimizer/opt_cluster.mx
+++ b/monetdb5/optimizer/opt_cluster.mx
@@ -149,9 +149,11 @@
continue;
grp[j++] = i;
}
- //if (lcnt && rcnt) {
+#if 0
+ if (lcnt && rcnt) {
/* lets cluster */
- //}
+ }
+#endif
return 1;
}
#endif
diff --git a/monetdb5/optimizer/opt_mergetable.mx
b/monetdb5/optimizer/opt_mergetable.mx
--- a/monetdb5/optimizer/opt_mergetable.mx
+++ b/monetdb5/optimizer/opt_mergetable.mx
@@ -1260,7 +1260,7 @@
if (s && p->argc == 2 &&
getModuleId(p) == batRef && getFunctionId(p) == reverseRef) {
- //return getArg(p, 1);
+ /* return getArg(p, 1); */
var = getArg(p, 1);
s = resultof(mb, var, s);
p = mb->stmt[s];
@@ -1359,7 +1359,7 @@
int tpe = getTailType(getVarType(mb, getArg(s, var)));
int stpe = TYPE_oid;
- if (s->argc == 2) // sort
+ if (s->argc == 2) /* sort */
stpe = tpe;
/* mat sortTail/sortTailReverse and refine/refine_rev */
setModuleId(pck,matRef);
@@ -2007,7 +2007,7 @@
if ((m = mat_join(mb, p, mat, mtop, m, n)) < 0) {
error++;
goto fail;
- //mtop = pack_all_mats(mat, mtop, mb);
+ /*mtop = pack_all_mats(mat, mtop, mb);*/
} else
mtop = m;
/* after topn projection we should merge */
@@ -2158,14 +2158,14 @@
if (match == 1 && p->argc == 2 && isOrderby(p) &&
(m=isMATalias(getArg(p,1), mat, mtop)) >=0 &&
mat[m].type == mat_grp) {
- assert(mat[m].mm); // should be packed
+ assert(mat[m].mm); /* should be packed */
error++;
goto fail;
}
if (match == 2 && p->argc == 3 && isOrderby(p) &&
(m=isMATalias(getArg(p,1), mat, mtop)) >= 0 &&
(n=isMATalias(getArg(p,2), mat, mtop)) >= 0 &&
- //mat_is_orderby(mat[n].type) &&
+ /*mat_is_orderby(mat[n].type) &&*/
mat_is_orderby(mat[m].type) && !mat[m].mm) {
mtop = mat_sort2(mb, p, mat, mtop, m, n);
actions++;
diff --git a/monetdb5/optimizer/opt_mitosis.mx
b/monetdb5/optimizer/opt_mitosis.mx
--- a/monetdb5/optimizer/opt_mitosis.mx
+++ b/monetdb5/optimizer/opt_mitosis.mx
@@ -230,14 +230,14 @@
q= copyInstruction(p);
q= pushInt(mb,q,j);
q= pushInt(mb,q,pieces);
- //q= pushOid(mb,q,low.value.val.oval);
+ /*q= pushOid(mb,q,low.value.val.oval);*/
if (j+1 < pieces) {
hgh.value.val.oval= low.value.val.oval+slice;
} else {
assert(rowcnt <= (wrd) BUN_MAX);
hgh.value.val.oval= (BUN) rowcnt;
}
- //q = pushOid(mb,q,hgh.value.val.oval);
+ /*q = pushOid(mb,q,hgh.value.val.oval);*/
k= getArg(q,0)= newTmpVariable(mb,tpe);
setVarUDFtype(mb,k);
diff --git a/monetdb5/optimizer/opt_prejoin.mx
b/monetdb5/optimizer/opt_prejoin.mx
--- a/monetdb5/optimizer/opt_prejoin.mx
+++ b/monetdb5/optimizer/opt_prejoin.mx
@@ -127,7 +127,7 @@
/* we may have uncovered new use-less operations */
DEBUGoptimizers
mnstr_printf(cntxt->fdout,"#opt_prejoin: %d statements
removed\n", actions);
- //chkProgram(cntxt->nspace,mb);
+ /*chkProgram(cntxt->nspace,mb);*/
GDKfree(old);
return actions;
}
diff --git a/monetdb5/optimizer/opt_support.mx
b/monetdb5/optimizer/opt_support.mx
--- a/monetdb5/optimizer/opt_support.mx
+++ b/monetdb5/optimizer/opt_support.mx
@@ -1449,7 +1449,7 @@
int isMatJoinOp(InstrPtr p){
return (getModuleId(p) == algebraRef &&
(getFunctionId(p) == joinRef ||
-// getFunctionId(p) == antijoinRef || is not mat save
+/* getFunctionId(p) == antijoinRef || is not mat save */
getFunctionId(p) == leftjoinRef ||
getFunctionId(p) == thetajoinRef ||
getFunctionId(p) == bandjoinRef)
@@ -1483,9 +1483,9 @@
) ) ||
(getModuleId(p)== batRef && (
getFunctionId(p)== reverseRef ||
- getFunctionId(p)== mirrorRef //||
-// getFunctionId(p)== setAccessRef ||
-// getFunctionId(p)== setWriteModeRef
+ getFunctionId(p)== mirrorRef /*||
+ getFunctionId(p)== setAccessRef ||
+ getFunctionId(p)== setWriteModeRef */
) );
}
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -5975,24 +5975,24 @@
BAT *bn = store_funcs.bind_col(tr, c, 0);
BUN sz;
- //printf("schema %s.%s.%s" , b->name, bt->name,
bc->name);
+ /*printf("schema %s.%s.%s" , b->name, bt->name,
bc->name);*/
sch = BUNappend(sch, b->name, FALSE);
tab = BUNappend(tab, bt->name, FALSE);
col = BUNappend(col, bc->name, FALSE);
- //printf(" cnt "BUNFMT, BATcount(bn));
+ /*printf(" cnt "BUNFMT, BATcount(bn));*/
sz= BATcount(bn);
cnt = BUNappend(cnt, &sz, FALSE);
- //printf(" cap "BUNFMT, BATcapacity(bn));
+ /*printf(" cap "BUNFMT, BATcapacity(bn));*/
sz= BATcapacity(bn);
cap = BUNappend(cap, &sz, FALSE);
- //printf(" loc %s",
BBP_physical(bn->batCacheid));
+ /*printf(" loc %s",
BBP_physical(bn->batCacheid));*/
loc = BUNappend(loc,
BBP_physical(bn->batCacheid), FALSE);
- //printf(" width %d", bn->T->width);
+ /*printf(" width %d", bn->T->width);*/
w= bn->T->width;
atom = BUNappend(atom, &w, FALSE);
- //printf(" size "BUNFMT,
tailsize(bn,BATcount(bn)) + (bn->T->vheap? bn->T->vheap->size:0));
+ /*printf(" size "BUNFMT,
tailsize(bn,BATcount(bn)) + (bn->T->vheap? bn->T->vheap->size:0));*/
sz = tailsize(bn,BATcapacity(bn)) +
(bn->T->vheap? bn->T->vheap->size:0);
sz += headsize(bn,BATcapacity(bn)) +
(bn->H->vheap? bn->H->vheap->size:0);
size = BUNappend(size, &sz, FALSE);
@@ -6000,8 +6000,8 @@
sz = bn->T->hash?bn->T->hash->heap->size:0;
sz += bn->H->hash?bn->H->hash->heap->size:0;
aux = BUNappend(aux, &sz, FALSE);
- //printf(" auxsize "BUNFMT,
bn->T->hash?bn->T->hash->heap->size:0);
- //printf("\n");
+ /*printf(" auxsize "BUNFMT,
bn->T->hash?bn->T->hash->heap->size:0);*/
+ /*printf("\n");*/
BBPunfix(bn->batCacheid);
}
}
diff --git a/sql/backends/monet5/sql_gencode.mx
b/sql/backends/monet5/sql_gencode.mx
--- a/sql/backends/monet5/sql_gencode.mx
+++ b/sql/backends/monet5/sql_gencode.mx
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
