Changeset: 8c9756100ad6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8c9756100ad6
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_batop.c
monetdb5/mal/mal_authorize.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/microbenchmark.c
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/pcre.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cast_impl_int.h
sql/backends/monet5/sql_cast_impl_up_to_flt.h
sql/backends/monet5/sql_fround_impl.h
sql/backends/monet5/sql_round_impl.h
sql/backends/monet5/vaults/netcdf/netcdf.c
sql/storage/bat/bat_storage.c
Branch: default
Log Message:
Changed the flag argument of BATkey to bool from int.
diffs (truncated from 434 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -141,7 +141,7 @@ void BAThseqbase(BAT *b, oid o);
gdk_return BATimprints(BAT *b);
BAT *BATintersectcand(BAT *a, BAT *b);
gdk_return BATjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, int
nil_matches, BUN estimate) __attribute__((__warn_unused_result__));
-gdk_return BATkey(BAT *b, int onoff);
+gdk_return BATkey(BAT *b, bool onoff);
int BATkeyed(BAT *b);
gdk_return BATleftjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
int nil_matches, BUN estimate) __attribute__((__warn_unused_result__));
void *BATmax(BAT *b, void *aggr);
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1299,7 +1299,7 @@ bat_iterator(BAT *b)
* @item void
* @tab BATsetcount (BAT *b, BUN cnt)
* @item BAT *
- * @tab BATkey (BAT *b, int onoff)
+ * @tab BATkey (BAT *b, bool onoff)
* @item BAT *
* @tab BATmode (BAT *b, int mode)
* @item BAT *
@@ -1341,7 +1341,7 @@ gdk_export BUN BATcount_no_nil(BAT *b);
gdk_export void BATsetcapacity(BAT *b, BUN cnt);
gdk_export void BATsetcount(BAT *b, BUN cnt);
gdk_export BUN BATgrows(BAT *b);
-gdk_export gdk_return BATkey(BAT *b, int onoff);
+gdk_export gdk_return BATkey(BAT *b, bool onoff);
gdk_export gdk_return BATmode(BAT *b, int onoff);
gdk_export gdk_return BATroles(BAT *b, const char *tnme);
gdk_export void BAThseqbase(BAT *b, oid o);
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -830,7 +830,7 @@ COLcopy(BAT *b, int tt, int writable, in
bn->trevsorted = b->trevsorted;
bn->tdense = b->tdense && ATOMtype(bn->ttype) == TYPE_oid;
if (b->tkey)
- BATkey(bn, TRUE);
+ BATkey(bn, true);
bn->tnonil = b->tnonil;
if (b->tnosorted > 0 && b->tnosorted < h)
bn->tnosorted = b->tnosorted;
@@ -1210,7 +1210,7 @@ BUNinplace(BAT *b, BUN p, const void *t,
} else if (b->tnorevsorted >= p)
b->tnorevsorted = 0;
if (((b->ttype != TYPE_void) & b->tkey & !b->tunique) && b->batCount >
1) {
- BATkey(b, FALSE);
+ BATkey(b, false);
} else if (!b->tkey && (b->tnokey[0] == p || b->tnokey[1] == p))
b->tnokey[0] = b->tnokey[1] = 0;
if (b->tnonil)
@@ -1427,25 +1427,24 @@ BATsetcount(BAT *b, BUN cnt)
* key property of the association head.
*/
gdk_return
-BATkey(BAT *b, int flag)
+BATkey(BAT *b, bool flag)
{
BATcheck(b, "BATkey", GDK_FAIL);
assert(b->batCacheid > 0);
- assert(flag == 0 || flag == 1);
assert(!b->tunique || flag);
if (b->ttype == TYPE_void) {
- if (!is_oid_nil(b->tseqbase) && flag == FALSE) {
+ if (!is_oid_nil(b->tseqbase) && !flag) {
GDKerror("BATkey: dense column must be unique.\n");
return GDK_FAIL;
}
- if (is_oid_nil(b->tseqbase) && flag == TRUE && b->batCount > 1)
{
+ if (is_oid_nil(b->tseqbase) && flag && b->batCount > 1) {
GDKerror("BATkey: void column cannot be unique.\n");
return GDK_FAIL;
}
}
- if (b->tkey != (flag != 0))
+ if (b->tkey != flag)
b->batDirtydesc = TRUE;
- b->tkey = flag != 0;
+ b->tkey = flag;
if (!flag)
b->tdense = 0;
else
@@ -1459,7 +1458,7 @@ BATkey(BAT *b, int flag)
!BATtkey(bp) &&
((BATtvoid(b) && BATtvoid(bp) && b->tseqbase ==
bp->tseqbase) ||
BATcount(b) == 0))
- return BATkey(bp, TRUE);
+ return BATkey(bp, true);
}
return GDK_SUCCEED;
}
@@ -1513,7 +1512,7 @@ BATtseqbase(BAT *b, oid o)
}
} else {
if (!b->tkey) {
- b->tkey = TRUE;
+ b->tkey = true;
b->tnokey[0] = b->tnokey[1] = 0;
}
b->tnonil = 1;
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -690,7 +690,7 @@ BATappend(BAT *b, BAT *n, BAT *s, bit fo
b->tkey &&
(!(BATtordered(b) || BATtrevordered(b)) ||
!n->tkey || xx == 0)) {
- BATkey(b, FALSE);
+ BATkey(b, false);
}
if (b->ttype != TYPE_void && b->tsorted && b->tdense &&
(BATtdense(n) == 0 ||
@@ -991,7 +991,7 @@ BATslice(BAT *b, BUN l, BUN h)
if (bn->batCount <= 1) {
bn->tsorted = ATOMlinear(b->ttype);
bn->trevsorted = ATOMlinear(b->ttype);
- BATkey(bn, 1);
+ BATkey(bn, true);
} else {
bn->tsorted = b->tsorted;
bn->trevsorted = b->trevsorted;
diff --git a/monetdb5/mal/mal_authorize.c b/monetdb5/mal/mal_authorize.c
--- a/monetdb5/mal/mal_authorize.c
+++ b/monetdb5/mal/mal_authorize.c
@@ -173,7 +173,7 @@ AUTHinitTables(const char *passwd) {
if (user == NULL)
throw(MAL, "initTables.user", SQLSTATE(HY001)
MAL_MALLOC_FAIL " user table");
- if (BATkey(user, TRUE) != GDK_SUCCEED ||
+ if (BATkey(user, true) != GDK_SUCCEED ||
BBPrename(BBPcacheid(user), "M5system_auth_user") != 0
||
BATmode(user, PERSISTENT) != GDK_SUCCEED) {
throw(MAL, "initTables.user", GDK_EXCEPTION);
diff --git a/monetdb5/modules/kernel/algebra.c
b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -1104,7 +1104,7 @@ str ALGreuse(bat *ret, const bat *bid)
BATsetcount(bn,BATcount(b));
bn->tsorted = FALSE;
bn->trevsorted = FALSE;
- BATkey(bn,FALSE);
+ BATkey(bn, false);
}
BBPkeepref(*ret= bn->batCacheid);
BBPunfix(b->batCacheid);
diff --git a/monetdb5/modules/kernel/bat5.c b/monetdb5/modules/kernel/bat5.c
--- a/monetdb5/modules/kernel/bat5.c
+++ b/monetdb5/modules/kernel/bat5.c
@@ -496,7 +496,7 @@ BKCsetkey(bat *res, const bat *bid, cons
BBPunfix(b->batCacheid);
throw(MAL, "bat.setKey", "values of bat not unique,
cannot set key property");
}
- BATkey(b, 1);
+ BATkey(b, true);
b->tunique = 1;
} else {
b->tunique = 0;
diff --git a/monetdb5/modules/kernel/batmmath.c
b/monetdb5/modules/kernel/batmmath.c
--- a/monetdb5/modules/kernel/batmmath.c
+++ b/monetdb5/modules/kernel/batmmath.c
@@ -87,7 +87,7 @@ str CMDscience_bat_##TYPE##_##FUNC(bat *
bn->trevsorted = 0;
\
bn->tnil = b->tnil;
\
bn->tnonil = b->tnonil;
\
- BATkey(bn, 0);
\
+ BATkey(bn, false);
\
BBPkeepref(*ret = bn->batCacheid);
\
BBPunfix(b->batCacheid);
\
return MAL_SUCCEED;
\
@@ -139,7 +139,7 @@ str CMDscience_bat_cst_##FUNC##_##TYPE(b
bn->trevsorted = 0;
\
bn->tnil = b->tnil;
\
bn->tnonil = b->tnonil;
\
- BATkey(bn,0);
\
+ BATkey(bn, false);
\
BBPkeepref(*ret = bn->batCacheid);
\
BBPunfix(b->batCacheid);
\
return MAL_SUCCEED;
\
@@ -190,7 +190,7 @@ str CMDscience_cst_bat_##FUNC##_##TYPE(b
bn->trevsorted = 0;
\
bn->tnil = b->tnil;
\
bn->tnonil = b->tnonil;
\
- BATkey(bn,0);
\
+ BATkey(bn, false);
\
BBPkeepref(*ret = bn->batCacheid);
\
BBPunfix(b->batCacheid);
\
return MAL_SUCCEED;
\
diff --git a/monetdb5/modules/kernel/microbenchmark.c
b/monetdb5/modules/kernel/microbenchmark.c
--- a/monetdb5/modules/kernel/microbenchmark.c
+++ b/monetdb5/modules/kernel/microbenchmark.c
@@ -50,7 +50,7 @@ BATrandom(BAT **bn, oid *base, lng *size
b->tsorted = 1;
b->trevsorted = 0;
b->tdense = FALSE;
- BATkey(b, TRUE);
+ BATkey(b, true);
*bn = b;
return GDK_SUCCEED;
}
@@ -79,7 +79,7 @@ BATrandom(BAT **bn, oid *base, lng *size
b->tsorted = FALSE;
b->trevsorted = FALSE;
b->tdense = FALSE;
- BATkey(b, FALSE);
+ BATkey(b, false);
*bn = b;
return GDK_SUCCEED;
}
@@ -110,7 +110,7 @@ BATuniform(BAT **bn, oid *base, lng *siz
b->tsorted = 1;
b->trevsorted = 0;
b->tdense = FALSE;
- BATkey(b, TRUE);
+ BATkey(b, true);
*bn = b;
return GDK_SUCCEED;
}
@@ -173,7 +173,7 @@ BATskewed(BAT **bn, oid *base, lng *size
b->tsorted = 1;
b->trevsorted = 0;
b->tdense = FALSE;
- BATkey(b, TRUE);
+ BATkey(b, true);
*bn = b;
return GDK_SUCCEED;
}
@@ -254,7 +254,7 @@ BATnormal(BAT **bn, oid *base, lng *size
b->tsorted = 1;
b->trevsorted = 0;
b->tdense = FALSE;
- BATkey(b, TRUE);
+ BATkey(b, true);
*bn = b;
return GDK_SUCCEED;
}
diff --git a/monetdb5/modules/mal/mkey.c b/monetdb5/modules/mal/mkey.c
--- a/monetdb5/modules/mal/mkey.c
+++ b/monetdb5/modules/mal/mkey.c
@@ -179,10 +179,10 @@ MKEYbathash(bat *res, const bat *bid)
}
if (dst->batCount <= 1) {
- BATkey(dst, 1);
+ BATkey(dst, true);
dst->tsorted = dst->trevsorted = 1;
} else {
- BATkey(dst, 0);
+ BATkey(dst, false);
dst->tsorted = dst->trevsorted = 0;
}
dst->tnonil = 0;
@@ -351,10 +351,10 @@ MKEYbulk_rotate_xor_hash(bat *res, const
}
}
if (bn->batCount <= 1) {
- BATkey(bn, 1);
+ BATkey(bn, true);
bn->tsorted = bn->trevsorted = 1;
} else {
- BATkey(bn, 0);
+ BATkey(bn, false);
bn->tsorted = bn->trevsorted = 0;
}
bn->tnonil = 0;
@@ -433,10 +433,10 @@ MKEYbulkconst_rotate_xor_hash(Client cnt
}
if (bn->batCount <= 1) {
- BATkey(bn, 1);
+ BATkey(bn, true);
bn->tsorted = bn->trevsorted = 1;
} else {
- BATkey(bn, 0);
+ BATkey(bn, false);
bn->tsorted = bn->trevsorted = 0;
}
bn->tnonil = 0;
@@ -539,10 +539,10 @@ MKEYconstbulk_rotate_xor_hash(bat *res,
}
}
if (bn->batCount <= 1) {
- BATkey(bn, 1);
+ BATkey(bn, true);
bn->tsorted = bn->trevsorted = 1;
} else {
- BATkey(bn, 0);
+ BATkey(bn, false);
bn->tsorted = bn->trevsorted = 0;
}
bn->tnonil = 0;
diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c
--- a/monetdb5/modules/mal/pcre.c
+++ b/monetdb5/modules/mal/pcre.c
@@ -1505,7 +1505,7 @@ BATPCRElike3(bat *ret, const bat *bid, c
BATsetcount(r, i);
r->tsorted = 0;
r->trevsorted = 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
