[prev in list] [next in list] [prev in thread] [next in thread]
List: monetdb-checkins
Subject: MonetDB: default - Removed useless calls.
From: Sjoerd Mullender <commits+sjoerd=acm.org () monetdb ! org>
Date: 2016-09-29 13:54:06
Message-ID: hg.775d9a71421b.1475157246.6315528441665844383 () monetdb2 ! cwi-incubator ! nl
[Download RAW message or body]
Changeset: 775d9a71421b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=775d9a71421b
Modified Files:
gdk/gdk_calc.c
Branch: default
Log Message:
Removed useless calls.
diffs (truncated from 307 to 300 lines):
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -60,11 +60,9 @@
static gdk_return
checkbats(BAT *b1, BAT *b2, const char *func)
{
- if (b2 != NULL) {
- if (b1->batCount != b2->batCount) {
- GDKerror("%s: inputs not the same size.\n", func);
- return GDK_FAIL;
- }
+ if (b1->batCount != b2->batCount) {
+ GDKerror("%s: inputs not the same size.\n", func);
+ return GDK_FAIL;
}
return GDK_SUCCEED;
}
@@ -196,8 +194,6 @@ BATcalcnot(BAT *b, BAT *s)
const oid *restrict cand = NULL, *candend = NULL;
BATcheck(b, "BATcalcnot", NULL);
- if (checkbats(b, NULL, "BATcalcnot") != GDK_SUCCEED)
- return NULL;
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, b->ttype, cnt, TRANSIENT);
@@ -315,8 +311,6 @@ BATcalcnegate(BAT *b, BAT *s)
const oid *restrict cand = NULL, *candend = NULL;
BATcheck(b, "BATcalcnegate", NULL);
- if (checkbats(b, NULL, "BATcalcnegate") != GDK_SUCCEED)
- return NULL;
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, b->ttype, cnt, TRANSIENT);
@@ -444,8 +438,6 @@ BATcalcabsolute(BAT *b, BAT *s)
const oid *restrict cand = NULL, *candend = NULL;
BATcheck(b, "BATcalcabsolute", NULL);
- if (checkbats(b, NULL, "BATcalcabsolute") != GDK_SUCCEED)
- return NULL;
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, b->ttype, cnt, TRANSIENT);
@@ -577,8 +569,6 @@ BATcalciszero(BAT *b, BAT *s)
const oid *restrict cand = NULL, *candend = NULL;
BATcheck(b, "BATcalciszero", NULL);
- if (checkbats(b, NULL, "BATcalciszero") != GDK_SUCCEED)
- return NULL;
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, TYPE_bit, cnt, TRANSIENT);
@@ -708,8 +698,6 @@ BATcalcsign(BAT *b, BAT *s)
const oid *restrict cand = NULL, *candend = NULL;
BATcheck(b, "BATcalcsign", NULL);
- if (checkbats(b, NULL, "BATcalcsign") != GDK_SUCCEED)
- return NULL;
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, TYPE_bte, cnt, TRANSIENT);
@@ -3183,9 +3171,6 @@ BATcalcaddcst(BAT *b, const ValRecord *v
BATcheck(b, "BATcalcaddcst", NULL);
- if (checkbats(b, NULL, "BATcalcaddcst") != GDK_SUCCEED)
- return NULL;
-
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, tp, cnt, TRANSIENT);
@@ -3235,9 +3220,6 @@ BATcalccstadd(const ValRecord *v, BAT *b
BATcheck(b, "BATcalccstadd", NULL);
- if (checkbats(b, NULL, "BATcalccstadd") != GDK_SUCCEED)
- return NULL;
-
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, tp, cnt, TRANSIENT);
@@ -3305,8 +3287,6 @@ BATcalcincrdecr(BAT *b, BAT *s, int abor
bte one = 1;
BATcheck(b, func, NULL);
- if (checkbats(b, NULL, func) != GDK_SUCCEED)
- return NULL;
CANDINIT(b, s, start, end, cnt, cand, candend);
@@ -5180,9 +5160,6 @@ BATcalcsubcst(BAT *b, const ValRecord *v
BATcheck(b, "BATcalcsubcst", NULL);
- if (checkbats(b, NULL, "BATcalcsubcst") != GDK_SUCCEED)
- return NULL;
-
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, tp, cnt, TRANSIENT);
@@ -5227,9 +5204,6 @@ BATcalccstsub(const ValRecord *v, BAT *b
BATcheck(b, "BATcalccstsub", NULL);
- if (checkbats(b, NULL, "BATcalccstsub") != GDK_SUCCEED)
- return NULL;
-
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, tp, cnt, TRANSIENT);
@@ -7227,9 +7201,6 @@ BATcalcmulcst(BAT *b, const ValRecord *v
BATcheck(b, "BATcalcmulcst", NULL);
- if (checkbats(b, NULL, "BATcalcmulcst") != GDK_SUCCEED)
- return NULL;
-
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, tp, cnt, TRANSIENT);
@@ -7284,9 +7255,6 @@ BATcalccstmul(const ValRecord *v, BAT *b
BATcheck(b, "BATcalccstmul", NULL);
- if (checkbats(b, NULL, "BATcalccstmul") != GDK_SUCCEED)
- return NULL;
-
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, tp, cnt, TRANSIENT);
@@ -9266,9 +9234,6 @@ BATcalcdivcst(BAT *b, const ValRecord *v
BATcheck(b, "BATcalcdivcst", NULL);
- if (checkbats(b, NULL, "BATcalcdivcst") != GDK_SUCCEED)
- return NULL;
-
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, tp, cnt, TRANSIENT);
@@ -9326,9 +9291,6 @@ BATcalccstdiv(const ValRecord *v, BAT *b
BATcheck(b, "BATcalccstdiv", NULL);
- if (checkbats(b, NULL, "BATcalccstdiv") != GDK_SUCCEED)
- return NULL;
-
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, tp, cnt, TRANSIENT);
@@ -10848,9 +10810,6 @@ BATcalcmodcst(BAT *b, const ValRecord *v
BATcheck(b, "BATcalcmodcst", NULL);
- if (checkbats(b, NULL, "BATcalcmodcst") != GDK_SUCCEED)
- return NULL;
-
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, tp, cnt, TRANSIENT);
@@ -10890,9 +10849,6 @@ BATcalccstmod(const ValRecord *v, BAT *b
BATcheck(b, "BATcalccstmod", NULL);
- if (checkbats(b, NULL, "BATcalccstmod") != GDK_SUCCEED)
- return NULL;
-
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, tp, cnt, TRANSIENT);
@@ -11059,9 +11015,6 @@ BATcalcxorcst(BAT *b, const ValRecord *v
BATcheck(b, "BATcalcxorcst", NULL);
- if (checkbats(b, NULL, "BATcalcxorcst") != GDK_SUCCEED)
- return NULL;
-
if (ATOMbasetype(b->ttype) != ATOMbasetype(v->vtype)) {
GDKerror("BATcalcxorcst: incompatible input types.\n");
return NULL;
@@ -11107,9 +11060,6 @@ BATcalccstxor(const ValRecord *v, BAT *b
BATcheck(b, "BATcalccstxor", NULL);
- if (checkbats(b, NULL, "BATcalccstxor") != GDK_SUCCEED)
- return NULL;
-
if (ATOMbasetype(b->ttype) != ATOMbasetype(v->vtype)) {
GDKerror("BATcalccstxor: incompatible input types.\n");
return NULL;
@@ -11303,9 +11253,6 @@ BATcalcorcst(BAT *b, const ValRecord *v,
BATcheck(b, "BATcalcorcst", NULL);
- if (checkbats(b, NULL, "BATcalcorcst") != GDK_SUCCEED)
- return NULL;
-
if (ATOMbasetype(b->ttype) != ATOMbasetype(v->vtype)) {
GDKerror("BATcalcorcst: incompatible input types.\n");
return NULL;
@@ -11351,9 +11298,6 @@ BATcalccstor(const ValRecord *v, BAT *b,
BATcheck(b, "BATcalccstor", NULL);
- if (checkbats(b, NULL, "BATcalccstor") != GDK_SUCCEED)
- return NULL;
-
if (ATOMbasetype(b->ttype) != ATOMbasetype(v->vtype)) {
GDKerror("BATcalccstor: incompatible input types.\n");
return NULL;
@@ -11544,9 +11488,6 @@ BATcalcandcst(BAT *b, const ValRecord *v
BATcheck(b, "BATcalcandcst", NULL);
- if (checkbats(b, NULL, "BATcalcandcst") != GDK_SUCCEED)
- return NULL;
-
if (ATOMbasetype(b->ttype) != ATOMbasetype(v->vtype)) {
GDKerror("BATcalcandcst: incompatible input types.\n");
return NULL;
@@ -11591,9 +11532,6 @@ BATcalccstand(const ValRecord *v, BAT *b
BATcheck(b, "BATcalccstand", NULL);
- if (checkbats(b, NULL, "BATcalccstand") != GDK_SUCCEED)
- return NULL;
-
if (ATOMbasetype(b->ttype) != ATOMbasetype(v->vtype)) {
GDKerror("BATcalccstand: incompatible input types.\n");
return NULL;
@@ -11885,9 +11823,6 @@ BATcalclshcst(BAT *b, const ValRecord *v
BATcheck(b, "BATcalclshcst", NULL);
- if (checkbats(b, NULL, "BATcalclshcst") != GDK_SUCCEED)
- return NULL;
-
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, b->ttype, cnt, TRANSIENT);
@@ -11926,9 +11861,6 @@ BATcalccstlsh(const ValRecord *v, BAT *b
BATcheck(b, "BATcalccstlsh", NULL);
- if (checkbats(b, NULL, "BATcalccstlsh") != GDK_SUCCEED)
- return NULL;
-
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, v->vtype, cnt, TRANSIENT);
@@ -12194,9 +12126,6 @@ BATcalcrshcst(BAT *b, const ValRecord *v
BATcheck(b, "BATcalcrshcst", NULL);
- if (checkbats(b, NULL, "BATcalcrshcst") != GDK_SUCCEED)
- return NULL;
-
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, b->ttype, cnt, TRANSIENT);
@@ -12235,9 +12164,6 @@ BATcalccstrsh(const ValRecord *v, BAT *b
BATcheck(b, "BATcalccstrsh", NULL);
- if (checkbats(b, NULL, "BATcalccstrsh") != GDK_SUCCEED)
- return NULL;
-
CANDINIT(b, s, start, end, cnt, cand, candend);
bn = COLnew(b->hseqbase, v->vtype, cnt, TRANSIENT);
@@ -12642,9 +12568,6 @@ BATcalcbetweencstcst(BAT *b, const ValRe
BATcheck(b, "BATcalcbetweencstcst", NULL);
- if (checkbats(b, NULL, "BATcalcbetweencstcst") != GDK_SUCCEED)
- return NULL;
-
if (ATOMbasetype(b->ttype) != ATOMbasetype(lo->vtype) ||
ATOMbasetype(b->ttype) != ATOMbasetype(hi->vtype)) {
GDKerror("BATcalcbetweencstcst: incompatible input types.\n");
@@ -12673,6 +12596,7 @@ BATcalcbetweenbatcst(BAT *b, BAT *lo, co
const oid *restrict cand = NULL, *candend = NULL;
BATcheck(b, "BATcalcbetweenbatcst", NULL);
+ BATcheck(lo, "BATcalcbetweenbatcst", NULL);
if (checkbats(b, lo, "BATcalcbetweenbatcst") != GDK_SUCCEED)
return NULL;
@@ -12706,6 +12630,7 @@ BATcalcbetweencstbat(BAT *b, const ValRe
const oid *restrict cand = NULL, *candend = NULL;
BATcheck(b, "BATcalcbetweencstbat", NULL);
+ BATcheck(hi, "BATcalcbetweencstbat", NULL);
if (checkbats(b, hi, "BATcalcbetweencstbat") != GDK_SUCCEED)
return NULL;
@@ -12985,8 +12910,6 @@ BATcalcifthencstelsecst(BAT *b, const Va
BATcheck(c1, "BATcalcifthenelsecst", NULL);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic