Changeset 22248

Timestamp:

05/20/09 13:42:27 (1 year ago)

Author:

piotras

Message:

Copy and extend MgdSchema?. Fixes #790, refs #1008

Files:

• trunk/midgard/core/midgard/Makefile.am (modified) (1 diff)
• trunk/midgard/core/midgard/src/mgdschema.c (modified) (36 diffs)
• trunk/midgard/core/midgard/src/midgard_core_schema.c (modified) (4 diffs)
• trunk/midgard/core/midgard/src/midgard_object.c (modified) (2 diffs)
• trunk/midgard/core/midgard/src/midgard_object_class.c (modified) (1 diff)
• trunk/midgard/core/midgard/src/schema.h (modified) (2 diffs)

trunk/midgard/core/midgard/Makefile.am

@@ -125 +125 @@
-        src/midgard_core_config.h \
-        src/midgard_core_object_parameter.h \
+        src/midgard_core_schema.c \
+        src/midgard_core_xml.h \
+        src/midgard_core_xml.c \
-        src/midgard_dbus.h \
-        src/midgard_dbus.c \

trunk/midgard/core/midgard/src/mgdschema.c

@@ -1 +1 @@
-/* Midgard schema , records and objects definition.
-   
-
+, 2009
-  
-  This program is free software; you can redistribute it and/or modify it
@@ -32 +32 @@
-#include <libxml/parserInternals.h>
-#include "guid.h"
+#include "midgard_core_xml.h"
-
-/* TODO tune header files , no need to include string.h while we need to include midgard.h in almost every case */
@@ -45 +46 @@
-static const gchar *parsed_schema = NULL;
-
-/* prototypes */ 
-static void _copy_schemas(gpointer key, gpointer value, gpointer userdata);
-
-MgdSchemaPropertyAttr *_mgd_schema_property_attr_new(){
-        
-        MgdSchemaPropertyAttr *prop = g_new(MgdSchemaPropertyAttr, 1); /* FIXME, LEAK */
-        prop->gtype = G_TYPE_NONE;
-        prop->type = NULL;
-        prop->default_value = NULL;
-        prop->dbtype = NULL;
-        prop->field = NULL;
-        prop->dbindex = FALSE;
-        prop->table = NULL;
-        prop->tablefield = NULL;
-        prop->upfield = NULL;
-        prop->parentfield = NULL;
-        prop->primaryfield = NULL;
-        prop->is_multilang = FALSE;
-        prop->link = NULL;
-        prop->link_target = NULL;
-        prop->is_primary = FALSE;
-        prop->is_reversed = FALSE;
-        prop->is_link = FALSE;
-        prop->is_linked = FALSE;
-        prop->description = NULL;
-        
-        return prop; 
-}
-
-void _mgd_schema_property_attr_free(MgdSchemaPropertyAttr *prop)
-{
-        g_assert(prop != NULL);
-
-        g_free((gchar *)prop->type);
-        g_free((gchar *)prop->dbtype);  
-        g_free((gchar *)prop->field);
-        g_free((gchar *)prop->table);
-        g_free((gchar *)prop->tablefield);
-        g_free((gchar *)prop->upfield);
-        g_free((gchar *)prop->parentfield);
-        g_free((gchar *)prop->primaryfield);
-        g_free((gchar *)prop->link);
-        g_free((gchar *)prop->link_target);
-
-        g_free(prop);
-}
-
-void _destroy_property_hash(gpointer key, gpointer value, gpointer userdata)
-{
@@ -113 +67 @@
-{
-        MgdSchemaTypeAttr *type = g_new(MgdSchemaTypeAttr, 1);
+        type->name = NULL;
-        type->base_index = 0;
-        type->num_properties = 0;
@@ -131 +86 @@
-        type->tableshash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
-        type->prophash = g_hash_table_new(g_str_hash, g_str_equal);
-s
+ren
-        type->unique_name = NULL;
-        type->sql_select_full = NULL;
-
+
+
-        
-        return type;
@@ -142 +98 @@
-{
-        g_assert(type != NULL);
+
+        g_free(type->name);
+        type->name = NULL;
-
-        g_free((gchar *)type->table);
@@ -155 +114 @@
-        g_hash_table_destroy(type->prophash);
-
-        g_free(type->tmp_select);
-        g_free(type->sql_select_full);
-        g_free(type->parentfield);
@@ -217 +175 @@
- * We change them only here , and in xml file itself.
- */
-
+"copy", "extends", 
-static const gchar *mgd_attribute[] = { 
-
-
+
+
+
+
+
-        "parent", 
-        "parentfield", 
-        "type", 
-        "link", 
-        "upfield", 
@@ -310 +270 @@
-/* Get all type attributes */
-static void
-
+, MidgardSchema *schema
-{
-        xmlAttr *attr;
@@ -322 +282 @@
-                while (attr != NULL){
-
-
+ 
-                                g_warning("Wrong attribute '%s' in '%s' on line %ld",
-                                                attr->name, parsed_schema, xmlGetLineNo(node)); 
-                        }       
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        xmlFree(attrval);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-        }
@@ -348 +352 @@
-                MgdSchemaTypeAttr *type_attr, MgdSchemaPropertyAttr *prop_attr)
-{
-        gboolean typeisset = FALSE;
-        xmlAttr *attr;
-        xmlChar *attrval;
@@ -363 +366 @@
-                                attrval = xmlNodeListGetString (node->doc, attr->children, 1);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                                } else {
-
-
-
-
+
-                                }
-
@@ -553 +517 @@
-                        if (g_str_equal(attr->name, "unique")) {
-
-
-
-
+
+
+
+
-                                        
-                                        if (prop_attr->gtype != MGD_TYPE_STRING) 
@@ -561 +526 @@
-
-                                        gchar *propname = (gchar *)xmlGetProp(node, (const xmlChar *)"name");
-
+
+
-                                }
-
-
+
+
-                        }
-        
@@ -619 +586 @@
-                                                        attrval);
-                                }
-
+
+
-                        }
-
@@ -640 +608 @@
-                                        xmlFree(tmpattr);
-                                } else {
-g_warning("u
+__warn_msg(node, "U
-                                }
-                                prop_attr->upfield = g_strdup((gchar *)attrval);                        
@@ -662 +630 @@
-                                        xmlFree(tmpattr);
-                                } else {                         
-g_warning("p
+__warn_msg(node, "P
-                                }
-                                prop_attr->parentfield = g_strdup((gchar *)attrval);
@@ -750 +718 @@
-                                /* Check if type name is reserved one */
-                                if (strv_contains(rtypes, nv)) {
-
-
+
-
-                                }
@@ -764 +731 @@
-                                        } else {
-                                                type_attr = _mgd_schema_type_attr_new();
+                                                type_attr->name = g_strdup((gchar *)nv);
-                                                g_hash_table_insert(schema->types,
-                                                                g_strdup((gchar *)nv), type_attr);
-
+, schema
-                                        }
-                                } 
@@ -786 +754 @@
-                                        /* FIXME
-                                         * one prop_attr seems to be assigned nowhere */
-_mgd_schema
+midgard_core_schema_type
-                                        midgard_core_schema_get_property_type(obj, type_attr, prop_attr);
-                                        midgard_core_schema_get_default_value(obj, type_attr, prop_attr);
@@ -801 +769 @@
-                                                g_free(tmpstr);
-                                        }
+                                        prop_attr->name = g_strdup((gchar *)nv);
-                                        g_hash_table_insert(type_attr->prophash, 
-                                                        g_strdup((gchar *)nv), prop_attr);
@@ -833 +802 @@
-                        }
-
+                        if (obj->children != NULL)
+                                _get_element_names (obj->children, type_attr, schema);  
+
-                        xmlFree(nv);
-                        if (obj->children != NULL)
-                                _get_element_names (obj->children, type_attr, schema);   
-                }
-        }
@@ -848 +818 @@
-        MgdSchemaPropertyAttr *prop_attr = (MgdSchemaPropertyAttr *) value;
-        const gchar *table, *tables, *primary, *parentname, *ext_table = NULL;
-        gchar *tmp_sql = NULL , *nick = "";     
-        /* type_attr->num_properties is used ( and is mandatory! ) 
-         * when we register new object types and set class properties */
-        guint n = ++type_attr->num_properties;;
-        const gchar *pname = (gchar *) key;
-        const gchar *fname = NULL, *upfield = NULL, *parentfield = NULL; 
-        gchar *tmpstr = NULL;
-        GParamSpec **params = type_attr->params;
-        GString *tmp_gstring_sql, *table_sql;
-        
-        /* Set default string type if not set */
-        if(!prop_attr->type) {
-                prop_attr->type = g_strdup("string");
-                prop_attr->gtype = MGD_TYPE_STRING;
-        }               
-        
-        table = prop_attr->table;
@@ -868 +826 @@
-        parentname = table;
-
-        /* TODO
-         * Set ACL data, create sql queries, add additional data
-         * All data required is present at this moment.
-         */
-        
-        /* Search for upfield and parentfield definition.
-         * We will use them ( if found ) for nick ( table.field ) definition 
-         * without need to define field attribute.  */
-        
-        upfield = prop_attr->upfield;
-        parentfield = prop_attr->parentfield;
@@ -885 +834 @@
-
-        ext_table = table;
-
-
-
-
-
+
-        if (ext_table != NULL){
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        } 
-        
@@ -948 +862 @@
-        }       
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-        if(prop_attr->field == NULL)
@@ -1002 +877 @@
-        if((prop_attr->is_primary) && (prop_attr->gtype != G_TYPE_UINT))
-                prop_attr->gtype = G_TYPE_UINT;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-/* Get types' data. Type's name and its values.
@@ -1070 +885 @@
- * with correct values
- */ 
-
-typedef struct {
-        GString *string;
-        guint elts;
-}_str_cont;
-
-static void __build_tables_string(
-                gpointer key, gpointer value, gpointer user_data)
-{
-        _str_cont *_cont  = (_str_cont *) user_data;
-        
-        if(_cont->elts == 0)
-                g_string_append_printf(_cont->string, "%s", (gchar *) key);
-        else 
-                g_string_append_printf(_cont->string, ", %s", (gchar *) key);
-        
-        _cont->elts++;
-}
-
-void __get_tdata_foreach(gpointer key, gpointer value, gpointer user_data)
-
-
+
-        MgdSchemaTypeAttr *type_attr = (MgdSchemaTypeAttr *) value;
-        guint np;               
@@ -1100 +895 @@
-        np = g_hash_table_size(type_attr->prophash);
-
-        type_attr->params = g_malloc(sizeof(GParamSpec*)*(np+1)); 
-
-        if (np > 0) {
+
-                g_hash_table_foreach(type_attr->prophash, 
-                                __get_pdata_foreach, type_attr);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        } else {
+
-                g_warning("Type %s has less than 1 property!", (gchar *)key);
-        }
@@ -1179 +922 @@
-
-/* We CAN NOT define some data during __get_tdata_foreach.
-s
+ren
- * all types are registered and all types internal structures are
- * already initialized and defined
- */ 
-
-
-
-
+
+
+
+
+
-        gchar *typename = (gchar *) key;
-        const gchar *parentname;
@@ -1193 +937 @@
-        
-        if (parentname  != NULL ){
-
-                /* validate tree parent class */
-                MidgardObjectClass *pklass = MIDGARD_OBJECT_GET_CLASS_BY_NAME(parentname);
-                if(pklass == NULL) {
-                        
-                        g_critical("Parent %s for %s class is not registered in GType system",
-                                        parentname, typename);
-                }
-
-                /* validate parent property */
-                MidgardObjectClass *klass = MIDGARD_OBJECT_GET_CLASS_BY_NAME(typename);
-                const gchar *parent_property = midgard_object_class_get_property_parent(klass);
-                if(parent_property == NULL) {
-                        
-                        g_critical("Parent property missed for %s class. %s declared as tree parent class",
-                                        typename, parentname);
-                }
-
-                /* Set child type name for parent's one */
@@ -1227 +954 @@
-
-                if ((parenttype = midgard_schema_lookup_type(schema, (gchar *)parentname)) != NULL){
-* g_debug("type %s, parent %s", typename, parentname); */
-s
+/ g_debug("type %s, parent %s", typename, parentname); 
+ren
-                                                (gpointer)g_type_from_name(typename))) {
-s
-s
+ren
+ren
-                                                        (gpointer)g_type_from_name(typename));
-                        }                       
-
-
+ 
+              
-}
-
@@ -1623 +1350 @@
-}
-
+static void __extend_type_attr(gpointer key, gpointer val, gpointer userdata)
+{
+        gchar *property = (gchar *)key;
+        MgdSchemaPropertyAttr *parent_attr = (MgdSchemaPropertyAttr *) val;
+        MgdSchemaTypeAttr *type = (MgdSchemaTypeAttr *) userdata;
+
+        /* Look for property registered for child type. If it is registered we silently
+           return. Child type may use different field for inherited property name */
+        MgdSchemaPropertyAttr *prop_attr = g_hash_table_lookup(type->prophash, key);
+
+        if (prop_attr) 
+                return;
+        
+        midgard_core_schema_type_property_copy(parent_attr, type);
+}
+
+static void __extend_type_foreach(gpointer key, gpointer val, gpointer userdata)
+{
+        MgdSchemaTypeAttr *type_attr = (MgdSchemaTypeAttr *) val;
+        MidgardSchema *schema = (MidgardSchema*) userdata;
+
+        if (val == NULL) return;
+        if (type_attr->extends == NULL) return;
+
+        MgdSchemaTypeAttr *parent_type_attr = 
+                midgard_schema_lookup_type(schema, type_attr->extends);
+
+        if (!parent_type_attr)
+                g_error("Type information for %s (%s's parent) not found", 
+                                type_attr->extends, type_attr->name);
+
+        /* Use parent's storage */
+        type_attr->table = g_strdup(parent_type_attr->table);
+        type_attr->tables = g_strdup(parent_type_attr->tables);
+
+        g_hash_table_foreach(parent_type_attr->prophash, __extend_type_attr, type_attr);        
+}
+
+static void __copy_type_attr(gpointer key, gpointer val, gpointer userdata)
+{
+        gchar *property = (gchar *)key;
+        MgdSchemaPropertyAttr *parent_attr = (MgdSchemaPropertyAttr *) val;
+        MgdSchemaTypeAttr *type = (MgdSchemaTypeAttr *) userdata;
+
+        /* Look for property registered for child type. If it is registered we silently
+           return. Child type may use different field for inherited property name */
+        MgdSchemaPropertyAttr *prop_attr = g_hash_table_lookup(type->prophash, key);
+
+        if (prop_attr) 
+                return;
+        
+        midgard_core_schema_type_property_copy(parent_attr, type);
+
+        prop_attr = g_hash_table_lookup(type->prophash, key);
+
+        /* redefine tablefield */
+        midgard_core_schema_type_property_set_tablefield(prop_attr, type->table, prop_attr->field);
+        
+}
+
+static void __copy_type_foreach(gpointer key, gpointer val, gpointer userdata)
+{
+        MgdSchemaTypeAttr *type_attr = (MgdSchemaTypeAttr *) val;
+        MidgardSchema *schema = (MidgardSchema*) userdata;
+
+        gchar *copied = type_attr->copy_from;
+
+        if (val == NULL) return;
+        if (copied == NULL) return;
+
+        MgdSchemaTypeAttr *parent_type_attr = 
+                midgard_schema_lookup_type(schema, copied);
+
+        if (!parent_type_attr)
+                g_error("Type information for %s (%s's parent) not found", 
+                                copied, type_attr->name);
+
+        g_hash_table_foreach(parent_type_attr->prophash, __copy_type_attr, type_attr);  
+}
+
+static void __register_schema_type (gpointer key, gpointer val, gpointer user_data)
+{
+        MgdSchemaTypeAttr *type_attr = (MgdSchemaTypeAttr *) val;
+
+        if (val == NULL) return;
+        if (type_attr->params == NULL) {
+
+                g_warning("No parameters found for %s schema type. Not registering.", type_attr->name);
+                return;
+        }
+
+        GType new_type;
+        new_type = midgard_type_register(key, type_attr, MIDGARD_TYPE_OBJECT);
+
+        if (new_type) {
+
+                GObject *foo = g_object_new(new_type, NULL);
+                /* Set number of properties.
+                 * This way we gain performance for instance_init call */
+                GParamSpec **pspecs = 
+                        g_object_class_list_properties(
+                                        G_OBJECT_GET_CLASS(G_OBJECT(foo)), 
+                                        &type_attr->class_nprop);
+                g_free(pspecs);
+                g_object_unref(foo); 
+        }
+}
+
+static void __build_static_sql (gpointer key, gpointer val, gpointer userdata)
+{
+        MgdSchemaTypeAttr *type_attr = (MgdSchemaTypeAttr *)val;
+        midgard_core_schema_type_build_static_sql (type_attr);
+}
+
+static void __initialize_paramspec (gpointer key, gpointer val, gpointer userdata)
+{
+        MgdSchemaTypeAttr *type_attr = (MgdSchemaTypeAttr *)val;
+        midgard_core_schema_type_initialize_paramspec (type_attr);
+}
+
+static void __validate_fields (gpointer key, gpointer val, gpointer userdata)
+{
+        MgdSchemaTypeAttr *type_attr = (MgdSchemaTypeAttr *)val;
+        midgard_core_schema_type_validate_fields (type_attr);
+}
+
+static void __midgard_schema_postconfig(MidgardSchema *self)
+{
+        g_assert(self != NULL);
+
+        g_hash_table_foreach (self->types, __extend_type_foreach, self);
+        g_hash_table_foreach (self->types, __copy_type_foreach, self);
+        g_hash_table_foreach (self->types, __initialize_paramspec, NULL);
+        g_hash_table_foreach (self->types, __build_static_sql, NULL);
+        g_hash_table_foreach (self->types, __validate_fields, NULL);
+        g_hash_table_foreach (self->types, __register_schema_type, NULL);
+}
+
-/**
- * midgard_schema_read_dir:
@@ -1640 +1505 @@
-        gint visible = 0;
-        const gchar *lschema_dir = dirname;
-
-        MidgardSchema *gschema = self;
-
-        if (dirname == NULL) {
@@ -1678 +1541 @@
-                                if(visible == 1){                                       
-                                        /* FIXME, use fpath here */
-gschema
+self
-                                }
-                        }
@@ -1686 +1549 @@
-                         * Glib itself is responsible for data returned from g_dir_read_name */
-                }
+
+                /* post parsing routines */
+                __midgard_schema_postconfig(self);
-
-                /* validate */

