From 5758c71e938730c06a01486185185d96acbdb0ae Mon Sep 17 00:00:00 2001 From: David Scott Date: Wed, 26 Jan 2011 17:39:05 +0000 Subject: [PATCH] Remove the build_number from the database manifest because it wasn't used. Signed-off-by: David Scott --- ocaml/database/db_cache_types.ml | 2 -- ocaml/database/db_cache_types.mli | 1 - ocaml/database/db_xml.ml | 3 --- ocaml/xapi/pool_db_backup.ml | 2 +- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/ocaml/database/db_cache_types.ml b/ocaml/database/db_cache_types.ml index f3a84f90..f5b76ae3 100644 --- a/ocaml/database/db_cache_types.ml +++ b/ocaml/database/db_cache_types.ml @@ -30,7 +30,6 @@ type db_dump_manifest = { schema_major_vsn : int; schema_minor_vsn : int; - build_number : string; xapi_major_vsn : int; xapi_minor_vsn : int; generation_count : Generation.t @@ -40,7 +39,6 @@ let gen_manifest gen_count = { schema_major_vsn = Datamodel.schema_major_vsn; schema_minor_vsn = Datamodel.schema_minor_vsn; - build_number = Version.build_number; xapi_major_vsn = Xapi_globs.version_major; xapi_minor_vsn = Xapi_globs.version_minor; generation_count = gen_count diff --git a/ocaml/database/db_cache_types.mli b/ocaml/database/db_cache_types.mli index 3163b05f..f006c9a1 100644 --- a/ocaml/database/db_cache_types.mli +++ b/ocaml/database/db_cache_types.mli @@ -25,7 +25,6 @@ type structured_op_t = AddSet | RemoveSet | AddMap | RemoveMap type db_dump_manifest = { schema_major_vsn : int; schema_minor_vsn : int; - build_number : string; xapi_major_vsn : int; xapi_minor_vsn : int; generation_count : Int64.t; diff --git a/ocaml/database/db_xml.ml b/ocaml/database/db_xml.ml index 63a5b753..01c8f91b 100644 --- a/ocaml/database/db_xml.ml +++ b/ocaml/database/db_xml.ml @@ -24,7 +24,6 @@ let make_tag n attrs : Xmlm.tag = (name n), List.map (fun (k, v) -> name k, v) a let _schema_major_vsn = "schema_major_vsn" let _schema_minor_vsn = "schema_minor_vsn" -let _build_number = "build_number" let _xapi_major_vsn = "xapi_major_vsn" let _xapi_minor_vsn = "xapi_minor_vsn" let _generation_count = "generation_count" @@ -62,7 +61,6 @@ module To = struct Xmlm.output output (`El_start (make_tag "manifest" [])); int output _schema_major_vsn manifest.schema_major_vsn; int output _schema_minor_vsn manifest.schema_minor_vsn; - string output _build_number manifest.build_number; int output _xapi_major_vsn manifest.xapi_major_vsn; int output _xapi_minor_vsn manifest.xapi_minor_vsn; int64 output _generation_count manifest.generation_count; @@ -134,7 +132,6 @@ module From = struct let manifest = { schema_major_vsn = int_of_string (List.assoc _schema_major_vsn manifest); schema_minor_vsn = int_of_string (List.assoc _schema_minor_vsn manifest); - build_number = List.assoc _build_number manifest; xapi_major_vsn = int_of_string (List.assoc _xapi_major_vsn manifest); xapi_minor_vsn = int_of_string (List.assoc _xapi_minor_vsn manifest); generation_count = Int64.of_string (List.assoc _generation_count manifest) diff --git a/ocaml/xapi/pool_db_backup.ml b/ocaml/xapi/pool_db_backup.ml index 9dd33a76..22d6e0c8 100644 --- a/ocaml/xapi/pool_db_backup.ml +++ b/ocaml/xapi/pool_db_backup.ml @@ -29,7 +29,7 @@ let octet_stream = "Content-Type: application/octet-stream" (* CA-18377: The smallest database that is compatible with the Miami database schema. *) let minimally_compliant_miami_database = - "
" + "
" (** Write the database dump out to a file/socket *) let write_database (s: Unix.file_descr) ~__context = -- 2.39.5