Changeset: e3d54bfb741a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e3d54bfb741a
Modified Files:
clients/Tests/exports.stable.out
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/vaults/csv/csv.c
sql/common/sql_changeset.c
sql/common/sql_hash.c
sql/common/sql_list.c
sql/common/sql_mem.c
sql/common/sql_stack.c
sql/common/sql_string.c
sql/common/sql_string.h
sql/common/sql_types.c
sql/common/sql_types.h
sql/include/sql_catalog.h
sql/include/sql_hash.h
sql/include/sql_list.h
sql/include/sql_mem.h
sql/include/sql_stack.h
sql/server/rel_basetable.c
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimize_others.c
sql/server/rel_optimize_sel.c
sql/server/rel_planner.c
sql/server/rel_prop.c
sql/server/rel_prop.h
sql/server/rel_propagate.c
sql/server/rel_psm.c
sql/server/rel_psm.h
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_remote.c
sql/server/rel_remote.h
sql/server/rel_rewriter.c
sql/server/rel_rewriter.h
sql/server/rel_schema.c
sql/server/rel_schema.h
sql/server/rel_select.c
sql/server/rel_sequence.c
sql/server/rel_statistics.c
sql/server/rel_statistics.h
sql/server/rel_statistics_functions.c
sql/server/rel_unnest.c
sql/server/rel_updates.c
sql/server/rel_updates.h
sql/server/sql_atom.c
sql/server/sql_atom.h
sql/server/sql_decimal.c
sql/server/sql_decimal.h
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sql_partition.c
sql/server/sql_qc.c
sql/server/sql_qc.h
sql/server/sql_query.c
sql/server/sql_scan.c
sql/server/sql_scan.h
sql/server/sql_semantic.c
sql/server/sql_symbol.c
sql/server/sql_symbol.h
sql/storage/objectset.c
sql/storage/objlist.c
sql/storage/sql_catalog.c
sql/storage/sql_storage.h
sql/storage/store.c
tools/monetdbe/monetdbe.c
Branch: no_type_bat
Log Message:
renamed sql_allocator into allocator.
diffs (truncated from 3568 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1517,13 +1517,13 @@ str dbl_num2dec_bte(bte *res, const dbl
str dbl_num2dec_int(int *res, const dbl *v, const int *d2, const int *s2);
str dbl_num2dec_lng(lng *res, const dbl *v, const int *d2, const int *s2);
str dbl_num2dec_sht(sht *res, const dbl *v, const int *d2, const int *s2);
-sql_exp *exp_atom_int(sql_allocator *sa, int i);
-sql_exp *exp_atom_lng(sql_allocator *sa, lng l);
-sql_exp *exp_atom_ptr(sql_allocator *sa, void *s);
-sql_exp *exp_atom_str(sql_allocator *sa, const char *s, sql_subtype *st);
+sql_exp *exp_atom_int(allocator *sa, int i);
+sql_exp *exp_atom_lng(allocator *sa, lng l);
+sql_exp *exp_atom_ptr(allocator *sa, void *s);
+sql_exp *exp_atom_str(allocator *sa, const char *s, sql_subtype *st);
stmt *exp_bin(backend *be, sql_exp *e, stmt *left, stmt *right, stmt *grp,
stmt *ext, stmt *cnt, stmt *sel, int depth, int reduce, int push);
-sql_exp *exp_column(sql_allocator *sa, const char *rname, const char *name,
sql_subtype *t, unsigned int card, int has_nils, int unique, int intern);
-sql_exp *exp_op(sql_allocator *sa, list *l, sql_subfunc *f);
+sql_exp *exp_column(allocator *sa, const char *rname, const char *name,
sql_subtype *t, unsigned int card, int has_nils, int unique, int intern);
+sql_exp *exp_op(allocator *sa, list *l, sql_subfunc *f);
sql_table *find_table_or_view_on_scope(mvc *sql, sql_schema *s, const char
*sname, const char *tname, const char *error, bool isView);
int fl_register(char *name, fl_add_types_fptr add_types, fl_load_fptr fl_load);
void fl_unregister(char *name);
@@ -1604,16 +1604,16 @@ bool option_disable_fork;
sql_part *partition_find_part(sql_trans *tr, sql_table *pt, sql_part *pp);
void qc_delete(qc *cache, cq *q);
cq *qc_find(qc *cache, int id);
-cq *qc_insert(qc *cache, sql_allocator *sa, sql_rel *r, symbol *s, list
*params, mapi_query_t type, char *codedstr, int no_mitosis);
-sql_rel *rel_project(sql_allocator *sa, sql_rel *l, list *e);
+cq *qc_insert(qc *cache, allocator *sa, sql_rel *r, symbol *s, list *params,
mapi_query_t type, char *codedstr, int no_mitosis);
+sql_rel *rel_project(allocator *sa, sql_rel *l, list *e);
void res_tables_destroy(res_table *results);
-void *sa_alloc(sql_allocator *sa, size_t sz);
-sql_allocator *sa_create(sql_allocator *pa);
-list *sa_list(sql_allocator *sa);
-char *sa_message(sql_allocator *sa, _In_z_ _Printf_format_string_ const char
*format, ...) __attribute__((__format__(__printf__, 2, 3)));
-sql_allocator *sa_reset(sql_allocator *sa);
-char *sa_strdup(sql_allocator *sa, const char *s);
-void *sa_zalloc(sql_allocator *sa, size_t sz);
+void *sa_alloc(allocator *sa, size_t sz);
+allocator *sa_create(allocator *pa);
+list *sa_list(allocator *sa);
+char *sa_message(allocator *sa, _In_z_ _Printf_format_string_ const char
*format, ...) __attribute__((__format__(__printf__, 2, 3)));
+allocator *sa_reset(allocator *sa);
+char *sa_strdup(allocator *sa, const char *s);
+void *sa_zalloc(allocator *sa, size_t sz);
void scanner_query_processed(struct scanner *s);
str sht_dec2_bte(bte *res, const int *s1, const sht *v);
str sht_dec2_dbl(dbl *res, const int *s1, const sht *v);
@@ -1633,7 +1633,7 @@ str sht_num2dec_flt(flt *res, const sht
str sht_num2dec_int(int *res, const sht *v, const int *d2, const int *s2);
str sht_num2dec_lng(lng *res, const sht *v, const int *d2, const int *s2);
str sht_num2dec_sht(sht *res, const sht *v, const int *d2, const int *s2);
-sql_subtype *sql_bind_subtype(sql_allocator *sa, const char *name, unsigned
int digits, unsigned int scale);
+sql_subtype *sql_bind_subtype(allocator *sa, const char *name, unsigned int
digits, unsigned int scale);
sql_subfunc *sql_find_func(mvc *sql, const char *sname, const char *fname, int
nrargs, sql_ftype type, bool private, sql_subfunc *prev);
int sql_find_subtype(sql_subtype *res, const char *name, unsigned int digits,
unsigned int scale);
void sql_init_subtype(sql_subtype *res, sql_type *t, unsigned int digits,
unsigned int scale);
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
@@ -141,7 +141,7 @@ refs_update_stmt(list *refs, sql_rel *re
static void
-print_stmtlist(sql_allocator *sa, stmt *l)
+print_stmtlist(allocator *sa, stmt *l)
{
node *n;
if (l) {
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
@@ -303,7 +303,7 @@ SQLset_protocol(Client cntxt, MalBlkPtr
str
create_table_or_view(mvc *sql, char *sname, char *tname, sql_table *t, int
temp, int replace)
{
- sql_allocator *osa;
+ allocator *osa;
sql_schema *s = mvc_bind_schema(sql, sname);
sql_table *nt = NULL, *ot;
node *n;
@@ -4988,7 +4988,7 @@ str_column_vacuum_callback(int argc, voi
char *sname = (char *) argv[1];
char *tname = (char *) argv[2];
char *cname = (char *) argv[3];
- sql_allocator *sa = NULL;
+ allocator *sa = NULL;
sql_session *session = NULL;
sql_schema *s = NULL;
sql_table *t = NULL;
@@ -4999,7 +4999,7 @@ str_column_vacuum_callback(int argc, voi
(void) argc;
if ((sa = sa_create(NULL)) == NULL) {
- TRC_ERROR((component_t) SQL, "[str_column_vacuum_callback] --
Failed to create sql_allocator!");
+ TRC_ERROR((component_t) SQL, "[str_column_vacuum_callback] --
Failed to create allocator!");
return GDK_FAIL;
}
diff --git a/sql/backends/monet5/sql_cat.c b/sql/backends/monet5/sql_cat.c
--- a/sql/backends/monet5/sql_cat.c
+++ b/sql/backends/monet5/sql_cat.c
@@ -570,7 +570,7 @@ create_trigger(mvc *sql, char *sname, ch
default: {
char *buf;
sql_rel *r = NULL;
- sql_allocator *sa = sql->sa;
+ allocator *sa = sql->sa;
if (!(sql->sa = sa_create(sql->pa))) {
sql->sa = sa;
@@ -1056,7 +1056,7 @@ create_func(mvc *sql, char *sname, char
case FUNC_LANG_SQL: {
char *buf;
sql_rel *r = NULL;
- sql_allocator *sa = sql->sa;
+ allocator *sa = sql->sa;
assert(nf->query);
if (!(sql->sa = sa_create(sql->pa))) {
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -251,7 +251,7 @@ SQLexecPostLoginTriggers(Client c)
int oldvtop = c->curprg->def->vtop;
int oldstop = c->curprg->def->stop;
Symbol curprg = c->curprg;
- sql_allocator *sa = m->sa;
+ allocator *sa = m->sa;
if (!(m->sa = sa_create(m->pa))) {
m->sa = sa;
@@ -366,7 +366,7 @@ SQLprepareClient(Client c, const char *p
str msg = MAL_SUCCEED;
if (c->sqlcontext == 0) {
- sql_allocator *sa = sa_create(NULL);
+ allocator *sa = sa_create(NULL);
if (sa == NULL) {
msg = createException(SQL,"sql.initClient",
SQLSTATE(HY013) MAL_MALLOC_FAIL);
goto bailout2;
@@ -507,7 +507,7 @@ SQLresetClient(Client c)
if (c->sqlcontext == NULL)
throw(SQL, "SQLexitClient", SQLSTATE(42000) "MVC catalogue not
available");
if (c->sqlcontext) {
- sql_allocator *pa = NULL;
+ allocator *pa = NULL;
backend *be = c->sqlcontext;
mvc *m = be->mvc;
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -185,7 +185,7 @@ stmt_bool(backend *be, int b)
}
static stmt *
-stmt_create(sql_allocator *sa, st_type type)
+stmt_create(allocator *sa, st_type type)
{
stmt *s = SA_NEW(sa, stmt);
@@ -307,7 +307,7 @@ create_bat(MalBlkPtr mb, int tt)
}
static int *
-dump_table(sql_allocator *sa, MalBlkPtr mb, sql_table *t)
+dump_table(allocator *sa, MalBlkPtr mb, sql_table *t)
{
int i = 0;
node *n;
@@ -4114,7 +4114,7 @@ stmt_func(backend *be, stmt *ops, const
}
}
- sql_allocator *sa = be->mvc->sa;
+ allocator *sa = be->mvc->sa;
bool enabled = be->mvc->sa->eb.enabled;
be->mvc->sa->eb.enabled = false;
stmt *o = NULL, *s = stmt_create(sa, st_func);
@@ -4444,7 +4444,7 @@ stmt_has_null(stmt *s)
}
static const char *
-func_name(sql_allocator *sa, const char *n1, const char *n2)
+func_name(allocator *sa, const char *n1, const char *n2)
{
size_t l1 = _strlen(n1), l2;
@@ -4469,10 +4469,10 @@ func_name(sql_allocator *sa, const char
}
}
-static const char *_column_name(sql_allocator *sa, stmt *st);
+static const char *_column_name(allocator *sa, stmt *st);
const char *
-column_name(sql_allocator *sa, stmt *st)
+column_name(allocator *sa, stmt *st)
{
if (!st->cname)
st->cname = _column_name(sa, st);
@@ -4480,7 +4480,7 @@ column_name(sql_allocator *sa, stmt *st)
}
static const char *
-_column_name(sql_allocator *sa, stmt *st)
+_column_name(allocator *sa, stmt *st)
{
switch (st->type) {
case st_order:
@@ -4546,14 +4546,14 @@ static const char *
}
const char *
-table_name(sql_allocator *sa, stmt *st)
+table_name(allocator *sa, stmt *st)
{
(void)sa;
return st->tname;
}
const char *
-schema_name(sql_allocator *sa, stmt *st)
+schema_name(allocator *sa, stmt *st)
{
switch (st->type) {
case st_const:
diff --git a/sql/backends/monet5/sql_statement.h
b/sql/backends/monet5/sql_statement.h
--- a/sql/backends/monet5/sql_statement.h
+++ b/sql/backends/monet5/sql_statement.h
@@ -268,9 +268,9 @@ extern stmt *stmt_assign(backend *be, co
extern sql_subtype *tail_type(stmt *st);
extern int stmt_has_null(stmt *s);
-extern const char *column_name(sql_allocator *sa, stmt *st);
-extern const char *table_name(sql_allocator *sa, stmt *st);
-extern const char *schema_name(sql_allocator *sa, stmt *st);
+extern const char *column_name(allocator *sa, stmt *st);
+extern const char *table_name(allocator *sa, stmt *st);
+extern const char *schema_name(allocator *sa, stmt *st);
extern stmt *const_column(backend *ba, stmt *val);
extern stmt *stmt_fetch(backend *ba, stmt *val);
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -761,7 +761,7 @@ sql_update_nov2019_missing_dependencies(
{
size_t bufsize = 8192, pos = 0, ppos;
char *err = NULL, *buf = GDKmalloc(bufsize);
- sql_allocator *old_sa = sql->sa;
+ allocator *old_sa = sql->sa;
bool first = true;
sql_trans *tr = sql->session->tr;
struct os_iter si;
@@ -3274,7 +3274,7 @@ sql_update_jan2022(Client c, mvc *sql)
sql_table *t;
/* this bit of code is to upgrade from a Jan2022 RC to the Jan2022
release */
- sql_allocator *old_sa = sql->sa;
+ allocator *old_sa = sql->sa;
if ((sql->sa = sa_create(sql->pa)) != NULL) {
list *l;
if ((l = sa_list(sql->sa)) != NULL) {
@@ -5224,7 +5224,7 @@ sql_update_jun2023(Client c, mvc *sql, s
}
/* new function sys.regexp_replace */
- sql_allocator *old_sa = sql->sa;
+ allocator *old_sa = sql->sa;
if ((sql->sa = sa_create(sql->pa)) != NULL) {
list *l;
if ((l = sa_list(sql->sa)) != NULL) {
@@ -6045,7 +6045,7 @@ sql_update_dec2023(Client c, mvc *sql, s
}
/* 52_describe.sql New function sys.sql_datatype(mtype varchar(999),
digits integer, tscale integer, nameonly boolean, shortname boolean) */
- sql_allocator *old_sa = sql->sa;
+ allocator *old_sa = sql->sa;
if ((sql->sa = sa_create(sql->pa)) != NULL) {
list *l;
if ((l = sa_list(sql->sa)) != NULL) {
diff --git a/sql/backends/monet5/vaults/csv/csv.c
b/sql/backends/monet5/vaults/csv/csv.c
--- a/sql/backends/monet5/vaults/csv/csv.c
+++ b/sql/backends/monet5/vaults/csv/csv.c
@@ -342,7 +342,7 @@ detect_types(const char *buf, char delim
}
static const char *
-get_name(sql_allocator *sa, const char *s, const char *es, const char **E,
char delim, char quote, bool has_header, int col)
+get_name(allocator *sa, const char *s, const char *es, const char **E, char
delim, char quote, bool has_header, int col)
{
if (!has_header) {
char buff[25];
diff --git a/sql/common/sql_changeset.c b/sql/common/sql_changeset.c
--- a/sql/common/sql_changeset.c
+++ b/sql/common/sql_changeset.c
@@ -12,7 +12,7 @@
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
