Changeset: a128469acce7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a128469acce7
Modified Files:
gdk/gdk_subquery.c
sql/backends/monet5/UDF/pyapi3/conversion3.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_result.h
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_table.c
sql/storage/sql_storage.h
sql/storage/store.c
tools/monetdbe/monetdbe.c
Branch: Jan2022
Log Message:
More const
diffs (truncated from 352 to 300 lines):
diff --git a/gdk/gdk_subquery.c b/gdk/gdk_subquery.c
--- a/gdk/gdk_subquery.c
+++ b/gdk/gdk_subquery.c
@@ -162,9 +162,9 @@ BATall_grp(BAT *l, BAT *g, BAT *e, BAT *
uint16_t width = res->twidth;
for (i = 0; i < ngrp; i++) { /* convert the
found oids in values */
BUN noid = oids[i];
- void *next;
+ const void *next;
if (noid == BUN_NONE) {
- next = (void*) nilp;
+ next = nilp;
hasnil = 1;
} else {
next = BUNtloc(li, noid);
diff --git a/sql/backends/monet5/UDF/pyapi3/conversion3.c
b/sql/backends/monet5/UDF/pyapi3/conversion3.c
--- a/sql/backends/monet5/UDF/pyapi3/conversion3.c
+++ b/sql/backends/monet5/UDF/pyapi3/conversion3.c
@@ -195,7 +195,7 @@ PyObject *PyArrayObject_FromBAT(PyInput
data = PyArray_DATA((PyArrayObject *)vararray);
BATloop(b, p, q)
{
- blob *t = (blob *)BUNtvar(li, p);
+ const blob *t = (const blob *)BUNtvar(li, p);
if (t->nitems == ~(size_t)0) {
data[p] = Py_None;
Py_INCREF(Py_None);
@@ -250,7 +250,7 @@ PyObject *PyArrayObject_FromBAT(PyInput
BATloop(b, p, q)
{
- char *t = (char *)BUNtvar(li, p);
+ const char *t = (const char
*)BUNtvar(li, p);
for (; *t != 0; t++) {
if (*t & 0x80) {
unicode = true;
@@ -311,7 +311,7 @@ PyObject *PyArrayObject_FromBAT(PyInput
} else {
BATloop(b, p, q)
{
- char *t = (char
*)BUNtvar(li, p);
+ const char *t =
(const char *)BUNtvar(li, p);
if (strNil(t)) {
//
str_nil isn't a valid UTF-8 character
//
(it's 0x80), so we can't decode it as
@@ -361,7 +361,7 @@ PyObject *PyArrayObject_FromBAT(PyInput
} else {
BATloop(b, p, q)
{
- char *t = (char
*)BUNtvar(li, p);
+ const char *t =
(const char *)BUNtvar(li, p);
obj =
PyString_FromString(t);
if (obj ==
NULL) {
bat_iterator_end(&li);
@@ -1106,7 +1106,7 @@ str ConvertFromSQLType(BAT *b, sql_subty
BATiter li = bat_iterator(b);
BATloop(b, p, q)
{
- void *element = (void *)BUNtail(li, p);
+ const void *element = (const void*)BUNtail(li, p);
if (strConversion(&result, &length, element, false) <
0) {
bat_iterator_end(&li);
BBPunfix((*ret_bat)->batCacheid);
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
@@ -1005,8 +1005,8 @@ mvc_get_value_bulk(Client cntxt, MalBlkP
vals = Tloc(bn, 0);
for (BUN i = 0; i < q; i++) {
oid p1 = canditer_next(&ci1) - off1, p2 = canditer_next(&ci2) -
off2;
- const char *sname = (str) BUNtvar(schi, p1);
- const char *seqname = (str) BUNtvar(seqi, p2);
+ const char *sname = BUNtvar(schi, p1);
+ const char *seqname = BUNtvar(seqi, p2);
if (strNil(sname) || strNil(seqname)) {
vals[i] = lng_nil;
@@ -2307,7 +2307,8 @@ mvc_result_set_wrap( Client cntxt, MalBl
bat scaleId= *getArgReference_bat(stk, pci,5);
bat bid;
int i, res, ok;
- str tblname, colname, tpename, msg= MAL_SUCCEED;
+ const char *tblname, *colname, *tpename;
+ str msg= MAL_SUCCEED;
int *digits, *scaledigits;
oid o = 0;
BATiter itertbl,iteratr,itertpe,iterdig,iterscl;
@@ -2398,7 +2399,8 @@ mvc_export_table_wrap( Client cntxt, Mal
stream *s = NULL;
bat bid;
int i, res, ok;
- str tblname, colname, tpename, msg= MAL_SUCCEED;
+ const char *tblname, *colname, *tpename;
+ str msg= MAL_SUCCEED;
int *digits, *scaledigits;
oid o = 0;
BATiter itertbl,iteratr,itertpe,iterdig,iterscl;
@@ -2542,7 +2544,8 @@ mvc_row_result_wrap( Client cntxt, MalBl
bat lenId= *getArgReference_bat(stk, pci,4);
bat scaleId= *getArgReference_bat(stk, pci,5);
int i, res, ok;
- str tblname, colname, tpename, msg= MAL_SUCCEED;
+ const char *tblname, *colname, *tpename;
+ str msg= MAL_SUCCEED;
int *digits, *scaledigits;
oid o = 0;
BATiter itertbl,iteratr,itertpe,iterdig,iterscl;
@@ -2632,7 +2635,8 @@ mvc_export_row_wrap( Client cntxt, MalBl
int i, res, ok;
stream *s = NULL;
- str tblname, colname, tpename, msg= MAL_SUCCEED;
+ const char *tblname, *colname, *tpename;
+ str msg = MAL_SUCCEED;
int *digits, *scaledigits;
oid o = 0;
BATiter itertbl,iteratr,itertpe,iterdig,iterscl;
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -2020,7 +2020,7 @@ mvc_result_table(backend *be, oid query_
}
int
-mvc_result_column(backend *be, char *tn, char *name, char *typename, int
digits, int scale, BAT *b)
+mvc_result_column(backend *be, const char *tn, const char *name, const char
*typename, int digits, int scale, BAT *b)
{
/* return 0 on success, non-zero on failure */
return res_col_create(be->mvc->session->tr, be->results, tn, name,
typename, digits, scale, TYPE_bat, b, false) ? 0 : -1;
diff --git a/sql/backends/monet5/sql_result.h b/sql/backends/monet5/sql_result.h
--- a/sql/backends/monet5/sql_result.h
+++ b/sql/backends/monet5/sql_result.h
@@ -29,7 +29,7 @@ extern int mvc_export_prepare(backend *b
extern str mvc_import_table(Client cntxt, BAT ***bats, mvc *c, bstream *s,
sql_table *t, const char *sep, const char *rsep, const char *ssep, const char
*ns, lng nr, lng offset, int best, bool from_stdin, bool escape);
sql5_export int mvc_result_table(backend *be, oid query_id, int nr_cols,
mapi_query_t type, BAT *order);
-sql5_export int mvc_result_column(backend *be, char *tn, char *name, char
*typename, int digits, int scale, BAT *b);
+sql5_export int mvc_result_column(backend *be, const char *tn, const char
*name, const char *typename, int digits, int scale, BAT *b);
extern int mvc_result_value(backend *be, const char *tn, const char *name,
const char *typename, int digits, int scale, ptr *p, int mtype);
/*
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -1369,7 +1369,7 @@ cs_update_bat( sql_trans *tr, sql_delta
}
}
for (oid i = 0, rid = start;
rid < lend && res == LOG_OK; rid++, i++) {
- ptr upd = BUNtail(upi,
rid-offset);
+ const void *upd =
BUNtail(upi, rid-offset);
if (void_inplace(b,
rid, upd, true) != GDK_SUCCEED)
res = LOG_ERR;
@@ -1411,7 +1411,7 @@ cs_update_bat( sql_trans *tr, sql_delta
memset(msk, 0,
end * sizeof(int));
}
}
- ptr upd = BUNtail(upi, i);
+ const void *upd = BUNtail(upi,
i);
if (void_inplace(b, rid[i],
upd, true) != GDK_SUCCEED)
res = LOG_ERR;
@@ -1455,7 +1455,7 @@ cs_update_bat( sql_trans *tr, sql_delta
res = LOG_ERR;
if (res == LOG_OK) {
- ptr upd = NULL;
+ const void *upd = NULL;
nui = bat_new(TYPE_oid, cs->ucnt + ucnt
- cnt, TRANSIENT);
nuv = bat_new(uv->ttype, cs->ucnt +
ucnt - cnt, TRANSIENT);
@@ -2536,7 +2536,7 @@ min_max_col(sql_trans *tr, sql_column *c
if ((b = temp_descriptor(d->cs.st == ST_DICT ? d->cs.ebid :
d->cs.bid))) {
BATiter bi = bat_iterator(b);
if (bi.minpos != BUN_NONE && bi.maxpos != BUN_NONE) {
- void *nmin = BUNtail(bi, bi.minpos), *nmax =
BUNtail(bi, bi.maxpos);
+ const void *nmin = BUNtail(bi, bi.minpos),
*nmax = BUNtail(bi, bi.maxpos);
size_t minlen = ATOMlen(bi.type, nmin), maxlen
= ATOMlen(bi.type, nmax);
if (!(c->min = GDKmalloc(minlen)) || !(c->max =
GDKmalloc(maxlen))) {
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
@@ -162,7 +162,7 @@ column_find_##TPE(sql_trans *tr, sql_col
} \
if (q != BUN_NONE) { \
BATiter bi = bat_iterator(b); \
- res = *(TPE*)BUNtail(bi, q); \
+ res = *(TPE*)BUNtloc(bi, q); \
bat_iterator_end(&bi); \
} \
bat_destroy(b); \
@@ -174,12 +174,12 @@ column_find_tpe(bte)
column_find_tpe(int)
column_find_tpe(lng)
-static str
+static const char *
column_find_string_start(sql_trans *tr, sql_column *c, oid rid, ptr *cbat)
{
BUN q = BUN_NONE;
BAT **b = (BAT**) cbat;
- str res = NULL;
+ const char *res = NULL;
*b = full_column(tr, c);
if (*b) {
@@ -190,7 +190,7 @@ column_find_string_start(sql_trans *tr,
}
if (q != BUN_NONE) {
BATiter bi = bat_iterator(*b);
- res = (str) BUNtvar(bi, q);
+ res = BUNtvar(bi, q);
bat_iterator_end(&bi);
}
return res;
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
@@ -45,7 +45,7 @@ typedef bte (*column_find_bte_fptr)(sql_
typedef sht (*column_find_sht_fptr)(sql_trans *tr, sql_column *c, oid rid);
typedef int (*column_find_int_fptr)(sql_trans *tr, sql_column *c, oid rid);
typedef lng (*column_find_lng_fptr)(sql_trans *tr, sql_column *c, oid rid);
-typedef str (*column_find_string_start_fptr)(sql_trans *tr, sql_column *c, oid
rid, ptr *cbat);
+typedef const char * (*column_find_string_start_fptr)(sql_trans *tr,
sql_column *c, oid rid, ptr *cbat);
typedef void (*column_find_string_end_fptr)(ptr cbat);
typedef int (*column_update_value_fptr)(sql_trans *tr, sql_column *c, oid rid,
void *value);
typedef int (*table_insert_fptr)(sql_trans *tr, sql_table *t, ...);
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -575,7 +575,7 @@ load_range_partition(sql_trans *tr, sql_
rs = store->table_api.rids_select(tr, find_sql_column(ranges,
"table_id"), &pt->member, &pt->member, NULL);
if ((rid = store->table_api.rids_next(rs)) != oid_nil) {
ptr cbat;
- str v;
+ const char *v;
pt->with_nills = (bit) store->table_api.column_find_bte(tr,
find_sql_column(ranges, "with_nulls"), rid);
v = store->table_api.column_find_string_start(tr,
find_sql_column(ranges, "minimum"), rid, &cbat);
@@ -608,9 +608,8 @@ load_value_partition(sql_trans *tr, sql_
for (rid = store->table_api.rids_next(rs); !is_oid_nil(rid); rid =
store->table_api.rids_next(rs)) {
ptr cbat;
- str v;
-
- v = store->table_api.column_find_string_start(tr,
find_sql_column(values, "value"), rid, &cbat);
+
+ const char *v = store->table_api.column_find_string_start(tr,
find_sql_column(values, "value"), rid, &cbat);
if (strNil(v)) { /* check for null value */
pt->with_nills = true;
} else {
@@ -634,7 +633,7 @@ load_part(sql_trans *tr, sql_table *mt,
sql_table *objects = find_sql_table(tr, syss, "objects");
sqlid id;
sqlstore *store = tr->store;
- str v;
+ const char *v;
ptr cbat;
assert(isMergeTable(mt) || isReplicaTable(mt));
@@ -832,7 +831,7 @@ load_type(sql_trans *tr, sql_schema *s,
sql_schema *syss = find_sql_schema(tr, "sys");
sql_table *types = find_sql_table(tr, syss, "types");
sqlid tid;
- str v;
+ const char *v;
ptr cbat;
tid = store->table_api.column_find_sqlid(tr, find_sql_column(types,
"id"), rid);
@@ -860,7 +859,7 @@ load_arg(sql_trans *tr, sql_func *f, oid
unsigned int digits, scale;
sql_schema *syss = find_sql_schema(tr, "sys");
sql_table *args = find_sql_table(tr, syss, "args");
- str v, tpe;
+ const char *v, *tpe;
ptr cbat;
v = store->table_api.column_find_string_start(tr, find_sql_column(args,
"name"), rid, &cbat);
@@ -893,7 +892,7 @@ load_func(sql_trans *tr, sql_schema *s,
sql_table *funcs = find_sql_table(tr, syss, "functions");
oid rid;
bool update_env; /* hacky way to update env function */
- str v;
+ const char *v;
ptr cbat;
rid = store->table_api.column_find_row(tr, find_sql_column(funcs,
"id"), &fid, NULL);
@@ -986,7 +985,7 @@ load_seq(sql_trans *tr, sql_schema * s,
sql_schema *syss = find_sql_schema(tr, "sys");
sql_table *seqs = find_sql_table(tr, syss, "sequences");
sqlid sid;
- str v;
+ const char *v;
ptr cbat;
sid = store->table_api.column_find_sqlid(tr, find_sql_column(seqs,
"id"), rid);
diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
