X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=osl.c;h=b9c23393dddf8d68bbd447d692f5cfbdb3ef8ebc;hb=8d549f29ee743cff2deaab5112dde797476f441f;hp=5f58488c0f3e342e7c413c743a1fc85cedc0294b;hpb=1a3291cfa4e3a1efc50e2a9752bf6abc0e6ce02a;p=osl.git

diff --git a/osl.c b/osl.c
index 5f58488..b9c2339 100644
--- 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,
@@ -553,6 +551,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 +718,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 */