trunk/midgard/core/midgard/src/midgard_core_schema.c

@@ -23 +23 @@
-        GString *string;
-        guint elts;
+        MgdSchemaTypeAttr *type;
-}_str_cont;
-
@@ -312 +313 @@
-        midgard_core_schema_type_property_set_table(prop, table);
-
+        /* Set field implicitly */
+        //g_free(prop->field); /* FIXME */
+        prop->field = g_strdup((gchar *)field);
+
-        prop->tablefield = g_strjoin(".", table, field, NULL);
-}
@@ -366 +371 @@
-        gchar *property = (gchar *) key;
-        MgdSchemaPropertyAttr *prop_attr = (MgdSchemaPropertyAttr *)val;
+        MgdSchemaTypeAttr *type = _cont->type;
+
+        /* Check if property attributes are correct */
+        /* Set missed table and tablefield */
+        if (prop_attr->table == NULL) {
+                midgard_core_schema_type_property_set_tablefield(prop_attr, type->table, prop_attr->field);
+        }
+
+        /* upfield defined, set tablefield */
+        if (prop_attr->upfield != NULL) 
+                midgard_core_schema_type_property_set_tablefield(prop_attr, prop_attr->table, prop_attr->upfield);
+        
+        /* parentfield defined, set tablefield */
+        if (prop_attr->parentfield != NULL) 
+                midgard_core_schema_type_property_set_tablefield(prop_attr, prop_attr->table, prop_attr->parentfield);
-
-        if(_cont->elts == 0)
@@ -387 +407 @@
-        cont->string = _sql;
-        cont->elts = 0;
+        cont->type = type_attr;
-
-        g_hash_table_foreach (type_attr->prophash, __build_static_sql, cont);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/midgard/core/midgard/src/midgard_object.c

