Store table version in struct osl_table.

[osl.git] / osl.c

diff --git a/osl.c b/osl.c
index 5f58488c0f3e342e7c413c743a1fc85cedc0294b..40b0a24f38bea36b2379836ee447f0e2923e726d 100644 (file)
--- a/osl.c
+++ b/osl.c
@@ -205,7 +205,6 @@ static int init_column_descriptions(struct osl_table *t)
        /* the size of the index header without column descriptions */
        t->index_header_size = IDX_COLUMN_DESCRIPTIONS;
        FOR_EACH_COLUMN(i, t->desc, cd) {
-               struct osl_column *col = t->columns + i;
                if (cd->storage_flags & OSL_RBTREE) {
                        if (!cd->compare_function)
                                return -E_OSL_NO_COMPARE_FUNC;
@@ -219,7 +218,6 @@ static int init_column_descriptions(struct osl_table *t)
                if (ret < 0)
                        goto err;
                t->index_header_size += index_column_description_size(cd->name);
-               column_name_hash(cd->name, col->name_hash);
                ret = -E_OSL_DUPLICATE_COL_NAME;
                for (j = i + 1; j < t->desc->num_columns; j++) {
                        const char *name2 = get_column_description(t->desc,
@@ -342,7 +340,7 @@ err:
  * Read the index header, check for the osl magic string and the table version
  * number.  Read all information stored in the index header into \a desc.
  *
- * \return Standard.
+ * \return The on-disk table version number on success, negative on errors.
  *
  * \sa struct osl_table_description, osl_create_table.
  */
@@ -408,7 +406,7 @@ int read_table_desc(struct osl_object *map, struct osl_table_description *desc)
                        offset, header_size);
                goto err;
        }
-       return 1;
+       return table_version;
 err:
        FOR_EACH_COLUMN(i, desc, cd)
                free(cd->name);
@@ -429,6 +427,7 @@ static int compare_table_descriptions(struct osl_table *t)
        ret = read_table_desc(&t->index_map, &desc);
        if (ret < 0)
                return ret;
+       t->version = ret;
        ret = -E_OSL_BAD_TABLE_FLAGS;
        if (desc.flags != t->desc->flags)
                goto out;
@@ -498,7 +497,7 @@ static int create_table_index(struct osl_table *t)
        sprintf(buf + IDX_OSL_MAGIC, "%s", OSL_MAGIC);
        write_u8(buf + IDX_TABLE_FLAGS, t->desc->flags);
        write_u8(buf + IDX_DIRTY_FLAG, 0);
-       write_u8(buf + IDX_VERSION, CURRENT_TABLE_VERSION);
+       write_u8(buf + IDX_VERSION, t->version);
        write_u16(buf + IDX_NUM_COLUMNS, t->num_mapped_columns + t->num_disk_storage_columns);
        write_u16(buf + IDX_HEADER_SIZE, t->index_header_size);
        offset = IDX_COLUMN_DESCRIPTIONS;
@@ -536,7 +535,8 @@ __export int osl_create_table(const struct osl_table_description *desc)
 
        if (ret < 0)
                return ret;
-       INFO_LOG("creating %s\n", desc->name);
+       t->version = CURRENT_TABLE_VERSION;
+       INFO_LOG("creating version %u table %s\n", t->version, desc->name);
        FOR_EACH_COLUMN(i, t->desc, cd) {
                if (cd->storage_type == OSL_NO_STORAGE)
                        continue;
@@ -553,6 +553,7 @@ __export int osl_create_table(const struct osl_table_description *desc)
                        if (ret < 0)
                                goto out;
                }
+               column_name_hash(cd->name, t->columns[i].name_hash);
                ret = -E_OSL_NOMEM;
                filename = column_filename(t, i);
                if (!filename)
@@ -719,13 +720,16 @@ int map_table(struct osl_table *t, enum map_table_flags flags)
        }
        mark_table_dirty(t);
        num_rows = table_num_rows(t);
-       if (!num_rows)
-               return num_rows;
        /* map data files */
-       FOR_EACH_MAPPED_COLUMN(i, t, cd) {
-               ret = map_column(t, i);
-               if (ret < 0)
-                       goto err;
+       FOR_EACH_COLUMN(i, t->desc, cd) {
+               if (cd->storage_type == OSL_NO_STORAGE)
+                       continue;
+               column_name_hash(cd->name, t->columns[i].name_hash);
+               if (num_rows > 0 && cd->storage_type == OSL_MAPPED_STORAGE) {
+                       ret = map_column(t, i);
+                       if (ret < 0)
+                               goto err;
+               }
        }
        return num_rows;
 err:   /* unmap what is already mapped */