Changeset: 394c32583f40 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=394c32583f40
Modified Files:
sql/include/sql_catalog.h
sql/storage/store.c
Branch: arrays
Log Message:
querying arrays after mserver5 restart works now
diffs (42 lines):
diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -468,7 +468,7 @@ typedef enum table_types {
#define isStream(x) (x->type==tt_stream)
#define isRemote(x) (x->type==tt_remote)
#define isReplicaTable(x) (x->type==tt_replica_table)
-#define isKindOfTable(x) (isTable(x) || isMergeTable(x) || isRemote(x) ||
isReplicaTable(x))
+#define isKindOfTable(x) (isTable(x) || isMergeTable(x) || isRemote(x) ||
isReplicaTable(x) || isArray(t))
#define isArray(x) (x->type==tt_array)
#define TABLE_WRITABLE 0
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -513,7 +513,7 @@ load_column(sql_trans *tr, sql_table *t,
else
_DELETE(st);
c->t = t;
- if (isTable(c->t))
+ if (isTable(c->t) || isArray(c->t))
store_funcs.create_col(tr, c);
c->sorted = sql_trans_is_sorted(tr, c);
c->dcount = 0;
@@ -614,7 +614,7 @@ load_table(sql_trans *tr, sql_schema *s,
cs_new(&t->triggers, tr->sa, (fdestroy) &trigger_destroy);
cs_new(&t->tables, tr->sa, (fdestroy) &table_destroy);
- if (isTable(t)) {
+ if (isTable(t) || isArray(t)) { //create the deltas
if (store_funcs.create_del(tr, t) != LOG_OK) {
if (bs_debug)
fprintf(stderr, "#\tload table %s missing
'deletes'", t->base.name);
@@ -2624,7 +2624,7 @@ rollforward_create_table(sql_trans *tr,
/* only register columns without commit action tables */
ok = rollforward_changeset_creates(tr, &t->columns, (rfcfunc)
&rollforward_create_column, mode);
- if (isTable(t)) {
+ if (isTable(t) ) {
if (p && mode == R_SNAPSHOT)
store_funcs.snapshot_create_del(tr, t);
else if (p && mode == R_LOG)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
