Changeset: 18e0869bde43 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=18e0869bde43
Modified Files:
gdk/gdk_col.c
gdk/gdk_value.c
Branch: headless
Log Message:
Comment layout.
diffs (49 lines):
diff --git a/gdk/gdk_col.c b/gdk/gdk_col.c
--- a/gdk/gdk_col.c
+++ b/gdk/gdk_col.c
@@ -670,7 +670,8 @@
return NULL;
}
- /* first try case (1); create a view, possibly with different
atom-types */
+ /* first try case (1); create a view, possibly with different
+ * atom-types */
if (COLrestricted(b) == COL_READ && !writable) {
bn = VIEWcreate(b);
if (bn == NULL)
@@ -681,7 +682,8 @@
bn->seqbase = b->seqbase;
}
} else {
- /* check whether we need case (4); oid-by-oid copy (by setting
bunstocopy != BUN_NONE) */
+ /* check whether we need case (4); oid-by-oid copy (by
+ * setting bunstocopy != BUN_NONE) */
if (ATOMsize(ht) != ATOMsize(b->type)) {
/* oops, void materialization */
bunstocopy = cnt;
@@ -692,9 +694,11 @@
/* extra checks needed for views */
bat hp = VIEWparent(b);
- if (/* reduced slice view: do not copy too much garbage
*/
- hp != 0 && CBP_cache(hp)->capacity > cnt + cnt)
+ if (hp != 0 && CBP_cache(hp)->capacity > cnt + cnt) {
+ /* reduced slice view: do not copy too
+ * much garbage */
bunstocopy = cnt;
+ }
}
bn = COLnew(ht, MAX(1, bunstocopy == BUN_NONE ? 0 :
bunstocopy));
diff --git a/gdk/gdk_value.c b/gdk/gdk_value.c
--- a/gdk/gdk_value.c
+++ b/gdk/gdk_value.c
@@ -240,7 +240,7 @@
*dst = *src; /* copy already in case there is no conversion
*/
/* we saved the original value of src->vtype, so we can
- overwrite that (in case src==dst */
+ * overwrite that (in case src==dst) */
dst->vtype = typ;
p = VALptr(dst);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
