Changeset: 377d5d058f0c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=377d5d058f0c
Modified Files:
gdk/gdk_batop.c
Branch: Jul2017
Log Message:
Fix some comments.
diffs (59 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1342,8 +1342,6 @@ do_sort(void *h, void *t, const void *ba
* parameters may be NULL. If they're all NULL, this function does
* nothing.
*
- * All BATs involved must be dense-headed.
- *
* If o is specified, it is used to first rearrange b according to the
* order specified in o, after which b is sorted taking g into
* account.
@@ -1365,7 +1363,7 @@ do_sort(void *h, void *t, const void *ba
* sorted results in (col1s, col2s, col3s):
* BATsort(&col1s, &ord1, &grp1, col1, NULL, NULL, 0, 0);
* BATsort(&col2s, &ord2, &grp2, col2, ord1, grp1, 0, 0);
- * BATsort(&col3s, NULL, NULL, col3, ord2, grp2, 0, 0);
+ * BATsort(&col3s, NULL, NULL, col3, ord2, grp2, 0, 0);
* Note that the "reverse" parameter can be different for each call.
*/
gdk_return
@@ -1391,7 +1389,7 @@ BATsort(BAT **sorted, BAT **order, BAT *
(o->ttype == TYPE_void && /* no nil tail */
BATcount(o) != 0 &&
o->tseqbase == oid_nil))) {
- GDKerror("BATsort: o must be [dense,oid] and same size as b\n");
+ GDKerror("BATsort: o must have type oid and same size as b\n");
return GDK_FAIL;
}
if (g != NULL &&
@@ -1401,7 +1399,7 @@ BATsort(BAT **sorted, BAT **order, BAT *
(g->ttype == TYPE_void && /* no nil tail */
BATcount(g) != 0 &&
g->tseqbase == oid_nil))) {
- GDKerror("BATsort: g must be [dense,oid], sorted on the tail,
and same size as b\n");
+ GDKerror("BATsort: g must have type oid, sorted on the tail,
and same size as b\n");
return GDK_FAIL;
}
assert(reverse == 0 || reverse == 1);
@@ -1469,7 +1467,7 @@ BATsort(BAT **sorted, BAT **order, BAT *
/* if we want a stable sort, the order index must be
* stable, if we don't want stable, we don't care */
(!stable || ((oid *) pb->torderidx->base)[2])) {
- /* there is a order index that we can use */
+ /* there is an order index that we can use */
on = COLnew(pb->hseqbase, TYPE_oid, BATcount(pb), TRANSIENT);
if (on == NULL)
goto error;
@@ -1721,8 +1719,8 @@ BATsort(BAT **sorted, BAT **order, BAT *
return GDK_FAIL;
}
-/* return a new BAT of length n with a dense head with seqbase hseq,
- * and the constant v in the tail */
+/* return a new BAT of length n with seqbase hseq, and the constant v
+ * in the tail */
BAT *
BATconstant(oid hseq, int tailtype, const void *v, BUN n, int role)
{
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
