Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1792/src/server
Modified Files:
rel_xml.mx sql_mvc.mx sql_psm.mx sql_schema.mx sql_select.mx
sql_semantic.mx sql_sequence.mx sql_symbol.mx sql_trans.mx
sql_updates.mx sql_xml.mx
Log Message:
Type cleanup.
Counting and indexing BUNs in a BAT is now done exclusively using the
type BUN. This means that e.g. the BATcount function now returns a
BUN instead of a size_t (with many more similar changes). It also
means that all uses of the hash_t type have been replaced by BUN.
vheaps are now exclusively indexed using the type var_t.
A few new constants have been introduced:
VAR_MAX - maximum allowed value of a value of type var_t.
BUN_MAX - maximum allowed value of a value of type BUN.
OIDFMT (existed already) - format string to print a value of type oid.
BUNFMT - format string to print a value of type BUN.
VARFMT - format string to print a value of type var_t.
U sql_schema.mx
Index: sql_schema.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_schema.mx,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- sql_schema.mx 22 Aug 2008 09:52:19 -0000 1.146
+++ sql_schema.mx 25 Aug 2008 13:36:16 -0000 1.147
@@ -1095,7 +1095,7 @@
}
if (res == SQL_ERR) {
- (void) sql_error(sql, 02, "unknown constraint (%ld)->token =
%s\n", (long) s, token2string(s->token));
+ (void) sql_error(sql, 02, "unknown constraint (" PTRFMT
")->token = %s\n", PTRFMTCAST s, token2string(s->token));
}
return res;
}
@@ -1245,7 +1245,7 @@
break;
}
if (res == SQL_ERR) {
- (void) sql_error(sql, 02, "unknown column option (%ld)->token =
%s\n", (long) s, token2string(s->token));
+ (void) sql_error(sql, 02, "unknown column option (" PTRFMT
")->token = %s\n", PTRFMTCAST s, token2string(s->token));
}
return res;
}
@@ -1451,7 +1451,7 @@
break;
}
if (!res) {
- return sql_error(sql, 02, "table constraint type: wrong token
(%ld) = %s\n", (long) s, token2string(s->token));
+ return sql_error(sql, 02, "table constraint type: wrong token
(" PTRFMT ") = %s\n", PTRFMTCAST s, token2string(s->token));
}
return res;
}
@@ -1472,7 +1472,7 @@
}
if (!res) {
- return sql_error(sql, 02, "table constraint: wrong token (%ld)
= %s\n", (long) s, token2string(s->token));
+ return sql_error(sql, 02, "table constraint: wrong token ("
PTRFMT ") = %s\n", PTRFMTCAST s, token2string(s->token));
}
return res;
}
@@ -1634,7 +1634,7 @@
} break;
}
if (!res) {
- return sql_error(sql, 02, "unknown table element (%ld)->token =
%s\n", (long) s, token2string(s->token));
+ return sql_error(sql, 02, "unknown table element (" PTRFMT
")->token = %s\n", PTRFMTCAST s, token2string(s->token));
}
return res;
}
@@ -2113,7 +2113,7 @@
break;
default:
- return sql_error(sql, 01, "schema statement unknown
symbol(%ld)->token = %s", (long) s, token2string(s->token));
+ return sql_error(sql, 01, "schema statement unknown symbol("
PTRFMT ")->token = %s", PTRFMTCAST s, token2string(s->token));
}
sql->last = NULL;
return ret;
U sql_semantic.mx
Index: sql_semantic.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_semantic.mx,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- sql_semantic.mx 11 Aug 2008 19:08:48 -0000 1.184
+++ sql_semantic.mx 25 Aug 2008 13:36:17 -0000 1.185
@@ -1217,7 +1217,7 @@
}
default:
- res = sql_error(sql, 01, "sql_stmt symbol(%ld)->token = %s",
(long) s, token2string(s->token));
+ res = sql_error(sql, 01, "sql_stmt symbol(" PTRFMT ")->token =
%s", PTRFMTCAST s, token2string(s->token));
}
return res;
}
U sql_select.mx
Index: sql_select.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_select.mx,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -d -r1.241 -r1.242
--- sql_select.mx 11 Aug 2008 19:08:48 -0000 1.241
+++ sql_select.mx 25 Aug 2008 13:36:16 -0000 1.242
@@ -1898,7 +1898,7 @@
static int
cvar_cmp(cvar *c1, cvar *c2)
{
- return c1-c2;
+ return (int) (c1-c2);
}
static stmt *
@@ -4293,7 +4293,7 @@
break;
default:
- return sql_error(sql, 01, "SELECT statement unknown
symbol(%ld)->token = %s", (long) s, token2string(s->token));
+ return sql_error(sql, 01, "SELECT statement unknown symbol("
PTRFMT ")->token = %s", PTRFMTCAST s, token2string(s->token));
}
return ret;
}
U sql_updates.mx
Index: sql_updates.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_updates.mx,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- sql_updates.mx 11 Aug 2008 19:08:49 -0000 1.142
+++ sql_updates.mx 25 Aug 2008 13:36:18 -0000 1.143
@@ -2004,7 +2004,7 @@
}
break;
default:
- return sql_error(sql, 01, "Updates statement unknown
Symbol(%ld)->token = %s", (long) s, token2string(s->token));
+ return sql_error(sql, 01, "Updates statement unknown Symbol("
PTRFMT ")->token = %s", PTRFMTCAST s, token2string(s->token));
}
return ret;
U sql_trans.mx
Index: sql_trans.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_trans.mx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- sql_trans.mx 11 Jan 2008 10:52:14 -0000 1.25
+++ sql_trans.mx 25 Aug 2008 13:36:18 -0000 1.26
@@ -93,7 +93,7 @@
(void) mvc_trans(sql);
} break;
default:
- return sql_error(sql, 01, "transaction unknown
Symbol(%ld)->token = %s", (long) s, token2string(s->token));
+ return sql_error(sql, 01, "transaction unknown Symbol(" PTRFMT
")->token = %s", PTRFMTCAST s, token2string(s->token));
}
return stmt_none();
}
U sql_xml.mx
Index: sql_xml.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_xml.mx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sql_xml.mx 21 Feb 2008 13:42:19 -0000 1.8
+++ sql_xml.mx 25 Aug 2008 13:36:18 -0000 1.9
@@ -362,7 +362,7 @@
ret = sql_xmltext(sql, scp, s, grp, subset, f, knd);
break;
default:
- return sql_error(sql, 01, "XML statement unknown
symbol(%ld)->token = %s", (long) s, token2string(s->token));
+ return sql_error(sql, 01, "XML statement unknown symbol("
PTRFMT ")->token = %s", PTRFMTCAST s, token2string(s->token));
}
return ret;
}
U sql_mvc.mx
Index: sql_mvc.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_mvc.mx,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- sql_mvc.mx 28 Jul 2008 13:20:55 -0000 1.207
+++ sql_mvc.mx 25 Aug 2008 13:36:16 -0000 1.208
@@ -169,7 +169,7 @@
extern void mvc_drop_schema(mvc *c, sql_schema *s, int drop_action);
extern sql_schema *mvc_create_schema(mvc *m, char *name, int auth_id, int
owner);
-extern size_t mvc_clear_table(mvc *m, sql_table *t);
+extern BUN mvc_clear_table(mvc *m, sql_table *t);
extern void mvc_drop_table(mvc *c, sql_schema *s, sql_table * t, int
drop_action);
extern sql_table *mvc_create_table(mvc *c, sql_schema *s, char *name, bit
system, int persistence, int commit_action, int sz);
extern sql_table *mvc_create_cluster(mvc *c, sql_schema *s, char *name, bit
system, int persistence, int commit_action, int sz);
@@ -1027,7 +1027,7 @@
sql_fkey *fk;
if (mvc_debug)
- fprintf(stderr, "mvc_create_fkey %s %u %ld\n", t->base.name,
kt, (long) rkey);
+ fprintf(stderr, "mvc_create_fkey %s %u " PTRFMT "\n",
t->base.name, kt, PTRFMTCAST rkey);
fk = sql_trans_create_fkey(m->session->tr, t, name, kt, rkey,
on_delete, on_update);
m->type = Q_SCHEMA;
return fk;
@@ -1188,7 +1188,7 @@
m->type = Q_SCHEMA;
}
-size_t
+BUN
mvc_clear_table(mvc *m, sql_table *t)
{
m->type = Q_UPDATE;
U sql_psm.mx
Index: sql_psm.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_psm.mx,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- sql_psm.mx 11 Aug 2008 19:08:46 -0000 1.56
+++ sql_psm.mx 25 Aug 2008 13:36:16 -0000 1.57
@@ -816,7 +816,7 @@
sql->type = Q_UPDATE;
break;
default:
- return sql_error(sql, 01, "schema statement unknown
symbol(%ld)->token = %s", (long) s, token2string(s->token));
+ return sql_error(sql, 01, "schema statement unknown symbol("
PTRFMT ")->token = %s", PTRFMTCAST s, token2string(s->token));
}
return ret;
}
U sql_symbol.mx
Index: sql_symbol.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_symbol.mx,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- sql_symbol.mx 11 Jan 2008 10:52:14 -0000 1.32
+++ sql_symbol.mx 25 Aug 2008 13:36:17 -0000 1.33
@@ -127,7 +127,7 @@
symbol_init(s, token, type_string);
s->data.sval = data;
if (symbol_debug)
- fprintf(stderr, "%ld = symbol_create_string(%s,%s)\n",
(long) s, token2string(s->token), s->data.sval);
+ fprintf(stderr, "" PTRFMT " =
symbol_create_string(%s,%s)\n", PTRFMTCAST s, token2string(s->token),
s->data.sval);
}
return s;
}
@@ -141,7 +141,7 @@
symbol_init(s, token, type_list);
s->data.lval = data;
if (symbol_debug)
- fprintf(stderr, "%ld = symbol_create_list(%s,%ld)\n",
(long) s, token2string(s->token), (long) s->data.lval);
+ fprintf(stderr, "" PTRFMT " =
symbol_create_list(%s,%ld)\n", PTRFMTCAST s, token2string(s->token), (long)
s->data.lval);
}
return s;
}
@@ -155,7 +155,7 @@
symbol_init(s, token, type_int);
s->data.ival = data;
if (symbol_debug)
- fprintf(stderr, "%ld =
symbol_create_int(%s,"LLFMT")\n", (long) s, token2string(s->token), data);
+ fprintf(stderr, "" PTRFMT " =
symbol_create_int(%s,"LLFMT")\n", PTRFMTCAST s, token2string(s->token), data);
}
return s;
}
@@ -169,7 +169,7 @@
symbol_init(s, token, type_symbol);
s->data.sym = data;
if (symbol_debug)
- fprintf(stderr, "%ld = symbol_create_symbol(%s,%s)\n",
(long) s, token2string(s->token), token2string(data->token));
+ fprintf(stderr, "" PTRFMT " =
symbol_create_symbol(%s,%s)\n", PTRFMTCAST s, token2string(s->token),
token2string(data->token));
}
return s;
}
U rel_xml.mx
Index: rel_xml.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_xml.mx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rel_xml.mx 25 Feb 2008 19:07:43 -0000 1.2
+++ rel_xml.mx 25 Aug 2008 13:36:16 -0000 1.3
@@ -338,7 +338,7 @@
ret = rel_xmltext(sql, rel, s, f, knd);
break;
default:
- return sql_error(sql, 01, "XML statement unknown
symbol(%ld)->token = %s", (long) s, token2string(s->token));
+ return sql_error(sql, 01, "XML statement unknown symbol("
PTRFMT ")->token = %s", PTRFMTCAST s, token2string(s->token));
}
return ret;
}
U sql_sequence.mx
Index: sql_sequence.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_sequence.mx,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- sql_sequence.mx 11 Jan 2008 10:52:14 -0000 1.46
+++ sql_sequence.mx 25 Aug 2008 13:36:17 -0000 1.47
@@ -221,7 +221,7 @@
}
break;
default:
- return sql_error(sql, 01, "sql_stmt Symbol(%ld)->token
= %s", (long) s, token2string(s->token));
+ return sql_error(sql, 01, "sql_stmt Symbol(" PTRFMT
")->token = %s", PTRFMTCAST s, token2string(s->token));
}
return res;
}
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
