Changeset: 9b4e279d0e42 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9b4e279d0e42
Modified Files:
sql/storage/store.c
Branch: nospare
Log Message:
Small refactoring.
diffs (28 lines):
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1701,19 +1701,15 @@ store_load(sqlstore *store, sql_allocato
insert_types(tr, types);
insert_functions(tr, functions, funcs, arguments);
insert_schemas(tr);
-
- if (sql_trans_commit(tr) != SQL_OK)
- TRC_CRITICAL(SQL_STORE, "Cannot commit initial
transaction\n");
- tr->ts = store_timestamp(store);
} else {
tr->active = 0;
GDKqsort(store_oids, NULL, NULL, nstore_oids, sizeof(sqlid), 0,
TYPE_int, false, false);
store->obj_id = store_oids[nstore_oids - 1] + 1;
-
- if (sql_trans_commit(tr) != SQL_OK)
- TRC_CRITICAL(SQL_STORE, "Cannot commit initial
transaction\n");
- tr->ts = store_timestamp(store);
- }
+ }
+
+ if (sql_trans_commit(tr) != SQL_OK)
+ TRC_CRITICAL(SQL_STORE, "Cannot commit initial transaction\n");
+ tr->ts = store_timestamp(store);
id = store->obj_id; /* db objects up till id are already created */
store->logger_api.get_sequence(store, OBJ_SID, &lng_store_oid);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