@@ -2924 +2924 @@
-        MIDGARD_ERRNO_SET(object->dbpriv->mgd, MGD_ERR_OK);
-
-s
-s = object->dbpriv->storage_data->childs
-
-s
+ren
+ren = object->dbpriv->storage_data->children
+
+ren
-                MIDGARD_ERRNO_SET(object->dbpriv->mgd, MGD_ERR_NOT_EXISTS);    
-                return NULL;
-        }
-        
-s
+ren
-                MIDGARD_ERRNO_SET(object->dbpriv->mgd, MGD_ERR_NOT_EXISTS);
-                g_log(G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG,
@@ -3017 +3017 @@
-
-        GSList *list = NULL;
-s; /* FIXME, make it proper English ;) */
+ren;
-
-        for (list = children ; list != NULL; list = list->next) {

trunk/midgard/core/midgard/src/midgard_object_class.c

@@ -144 +144 @@
-
-        _GET_TYPE_ATTR(klass);
-s
+ren
-                return NULL;
-        
-s
+ren
-        guint i = 0;
-        MidgardObjectClass **children = 

trunk/midgard/core/midgard/src/schema.h

@@ -68 +68 @@
-        gchar *primaryfield;
-        gboolean use_lang;
-s
+ren
-        guint property_count;
-        gchar *tmp_select;      
@@ -96 +96 @@
-void                    midgard_core_schema_type_build_static_sql       (MgdSchemaTypeAttr *type_attr);
-void                    midgard_core_schema_type_initialize_paramspec   (MgdSchemaTypeAttr *type);
-
+
-
-/* RESERVED WORDS */