Changeset 2090

Timestamp:

06/03/09 17:20:19 (15 months ago)

Author:

drobilla

Message:

Centralize storage creation and only create SPO and OPS indices (TODO: Add API for user to select, predicate-variable queries will be slow this way).

Location:

trunk/slv2

Files:

• src/plugin.c (modified) (1 diff)
• src/slv2_internal.h (modified) (1 diff)
• src/world.c (modified) (3 diffs)
• utils/lv2_inspect.c (modified) (1 diff)

trunk/slv2/src/plugin.c

@@ -196 +196 @@
         if (!p->storage) {
                 assert(!p->rdf);
-                p->storage = librdf_new_storage(p->world->world, "trees", NULL, NULL);
-                if (!p->storage)
-                        p->storage = librdf_new_storage(p->world->world, "memory", NULL, NULL);
+                p->storage = slv2_world_new_storage(p->world);
                 p->rdf = librdf_new_model(p->world->world, p->storage, NULL);
         }

trunk/slv2/src/slv2_internal.h

@@ -166 +166 @@
 slv2_world_load_file(SLV2World world, librdf_uri* file_uri);
 
+librdf_storage*
+slv2_world_new_storage(SLV2World world);
+
 
 /* ********* Plugin UI ********* */

trunk/slv2/src/world.c

@@ -43 +43 @@
         assert(world->world);
 
-        world->storage = librdf_new_storage(world->world, "trees", NULL, NULL);
-        if (!world->storage) {
-                SLV2_WARN("Warning: Unable to create \"trees\" RDF storage.\n"
-                                "Performance can be improved by upgrading librdf.\n");
-                world->storage = librdf_new_storage(world->world, "hashes", NULL,
-                                "hash-type='memory'");
-        }
-
+        world->storage = slv2_world_new_storage(world);
         if (!world->storage)
                 goto fail;
@@ -89 +82 @@
         /* keep on rockin' in the */ free(world);
         return NULL;
+}
+
+
+/* private */
+librdf_storage*
+slv2_world_new_storage(SLV2World world)
+{
+        static bool warned = false;
+        librdf_hash* options = librdf_new_hash_from_string(world->world, NULL,
+                        "index-spo='yes',index-ops='yes'");
+        librdf_storage* ret = librdf_new_storage_with_options(
+                        world->world, "trees", NULL, options);
+        if (!ret) {
+                warned = true;
+                SLV2_WARN("Warning: Unable to create \"trees\" RDF storage.\n"
+                                "Performance can be improved by upgrading librdf.\n");
+                ret = librdf_new_storage(world->world, "hashes", NULL,
+                                "hash-type='memory'");
+        }
+
+        librdf_free_hash(options);
+        return ret;
 }
 
@@ -186 +201 @@
 
         /* Parse the manifest into a temporary model */
-        librdf_storage* manifest_storage = librdf_new_storage(world->world, "trees", NULL, NULL);
-        if (manifest_storage == NULL)
-                manifest_storage = librdf_new_storage(world->world, "memory", NULL, NULL);
+        librdf_storage* manifest_storage = slv2_world_new_storage(world);
 
         librdf_model* manifest_model = librdf_new_model(world->world,

trunk/slv2/utils/lv2_inspect.c

@@ -227 +227 @@
                 SLV2Value name = slv2_results_get_binding_value(presets, 0);
                 printf("\t         %s\n", slv2_value_as_string(name));
+                slv2_value_free(name);
         }
         slv2_results_free(presets);