Changeset: 0867c69a9873 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0867c69a9873
Modified Files:
monetdb5/modules/kernel/algebra.c
Branch: Jun2020
Log Message:
Simplify.
diffs (57 lines):
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
@@ -693,28 +693,6 @@ ALGunary(bat *result, const bat *bid, BA
return MAL_SUCCEED;
}
-static str
-ALGbinary(bat *result, const bat *lid, const bat *rid, BAT *(*func)(BAT *, BAT
*), const char *name)
-{
- BAT *left, *right,*bn= NULL;
-
- if ((left = BATdescriptor(*lid)) == NULL) {
- throw(MAL, name, SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
- }
- if ((right = BATdescriptor(*rid)) == NULL) {
- BBPunfix(left->batCacheid);
- throw(MAL, name, SQLSTATE(HY002) RUNTIME_OBJECT_MISSING);
- }
- bn = (*func)(left, right);
- BBPunfix(left->batCacheid);
- BBPunfix(right->batCacheid);
- if (bn == NULL)
- throw(MAL, name, GDK_EXCEPTION);
- *result = bn->batCacheid;
- BBPkeepref(*result);
- return MAL_SUCCEED;
-}
-
static BAT *
BATwcopy(BAT *b)
{
@@ -782,7 +760,23 @@ ALGcrossproduct2( bat *l, bat *r, const
str
ALGprojection(bat *result, const bat *lid, const bat *rid)
{
- return ALGbinary(result, lid, rid, BATproject, "algebra.projection");
+ BAT *left, *right,*bn= NULL;
+
+ if ((left = BATdescriptor(*lid)) == NULL) {
+ throw(MAL, "algebra.projection", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
+ }
+ if ((right = BATdescriptor(*rid)) == NULL) {
+ BBPunfix(left->batCacheid);
+ throw(MAL, "algebra.projection", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
+ }
+ bn = BATproject(left, right);
+ BBPunfix(left->batCacheid);
+ BBPunfix(right->batCacheid);
+ if (bn == NULL)
+ throw(MAL, "algebra.projection", GDK_EXCEPTION);
+ *result = bn->batCacheid;
+ BBPkeepref(*result);
+ return MAL_SUCCEED;
}
str
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
