X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=osl.c;h=9480325ea8ab3c81977bfd33c892e11f3b524eb9;hb=758c28419b5b0876bee510f1fb4e01b75b2918f5;hp=17bddeb5db58b821931bd808f8ab0511ff78b3d9;hpb=c2e27a85d7a7b8d4ce734c88f9ff1493b87a5789;p=osl.git

diff --git a/osl.c b/osl.c
index 17bddeb..9480325 100644
--- a/osl.c
+++ b/osl.c
@@ -168,7 +168,7 @@ static char *disk_storage_name_of_object(const struct osl_table *t,
 	const struct osl_object *obj)
 {
 	HASH_TYPE hash[HASH_SIZE];
-	hash_object(obj, hash);
+	hash_object(t, obj, hash);
 	return disk_storage_name_of_hash(t, hash);
 }
 
@@ -186,9 +186,10 @@ static int disk_storage_name_of_row(const struct osl_table *t,
 	return -E_OSL_NOMEM;
 }
 
-static void column_name_hash(const char *col_name, HASH_TYPE *hash)
+static void column_name_hash(const struct osl_table *t, const char *col_name,
+		HASH_TYPE *hash)
 {
-	hash_function(col_name, strlen(col_name), hash);
+	hash_function(t->version, col_name, strlen(col_name), hash);
 }
 
 static int init_column_descriptions(struct osl_table *t)
@@ -205,7 +206,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 +219,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,14 +341,14 @@ 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.
  */
 int read_table_desc(struct osl_object *map, struct osl_table_description *desc)
 {
 	char *buf = map->data;
-	uint8_t version, compat_version, create_version;
+	uint8_t table_version;
 	uint16_t header_size;
 	int ret, i;
 	unsigned offset;
@@ -359,20 +358,11 @@ int read_table_desc(struct osl_object *map, struct osl_table_description *desc)
 		return -E_OSL_SHORT_TABLE;
 	if (strncmp(buf + IDX_OSL_MAGIC, OSL_MAGIC, strlen(OSL_MAGIC)))
 		return -E_OSL_NO_MAGIC;
-	version = read_u8(buf + IDX_VERSION);
-	/*
-	 * The on-disk version consists of two version numbers: the
-	 * create_version (low 4 bits) is the CURRENT_TABLE_VERSION version
-	 * number of the library that created the table, and compat_version
-	 * (high 4 bits) tells us the lowest version of the library that can
-	 * still read this table.
-	 */
-	create_version = version & 0xf;
-	compat_version = version >> 4;
-	INFO_LOG("create_version: %u, compat_version: %u\n", create_version,
-		compat_version);
-	if (create_version < MIN_TABLE_VERSION /* table too old */
-		|| compat_version > CURRENT_TABLE_VERSION) /* libosl too old */
+	table_version = read_u8(buf + IDX_VERSION);
+	INFO_LOG("osl versions (table/min/current): %u/%u/%u\n",
+		table_version, MIN_TABLE_VERSION, CURRENT_TABLE_VERSION);
+	if (table_version < MIN_TABLE_VERSION /* table too old */
+		|| table_version > CURRENT_TABLE_VERSION) /* libosl too old */
 		return -E_OSL_VERSION_MISMATCH;
 	desc->flags = read_u8(buf + IDX_TABLE_FLAGS);
 	desc->num_columns = read_u16(buf + IDX_NUM_COLUMNS);
@@ -417,7 +407,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);
@@ -438,6 +428,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;
@@ -507,8 +498,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
-		+ (COMPAT_TABLE_VERSION << 4));
+	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;
@@ -546,7 +536,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;
@@ -563,6 +554,7 @@ __export int osl_create_table(const struct osl_table_description *desc)
 			if (ret < 0)
 				goto out;
 		}
+		column_name_hash(t, cd->name, t->columns[i].name_hash);
 		ret = -E_OSL_NOMEM;
 		filename = column_filename(t, i);
 		if (!filename)
@@ -729,13 +721,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(t, 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 */
@@ -1082,30 +1077,13 @@ int init_rbtrees(struct osl_table *t)
 __export int osl_open_table(const struct osl_table_description *table_desc,
 		struct osl_table **result)
 {
-	int i, ret;
+	int ret;
 	struct osl_table *t;
-	const struct osl_column_description *cd;
 
 	NOTICE_LOG("opening table %s\n", table_desc->name);
 	ret = init_table_structure(table_desc, &t);
 	if (ret < 0)
 		return ret;
-	FOR_EACH_DISK_STORAGE_COLUMN(i, t, cd) {
-		struct stat statbuf;
-		char *dirname = column_filename(t, i);
-
-		ret = -E_OSL_NOMEM;
-		if (!dirname)
-			goto err;
-		/* check if directory exists */
-		ret = osl_stat(dirname, &statbuf);
-		free(dirname);
-		if (ret < 0)
-			goto err;
-		ret = -E_OSL_NOTDIR;
-		if (!S_ISDIR(statbuf.st_mode))
-			goto err;
-	}
 	ret = map_table(t, MAP_TBL_FL_VERIFY_INDEX);
 	if (ret < 0)
 		goto err;