X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fmetadata%2FmetadataDb.ml;h=c5fbb79a832ac642a3584d93a270fd931140c94b;hb=97c2d258a5c524eb5c4b85208899d80751a2c82f;hp=2fdfb49fd49a02056c502dd4b6463651462f1194;hpb=a18be43f8f1cdde43b5b2c79c2c8968c11d4804f;p=helm.git

diff --git a/helm/ocaml/metadata/metadataDb.ml b/helm/ocaml/metadata/metadataDb.ml
index 2fdfb49fd..c5fbb79a8 100644
--- a/helm/ocaml/metadata/metadataDb.ml
+++ b/helm/ocaml/metadata/metadataDb.ml
@@ -55,21 +55,21 @@ let execute_insert dbd uri (sort_cols, rel_cols, obj_cols) =
     let query_sort = 
       sprintf "INSERT %s VALUES %s;" (sort_tbl ()) (String.concat "," sort_tuples) 
     in
-    ignore (Mysql.exec dbd query_sort)
+    ignore (HMysql.exec dbd query_sort)
     end;
   if rel_tuples <> [] then
     begin
     let query_rel = 
       sprintf "INSERT %s VALUES %s;" (rel_tbl ()) (String.concat "," rel_tuples) 
     in
-    ignore (Mysql.exec dbd query_rel)
+    ignore (HMysql.exec dbd query_rel)
     end;
   if obj_tuples <> [] then
     begin
     let query_obj = 
       sprintf "INSERT %s VALUES %s;" (obj_tbl ()) (String.concat "," obj_tuples) 
     in
-    ignore (Mysql.exec dbd query_obj)
+    ignore (HMysql.exec dbd query_obj)
     end
   
     
@@ -109,7 +109,7 @@ let insert_const_no ~dbd l =
  let insert =
   sprintf "INSERT INTO %s VALUES %s" (count_tbl ()) (String.concat "," data)
  in
-  ignore (Mysql.exec dbd insert)
+  ignore (HMysql.exec dbd insert)
   
 let insert_name ~dbd l =
  let data =
@@ -120,7 +120,7 @@ let insert_name ~dbd l =
  let insert =
   sprintf "INSERT INTO %s VALUES %s" (name_tbl ()) (String.concat "," data)
  in
-  ignore (Mysql.exec dbd insert)
+  ignore (HMysql.exec dbd insert)
 
 type columns =
   MetadataPp.t list list * MetadataPp.t list list * MetadataPp.t list list
@@ -136,44 +136,32 @@ let eventually_analyze dbd =
     begin
       let analyze t = "OPTIMIZE TABLE " ^ t ^ ";" in
       List.iter 
-        (fun table -> ignore (Mysql.exec dbd (analyze table)))
+        (fun table -> ignore (HMysql.exec dbd (analyze table)))
         [name_tbl (); rel_tbl (); sort_tbl (); obj_tbl(); count_tbl()]
     end
   
 (***** TENTATIVE HACK FOR THE DB SLOWDOWN - END *******)
 
-let profile = (CicUtil.profile "foo").CicUtil.profile
-let profile2 = (CicUtil.profile "foo2").CicUtil.profile
-let profile3 = (CicUtil.profile "foo3").CicUtil.profile
-
 let index_obj ~dbd ~uri = 
   if not (already_indexed uri) then begin
-let foo () =
     eventually_analyze dbd;
-in profile3 foo ();
-    let metadata =
-let foo () =
-MetadataExtractor.compute_obj uri in
-profile2 foo () in
+    let metadata = MetadataExtractor.compute_obj uri in
     let uri = UriManager.string_of_uri uri in
-    let columns =
-MetadataPp.columns_of_metadata metadata in
-let foo () =
+    let columns = MetadataPp.columns_of_metadata metadata in
     execute_insert dbd uri (columns :> columns);
     insert_const_no ~dbd metadata;
     insert_name ~dbd metadata
-in profile foo ()
   end
   
 
 let tables_to_clean =
   [sort_tbl; rel_tbl; obj_tbl; name_tbl; count_tbl]
 
-let clean ~(dbd:Mysql.dbd) =
+let clean ~(dbd:HMysql.dbd) =
   let owned_uris =  (* list of uris in list-of-columns format *)
     let query = sprintf "SELECT source FROM %s" (name_tbl ()) in
-    let result = Mysql.exec dbd query in
-    let uris = Mysql.map result (fun cols ->
+    let result = HMysql.exec dbd query in
+    let uris = HMysql.map result (fun cols ->
       match cols.(0) with
       | Some src -> src
       | None -> assert false) in
@@ -185,7 +173,7 @@ let clean ~(dbd:Mysql.dbd) =
       sprintf "DELETE FROM %s WHERE source LIKE \"%s%%\"" (tbl ()) s 
     in
     List.iter
-      (fun source_col -> ignore (Mysql.exec dbd (query source_col)))
+      (fun source_col -> ignore (HMysql.exec dbd (query source_col)))
       owned_uris
   in
   List.iter del_from tables_to_clean;
@@ -197,7 +185,7 @@ let unindex ~dbd ~uri =
     let query tbl =
       sprintf "DELETE FROM %s WHERE source LIKE \"%s%%\"" (tbl ()) uri
     in
-    ignore (Mysql.exec dbd (query tbl))
+    ignore (HMysql.exec dbd (query tbl))
   in
   List.iter del_from tables_to_clean