Changeset: bbf63164cd12 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/bbf63164cd12
Modified Files:
monetdb5/modules/mal/pp_hash.c
Branch: default
Log Message:
unify internal function signature:
- prefix the actual internal implementing function name with '_'
- converting all 'const bit *' from the implementation of the MAL functions to
'bit' when calling the actual implementing functions.
This is because we're adding more 'bit' parameters to these functions, and
'const bit *' and 'bit' get mixed.
diffs (252 lines):
diff --git a/monetdb5/modules/mal/pp_hash.c b/monetdb5/modules/mal/pp_hash.c
--- a/monetdb5/modules/mal/pp_hash.c
+++ b/monetdb5/modules/mal/pp_hash.c
@@ -1981,7 +1981,7 @@ error:
oid_mtd[mtdcnt] = off+i; \
slt[mtdcnt] = (oid)(slot - 1); \
mtdcnt++; \
- if (match && *single && freq[slot - 1]
> 1) { \
+ if (match && single && freq[slot - 1] >
1) { \
err = createException(SQL,
"oahash.probe", "more than one match"); \
goto error; \
} \
@@ -2004,7 +2004,7 @@ error:
oid_mtd[mtdcnt] = off+i; \
slt[mtdcnt] = (oid)(slot - 1); \
mtdcnt++; \
- if (match && *single && freq[slot - 1]
> 1) { \
+ if (match && single && freq[slot - 1] >
1) { \
err = createException(SQL,
"oahash.probe", "more than one match"); \
goto error; \
} \
@@ -2030,7 +2030,7 @@ error:
break; \
} \
TIMEOUT_LOOP_IDX_DECL(i, keycnt, qry_ctx) { \
- if (!(*semantics) && is_##Type##_nil(ky[i])) { \
+ if (!(semantics) && is_##Type##_nil(ky[i])) { \
if (!match && empty) { \
oid_mtd[mtdcnt] = off+i; \
slt[mtdcnt] = oid_nil; \
@@ -2049,7 +2049,7 @@ error:
oid_mtd[mtdcnt] = off+i; \
slt[mtdcnt] = match?(oid)(slot - 1):oid_nil; \
mtdcnt++; \
- if (match && *single && freq[slot - 1] > 1) { \
+ if (match && single && freq[slot - 1] > 1) { \
err = createException(SQL,
"oahash.probe", "more than one match"); \
goto error; \
} \
@@ -2069,7 +2069,7 @@ error:
Type *vals = ht->vals; \
\
TIMEOUT_LOOP_IDX_DECL(i, keycnt, qry_ctx) { \
- if (!(*semantics) && is_##Type##_nil(ky[i])) { \
+ if (!(semantics) && is_##Type##_nil(ky[i])) { \
if (!match && empty) { \
oid_mtd[mtdcnt] = off+i; \
slt[mtdcnt] = oid_nil; \
@@ -2088,7 +2088,7 @@ error:
oid_mtd[mtdcnt] = off+i; \
slt[mtdcnt] = match?(oid)(slot - 1):oid_nil; \
mtdcnt++; \
- if (match && *single && freq[slot - 1] > 1) { \
+ if (match && single && freq[slot - 1] > 1) { \
err = createException(SQL,
"oahash.probe", "more than one match"); \
goto error; \
} \
@@ -2106,7 +2106,7 @@ error:
TIMEOUT_LOOP_IDX_DECL(i, keycnt, qry_ctx) { \
var_t voff = VarHeapVal(bi.base,i,bi.width);
\
char *val = voff == 0 ? (char*) ATOMnilptr((bi).type) :
(char *) ((bi).vh->base+voff); \
- if (!(*semantics) && atomcmp(val, nil) == 0) { \
+ if (!(semantics) && atomcmp(val, nil) == 0) { \
if (!match && empty) { \
oid_mtd[mtdcnt] = off+i; \
slt[mtdcnt] = oid_nil; \
@@ -2125,7 +2125,7 @@ error:
oid_mtd[mtdcnt] = off+i; \
slt[mtdcnt] = match?(oid)(slot - 1):oid_nil; \
mtdcnt++; \
- if (match && *single && freq[slot - 1] > 1) { \
+ if (match && single && freq[slot - 1] > 1) { \
err = createException(SQL,
"oahash.probe", "more than one match"); \
bat_iterator_end(&bi); \
goto error; \
@@ -2136,7 +2136,7 @@ error:
} while (0)
static str
-OAHASHprobe1(Client ctx, bat *PRB_oid, bat *HSH_slotid, const bat *PRB_key,
const bat *HSH_ht, const bat *frequency, const bit *single, const bit
*semantics, bit match)
+_OAHASHprobe1(Client ctx, bat *PRB_oid, bat *HSH_slotid, const bat *PRB_key,
const bat *HSH_ht, const bat *frequency, bit single, bit semantics, bit match)
{
(void)ctx;
BAT *o = NULL, *s = NULL, *k = NULL, *t = NULL, *f = NULL;
@@ -2144,7 +2144,7 @@ OAHASHprobe1(Client ctx, bat *PRB_oid, b
lng *freq = NULL;
str err = NULL;
- assert(((*single) && frequency) || !(*single));
+ assert(((single) && frequency) || !(single));
k = BATdescriptor(*PRB_key);
t = BATdescriptor(*HSH_ht);
@@ -2152,7 +2152,7 @@ OAHASHprobe1(Client ctx, bat *PRB_oid, b
err = createException(SQL, "oahash.probe", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto error;
}
- if (*single) {
+ if (single) {
/* frequency is required to check if a match is single */
f = BATdescriptor(*frequency);
if (!f) {
@@ -2387,25 +2387,25 @@ error:
static str
OAHASHprobe_single(Client ctx, bat *PRB_oid, bat *HSH_slotid, const bat
*PRB_key, const bat *HSH_ht, const bat *frequency, const bit *single, const bit
*semantics)
{
- return OAHASHprobe1(ctx, PRB_oid, HSH_slotid, PRB_key, HSH_ht,
frequency, single, semantics, true);
+ return _OAHASHprobe1(ctx, PRB_oid, HSH_slotid, PRB_key, HSH_ht,
frequency, *single, *semantics, true);
}
static str
OAHASHprobe(Client ctx, bat *PRB_oid, bat *HSH_slotid, const bat *PRB_key,
const bat *HSH_ht, const bit *single, const bit *semantics)
{
- return OAHASHprobe1(ctx, PRB_oid, HSH_slotid, PRB_key, HSH_ht, NULL,
single, semantics, true);
+ return _OAHASHprobe1(ctx, PRB_oid, HSH_slotid, PRB_key, HSH_ht, NULL,
*single, *semantics, true);
}
static str
OAHASHnprobe_single(Client ctx, bat *PRB_oid, bat *HSH_slotid, const bat
*PRB_key, const bat *HSH_ht, const bat *frequency, const bit *single, const bit
*semantics)
{
- return OAHASHprobe1(ctx, PRB_oid, HSH_slotid, PRB_key, HSH_ht,
frequency, single, semantics, false);
+ return _OAHASHprobe1(ctx, PRB_oid, HSH_slotid, PRB_key, HSH_ht,
frequency, *single, *semantics, false);
}
static str
OAHASHnprobe(Client ctx, bat *PRB_oid, bat *HSH_slotid, const bat *PRB_key,
const bat *HSH_ht, const bit *single, const bit *semantics)
{
- return OAHASHprobe1(ctx, PRB_oid, HSH_slotid, PRB_key, HSH_ht, NULL,
single, semantics, false);
+ return _OAHASHprobe1(ctx, PRB_oid, HSH_slotid, PRB_key, HSH_ht, NULL,
*single, *semantics, false);
}
#define BATvoprobe() \
@@ -2429,7 +2429,7 @@ OAHASHnprobe(Client ctx, bat *PRB_oid, b
if (slot) { \
slt[mtdcnt] = (oid)(slot - 1); \
mark[i] = true; \
- if (*single && freq[slot - 1] > 1) { \
+ if (single && freq[slot - 1] > 1) { \
err = createException(SQL,
"oahash.probe", "more than one match"); \
goto error; \
} \
@@ -2447,7 +2447,7 @@ OAHASHnprobe(Client ctx, bat *PRB_oid, b
Type *vals = ht->vals; \
\
TIMEOUT_LOOP_IDX_DECL(i, keycnt, qry_ctx) { \
- if (!(*semantics) && is_##Type##_nil(ky[i])) { \
+ if (!(semantics) && is_##Type##_nil(ky[i])) { \
oid_mtd[mtdcnt] = off+i; \
slt[mtdcnt] = oid_nil; \
mark[i] = any?empty:false; \
@@ -2465,7 +2465,7 @@ OAHASHnprobe(Client ctx, bat *PRB_oid, b
if (slot) { \
slt[mtdcnt] = (oid)(slot - 1); \
mark[i] = true; \
- if (*single && freq[slot - 1] > 1) { \
+ if (single && freq[slot - 1] > 1) { \
err = createException(SQL,
"oahash.probe", "more than one match"); \
goto error; \
} \
@@ -2489,7 +2489,7 @@ OAHASHnprobe(Client ctx, bat *PRB_oid, b
Type *vals = ht->vals; \
\
TIMEOUT_LOOP_IDX_DECL(i, keycnt, qry_ctx) { \
- if (!(*semantics) && is_##Type##_nil(ky[i])) { \
+ if (!(semantics) && is_##Type##_nil(ky[i])) { \
oid_mtd[mtdcnt] = off+i; \
slt[mtdcnt] = oid_nil; \
mark[i] = any?empty:false; \
@@ -2507,7 +2507,7 @@ OAHASHnprobe(Client ctx, bat *PRB_oid, b
if (slot) { \
slt[mtdcnt] = (oid)(slot - 1); \
mark[i] = true; \
- if (*single && freq[slot - 1] > 1) { \
+ if (single && freq[slot - 1] > 1) { \
err = createException(SQL,
"oahash.probe", "more than one match"); \
goto error; \
} \
@@ -2529,7 +2529,7 @@ OAHASHnprobe(Client ctx, bat *PRB_oid, b
TIMEOUT_LOOP_IDX_DECL(i, keycnt, qry_ctx) { \
var_t voff = VarHeapVal(bi.base,i,bi.width);
\
char *val = voff == 0 ? (char*) ATOMnilptr((bi).type) :
(char *) ((bi).vh->base+voff); \
- if (!(*semantics) && atomcmp(val, nil) == 0) { \
+ if (!(semantics) && atomcmp(val, nil) == 0) { \
oid_mtd[mtdcnt] = off+i; \
slt[mtdcnt] = oid_nil; \
mark[i] = any?empty:false; \
@@ -2547,7 +2547,7 @@ OAHASHnprobe(Client ctx, bat *PRB_oid, b
if (slot) { \
slt[mtdcnt] = (oid)(slot - 1); \
mark[i] = true; \
- if (*single && freq[slot - 1] > 1) { \
+ if (single && freq[slot - 1] > 1) { \
err = createException(SQL,
"oahash.oprobe", "more than one match"); \
bat_iterator_end(&bi); \
goto error; \
@@ -2562,7 +2562,7 @@ OAHASHnprobe(Client ctx, bat *PRB_oid, b
} while (0)
static str
-OAHASHomprobe(Client ctx, bat *PRB_oid, bat *HSH_slotid, bat *PRB_mark, const
bat *PRB_key, const bat *HSH_ht, const bat *frequency, const bit *single, const
bit *semantics, bool any)
+_OAHASHomprobe(Client ctx, bat *PRB_oid, bat *HSH_slotid, bat *PRB_mark, const
bat *PRB_key, const bat *HSH_ht, const bat *frequency, bit single, bit
semantics, bool any)
{
(void)ctx;
BAT *o = NULL, *s = NULL, *m = NULL, *k = NULL, *t = NULL, *f = NULL;
@@ -2570,7 +2570,7 @@ OAHASHomprobe(Client ctx, bat *PRB_oid,
lng *freq = NULL;
str err = NULL;
- assert(((*single) && frequency) || !(*single));
+ assert(((single) && frequency) || !(single));
k = BATdescriptor(*PRB_key);
t = BATdescriptor(*HSH_ht);
@@ -2578,7 +2578,7 @@ OAHASHomprobe(Client ctx, bat *PRB_oid,
err = createException(SQL, "oahash.probe", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
goto error;
}
- if (*single) {
+ if (single) {
/* frequency is required to check if a match is single */
f = BATdescriptor(*frequency);
if (!f) {
@@ -2707,25 +2707,25 @@ error:
static str
OAHASHoprobe_single(Client ctx, bat *PRB_oid, bat *HSH_slotid, bat *PRB_mark,
const bat *PRB_key, const bat *HSH_ht, const bat *frequency, const bit *single,
const bit *semantics)
{
- return OAHASHomprobe(ctx, PRB_oid, HSH_slotid, PRB_mark, PRB_key,
HSH_ht, frequency, single, semantics, false);
+ return _OAHASHomprobe(ctx, PRB_oid, HSH_slotid, PRB_mark, PRB_key,
HSH_ht, frequency, *single, *semantics, false);
}
static str
OAHASHoprobe(Client ctx, bat *PRB_oid, bat *HSH_slotid, bat *PRB_mark, const
bat *PRB_key, const bat *HSH_ht, const bit *single, const bit *semantics)
{
- return OAHASHomprobe(ctx, PRB_oid, HSH_slotid, PRB_mark, PRB_key,
HSH_ht, NULL, single, semantics, false);
+ return _OAHASHomprobe(ctx, PRB_oid, HSH_slotid, PRB_mark, PRB_key,
HSH_ht, NULL, *single, *semantics, false);
}
static str
OAHASHmprobe_single(Client ctx, bat *PRB_oid, bat *HSH_slotid, bat *PRB_mark,
const bat *PRB_key, const bat *HSH_ht, const bat *frequency, const bit *single,
const bit *semantics)
{
- return OAHASHomprobe(ctx, PRB_oid, HSH_slotid, PRB_mark, PRB_key,
HSH_ht, frequency, single, semantics, true);
+ return _OAHASHomprobe(ctx, PRB_oid, HSH_slotid, PRB_mark, PRB_key,
HSH_ht, frequency, *single, *semantics, true);
}
static str
OAHASHmprobe(Client ctx, bat *PRB_oid, bat *HSH_slotid, bat *PRB_mark, const
bat *PRB_key, const bat *HSH_ht, const bit *single, const bit *semantics)
{
- return OAHASHomprobe(ctx, PRB_oid, HSH_slotid, PRB_mark, PRB_key,
HSH_ht, NULL, single, semantics, true);
+ return _OAHASHomprobe(ctx, PRB_oid, HSH_slotid, PRB_mark, PRB_key,
HSH_ht, NULL, *single, *semantics, true);
}
#define BATvprobe_cmbd() \
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
