Changeset: 08c1ef664e69 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=08c1ef664e69
Modified Files:
sql/src/storage/bat/bat_storage.mx
sql/src/storage/sql_storage.h
sql/src/storage/store.mx
Branch: Jun2010
Log Message:
fixes for create stream
(transplanted from c0bd93a1fb991c0852b625b56485c76b20e4e021)
diffs (truncated from 552 to 300 lines):
diff -r a8cd8797b93d -r 08c1ef664e69 sql/src/storage/bat/bat_storage.mx
--- a/sql/src/storage/bat/bat_storage.mx Mon Jun 21 19:11:09 2010 +0200
+++ b/sql/src/storage/bat/bat_storage.mx Mon Jun 21 19:11:39 2010 +0200
@@ -1213,7 +1213,7 @@
for (n = s->tables.set->h; n; n = n->next) {
sql_table *t = n->data;
- if (isGlobalTable(t))
+ if (isTable(t) && isGlobal(t))
gtr_update_table(tr, t);
}
}
diff -r a8cd8797b93d -r 08c1ef664e69 sql/src/storage/sql_storage.h
--- a/sql/src/storage/sql_storage.h Mon Jun 21 19:11:09 2010 +0200
+++ b/sql/src/storage/sql_storage.h Mon Jun 21 19:11:39 2010 +0200
@@ -27,7 +27,7 @@
#define isNew(x) ((x)->base.flag == TR_NEW)
#define isTemp(x) (isNew((x)->t)||(x)->t->persistence!=SQL_PERSIST)
#define isTempTable(x) ((x)->persistence!=SQL_PERSIST)
-#define isGlobalTable(x) ((x)->persistence!=SQL_LOCAL_TEMP && \
+#define isGlobal(x) ((x)->persistence!=SQL_LOCAL_TEMP && \
(x)->persistence!=SQL_DECLARED_TABLE)
#define isGlobalTemp(x) ((x)->persistence==SQL_GLOBAL_TEMP)
#define isTempSchema(x) (strcmp((x)->base.name, "tmp") == 0 || \
diff -r a8cd8797b93d -r 08c1ef664e69 sql/src/storage/store.mx
--- a/sql/src/storage/store.mx Mon Jun 21 19:11:09 2010 +0200
+++ b/sql/src/storage/store.mx Mon Jun 21 19:11:39 2010 +0200
@@ -1665,7 +1665,7 @@
{
sql_key *nk = key_dup(tr, TR_NEW, k, t);
sql_fkey *fk = (sql_fkey*)nk;
- sql_schema *syss = find_sql_schema(tr, isGlobalTable(t)?"sys":"tmp");
+ sql_schema *syss = find_sql_schema(tr, isGlobal(t)?"sys":"tmp");
sql_table *syskey = find_sql_table(syss, "keys");
sql_table *syskc = find_sql_table(syss, "keycolumns");
int neg = -1, action = -1, nr;
@@ -1695,7 +1695,7 @@
}
syskey->base.wtime = syskey->s->base.wtime = t->base.wtime =
t->s->base.wtime = tr->wtime = tr->stime;
- if (isGlobalTable(t))
+ if (isGlobal(t))
tr->schema_updates ++;
return nk;
}
@@ -1735,7 +1735,7 @@
sql_idx *
sql_trans_copy_idx( sql_trans *tr, sql_table *t, sql_idx *i )
{
- sql_schema *syss = find_sql_schema(tr, isGlobalTable(t)?"sys":"tmp");
+ sql_schema *syss = find_sql_schema(tr, isGlobal(t)?"sys":"tmp");
sql_table *sysidx = find_sql_table(syss, "idxs");
sql_table *sysic = find_sql_table(syss, "keycolumns");
node *n;
@@ -1770,7 +1770,7 @@
if (!isDeclaredTable(t))
table_funcs.table_insert(tr, sysidx, &ni->base.id, &t->base.id,
&ni->type, ni->base.name);
ni->base.wtime = t->base.wtime = t->s->base.wtime = tr->wtime =
tr->stime;
- if (isGlobalTable(t))
+ if (isGlobal(t))
tr->schema_updates ++;
return ni;
}
@@ -1836,7 +1836,7 @@
sql_column *
sql_trans_copy_column( sql_trans *tr, sql_table *t, sql_column *c )
{
- sql_schema *syss = find_sql_schema(tr, isGlobalTable(t)?"sys":"tmp");
+ sql_schema *syss = find_sql_schema(tr, isGlobal(t)?"sys":"tmp");
sql_table *syscolumn = find_sql_table(syss, "_columns");
sql_column *col = ZNEW(sql_column);
@@ -1860,7 +1860,7 @@
if (!isDeclaredTable(t))
table_funcs.table_insert(tr, syscolumn, &col->base.id,
col->base.name, col->type.type->sqlname, &col->type.digits, &col->type.scale,
&t->base.id, (col->def) ? col->def : ATOMnilptr(TYPE_str), &col->null,
&col->colnr, (col->storage_type) ? col->storage_type : ATOMnilptr(TYPE_str));
col->base.wtime = t->base.wtime = t->s->base.wtime = tr->wtime =
tr->stime;
- if (isGlobalTable(t))
+ if (isGlobal(t))
tr->schema_updates ++;
return col;
}
@@ -2338,7 +2338,7 @@
if (bs_debug)
fprintf(stderr, "create table %s\n", t->base.name);
- if (isTable(t) && isGlobalTable(t)) {
+ if (isTable(t) && isGlobal(t)) {
int p = (tr->parent == gtrans && !isTempTable(t));
/* only register columns without commit action tables */
@@ -2551,11 +2551,11 @@
int p = (tr->parent == gtrans);
/* persistent columns need to be dupped */
- if ((p && isGlobalTable(ot)) ||
+ if ((p && isGlobal(ot)) ||
/* allways dup in recursive mode */
tr->parent != gtrans)
return table_dup(tr, flag, ot, s);
- else if (!isGlobalTable(ot)){/* is local temp, may need to be cleared */
+ else if (!isGlobal(ot)){/* is local temp, may need to be cleared */
if (ot->commit_action == CA_DELETE) {
sql_trans_clear_table(tr, ot);
} else if (ot->commit_action == CA_DROP) {
@@ -2578,7 +2578,7 @@
node *nxt = n->next;
sql_table *t = n->data;
- if ((isTable(t) && isGlobalTable(t) &&
+ if ((isTable(t) && isGlobal(t) &&
t->commit_action != CA_PRESERVE) ||
t->commit_action == CA_DELETE) {
sql_trans_clear_table(tr, t);
@@ -2873,7 +2873,7 @@
node *nxt = n->next;
sql_table *t = n->data;
- if ((isTable(t) && isGlobalTable(t) &&
+ if ((isTable(t) && isGlobal(t) &&
t->commit_action != CA_PRESERVE) ||
t->commit_action == CA_DELETE) {
sql_trans_clear_table(tr, t);
@@ -3074,7 +3074,7 @@
static void
sys_drop_kc(sql_trans *tr, sql_key *k, sql_kc *kc)
{
- sql_schema *syss = find_sql_schema(tr, isGlobalTable(k->t)?"sys":"tmp");
+ sql_schema *syss = find_sql_schema(tr, isGlobal(k->t)?"sys":"tmp");
sql_table *syskc = find_sql_table(syss, "keycolumns");
oid rid = table_funcs.column_find_row(tr, find_sql_column(syskc, "id"),
&k->base.id, NULL);
@@ -3082,14 +3082,14 @@
assert(rid != oid_nil);
table_funcs.table_delete(tr, syskc, rid);
- if (isGlobalTable(k->t))
+ if (isGlobal(k->t))
tr->schema_updates ++;
}
static void
sys_drop_ic(sql_trans *tr, sql_idx * i, sql_kc *kc)
{
- sql_schema *syss = find_sql_schema(tr, isGlobalTable(i->t)?"sys":"tmp");
+ sql_schema *syss = find_sql_schema(tr, isGlobal(i->t)?"sys":"tmp");
sql_table *syskc = find_sql_table(syss, "keycolumns");
sql_column *kc_id = find_sql_column(syskc, "id");
oid rid = table_funcs.column_find_row(tr, kc_id, &i->base.id, NULL);
@@ -3098,7 +3098,7 @@
assert(rid != oid_nil);
table_funcs.table_delete(tr, syskc, rid);
- if (isGlobalTable(i->t))
+ if (isGlobal(i->t))
tr->schema_updates ++;
}
@@ -3106,7 +3106,7 @@
sys_drop_idx(sql_trans *tr, sql_idx * i, int drop_action)
{
node *n;
- sql_schema *syss = find_sql_schema(tr, isGlobalTable(i->t)?"sys":"tmp");
+ sql_schema *syss = find_sql_schema(tr, isGlobal(i->t)?"sys":"tmp");
sql_table *sysidx = find_sql_table(syss, "idxs");
oid rid = table_funcs.column_find_row(tr, find_sql_column(sysidx,
"id"), &i->base.id, NULL);
@@ -3124,7 +3124,7 @@
if (i->t->cluster == i)
i->t->cluster = NULL;
sql_trans_drop_dependencies(tr, i->base.id);
- if (isGlobalTable(i->t))
+ if (isGlobal(i->t))
tr->schema_updates ++;
if (drop_action)
@@ -3135,7 +3135,7 @@
sys_drop_key(sql_trans *tr, sql_key *k, int drop_action)
{
node *n;
- sql_schema *syss = find_sql_schema(tr, isGlobalTable(k->t)?"sys":"tmp");
+ sql_schema *syss = find_sql_schema(tr, isGlobal(k->t)?"sys":"tmp");
sql_table *syskey = find_sql_table(syss, "keys");
oid rid = table_funcs.column_find_row(tr, find_sql_column(syskey,
"id"), &k->base.id, NULL);
@@ -3161,7 +3161,7 @@
fk->rkey = NULL;
}
- if (isGlobalTable(k->t))
+ if (isGlobal(k->t))
tr->schema_updates ++;
sql_trans_drop_dependencies(tr, k->base.id);
@@ -3174,14 +3174,14 @@
static void
sys_drop_tc(sql_trans *tr, sql_trigger * i, sql_kc *kc)
{
- sql_schema *syss = find_sql_schema(tr, isGlobalTable(i->t)?"sys":"tmp");
+ sql_schema *syss = find_sql_schema(tr, isGlobal(i->t)?"sys":"tmp");
sql_table *syskc = find_sql_table(syss, "keycolumns");
oid rid = table_funcs.column_find_row(tr, find_sql_column(syskc, "id"),
&i->base.id, NULL);
(void) kc; /* Stefan: unused!? */
assert(rid != oid_nil);
table_funcs.table_delete(tr, syskc, rid);
- if (isGlobalTable(i->t))
+ if (isGlobal(i->t))
tr->schema_updates ++;
}
@@ -3189,7 +3189,7 @@
sys_drop_trigger(sql_trans *tr, sql_trigger * i)
{
node *n;
- sql_schema *syss = find_sql_schema(tr, isGlobalTable(i->t)?"sys":"tmp");
+ sql_schema *syss = find_sql_schema(tr, isGlobal(i->t)?"sys":"tmp");
sql_table *systrigger = find_sql_table(syss, "triggers");
oid rid = table_funcs.column_find_row(tr, find_sql_column(systrigger,
"id"), &i->base.id, NULL);
@@ -3204,7 +3204,7 @@
/* remove trigger from schema */
list_remove_data(i->t->s->triggers, i);
sql_trans_drop_dependencies(tr, i->base.id);
- if (isGlobalTable(i->t))
+ if (isGlobal(i->t))
tr->schema_updates ++;
}
@@ -3228,7 +3228,7 @@
{
str seq_pos = NULL;
const char *next_value_for = "next value for \"sys\".\"seq_";
- sql_schema *syss = find_sql_schema(tr,
isGlobalTable(col->t)?"sys":"tmp");
+ sql_schema *syss = find_sql_schema(tr, isGlobal(col->t)?"sys":"tmp");
sql_table *syscolumn = find_sql_table(syss, "_columns");
oid rid = table_funcs.column_find_row(tr, find_sql_column(syscolumn,
"id"),
&col->base.id, NULL);
@@ -3247,7 +3247,7 @@
_DELETE(seq_name);
}
- if (isGlobalTable(col->t))
+ if (isGlobal(col->t))
tr->schema_updates ++;
if (drop_action)
@@ -3296,7 +3296,7 @@
static void
sys_drop_table(sql_trans *tr, sql_table *t, int drop_action)
{
- sql_schema *syss = find_sql_schema(tr, isGlobalTable(t)?"sys":"tmp");
+ sql_schema *syss = find_sql_schema(tr, isGlobal(t)?"sys":"tmp");
sql_table *systable = find_sql_table(syss, "_tables");
sql_column *syscol = find_sql_column(systable, "id");
oid rid = table_funcs.column_find_row(tr, syscol, &t->base.id, NULL);
@@ -3311,7 +3311,7 @@
if (isTable(t))
sys_drop_columns(tr, t, drop_action);
- if (isGlobalTable(t))
+ if (isGlobal(t))
tr->schema_updates ++;
if (drop_action)
@@ -3618,7 +3618,7 @@
sql_trans_create_table(sql_trans *tr, sql_schema *s, char *name, char *sql,
int tt, bit system, int persistence, int commit_action, int sz)
{
sql_table *t = create_sql_table(NULL, name, tt, system, persistence,
commit_action);
- sql_schema *syss = find_sql_schema(tr, isGlobalTable(t)?"sys":"tmp");
+ sql_schema *syss = find_sql_schema(tr, isGlobal(t)?"sys":"tmp");
sql_table *systable = find_sql_table(syss, "_tables");
sht ca;
@@ -3644,7 +3644,7 @@
&t->system, &ca, &t->readonly);
t->base.wtime = s->base.wtime = tr->wtime = tr->stime;
- if (isGlobalTable(t))
+ if (isGlobal(t))
tr->schema_updates ++;
return t;
}
@@ -3777,7 +3777,7 @@
sys_drop_table(tr, t, drop_action);
t->base.wtime = s->base.wtime = tr->wtime = tr->stime;
- if (isGlobalTable(t) || (t->commit_action != CA_DROP))
+ if (isGlobal(t) || (t->commit_action != CA_DROP))
tr->schema_updates ++;
cs_del(&s->tables, n, t->base.flag);
@@ -3822,7 +3822,7 @@
sql_trans_create_column(sql_trans *tr, sql_table *t, char *name, sql_subtype
*tpe)
{
sql_column *col;
- sql_schema *syss = find_sql_schema(tr, isGlobalTable(t)?"sys":"tmp");
+ sql_schema *syss = find_sql_schema(tr, isGlobal(t)?"sys":"tmp");
sql_table *syscolumn = find_sql_table(syss, "_columns");
if (!tpe)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
