Changeset: 709586ab3214 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=709586ab3214
Modified Files:
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_calc.c
monetdb5/mal/mal_builder.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/mkey.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/vaults/fits/fits.c
sql/server/rel_select.c
sql/server/sql_atom.c
sql/storage/bat/bat_table.c
sql/storage/sql_storage.h
sql/storage/store.c
Branch: default
Log Message:
Turn atomNull (and hence ATOMnilptr()) into a const void *.
diffs (truncated from 312 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1879,7 +1879,7 @@ typedef struct {
short align; /* alignment condition for values */
/* automatically generated fields */
- ptr atomNull; /* global nil value */
+ const void *atomNull; /* global nil value */
/* generic (fixed + varsized atom) ADT functions */
int (*atomFromStr) (const char *src, int *len, ptr *dst);
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -2279,7 +2279,7 @@ BATminmax(BAT *b, void *aggr,
const oid *, BUN, int, int))
{
oid pos;
- void *res;
+ const void *res;
int s;
int needdecref = 0;
BATiter bi;
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -13371,7 +13371,7 @@ convert_any_str(int tp, const void *src,
int len = 0;
BUN nils = 0;
BUN i;
- void *nil = ATOMnilptr(tp);
+ const void *nil = ATOMnilptr(tp);
int (*atomtostr)(str *, int *, const void *) = BATatoms[tp].atomToStr;
int size = ATOMsize(tp);
diff --git a/monetdb5/mal/mal_builder.c b/monetdb5/mal/mal_builder.c
--- a/monetdb5/mal/mal_builder.c
+++ b/monetdb5/mal/mal_builder.c
@@ -512,8 +512,8 @@ pushNil(MalBlkPtr mb, InstrPtr q, int tp
ptr p = ATOMnil(tpe);
VALset(&cst, tpe, p);
} else {
- ptr p = ATOMnilptr(tpe);
- VALset(&cst, tpe, p);
+ const void *p = ATOMnilptr(tpe);
+ VALinit(&cst, tpe, p);
}
_t = defConstant(mb,tpe,&cst);
} else {
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
@@ -311,9 +311,8 @@ ALGselectNotNil(bat *result, const bat *
if( BATcount_no_nil(b) != BATcount(b) ){
BAT *s = NULL;
- ptr low = ATOMnilptr(b->ttype);
- s = BATselect(b, s, low, NULL, TRUE, TRUE, TRUE);
+ s = BATselect(b, s, ATOMnilptr(b->ttype), NULL, TRUE, TRUE,
TRUE);
if (s) {
bn = BATproject(s, b);
BBPunfix(s->batCacheid);
diff --git a/monetdb5/modules/mal/calc.c b/monetdb5/modules/mal/calc.c
--- a/monetdb5/modules/mal/calc.c
+++ b/monetdb5/modules/mal/calc.c
@@ -646,7 +646,7 @@ CALCswitchbit(Client cntxt, MalBlkPtr mb
return mythrow(MAL, "ifthenelse", SEMANTIC_TYPE_MISMATCH);
if (b == bit_nil) {
- *(ptr**)retval = p = ATOMnilptr(t1);
+ VALinit(&stk->stk[pci->argv[0]], t1, ATOMnilptr(t1));
return MAL_SUCCEED;
}
if (b) {
@@ -670,9 +670,9 @@ str
CALCmin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
int t = getArgType(mb, pci, 1);
- ptr p1 = getArgReference(stk, pci, 1);
- ptr p2 = getArgReference(stk, pci, 2);
- ptr nil;
+ const void *p1 = getArgReference(stk, pci, 1);
+ const void *p2 = getArgReference(stk, pci, 2);
+ const void *nil;
(void) cntxt;
if (t != getArgType(mb, pci, 2))
@@ -698,7 +698,7 @@ CALCmin_no_nil(Client cntxt, MalBlkPtr m
int t = getArgType(mb, pci, 1);
ptr p1 = getArgReference(stk, pci, 1);
ptr p2 = getArgReference(stk, pci, 2);
- ptr nil;
+ const void *nil;
(void) cntxt;
if (t != getArgType(mb, pci, 2))
@@ -721,9 +721,9 @@ str
CALCmax(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
int t = getArgType(mb, pci, 1);
- ptr p1 = getArgReference(stk, pci, 1);
- ptr p2 = getArgReference(stk, pci, 2);
- ptr nil;
+ const void *p1 = getArgReference(stk, pci, 1);
+ const void *p2 = getArgReference(stk, pci, 2);
+ const void *nil;
(void) cntxt;
if (t != getArgType(mb, pci, 2))
@@ -749,7 +749,7 @@ CALCmax_no_nil(Client cntxt, MalBlkPtr m
int t = getArgType(mb, pci, 1);
ptr p1 = getArgReference(stk, pci, 1);
ptr p2 = getArgReference(stk, pci, 2);
- ptr nil;
+ const void *nil;
(void) cntxt;
if (t != getArgType(mb, pci, 2))
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
@@ -158,7 +158,7 @@ MKEYbathash(bat *res, const bat *bid)
BATiter bi = bat_iterator(b);
BUN (*hash)(const void *) = BATatoms[b->ttype].atomHash;
int (*cmp)(const void *, const void *) = ATOMcompare(b->ttype);
- void *nil = ATOMnilptr(b->ttype);
+ const void *nil = ATOMnilptr(b->ttype);
BUN i;
const void *v;
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -891,11 +891,8 @@ sql_convert_arg(mvc *sql, int nr, sql_su
if (atom_null(a)) {
if (a->data.vtype != rt->type->localtype) {
- ptr p;
-
a->data.vtype = rt->type->localtype;
- p = ATOMnilptr(a->data.vtype);
- VALset(&a->data, a->data.vtype, p);
+ VALinit(&a->data, a->data.vtype,
ATOMnilptr(a->data.vtype));
}
}
a->tpe = *rt;
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -638,7 +638,7 @@ alter_table(Client cntxt, mvc *sql, char
mvc_null(sql, nc, c->null);
/* for non empty check for nulls */
if (c->null == 0) {
- void *nilptr =
ATOMnilptr(c->type.type->localtype);
+ const void *nilptr =
ATOMnilptr(c->type.type->localtype);
rids *nils =
table_funcs.rids_select(sql->session->tr, nc, nilptr, NULL, NULL);
int has_nils = (table_funcs.rids_next(nils) !=
oid_nil);
@@ -3731,7 +3731,7 @@ zero_or_one(ptr ret, const bat *bid)
{
BAT *b;
BUN c, _s;
- ptr p;
+ const void *p;
if ((b = BATdescriptor(*bid)) == NULL) {
throw(SQL, "zero_or_one", "Cannot access descriptor");
@@ -3780,7 +3780,7 @@ SQLall(ptr ret, const bat *bid)
{
BAT *b;
BUN c, _s;
- ptr p;
+ const void *p;
if ((b = BATdescriptor(*bid)) == NULL) {
throw(SQL, "all", "Cannot access descriptor");
diff --git a/sql/backends/monet5/vaults/fits/fits.c
b/sql/backends/monet5/vaults/fits/fits.c
--- a/sql/backends/monet5/vaults/fits/fits.c
+++ b/sql/backends/monet5/vaults/fits/fits.c
@@ -835,7 +835,7 @@ str FITSloadTable(Client cntxt, MalBlkPt
int *tpcode = NULL;
long *rep = NULL, *wid = NULL, rows; /* type long used by fits library
*/
char keywrd[80], **cname, nm[FLEN_VALUE];
- ptr nilptr;
+ const void *nilptr;
if ((msg = getSQLContext(cntxt, mb, &m, NULL)) != MAL_SUCCEED)
return msg;
@@ -937,7 +937,7 @@ str FITSloadTable(Client cntxt, MalBlkPt
throw(MAL,"fits.load", MAL_MALLOC_FAIL);
}
if (mtype != TYPE_str) {
- fits_read_col(fptr, tpcode[j - 1], j, 1, 1, rows,
nilptr, (void *)BUNtloc(bat_iterator(tmp), 0), &anynull, &status);
+ fits_read_col(fptr, tpcode[j - 1], j, 1, 1, rows, (void
*) nilptr, (void *)BUNtloc(bat_iterator(tmp), 0), &anynull, &status);
BATsetcount(tmp, rows);
tmp->tsorted = 0;
tmp->trevsorted = 0;
@@ -952,7 +952,7 @@ str FITSloadTable(Client cntxt, MalBlkPt
for(i = 0; i < rows; i += batch) {
batch = rows - i < bsize ? rows - i: bsize;
tm0 = GDKms();
- fits_read_col(fptr, tpcode[j - 1], j, 1 + i, 1,
batch, nilptr, (void *)v, &anynull, &status);
+ fits_read_col(fptr, tpcode[j - 1], j, 1 + i, 1,
batch, (void *) nilptr, (void *)v, &anynull, &status);
tloadtm += GDKms() - tm0;
tm0 = GDKms();
for(k = 0; k < batch ; k++)
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -1142,11 +1142,11 @@ convert_atom(atom *a, sql_subtype *rt)
{
if (atom_null(a)) {
if (a->data.vtype != rt->type->localtype) {
- ptr p;
+ const void *p;
a->data.vtype = rt->type->localtype;
p = ATOMnilptr(a->data.vtype);
- VALset(&a->data, a->data.vtype, p);
+ VALinit(&a->data, a->data.vtype, p);
}
}
a->tpe = *rt;
diff --git a/sql/server/sql_atom.c b/sql/server/sql_atom.c
--- a/sql/server/sql_atom.c
+++ b/sql/server/sql_atom.c
@@ -266,8 +266,7 @@ atom_general(sql_allocator *sa, sql_subt
/*_DELETE(val);*/
}
} else {
- p = ATOMnilptr(a->data.vtype);
- VALset(&a->data, a->data.vtype, p);
+ VALinit(&a->data, a->data.vtype, ATOMnilptr(a->data.vtype));
a->isnull = 1;
}
return a;
@@ -1102,12 +1101,9 @@ atom_cast(atom *a, sql_subtype *tp)
return 1;
}
} else {
- ptr p = NULL;
-
a->tpe = *tp;
a->data.vtype = tp->type->localtype;
- p = ATOMnilptr(a->data.vtype);
- VALset(&a->data, a->data.vtype, p);
+ VALinit(&a->data, a->data.vtype, ATOMnilptr(a->data.vtype));
return 1;
}
return 0;
diff --git a/sql/storage/bat/bat_table.c b/sql/storage/bat/bat_table.c
--- a/sql/storage/bat/bat_table.c
+++ b/sql/storage/bat/bat_table.c
@@ -290,12 +290,12 @@ table_delete(sql_trans *tr, sql_table *t
/* returns table rids, for the given select ranges */
static rids *
-rids_select( sql_trans *tr, sql_column *key, void *key_value_low, void
*key_value_high, ...)
+rids_select( sql_trans *tr, sql_column *key, const void *key_value_low, const
void *key_value_high, ...)
{
va_list va;
BAT *b = NULL, *r = NULL, *s = NULL;
rids *rs = ZNEW(rids);
- void *kvl = key_value_low, *kvh = key_value_high;
+ const void *kvl = key_value_low, *kvh = key_value_high;
int hi = 0;
s = delta_cands(tr, key->t);
diff --git a/sql/storage/sql_storage.h b/sql/storage/sql_storage.h
--- a/sql/storage/sql_storage.h
+++ b/sql/storage/sql_storage.h
@@ -61,7 +61,7 @@ typedef struct subrids {
} subrids;
/* returns table rids, for the given select ranges */
-typedef rids *(*rids_select_fptr)( sql_trans *tr, sql_column *key, void
*key_value_low, void *key_value_high, ...);
+typedef rids *(*rids_select_fptr)( sql_trans *tr, sql_column *key, const void
*key_value_low, const void *key_value_high, ...);
/* order rids by orderby_column values */
typedef rids *(*rids_orderby_fptr)( sql_trans *tr, rids *r, sql_column
*orderby_col);
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -4640,7 +4640,7 @@ sql_trans_alter_default(sql_trans *tr, s
return col; /* no change */
if (!col->def || !val || strcmp(col->def, val) != 0) {
- void *p = val ? val : ATOMnilptr(TYPE_str);
+ void *p = val ? val : (void *) ATOMnilptr(TYPE_str);
sql_schema *syss = find_sql_schema(tr,
isGlobal(col->t)?"sys":"tmp");
sql_table *syscolumn = find_sql_table(syss, "_columns");
sql_column *col_ids = find_sql_column(syscolumn, "id");
@@ -4667,7 +4667,7 @@ sql_trans_alter_storage(sql_trans *tr, s
return col; /* no change */
if (!col->storage_type || !storage || strcmp(col->storage_type,
storage) != 0) {
- void *p = storage ? storage : ATOMnilptr(TYPE_str);
+ void *p = storage ? storage : (void *) ATOMnilptr(TYPE_str);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
